From 9ed70233ff537b0793b89323944642e4c0aa77a4 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Mon, 25 Feb 2019 11:42:51 +0530
Subject: [PATCH 001/295] BAEL2489 - Avoid check for null statement in Java

---
 core-java/pom.xml                             | 40 +++++++++++++------
 .../java/com/baeldung/nulls/APIContracts.java | 29 ++++++++++++++
 .../java/com/baeldung/nulls/Assertions.java   | 13 ++++++
 .../com/baeldung/nulls/EmptyCollections.java  | 24 +++++++++++
 .../baeldung/nulls/FindBugsAnnotations.java   | 28 +++++++++++++
 .../com/baeldung/nulls/Preconditions.java     | 32 +++++++++++++++
 .../baeldung/nulls/PrimitivesAndWrapper.java  | 24 +++++++++++
 .../java/com/baeldung/nulls/UsingLombok.java  | 10 +++++
 .../java/com/baeldung/nulls/UsingObjects.java | 24 +++++++++++
 .../com/baeldung/nulls/UsingOptional.java     | 23 +++++++++++
 .../com/baeldung/nulls/UsingStringUtils.java  | 17 ++++++++
 11 files changed, 251 insertions(+), 13 deletions(-)
 create mode 100644 core-java/src/main/java/com/baeldung/nulls/APIContracts.java
 create mode 100644 core-java/src/main/java/com/baeldung/nulls/Assertions.java
 create mode 100644 core-java/src/main/java/com/baeldung/nulls/EmptyCollections.java
 create mode 100644 core-java/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
 create mode 100644 core-java/src/main/java/com/baeldung/nulls/Preconditions.java
 create mode 100644 core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
 create mode 100644 core-java/src/main/java/com/baeldung/nulls/UsingLombok.java
 create mode 100644 core-java/src/main/java/com/baeldung/nulls/UsingObjects.java
 create mode 100644 core-java/src/main/java/com/baeldung/nulls/UsingOptional.java
 create mode 100644 core-java/src/main/java/com/baeldung/nulls/UsingStringUtils.java

diff --git a/core-java/pom.xml b/core-java/pom.xml
index 463b65a4ce..e8548600f8 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -129,6 +129,13 @@
             <scope>system</scope>
             <systemPath>${java.home}/../lib/tools.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>${intellij.annotations.version}</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>
@@ -209,7 +216,8 @@
                         <configuration>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
                                 </transformer>
                             </transformers>
@@ -264,12 +272,12 @@
                         <argument>-Xmx300m</argument>
                         <argument>-XX:+UseParallelGC</argument>
                         <argument>-classpath</argument>
-                        <classpath />
+                        <classpath/>
                         <argument>com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed</argument>
                     </arguments>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -330,7 +338,7 @@
                                     <executable>java</executable>
                                     <arguments>
                                         <argument>-classpath</argument>
-                                        <classpath />
+                                        <classpath/>
                                         <argument>org.openjdk.jmh.Main</argument>
                                         <argument>.*</argument>
                                     </arguments>
@@ -363,7 +371,8 @@
                                         <manifest>
                                             <addClasspath>true</addClasspath>
                                         </manifest>
-                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF
+                                        </manifestFile>
                                     </archive>
 
                                     <includes>
@@ -397,12 +406,14 @@
                                         <manifest>
                                             <addClasspath>true</addClasspath>
                                         </manifest>
-                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF
+                                        </manifestFile>
                                     </archive>
 
                                     <includes>
                                         <include>com/baeldung/instrumentation/application/MyAtm.class</include>
-                                        <include>com/baeldung/instrumentation/application/MyAtmApplication.class</include>
+                                        <include>com/baeldung/instrumentation/application/MyAtmApplication.class
+                                        </include>
                                         <include>com/baeldung/instrumentation/application/Launcher.class</include>
                                     </includes>
                                 </configuration>
@@ -432,12 +443,14 @@
                                         <manifest>
                                             <addClasspath>true</addClasspath>
                                         </manifest>
-                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF
+                                        </manifestFile>
                                     </archive>
 
                                     <includes>
                                         <include>com/baeldung/instrumentation/agent/AtmTransformer.class</include>
-                                        <include>com/baeldung/instrumentation/agent/MyInstrumentationAgent.class</include>
+                                        <include>com/baeldung/instrumentation/agent/MyInstrumentationAgent.class
+                                        </include>
                                     </includes>
                                 </configuration>
                             </execution>
@@ -449,7 +462,7 @@
     </profiles>
 
     <properties>
-        
+
         <!-- marshalling -->
         <gson.version>2.8.2</gson.version>
 
@@ -470,12 +483,12 @@
 
         <!-- maven plugins -->
         <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
-        
+
         <javamoney.moneta.version>1.1</javamoney.moneta.version>
         <h2database.version>1.4.197</h2database.version>
         <esapi.version>2.1.0.1</esapi.version>
         <jmh-core.version>1.19</jmh-core.version>
-       
+
         <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
         <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
@@ -486,7 +499,8 @@
         <icu4j.version>61.1</icu4j.version>
         <!-- instrumentation -->
         <javaassist.version>3.21.0-GA</javaassist.version>
-        
+
         <sun.tools.version>1.8.0</sun.tools.version>
+        <intellij.annotations.version>16.0.2</intellij.annotations.version>
     </properties>
 </project>
diff --git a/core-java/src/main/java/com/baeldung/nulls/APIContracts.java b/core-java/src/main/java/com/baeldung/nulls/APIContracts.java
new file mode 100644
index 0000000000..f8dfba25dd
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/nulls/APIContracts.java
@@ -0,0 +1,29 @@
+package com.baeldung.nulls;
+
+public class APIContracts {
+
+    /**
+     * Prints the value of {@code param} if not null. Prints {@code null} otherwise.
+     * @param param
+     */
+    public void print(Object param) {
+        System.out.println("Printing " + param);
+    }
+
+    /**
+     *
+     * @return non null result
+     * @throws Exception - if result is null
+     */
+    public Object process() throws Exception {
+        Object result = doSomething();
+        if (result == null)
+            throw new Exception("Processing fail. Got a null response");
+        else
+            return result;
+    }
+
+    private Object doSomething() {
+        return null;
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/nulls/Assertions.java b/core-java/src/main/java/com/baeldung/nulls/Assertions.java
new file mode 100644
index 0000000000..a0d692623f
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/nulls/Assertions.java
@@ -0,0 +1,13 @@
+package com.baeldung.nulls;
+
+public class Assertions {
+    
+    public void accept(Object param){
+        assert param != null;
+        
+        doSomething(param);
+    }
+
+    private void doSomething(Object param) {
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/nulls/EmptyCollections.java b/core-java/src/main/java/com/baeldung/nulls/EmptyCollections.java
new file mode 100644
index 0000000000..95e49e4e91
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/nulls/EmptyCollections.java
@@ -0,0 +1,24 @@
+package com.baeldung.nulls;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class EmptyCollections {
+
+    public List<String> names(){
+        if (userExist())
+            return Stream.of(readName()).collect(Collectors.toList());
+        else
+            return Collections.emptyList();
+    }
+
+    private boolean userExist() {
+        return false;
+    }
+
+    private String readName() {
+        return "test";
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java b/core-java/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
new file mode 100644
index 0000000000..f879f033c9
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
@@ -0,0 +1,28 @@
+package com.baeldung.nulls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class FindBugsAnnotations {
+
+    public void accept(@Nonnull Object param) {
+        System.out.println(param.toString());
+    }
+
+    public void print(@Nullable Object param) {
+        System.out.println("Printing " + param);
+    }
+
+    @Nonnull
+    public Object process() throws Exception {
+        Object result = doSomething();
+        if (result == null)
+            throw new Exception("Processing fail. Got a null response");
+        else
+            return result;
+    }
+
+    private Object doSomething() {
+        return null;
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/nulls/Preconditions.java b/core-java/src/main/java/com/baeldung/nulls/Preconditions.java
new file mode 100644
index 0000000000..ff32db46dd
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/nulls/Preconditions.java
@@ -0,0 +1,32 @@
+package com.baeldung.nulls;
+
+public class Preconditions {
+
+    public void goodAccept(String one, String two, String three) {
+        if (null == one || null == two || three == null)
+            throw new IllegalArgumentException();
+    }
+
+    public void badAccept(String one, String two, String three){
+        if (null == one)
+            throw new IllegalArgumentException();
+        else
+            process(one);
+
+        if (null == two)
+            throw new IllegalArgumentException();
+        else
+            process(two);
+
+        if (null == three)
+            throw new IllegalArgumentException();
+        else
+            process(three);
+
+    }
+
+    private void process(String one) {
+    }
+
+
+}
diff --git a/core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java b/core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
new file mode 100644
index 0000000000..dce7a05308
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
@@ -0,0 +1,24 @@
+package com.baeldung.nulls;
+
+public class PrimitivesAndWrapper {
+
+    public static int sum(int a, int b) {
+        return a + b;
+    }
+
+    public static Integer sum(Integer a, Integer b) {
+        return a + b;
+    }
+
+    public static Integer goodSum(Integer a, Integer b) {
+        if (a != null && b != null)
+            return a + b;
+        else
+            throw new IllegalArgumentException();
+    }
+
+    public static void main(String[] args) {
+        sum(0, 0);
+        sum(null, null);
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/nulls/UsingLombok.java b/core-java/src/main/java/com/baeldung/nulls/UsingLombok.java
new file mode 100644
index 0000000000..73db0742c8
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/nulls/UsingLombok.java
@@ -0,0 +1,10 @@
+package com.baeldung.nulls;
+
+import lombok.NonNull;
+
+public class UsingLombok {
+
+    public void accept(@NonNull Object param){
+        System.out.println(param);
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/nulls/UsingObjects.java b/core-java/src/main/java/com/baeldung/nulls/UsingObjects.java
new file mode 100644
index 0000000000..e8a3262ce7
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/nulls/UsingObjects.java
@@ -0,0 +1,24 @@
+package com.baeldung.nulls;
+
+import java.util.Objects;
+
+public class UsingObjects {
+
+    private String checked;
+
+    public void accept(Object param) {
+        try {
+            Objects.requireNonNull(param);
+        } catch (NullPointerException e) {
+            //doSomethingElseToo
+            e.printStackTrace();
+        }
+    }
+
+    public void caller() throws Exception {
+        if (Objects.nonNull(checked))
+            accept(checked);
+        else
+            throw new Exception();
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/nulls/UsingOptional.java b/core-java/src/main/java/com/baeldung/nulls/UsingOptional.java
new file mode 100644
index 0000000000..626afc311d
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/nulls/UsingOptional.java
@@ -0,0 +1,23 @@
+package com.baeldung.nulls;
+
+import java.util.Optional;
+
+public class UsingOptional {
+
+    public Optional<Object> process() {
+        if (isProcessed())
+            return Optional.of("dummy");
+        else
+            return Optional.empty();
+    }
+
+    public void caller() {
+        Optional<Object> result = process();
+        result.ifPresent(p -> System.out.println(p));
+        result.orElseThrow(() -> new IllegalArgumentException());
+    }
+
+    private boolean isProcessed() {
+        return false;
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/nulls/UsingStringUtils.java b/core-java/src/main/java/com/baeldung/nulls/UsingStringUtils.java
new file mode 100644
index 0000000000..8cbf3752e1
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/nulls/UsingStringUtils.java
@@ -0,0 +1,17 @@
+package com.baeldung.nulls;
+
+
+import org.apache.commons.lang3.StringUtils;
+
+public class UsingStringUtils {
+
+    public void accept(String param) {
+        if (StringUtils.isNotEmpty(param))
+            System.out.println(param);
+    }
+
+    public void acceptOnlyNonBlank(String param) {
+        if (StringUtils.isNotBlank(param))
+            System.out.println(param);
+    }
+}

From 70016f1d76e69db776dc7de6ddee390e3db18bb3 Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Tue, 26 Feb 2019 22:28:52 +0200
Subject: [PATCH 002/295] fix spring-data-jpa module

---
 persistence-modules/spring-data-jpa/pom.xml   |   4 +
 .../com/baeldung/{ => boot}/Application.java  |   5 +-
 .../boot/config/PersistenceConfiguration.java |  33 ++
 .../daos}/ArticleRepository.java              |   5 +-
 .../daos}/CustomItemRepository.java           |   4 +-
 .../daos}/CustomItemTypeRepository.java       |   4 +-
 .../daos}/ExtendedRepository.java             |   2 +-
 .../daos}/ExtendedStudentRepository.java      |   4 +-
 .../daos}/IBarCrudRepository.java             |   5 +-
 .../baeldung/{dao => boot/daos}/IFooDao.java  |   5 +-
 .../daos}/InventoryRepository.java            |   5 +-
 .../daos}/ItemTypeRepository.java             |   4 +-
 .../daos}/LocationRepository.java             |   4 +-
 .../daos}/ReadOnlyLocationRepository.java     |   4 +-
 .../daos}/StoreRepository.java                |   4 +-
 .../daos}/impl/CustomItemRepositoryImpl.java  |   6 +-
 .../impl/CustomItemTypeRepositoryImpl.java    |   6 +-
 .../daos}/impl/ExtendedRepositoryImpl.java    |   5 +-
 .../daos}/impl/PersonInsertRepository.java    |   5 +-
 .../{ => boot}/ddd/event/Aggregate.java       |   2 +-
 .../{ => boot}/ddd/event/Aggregate2.java      |   2 +-
 .../ddd/event/Aggregate2Repository.java       |   2 +-
 .../{ => boot}/ddd/event/Aggregate3.java      |   2 +-
 .../ddd/event/Aggregate3Repository.java       |   2 +-
 .../ddd/event/AggregateRepository.java        |   2 +-
 .../{ => boot}/ddd/event/DddConfig.java       |   2 +-
 .../baeldung/boot/ddd/event/DomainEvent.java  |   8 +
 .../{ => boot}/ddd/event/DomainService.java   |   2 +-
 .../baeldung/{ => boot}/domain/Article.java   |   2 +-
 .../com/baeldung/{ => boot}/domain/Bar.java   |   2 +-
 .../com/baeldung/{ => boot}/domain/Foo.java   |   2 +-
 .../com/baeldung/{ => boot}/domain/Item.java  |   2 +-
 .../baeldung/{ => boot}/domain/ItemType.java  |   2 +-
 .../com/baeldung/{ => boot}/domain/KVTag.java |   2 +-
 .../baeldung/{ => boot}/domain/Location.java  |   2 +-
 .../{ => boot}/domain/MerchandiseEntity.java  |   2 +-
 .../baeldung/{ => boot}/domain/Person.java    |   2 +-
 .../user => boot/domain}/Possession.java      |   2 +-
 .../baeldung/{ => boot}/domain/SkillTag.java  |   2 +-
 .../com/baeldung/{ => boot}/domain/Store.java |   2 +-
 .../baeldung/{ => boot}/domain/Student.java   |   2 +-
 .../java/com/baeldung/boot/domain/User.java   |  86 ++++
 .../passenger/CustomPassengerRepository.java  |   2 +-
 .../{ => boot}/passenger/Passenger.java       |   2 +-
 .../passenger/PassengerRepository.java        |   2 +-
 .../passenger/PassengerRepositoryImpl.java    |   2 +-
 .../baeldung/boot/services/IBarService.java   |   7 +
 .../{ => boot}/services/IFooService.java      |   5 +-
 .../{ => boot}/services/IOperations.java      |   2 +-
 .../services/impl/AbstractService.java        |   4 +-
 .../impl/AbstractSpringDataJpaService.java    |   4 +-
 .../impl/BarSpringDataJpaService.java         |   9 +-
 .../{ => boot}/services/impl/FooService.java  |   9 +-
 .../user/PossessionRepository.java            |   5 +-
 .../baeldung/boot/user/UserRepository.java    |  81 ++++
 .../boot/user/UserRepositoryCustom.java       |  10 +
 .../boot/user/UserRepositoryCustomImpl.java   |  43 ++
 .../config/PersistenceConfiguration.java      |  97 -----
 .../com/baeldung/ddd/event/DomainEvent.java   |   8 -
 .../multipledb/MultipleDbApplication.java     |  14 +
 .../PersistenceProductConfiguration.java      |   8 +-
 .../PersistenceUserConfiguration.java         |   8 +-
 .../com/baeldung/multipledb/Possession.java   |  82 ++++
 .../multipledb/PossessionRepository.java      |   9 +
 .../product => multipledb}/Product.java       |   2 +-
 .../ProductRepository.java                    |   4 +-
 .../java/com/baeldung/multipledb/User.java    |  76 ++++
 .../com/baeldung/services/IBarService.java    |   7 -
 .../src/main/resources/application.properties |  20 +-
 .../src/main/resources/persistence.properties |   2 -
 .../ArticleRepositoryIntegrationTest.java     |  15 +-
 ...endedStudentRepositoryIntegrationTest.java |  11 +-
 .../InventoryRepositoryIntegrationTest.java   |  12 +-
 .../daos}/JpaRepositoriesIntegrationTest.java |  24 +-
 ...PersonInsertRepositoryIntegrationTest.java |   7 +-
 .../boot/daos/UserRepositoryCommon.java       | 405 ++++++++++++++++++
 .../daos/UserRepositoryIntegrationTest.java   |  37 ++
 .../UserRepositoryTCAutoIntegrationTest.java  |  40 ++
 .../daos/UserRepositoryTCIntegrationTest.java |  56 +++
 .../Aggregate2EventsIntegrationTest.java      |   6 +-
 .../Aggregate3EventsIntegrationTest.java      |   6 +-
 .../event/AggregateEventsIntegrationTest.java |   7 +-
 .../ddd/event/TestEventHandler.java           |   4 +-
 .../PassengerRepositoryIntegrationTest.java   |   5 +-
 ...ractServicePersistenceIntegrationTest.java |   5 +-
 .../FooServicePersistenceIntegrationTest.java |  13 +-
 .../SpringDataJPABarAuditIntegrationTest.java |  11 +-
 .../JpaMultipleDBIntegrationTest.java         |  21 +-
 .../ProductRepositoryIntegrationTest.java     |  10 +-
 .../SpringContextIntegrationTest.java         |   2 +-
 .../SpringJpaContextIntegrationTest.java      |   8 +-
 91 files changed, 1202 insertions(+), 277 deletions(-)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/Application.java (75%)
 create mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/config/PersistenceConfiguration.java
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/ArticleRepository.java (90%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/CustomItemRepository.java (74%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/CustomItemTypeRepository.java (71%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/ExtendedRepository.java (90%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/ExtendedStudentRepository.java (54%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/IBarCrudRepository.java (71%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao => boot/daos}/IFooDao.java (83%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/InventoryRepository.java (63%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/ItemTypeRepository.java (76%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/LocationRepository.java (72%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/ReadOnlyLocationRepository.java (79%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/StoreRepository.java (79%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/impl/CustomItemRepositoryImpl.java (83%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/impl/CustomItemTypeRepositoryImpl.java (84%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/impl/ExtendedRepositoryImpl.java (93%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/impl/PersonInsertRepository.java (90%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/ddd/event/Aggregate.java (95%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/ddd/event/Aggregate2.java (95%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/ddd/event/Aggregate2Repository.java (80%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/ddd/event/Aggregate3.java (91%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/ddd/event/Aggregate3Repository.java (83%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/ddd/event/AggregateRepository.java (80%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/ddd/event/DddConfig.java (89%)
 create mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/DomainEvent.java
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/ddd/event/DomainService.java (95%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/domain/Article.java (92%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/domain/Bar.java (99%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/domain/Foo.java (98%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/domain/Item.java (97%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/domain/ItemType.java (96%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/domain/KVTag.java (94%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/domain/Location.java (96%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/domain/MerchandiseEntity.java (97%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/domain/Person.java (95%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{domain/user => boot/domain}/Possession.java (98%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/domain/SkillTag.java (93%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/domain/Store.java (97%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/domain/Student.java (97%)
 create mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/User.java
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/passenger/CustomPassengerRepository.java (77%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/passenger/Passenger.java (98%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/passenger/PassengerRepository.java (92%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/passenger/PassengerRepositoryImpl.java (93%)
 create mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/IBarService.java
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/services/IFooService.java (76%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/services/IOperations.java (92%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/services/impl/AbstractService.java (94%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/services/impl/AbstractSpringDataJpaService.java (92%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/services/impl/BarSpringDataJpaService.java (79%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{ => boot}/services/impl/FooService.java (87%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot}/user/PossessionRepository.java (62%)
 create mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepository.java
 create mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustom.java
 create mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustomImpl.java
 delete mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/config/PersistenceConfiguration.java
 delete mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/DomainEvent.java
 create mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/MultipleDbApplication.java
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{config => multipledb}/PersistenceProductConfiguration.java (90%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{config => multipledb}/PersistenceUserConfiguration.java (90%)
 create mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/Possession.java
 create mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PossessionRepository.java
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{domain/product => multipledb}/Product.java (97%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories/product => multipledb}/ProductRepository.java (76%)
 create mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/User.java
 delete mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/IBarService.java
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{dao/repositories => boot/daos}/ArticleRepositoryIntegrationTest.java (82%)
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{dao/repositories => boot/daos}/ExtendedStudentRepositoryIntegrationTest.java (80%)
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{dao/repositories => boot/daos}/InventoryRepositoryIntegrationTest.java (85%)
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{dao/repositories => boot/daos}/JpaRepositoriesIntegrationTest.java (80%)
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{dao/repositories => boot/daos}/PersonInsertRepositoryIntegrationTest.java (94%)
 create mode 100644 persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryCommon.java
 create mode 100644 persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryIntegrationTest.java
 create mode 100644 persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCAutoIntegrationTest.java
 create mode 100644 persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCIntegrationTest.java
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{ => boot}/ddd/event/Aggregate2EventsIntegrationTest.java (90%)
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{ => boot}/ddd/event/Aggregate3EventsIntegrationTest.java (90%)
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{ => boot}/ddd/event/AggregateEventsIntegrationTest.java (91%)
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{ => boot}/ddd/event/TestEventHandler.java (68%)
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{ => boot}/passenger/PassengerRepositoryIntegrationTest.java (97%)
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{ => boot}/services/AbstractServicePersistenceIntegrationTest.java (98%)
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{ => boot}/services/FooServicePersistenceIntegrationTest.java (85%)
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{ => boot}/services/SpringDataJPABarAuditIntegrationTest.java (87%)
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{services => multipledb}/JpaMultipleDBIntegrationTest.java (83%)
 rename persistence-modules/spring-data-jpa/src/test/java/com/baeldung/{dao/repositories/product => multipledb}/ProductRepositoryIntegrationTest.java (93%)

diff --git a/persistence-modules/spring-data-jpa/pom.xml b/persistence-modules/spring-data-jpa/pom.xml
index 401f4877ac..91bcbb69b2 100644
--- a/persistence-modules/spring-data-jpa/pom.xml
+++ b/persistence-modules/spring-data-jpa/pom.xml
@@ -80,5 +80,9 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    
+    <properties>
+    	<start-class>com.baeldung.boot.Application</start-class>
+    </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/Application.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/Application.java
similarity index 75%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/Application.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/Application.java
index 72d29d9fa5..1f078801e2 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/Application.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/Application.java
@@ -1,10 +1,11 @@
-package com.baeldung;
+package com.baeldung.boot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
-import com.baeldung.dao.repositories.impl.ExtendedRepositoryImpl;
+import com.baeldung.boot.daos.impl.ExtendedRepositoryImpl;
+import com.baeldung.multipledb.MultipleDbApplication;
 
 @SpringBootApplication
 @EnableJpaRepositories(repositoryBaseClass = ExtendedRepositoryImpl.class)
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/config/PersistenceConfiguration.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/config/PersistenceConfiguration.java
new file mode 100644
index 0000000000..64e3cd8c9a
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/config/PersistenceConfiguration.java
@@ -0,0 +1,33 @@
+package com.baeldung.boot.config;
+
+import com.baeldung.boot.daos.impl.ExtendedRepositoryImpl;
+import com.baeldung.boot.services.IBarService;
+import com.baeldung.boot.services.impl.BarSpringDataJpaService;
+import com.google.common.base.Preconditions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.*;
+import org.springframework.core.env.Environment;
+import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.JpaVendorAdapter;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.sql.DataSource;
+import java.util.Properties;
+
+@Configuration
+@Profile("!tc")
+public class PersistenceConfiguration {
+
+    @Bean
+    public IBarService barSpringDataJpaService() {
+        return new BarSpringDataJpaService();
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ArticleRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ArticleRepository.java
similarity index 90%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ArticleRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ArticleRepository.java
index 8402c099d9..73397ad42e 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ArticleRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ArticleRepository.java
@@ -1,10 +1,11 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
 
-import com.baeldung.domain.Article;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import com.baeldung.boot.domain.Article;
+
 import java.util.Date;
 import java.util.List;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/CustomItemRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/CustomItemRepository.java
similarity index 74%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/CustomItemRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/CustomItemRepository.java
index ba077ccf1f..207f992b33 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/CustomItemRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/CustomItemRepository.java
@@ -1,8 +1,8 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
 
 import org.springframework.stereotype.Repository;
 
-import com.baeldung.domain.Item;
+import com.baeldung.boot.domain.Item;
 
 @Repository
 public interface CustomItemRepository {
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/CustomItemTypeRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/CustomItemTypeRepository.java
similarity index 71%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/CustomItemTypeRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/CustomItemTypeRepository.java
index 81ebdf3fda..832d61408c 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/CustomItemTypeRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/CustomItemTypeRepository.java
@@ -1,8 +1,8 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
 
 import org.springframework.stereotype.Repository;
 
-import com.baeldung.domain.ItemType;
+import com.baeldung.boot.domain.ItemType;
 
 @Repository
 public interface CustomItemTypeRepository {
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ExtendedRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ExtendedRepository.java
similarity index 90%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ExtendedRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ExtendedRepository.java
index 9e82f02fa6..adb2af4320 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ExtendedRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ExtendedRepository.java
@@ -1,4 +1,4 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ExtendedStudentRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ExtendedStudentRepository.java
similarity index 54%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ExtendedStudentRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ExtendedStudentRepository.java
index 199e4e5ff6..c9b0192536 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ExtendedStudentRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ExtendedStudentRepository.java
@@ -1,6 +1,6 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
 
-import com.baeldung.domain.Student;
+import com.baeldung.boot.domain.Student;
 
 public interface ExtendedStudentRepository extends ExtendedRepository<Student, Long> {
 }
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/IBarCrudRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/IBarCrudRepository.java
similarity index 71%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/IBarCrudRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/IBarCrudRepository.java
index 54a7d77691..921fabe3fb 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/IBarCrudRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/IBarCrudRepository.java
@@ -1,8 +1,9 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
 
-import com.baeldung.domain.Bar;
 import org.springframework.data.repository.CrudRepository;
 
+import com.baeldung.boot.domain.Bar;
+
 import java.io.Serializable;
 
 public interface IBarCrudRepository extends CrudRepository<Bar, Serializable> {
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/IFooDao.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/IFooDao.java
similarity index 83%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/IFooDao.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/IFooDao.java
index bb3c229945..d537772076 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/IFooDao.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/IFooDao.java
@@ -1,10 +1,11 @@
-package com.baeldung.dao;
+package com.baeldung.boot.daos;
 
-import com.baeldung.domain.Foo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import com.baeldung.boot.domain.Foo;
+
 public interface IFooDao extends JpaRepository<Foo, Long> {
 
     @Query("SELECT f FROM Foo f WHERE LOWER(f.name) = LOWER(:name)")
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/InventoryRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/InventoryRepository.java
similarity index 63%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/InventoryRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/InventoryRepository.java
index a575f0b915..606f3993d5 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/InventoryRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/InventoryRepository.java
@@ -1,7 +1,8 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
 
-import com.baeldung.domain.MerchandiseEntity;
 import org.springframework.data.repository.CrudRepository;
 
+import com.baeldung.boot.domain.MerchandiseEntity;
+
 public interface InventoryRepository extends CrudRepository<MerchandiseEntity, Long> {
 }
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ItemTypeRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ItemTypeRepository.java
similarity index 76%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ItemTypeRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ItemTypeRepository.java
index 2af83bc322..413c09e968 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ItemTypeRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ItemTypeRepository.java
@@ -1,9 +1,9 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import com.baeldung.domain.ItemType;
+import com.baeldung.boot.domain.ItemType;
 
 @Repository
 public interface ItemTypeRepository extends JpaRepository<ItemType, Long>, CustomItemTypeRepository, CustomItemRepository {
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/LocationRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/LocationRepository.java
similarity index 72%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/LocationRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/LocationRepository.java
index 27bbe27af0..697ce295d0 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/LocationRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/LocationRepository.java
@@ -1,9 +1,9 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import com.baeldung.domain.Location;
+import com.baeldung.boot.domain.Location;
 
 @Repository
 public interface LocationRepository extends JpaRepository<Location, Long> {
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ReadOnlyLocationRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ReadOnlyLocationRepository.java
similarity index 79%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ReadOnlyLocationRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ReadOnlyLocationRepository.java
index 8f68cdbbe5..3a2ea3cda5 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ReadOnlyLocationRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/ReadOnlyLocationRepository.java
@@ -1,10 +1,10 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
 
 import java.util.Optional;
 
 import org.springframework.data.repository.Repository;
 
-import com.baeldung.domain.Location;
+import com.baeldung.boot.domain.Location;
 
 @org.springframework.stereotype.Repository
 public interface ReadOnlyLocationRepository extends Repository<Location, Long> {
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/StoreRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/StoreRepository.java
similarity index 79%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/StoreRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/StoreRepository.java
index 9318c32ee9..ae13f75f66 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/StoreRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/StoreRepository.java
@@ -1,11 +1,11 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import com.baeldung.domain.Store;
+import com.baeldung.boot.domain.Store;
 
 @Repository
 public interface StoreRepository extends JpaRepository<Store, Long> {
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/CustomItemRepositoryImpl.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/impl/CustomItemRepositoryImpl.java
similarity index 83%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/CustomItemRepositoryImpl.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/impl/CustomItemRepositoryImpl.java
index 53def88af0..7c681eb49f 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/CustomItemRepositoryImpl.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/impl/CustomItemRepositoryImpl.java
@@ -1,12 +1,12 @@
-package com.baeldung.dao.repositories.impl;
+package com.baeldung.boot.daos.impl;
 
 import javax.persistence.EntityManager;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
-import com.baeldung.domain.Item;
-import com.baeldung.dao.repositories.CustomItemRepository;
+import com.baeldung.boot.daos.CustomItemRepository;
+import com.baeldung.boot.domain.Item;
 
 @Repository
 public class CustomItemRepositoryImpl implements CustomItemRepository {
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/CustomItemTypeRepositoryImpl.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/impl/CustomItemTypeRepositoryImpl.java
similarity index 84%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/CustomItemTypeRepositoryImpl.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/impl/CustomItemTypeRepositoryImpl.java
index 2b49f2380c..d7cba7c2c6 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/CustomItemTypeRepositoryImpl.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/impl/CustomItemTypeRepositoryImpl.java
@@ -1,4 +1,4 @@
-package com.baeldung.dao.repositories.impl;
+package com.baeldung.boot.daos.impl;
 
 import javax.persistence.EntityManager;
 
@@ -7,8 +7,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
-import com.baeldung.domain.ItemType;
-import com.baeldung.dao.repositories.CustomItemTypeRepository;
+import com.baeldung.boot.daos.CustomItemTypeRepository;
+import com.baeldung.boot.domain.ItemType;
 
 @Repository
 public class CustomItemTypeRepositoryImpl implements CustomItemTypeRepository {
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/ExtendedRepositoryImpl.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/impl/ExtendedRepositoryImpl.java
similarity index 93%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/ExtendedRepositoryImpl.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/impl/ExtendedRepositoryImpl.java
index f6f06efb51..fbe6695844 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/ExtendedRepositoryImpl.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/impl/ExtendedRepositoryImpl.java
@@ -1,4 +1,4 @@
-package com.baeldung.dao.repositories.impl;
+package com.baeldung.boot.daos.impl;
 
 import java.io.Serializable;
 import java.util.List;
@@ -10,10 +10,11 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 import javax.transaction.Transactional;
 
-import com.baeldung.dao.repositories.ExtendedRepository;
 import org.springframework.data.jpa.repository.support.JpaEntityInformation;
 import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
 
+import com.baeldung.boot.daos.ExtendedRepository;
+
 public class ExtendedRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRepository<T, ID> implements ExtendedRepository<T, ID> {
 
     private EntityManager entityManager;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/PersonInsertRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/impl/PersonInsertRepository.java
similarity index 90%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/PersonInsertRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/impl/PersonInsertRepository.java
index d809385456..373532e1c3 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/PersonInsertRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/impl/PersonInsertRepository.java
@@ -1,8 +1,9 @@
-package com.baeldung.dao.repositories.impl;
+package com.baeldung.boot.daos.impl;
 
-import com.baeldung.domain.Person;
 import org.springframework.stereotype.Repository;
 
+import com.baeldung.boot.domain.Person;
+
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.transaction.Transactional;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate.java
similarity index 95%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate.java
index bf6ff0a0b9..e435f4c85c 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package com.baeldung.ddd.event;
+package com.baeldung.boot.ddd.event;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate2.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate2.java
similarity index 95%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate2.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate2.java
index 3d2816299a..08f61db812 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate2.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate2.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package com.baeldung.ddd.event;
+package com.baeldung.boot.ddd.event;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate2Repository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate2Repository.java
similarity index 80%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate2Repository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate2Repository.java
index 2a95abe347..7f09c410fc 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate2Repository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate2Repository.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package com.baeldung.ddd.event;
+package com.baeldung.boot.ddd.event;
 
 import org.springframework.data.repository.CrudRepository;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate3.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate3.java
similarity index 91%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate3.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate3.java
index e0c3131b06..f664322a59 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate3.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate3.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package com.baeldung.ddd.event;
+package com.baeldung.boot.ddd.event;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate3Repository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate3Repository.java
similarity index 83%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate3Repository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate3Repository.java
index e442bdb210..93f50bb5cf 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/Aggregate3Repository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/Aggregate3Repository.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.baeldung.ddd.event;
+package com.baeldung.boot.ddd.event;
 
 import org.springframework.data.repository.CrudRepository;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/AggregateRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/AggregateRepository.java
similarity index 80%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/AggregateRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/AggregateRepository.java
index 5a15156d03..1c2d3884bf 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/AggregateRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/AggregateRepository.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package com.baeldung.ddd.event;
+package com.baeldung.boot.ddd.event;
 
 import org.springframework.data.repository.CrudRepository;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/DddConfig.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/DddConfig.java
similarity index 89%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/DddConfig.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/DddConfig.java
index 1315b11875..34cf21463b 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/DddConfig.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/DddConfig.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package com.baeldung.ddd.event;
+package com.baeldung.boot.ddd.event;
 
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/DomainEvent.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/DomainEvent.java
new file mode 100644
index 0000000000..e7626e742d
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/DomainEvent.java
@@ -0,0 +1,8 @@
+/**
+ *
+ */
+package com.baeldung.boot.ddd.event;
+
+class DomainEvent {
+
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/DomainService.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/DomainService.java
similarity index 95%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/DomainService.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/DomainService.java
index 082c9bd88e..80aa5ca6cb 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/DomainService.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/ddd/event/DomainService.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package com.baeldung.ddd.event;
+package com.baeldung.boot.ddd.event;
 
 import javax.transaction.Transactional;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Article.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Article.java
similarity index 92%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Article.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Article.java
index 3b5a8be088..de4dbed1a0 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Article.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Article.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import javax.persistence.*;
 import java.util.Date;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Bar.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Bar.java
similarity index 99%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Bar.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Bar.java
index efd297bafc..35d1903801 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Bar.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Bar.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import com.google.common.collect.Sets;
 import org.hibernate.annotations.OrderBy;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Foo.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Foo.java
similarity index 98%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Foo.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Foo.java
index ef88840746..5030e5600b 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Foo.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Foo.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import org.hibernate.envers.Audited;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Item.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Item.java
similarity index 97%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Item.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Item.java
index 1e58fb25ba..8ac06af15a 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Item.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Item.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import java.math.BigDecimal;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/ItemType.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/ItemType.java
similarity index 96%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/ItemType.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/ItemType.java
index b0349e0471..8a52a9847c 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/ItemType.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/ItemType.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/KVTag.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/KVTag.java
similarity index 94%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/KVTag.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/KVTag.java
index b3e7d78b30..1901f43c0a 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/KVTag.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/KVTag.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import javax.persistence.Embeddable;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Location.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Location.java
similarity index 96%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Location.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Location.java
index 4ca7295986..9c1b93d551 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Location.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Location.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/MerchandiseEntity.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/MerchandiseEntity.java
similarity index 97%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/MerchandiseEntity.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/MerchandiseEntity.java
index bfc690e0e2..e94c23de86 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/MerchandiseEntity.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/MerchandiseEntity.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Person.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Person.java
similarity index 95%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Person.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Person.java
index 30d7370982..88894ccc72 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Person.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Person.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/user/Possession.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Possession.java
similarity index 98%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/user/Possession.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Possession.java
index b1427c0270..44cdce86c0 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/user/Possession.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Possession.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain.user;
+package com.baeldung.boot.domain;
 
 import javax.persistence.*;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/SkillTag.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/SkillTag.java
similarity index 93%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/SkillTag.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/SkillTag.java
index 1f2778c589..0933a3e6af 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/SkillTag.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/SkillTag.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import javax.persistence.Embeddable;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Store.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Store.java
similarity index 97%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Store.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Store.java
index 4172051c71..5b4b831cc7 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Store.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Store.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Student.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Student.java
similarity index 97%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Student.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Student.java
index bd7eaeb24b..1003167cc7 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Student.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Student.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/User.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/User.java
new file mode 100644
index 0000000000..5c709307ac
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/User.java
@@ -0,0 +1,86 @@
+package com.baeldung.boot.domain;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+@Table(name = "users")
+public class User {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+    private String name;
+    private int age;
+    @Column(unique = true, nullable = false)
+    private String email;
+    private Integer status;
+    @OneToMany
+    List<Possession> possessionList;
+
+    public User() {
+        super();
+    }
+
+    public User(String name, String email, Integer status) {
+        this.name = name;
+        this.email = email;
+        this.status = status;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(final String email) {
+        this.email = email;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(final int age) {
+        this.age = age;
+    }
+
+    public List<Possession> getPossessionList() {
+        return possessionList;
+    }
+
+    public void setPossessionList(List<Possession> possessionList) {
+        this.possessionList = possessionList;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("User [name=").append(name).append(", id=").append(id).append("]");
+        return builder.toString();
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/passenger/CustomPassengerRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/passenger/CustomPassengerRepository.java
similarity index 77%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/passenger/CustomPassengerRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/passenger/CustomPassengerRepository.java
index 7ae44bfbda..7152286c83 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/passenger/CustomPassengerRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/passenger/CustomPassengerRepository.java
@@ -1,4 +1,4 @@
-package com.baeldung.passenger;
+package com.baeldung.boot.passenger;
 
 import java.util.List;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/passenger/Passenger.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/passenger/Passenger.java
similarity index 98%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/passenger/Passenger.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/passenger/Passenger.java
index a96b1edb20..c75107a783 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/passenger/Passenger.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/passenger/Passenger.java
@@ -1,4 +1,4 @@
-package com.baeldung.passenger;
+package com.baeldung.boot.passenger;
 
 import javax.persistence.Basic;
 import javax.persistence.Column;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/passenger/PassengerRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/passenger/PassengerRepository.java
similarity index 92%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/passenger/PassengerRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/passenger/PassengerRepository.java
index 6ae6afb403..107ea838ed 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/passenger/PassengerRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/passenger/PassengerRepository.java
@@ -1,4 +1,4 @@
-package com.baeldung.passenger;
+package com.baeldung.boot.passenger;
 
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/passenger/PassengerRepositoryImpl.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/passenger/PassengerRepositoryImpl.java
similarity index 93%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/passenger/PassengerRepositoryImpl.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/passenger/PassengerRepositoryImpl.java
index bd6e535e3e..508c669066 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/passenger/PassengerRepositoryImpl.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/passenger/PassengerRepositoryImpl.java
@@ -1,4 +1,4 @@
-package com.baeldung.passenger;
+package com.baeldung.boot.passenger;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/IBarService.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/IBarService.java
new file mode 100644
index 0000000000..8054cbba59
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/IBarService.java
@@ -0,0 +1,7 @@
+package com.baeldung.boot.services;
+
+import com.baeldung.boot.domain.Bar;
+
+public interface IBarService extends IOperations<Bar> {
+    //
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/IFooService.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/IFooService.java
similarity index 76%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/IFooService.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/IFooService.java
index 7e16ace5b6..871cccdd45 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/IFooService.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/IFooService.java
@@ -1,9 +1,10 @@
-package com.baeldung.services;
+package com.baeldung.boot.services;
 
-import com.baeldung.domain.Foo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import com.baeldung.boot.domain.Foo;
+
 public interface IFooService extends IOperations<Foo> {
 
     Foo retrieveByName(String name);
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/IOperations.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/IOperations.java
similarity index 92%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/IOperations.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/IOperations.java
index d50d465639..ec2b866b6f 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/IOperations.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/IOperations.java
@@ -1,4 +1,4 @@
-package com.baeldung.services;
+package com.baeldung.boot.services;
 
 import org.springframework.data.domain.Page;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/impl/AbstractService.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/impl/AbstractService.java
similarity index 94%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/impl/AbstractService.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/impl/AbstractService.java
index 708524225b..8e4f643adc 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/impl/AbstractService.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/impl/AbstractService.java
@@ -1,6 +1,6 @@
-package com.baeldung.services.impl;
+package com.baeldung.boot.services.impl;
 
-import com.baeldung.services.IOperations;
+import com.baeldung.boot.services.IOperations;
 import com.google.common.collect.Lists;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/impl/AbstractSpringDataJpaService.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/impl/AbstractSpringDataJpaService.java
similarity index 92%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/impl/AbstractSpringDataJpaService.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/impl/AbstractSpringDataJpaService.java
index 28c86bee28..a73a6bd7fc 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/impl/AbstractSpringDataJpaService.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/impl/AbstractSpringDataJpaService.java
@@ -1,6 +1,6 @@
-package com.baeldung.services.impl;
+package com.baeldung.boot.services.impl;
 
-import com.baeldung.services.IOperations;
+import com.baeldung.boot.services.IOperations;
 import com.google.common.collect.Lists;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/impl/BarSpringDataJpaService.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/impl/BarSpringDataJpaService.java
similarity index 79%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/impl/BarSpringDataJpaService.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/impl/BarSpringDataJpaService.java
index ca3e5f868d..80568f2fd4 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/impl/BarSpringDataJpaService.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/impl/BarSpringDataJpaService.java
@@ -1,8 +1,9 @@
-package com.baeldung.services.impl;
+package com.baeldung.boot.services.impl;
+
+import com.baeldung.boot.daos.IBarCrudRepository;
+import com.baeldung.boot.domain.Bar;
+import com.baeldung.boot.services.IBarService;
 
-import com.baeldung.domain.Bar;
-import com.baeldung.dao.repositories.IBarCrudRepository;
-import com.baeldung.services.IBarService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.repository.CrudRepository;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/impl/FooService.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/impl/FooService.java
similarity index 87%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/impl/FooService.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/impl/FooService.java
index 319ab3a825..04eec63854 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/impl/FooService.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/services/impl/FooService.java
@@ -1,9 +1,10 @@
-package com.baeldung.services.impl;
+package com.baeldung.boot.services.impl;
 
 import com.google.common.collect.Lists;
-import com.baeldung.dao.IFooDao;
-import com.baeldung.domain.Foo;
-import com.baeldung.services.IFooService;
+import com.baeldung.boot.daos.IFooDao;
+import com.baeldung.boot.domain.Foo;
+import com.baeldung.boot.services.IFooService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/PossessionRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/PossessionRepository.java
similarity index 62%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/PossessionRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/PossessionRepository.java
index f0eeb475c1..63af5ca05d 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/PossessionRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/PossessionRepository.java
@@ -1,8 +1,9 @@
-package com.baeldung.dao.repositories.user;
+package com.baeldung.boot.user;
 
-import com.baeldung.domain.user.Possession;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import com.baeldung.boot.domain.Possession;
+
 public interface PossessionRepository extends JpaRepository<Possession, Long> {
 
 }
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepository.java
new file mode 100644
index 0000000000..1097387e7b
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepository.java
@@ -0,0 +1,81 @@
+package com.baeldung.boot.user;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import com.baeldung.boot.domain.User;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Stream;
+
+public interface UserRepository extends JpaRepository<User, Integer> , UserRepositoryCustom{
+
+    Stream<User> findAllByName(String name);
+
+    @Query("SELECT u FROM User u WHERE u.status = 1")
+    Collection<User> findAllActiveUsers();
+
+    @Query(value = "SELECT * FROM Users u WHERE u.status = 1", nativeQuery = true)
+    Collection<User> findAllActiveUsersNative();
+
+    @Query("SELECT u FROM User u WHERE u.status = ?1")
+    User findUserByStatus(Integer status);
+
+    @Query(value = "SELECT * FROM Users u WHERE u.status = ?1", nativeQuery = true)
+    User findUserByStatusNative(Integer status);
+
+    @Query("SELECT u FROM User u WHERE u.status = ?1 and u.name = ?2")
+    User findUserByStatusAndName(Integer status, String name);
+
+    @Query("SELECT u FROM User u WHERE u.status = :status and u.name = :name")
+    User findUserByStatusAndNameNamedParams(@Param("status") Integer status, @Param("name") String name);
+
+    @Query(value = "SELECT * FROM Users u WHERE u.status = :status AND u.name = :name", nativeQuery = true)
+    User findUserByStatusAndNameNamedParamsNative(@Param("status") Integer status, @Param("name") String name);
+
+    @Query("SELECT u FROM User u WHERE u.status = :status and u.name = :name")
+    User findUserByUserStatusAndUserName(@Param("status") Integer userStatus, @Param("name") String userName);
+
+    @Query("SELECT u FROM User u WHERE u.name like ?1%")
+    User findUserByNameLike(String name);
+
+    @Query("SELECT u FROM User u WHERE u.name like :name%")
+    User findUserByNameLikeNamedParam(@Param("name") String name);
+
+    @Query(value = "SELECT * FROM users u WHERE u.name LIKE ?1%", nativeQuery = true)
+    User findUserByNameLikeNative(String name);
+
+    @Query(value = "SELECT u FROM User u")
+    List<User> findAllUsers(Sort sort);
+
+    @Query(value = "SELECT u FROM User u ORDER BY id")
+    Page<User> findAllUsersWithPagination(Pageable pageable);
+
+    @Query(value = "SELECT * FROM Users ORDER BY id", countQuery = "SELECT count(*) FROM Users", nativeQuery = true)
+    Page<User> findAllUsersWithPaginationNative(Pageable pageable);
+
+    @Modifying
+    @Query("update User u set u.status = :status where u.name = :name")
+    int updateUserSetStatusForName(@Param("status") Integer status, @Param("name") String name);
+
+    @Modifying
+    @Query(value = "UPDATE Users u SET u.status = ? WHERE u.name = ?", nativeQuery = true)
+    int updateUserSetStatusForNameNative(Integer status, String name);
+
+    @Query(value = "INSERT INTO Users (name, age, email, status) VALUES (:name, :age, :email, :status)", nativeQuery = true)
+    @Modifying
+    void insertUser(@Param("name") String name, @Param("age") Integer age, @Param("status") Integer status, @Param("email") String email);
+
+    @Modifying
+    @Query(value = "UPDATE Users u SET status = ? WHERE u.name = ?", nativeQuery = true)
+    int updateUserSetStatusForNameNativePostgres(Integer status, String name);
+    
+    @Query(value = "SELECT u FROM User u WHERE u.name IN :names")
+	  List<User> findUserByNameList(@Param("names") Collection<String> names);
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustom.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustom.java
new file mode 100644
index 0000000000..7690463093
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustom.java
@@ -0,0 +1,10 @@
+package com.baeldung.boot.user;
+
+import java.util.List;
+import java.util.Set;
+
+import com.baeldung.boot.domain.User;
+
+public interface UserRepositoryCustom {
+    List<User> findUserByEmails(Set<String> emails);
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustomImpl.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustomImpl.java
new file mode 100644
index 0000000000..8739a1a868
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustomImpl.java
@@ -0,0 +1,43 @@
+package com.baeldung.boot.user;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import com.baeldung.boot.domain.User;
+
+public class UserRepositoryCustomImpl implements UserRepositoryCustom {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Override
+    public List<User> findUserByEmails(Set<String> emails) {
+        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+        CriteriaQuery<User> query = cb.createQuery(User.class);
+        Root<User> user = query.from(User.class);
+
+        Path<String> emailPath = user.get("email");
+
+        List<Predicate> predicates = new ArrayList<>();
+        for (String email : emails) {
+
+            predicates.add(cb.like(emailPath, email));
+
+        }
+        query.select(user)
+            .where(cb.or(predicates.toArray(new Predicate[predicates.size()])));
+
+        return entityManager.createQuery(query)
+            .getResultList();
+    }
+
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/config/PersistenceConfiguration.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/config/PersistenceConfiguration.java
deleted file mode 100644
index 891624443b..0000000000
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/config/PersistenceConfiguration.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.baeldung.config;
-
-import com.baeldung.dao.repositories.impl.ExtendedRepositoryImpl;
-import com.baeldung.services.IBarService;
-import com.baeldung.services.impl.BarSpringDataJpaService;
-import com.google.common.base.Preconditions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.*;
-import org.springframework.core.env.Environment;
-import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.JpaVendorAdapter;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import javax.sql.DataSource;
-import java.util.Properties;
-
-@Configuration
-@ComponentScan({ "com.baeldung.dao", "com.baeldung.services" })
-@EnableTransactionManagement
-@EnableJpaRepositories(basePackages = { "com.baeldung.dao" }, repositoryBaseClass = ExtendedRepositoryImpl.class)
-@EnableJpaAuditing
-@PropertySource("classpath:persistence.properties")
-@Profile("!tc")
-public class PersistenceConfiguration {
-
-    @Autowired
-    private Environment env;
-
-    public PersistenceConfiguration() {
-        super();
-    }
-
-    @Bean
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
-        final LocalContainerEntityManagerFactoryBean emf = new LocalContainerEntityManagerFactoryBean();
-        emf.setDataSource(dataSource());
-        emf.setPackagesToScan("com.baeldung.domain");
-
-        final JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-        emf.setJpaVendorAdapter(vendorAdapter);
-        emf.setJpaProperties(hibernateProperties());
-
-        return emf;
-    }
-
-    @Bean
-    public DataSource dataSource() {
-        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
-        dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
-        dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
-        dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user")));
-        dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass")));
-
-        return dataSource;
-    }
-
-    @Bean
-    public PlatformTransactionManager transactionManager() {
-        final JpaTransactionManager transactionManager = new JpaTransactionManager();
-        transactionManager.setEntityManagerFactory(entityManagerFactory().getObject());
-        return transactionManager;
-    }
-
-    @Bean
-    public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
-        return new PersistenceExceptionTranslationPostProcessor();
-    }
-
-    @Bean
-    public IBarService barSpringDataJpaService() {
-        return new BarSpringDataJpaService();
-    }
-
-    private final Properties hibernateProperties() {
-        final Properties hibernateProperties = new Properties();
-        hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
-        hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
-
-        hibernateProperties.setProperty("hibernate.show_sql", "true");
-        // hibernateProperties.setProperty("hibernate.format_sql", "true");
-        // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
-
-        // Envers properties
-        hibernateProperties.setProperty("org.hibernate.envers.audit_table_suffix",
-            env.getProperty("envers.audit_table_suffix"));
-
-        return hibernateProperties;
-    }
-
-}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/DomainEvent.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/DomainEvent.java
deleted file mode 100644
index 1e6479d4fc..0000000000
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/ddd/event/DomainEvent.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- *
- */
-package com.baeldung.ddd.event;
-
-class DomainEvent {
-
-}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/MultipleDbApplication.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/MultipleDbApplication.java
new file mode 100644
index 0000000000..8ff6799e31
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/MultipleDbApplication.java
@@ -0,0 +1,14 @@
+package com.baeldung.multipledb;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class MultipleDbApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MultipleDbApplication.class, args);
+    }
+
+}
+
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/config/PersistenceProductConfiguration.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceProductConfiguration.java
similarity index 90%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/config/PersistenceProductConfiguration.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceProductConfiguration.java
index ecaee82ae5..d79e721e31 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/config/PersistenceProductConfiguration.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceProductConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.config;
+package com.baeldung.multipledb;
 
 import com.google.common.base.Preconditions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,9 +17,9 @@ import org.springframework.transaction.PlatformTransactionManager;
 import javax.sql.DataSource;
 import java.util.HashMap;
 
-@Configuration
+//@Configuration
 @PropertySource({"classpath:persistence-multiple-db.properties"})
-@EnableJpaRepositories(basePackages = "com.baeldung.dao.repositories.product", entityManagerFactoryRef = "productEntityManager", transactionManagerRef = "productTransactionManager")
+@EnableJpaRepositories(basePackages = "com.baeldung.multipledb", entityManagerFactoryRef = "productEntityManager", transactionManagerRef = "productTransactionManager")
 @Profile("!tc")
 public class PersistenceProductConfiguration {
     @Autowired
@@ -35,7 +35,7 @@ public class PersistenceProductConfiguration {
     public LocalContainerEntityManagerFactoryBean productEntityManager() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(productDataSource());
-        em.setPackagesToScan("com.baeldung.domain.product");
+        em.setPackagesToScan("com.baeldung.multipledb");
 
         final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         em.setJpaVendorAdapter(vendorAdapter);
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/config/PersistenceUserConfiguration.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceUserConfiguration.java
similarity index 90%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/config/PersistenceUserConfiguration.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceUserConfiguration.java
index 6893d889e6..572065314d 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/config/PersistenceUserConfiguration.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceUserConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.config;
+package com.baeldung.multipledb;
 
 import com.google.common.base.Preconditions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,9 +14,9 @@ import org.springframework.transaction.PlatformTransactionManager;
 import javax.sql.DataSource;
 import java.util.HashMap;
 
-@Configuration
+//@Configuration
 @PropertySource({"classpath:persistence-multiple-db.properties"})
-@EnableJpaRepositories(basePackages = "com.baeldung.dao.repositories.user", entityManagerFactoryRef = "userEntityManager", transactionManagerRef = "userTransactionManager")
+@EnableJpaRepositories(basePackages = "com.baeldung.multipledb", entityManagerFactoryRef = "userEntityManager", transactionManagerRef = "userTransactionManager")
 @Profile("!tc")
 public class PersistenceUserConfiguration {
     @Autowired
@@ -33,7 +33,7 @@ public class PersistenceUserConfiguration {
     public LocalContainerEntityManagerFactoryBean userEntityManager() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(userDataSource());
-        em.setPackagesToScan("com.baeldung.domain.user");
+        em.setPackagesToScan("com.baeldung.multipledb");
 
         final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         em.setJpaVendorAdapter(vendorAdapter);
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/Possession.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/Possession.java
new file mode 100644
index 0000000000..0281184dec
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/Possession.java
@@ -0,0 +1,82 @@
+package com.baeldung.multipledb;
+
+import javax.persistence.*;
+
+@Entity
+@Table
+public class Possession {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    private String name;
+
+    public Possession() {
+        super();
+    }
+
+    public Possession(final String name) {
+        super();
+
+        this.name = name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = (prime * result) + (int) (id ^ (id >>> 32));
+        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;
+        }
+        final Possession other = (Possession) obj;
+        if (id != other.id) {
+            return false;
+        }
+        if (name == null) {
+            if (other.name != null) {
+                return false;
+            }
+        } else if (!name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("Possesion [id=").append(id).append(", name=").append(name).append("]");
+        return builder.toString();
+    }
+
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PossessionRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PossessionRepository.java
new file mode 100644
index 0000000000..104a0ca6b5
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PossessionRepository.java
@@ -0,0 +1,9 @@
+package com.baeldung.multipledb;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.baeldung.boot.domain.Possession;
+
+public interface PossessionRepository extends JpaRepository<Possession, Long> {
+
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/product/Product.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/Product.java
similarity index 97%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/product/Product.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/Product.java
index 2f82e3e318..1edbd924a3 100755
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/product/Product.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/Product.java
@@ -1,4 +1,4 @@
-package com.baeldung.domain.product;
+package com.baeldung.multipledb;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/product/ProductRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/ProductRepository.java
similarity index 76%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/product/ProductRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/ProductRepository.java
index 1f9f5f9195..b82b0989de 100755
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/product/ProductRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/ProductRepository.java
@@ -1,6 +1,4 @@
-package com.baeldung.dao.repositories.product;
-
-import com.baeldung.domain.product.Product;
+package com.baeldung.multipledb;
 
 import java.util.List;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/User.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/User.java
new file mode 100644
index 0000000000..e173794d74
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/User.java
@@ -0,0 +1,76 @@
+package com.baeldung.multipledb;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+@Table(name = "users")
+public class User {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+    private String name;
+    private int age;
+    @Column(unique = true, nullable = false)
+    private String email;
+    private Integer status;
+  
+    public User() {
+        super();
+    }
+
+    public User(String name, String email, Integer status) {
+        this.name = name;
+        this.email = email;
+        this.status = status;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(final String email) {
+        this.email = email;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(final int age) {
+        this.age = age;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("User [name=").append(name).append(", id=").append(id).append("]");
+        return builder.toString();
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/IBarService.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/IBarService.java
deleted file mode 100644
index 7e127488db..0000000000
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/services/IBarService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.baeldung.services;
-
-import com.baeldung.domain.Bar;
-
-public interface IBarService extends IOperations<Bar> {
-    //
-}
diff --git a/persistence-modules/spring-data-jpa/src/main/resources/application.properties b/persistence-modules/spring-data-jpa/src/main/resources/application.properties
index 37fb9ca9c4..9ea2ad8970 100644
--- a/persistence-modules/spring-data-jpa/src/main/resources/application.properties
+++ b/persistence-modules/spring-data-jpa/src/main/resources/application.properties
@@ -1,17 +1,9 @@
-# spring.datasource.x
-spring.datasource.driver-class-name=org.h2.Driver
-spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
-spring.datasource.username=sa
-spring.datasource.password=sa
+#spring.datasource.data=import_entities.sql
+#spring.jpa.properties.hibernate.hbm2ddl.import_files=import_entities.sql
 
-# hibernate.X
-hibernate.dialect=org.hibernate.dialect.H2Dialect
-hibernate.show_sql=true
-hibernate.hbm2ddl.auto=create-drop
-hibernate.cache.use_second_level_cache=true
-hibernate.cache.use_query_cache=true
-hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory
+spring.main.allow-bean-definition-overriding=true
 
-spring.datasource.data=import_entities.sql
 
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+# envers.X
+#spring.jpa.properties.hibernate.hbm2ddl.import_files=import_entities.sql
+spring.datasource.data=classpath:import_entities.sql
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa/src/main/resources/persistence.properties b/persistence-modules/spring-data-jpa/src/main/resources/persistence.properties
index 3543e1b52b..6bc83edf34 100644
--- a/persistence-modules/spring-data-jpa/src/main/resources/persistence.properties
+++ b/persistence-modules/spring-data-jpa/src/main/resources/persistence.properties
@@ -12,5 +12,3 @@ hibernate.cache.use_second_level_cache=true
 hibernate.cache.use_query_cache=true
 hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory
 
-# envers.X
-envers.audit_table_suffix=_audit_log
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/ArticleRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/ArticleRepositoryIntegrationTest.java
similarity index 82%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/ArticleRepositoryIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/ArticleRepositoryIntegrationTest.java
index 093e744003..dfb04b3dfb 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/ArticleRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/ArticleRepositoryIntegrationTest.java
@@ -1,13 +1,16 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
+
+import com.baeldung.boot.Application;
+import com.baeldung.boot.config.PersistenceConfiguration;
+import com.baeldung.boot.daos.ArticleRepository;
+import com.baeldung.boot.domain.Article;
 
-import com.baeldung.config.PersistenceConfiguration;
-import com.baeldung.config.PersistenceProductConfiguration;
-import com.baeldung.config.PersistenceUserConfiguration;
-import com.baeldung.domain.Article;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.text.SimpleDateFormat;
@@ -18,7 +21,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(SpringRunner.class)
-@DataJpaTest(excludeAutoConfiguration = {PersistenceConfiguration.class, PersistenceUserConfiguration.class, PersistenceProductConfiguration.class})
+@DataJpaTest(properties="spring.datasource.data=classpath:import_entities.sql")
 public class ArticleRepositoryIntegrationTest {
 
     @Autowired
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/ExtendedStudentRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/ExtendedStudentRepositoryIntegrationTest.java
similarity index 80%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/ExtendedStudentRepositoryIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/ExtendedStudentRepositoryIntegrationTest.java
index b19a34df82..66de5911db 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/ExtendedStudentRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/ExtendedStudentRepositoryIntegrationTest.java
@@ -1,7 +1,10 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
+
+import com.baeldung.boot.Application;
+import com.baeldung.boot.config.PersistenceConfiguration;
+import com.baeldung.boot.daos.ExtendedStudentRepository;
+import com.baeldung.boot.domain.Student;
 
-import com.baeldung.config.PersistenceConfiguration;
-import com.baeldung.domain.Student;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -15,7 +18,7 @@ import java.util.List;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {PersistenceConfiguration.class})
+@ContextConfiguration(classes = {Application.class})
 @DirtiesContext
 public class ExtendedStudentRepositoryIntegrationTest {
     @Resource
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/InventoryRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/InventoryRepositoryIntegrationTest.java
similarity index 85%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/InventoryRepositoryIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/InventoryRepositoryIntegrationTest.java
index 9d6334445c..877e59d5a2 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/InventoryRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/InventoryRepositoryIntegrationTest.java
@@ -1,11 +1,15 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
+
+import com.baeldung.boot.Application;
+import com.baeldung.boot.config.PersistenceConfiguration;
+import com.baeldung.boot.daos.InventoryRepository;
+import com.baeldung.boot.domain.MerchandiseEntity;
 
-import com.baeldung.config.PersistenceConfiguration;
-import com.baeldung.domain.MerchandiseEntity;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.math.BigDecimal;
@@ -15,7 +19,7 @@ import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 
 @RunWith(SpringRunner.class)
-@DataJpaTest(excludeAutoConfiguration = {PersistenceConfiguration.class})
+@SpringBootTest(classes=Application.class)
 public class InventoryRepositoryIntegrationTest {
 
     private static final String ORIGINAL_TITLE = "Pair of Pants";
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/JpaRepositoriesIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/JpaRepositoriesIntegrationTest.java
similarity index 80%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/JpaRepositoriesIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/JpaRepositoriesIntegrationTest.java
index 01405c0b8a..30925d9b68 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/JpaRepositoriesIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/JpaRepositoriesIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
 
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
@@ -13,18 +13,24 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.config.PersistenceConfiguration;
-import com.baeldung.config.PersistenceProductConfiguration;
-import com.baeldung.config.PersistenceUserConfiguration;
-import com.baeldung.domain.Item;
-import com.baeldung.domain.ItemType;
-import com.baeldung.domain.Location;
-import com.baeldung.domain.Store;
+import com.baeldung.boot.Application;
+import com.baeldung.boot.config.PersistenceConfiguration;
+import com.baeldung.boot.daos.ItemTypeRepository;
+import com.baeldung.boot.daos.LocationRepository;
+import com.baeldung.boot.daos.ReadOnlyLocationRepository;
+import com.baeldung.boot.daos.StoreRepository;
+import com.baeldung.boot.domain.Item;
+import com.baeldung.boot.domain.ItemType;
+import com.baeldung.boot.domain.Location;
+import com.baeldung.boot.domain.Store;
+import com.baeldung.multipledb.PersistenceProductConfiguration;
+import com.baeldung.multipledb.PersistenceUserConfiguration;
 
 @RunWith(SpringRunner.class)
-@DataJpaTest(excludeAutoConfiguration = { PersistenceConfiguration.class, PersistenceUserConfiguration.class, PersistenceProductConfiguration.class })
+@DataJpaTest(properties="spring.datasource.data=classpath:import_entities.sql")
 public class JpaRepositoriesIntegrationTest {
     @Autowired
     private LocationRepository locationRepository;
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/PersonInsertRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/PersonInsertRepositoryIntegrationTest.java
similarity index 94%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/PersonInsertRepositoryIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/PersonInsertRepositoryIntegrationTest.java
index b248cf8bf1..9d45c17035 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/PersonInsertRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/PersonInsertRepositoryIntegrationTest.java
@@ -1,7 +1,8 @@
-package com.baeldung.dao.repositories;
+package com.baeldung.boot.daos;
+
+import com.baeldung.boot.daos.impl.PersonInsertRepository;
+import com.baeldung.boot.domain.Person;
 
-import com.baeldung.dao.repositories.impl.PersonInsertRepository;
-import com.baeldung.domain.Person;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryCommon.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryCommon.java
new file mode 100644
index 0000000000..e101d35de1
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryCommon.java
@@ -0,0 +1,405 @@
+package com.baeldung.boot.daos;
+
+import com.baeldung.boot.domain.User;
+import com.baeldung.boot.user.UserRepository;
+
+import org.junit.After;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.JpaSort;
+import org.springframework.data.mapping.PropertyReferenceException;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class UserRepositoryCommon {
+
+    final String USER_EMAIL = "email@example.com";
+    final String USER_EMAIL2 = "email2@example.com";
+    final String USER_EMAIL3 = "email3@example.com";
+    final String USER_EMAIL4 = "email4@example.com";
+    final Integer INACTIVE_STATUS = 0;
+    final Integer ACTIVE_STATUS = 1;
+    final String USER_EMAIL5 = "email5@example.com";
+    final String USER_EMAIL6 = "email6@example.com";
+    final String USER_NAME_ADAM = "Adam";
+    final String USER_NAME_PETER = "Peter";
+
+    @Autowired
+    protected UserRepository userRepository;
+
+    @Test
+    @Transactional
+    public void givenUsersWithSameNameInDB_WhenFindAllByName_ThenReturnStreamOfUsers() {
+        User user1 = new User();
+        user1.setName(USER_NAME_ADAM);
+        user1.setEmail(USER_EMAIL);
+        userRepository.save(user1);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_ADAM);
+        user2.setEmail(USER_EMAIL2);
+        userRepository.save(user2);
+
+        User user3 = new User();
+        user3.setName(USER_NAME_ADAM);
+        user3.setEmail(USER_EMAIL3);
+        userRepository.save(user3);
+
+        User user4 = new User();
+        user4.setName("SAMPLE");
+        user4.setEmail(USER_EMAIL4);
+        userRepository.save(user4);
+
+        try (Stream<User> foundUsersStream = userRepository.findAllByName(USER_NAME_ADAM)) {
+            assertThat(foundUsersStream.count()).isEqualTo(3l);
+        }
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindAllWithQueryAnnotation_ThenReturnCollectionWithActiveUsers() {
+        User user1 = new User();
+        user1.setName(USER_NAME_ADAM);
+        user1.setEmail(USER_EMAIL);
+        user1.setStatus(ACTIVE_STATUS);
+        userRepository.save(user1);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_ADAM);
+        user2.setEmail(USER_EMAIL2);
+        user2.setStatus(ACTIVE_STATUS);
+        userRepository.save(user2);
+
+        User user3 = new User();
+        user3.setName(USER_NAME_ADAM);
+        user3.setEmail(USER_EMAIL3);
+        user3.setStatus(INACTIVE_STATUS);
+        userRepository.save(user3);
+
+        Collection<User> allActiveUsers = userRepository.findAllActiveUsers();
+
+        assertThat(allActiveUsers.size()).isEqualTo(2);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindAllWithQueryAnnotationNative_ThenReturnCollectionWithActiveUsers() {
+        User user1 = new User();
+        user1.setName(USER_NAME_ADAM);
+        user1.setEmail(USER_EMAIL);
+        user1.setStatus(ACTIVE_STATUS);
+        userRepository.save(user1);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_ADAM);
+        user2.setEmail(USER_EMAIL2);
+        user2.setStatus(ACTIVE_STATUS);
+        userRepository.save(user2);
+
+        User user3 = new User();
+        user3.setName(USER_NAME_ADAM);
+        user3.setEmail(USER_EMAIL3);
+        user3.setStatus(INACTIVE_STATUS);
+        userRepository.save(user3);
+
+        Collection<User> allActiveUsers = userRepository.findAllActiveUsersNative();
+
+        assertThat(allActiveUsers.size()).isEqualTo(2);
+    }
+
+    @Test
+    public void givenUserInDB_WhenFindUserByStatusWithQueryAnnotation_ThenReturnActiveUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User userByStatus = userRepository.findUserByStatus(ACTIVE_STATUS);
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUserInDB_WhenFindUserByStatusWithQueryAnnotationNative_ThenReturnActiveUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User userByStatus = userRepository.findUserByStatusNative(ACTIVE_STATUS);
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByStatusAndNameWithQueryAnnotationIndexedParams_ThenReturnOneUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
+        user2.setStatus(ACTIVE_STATUS);
+        userRepository.save(user2);
+
+        User userByStatus = userRepository.findUserByStatusAndName(ACTIVE_STATUS, USER_NAME_ADAM);
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByStatusAndNameWithQueryAnnotationNamedParams_ThenReturnOneUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
+        user2.setStatus(ACTIVE_STATUS);
+        userRepository.save(user2);
+
+        User userByStatus = userRepository.findUserByStatusAndNameNamedParams(ACTIVE_STATUS, USER_NAME_ADAM);
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByStatusAndNameWithQueryAnnotationNativeNamedParams_ThenReturnOneUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
+        user2.setStatus(ACTIVE_STATUS);
+        userRepository.save(user2);
+
+        User userByStatus = userRepository.findUserByStatusAndNameNamedParamsNative(ACTIVE_STATUS, USER_NAME_ADAM);
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByStatusAndNameWithQueryAnnotationNamedParamsCustomNames_ThenReturnOneUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
+        user2.setStatus(ACTIVE_STATUS);
+        userRepository.save(user2);
+
+        User userByStatus = userRepository.findUserByUserStatusAndUserName(ACTIVE_STATUS, USER_NAME_ADAM);
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByNameLikeWithQueryAnnotationIndexedParams_ThenReturnUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User userByStatus = userRepository.findUserByNameLike("Ad");
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByNameLikeWithQueryAnnotationNamedParams_ThenReturnUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User userByStatus = userRepository.findUserByNameLikeNamedParam("Ad");
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByNameLikeWithQueryAnnotationNative_ThenReturnUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User userByStatus = userRepository.findUserByNameLikeNative("Ad");
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindAllWithSortByName_ThenReturnUsersSorted() {
+        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
+
+        List<User> usersSortByName = userRepository.findAll(new Sort(Sort.Direction.ASC, "name"));
+
+        assertThat(usersSortByName.get(0)
+          .getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test(expected = PropertyReferenceException.class)
+    public void givenUsersInDB_WhenFindAllSortWithFunction_ThenThrowException() {
+        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
+
+        userRepository.findAll(new Sort(Sort.Direction.ASC, "name"));
+
+        List<User> usersSortByNameLength = userRepository.findAll(new Sort("LENGTH(name)"));
+
+        assertThat(usersSortByNameLength.get(0)
+          .getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindAllSortWithFunctionQueryAnnotationJPQL_ThenReturnUsersSorted() {
+        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
+
+        userRepository.findAllUsers(new Sort("name"));
+
+        List<User> usersSortByNameLength = userRepository.findAllUsers(JpaSort.unsafe("LENGTH(name)"));
+
+        assertThat(usersSortByNameLength.get(0)
+          .getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindAllWithPageRequestQueryAnnotationJPQL_ThenReturnPageOfUsers() {
+        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", USER_EMAIL4, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE2", USER_EMAIL5, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", USER_EMAIL6, INACTIVE_STATUS));
+
+        Page<User> usersPage = userRepository.findAllUsersWithPagination(new PageRequest(1, 3));
+
+        assertThat(usersPage.getContent()
+          .get(0)
+          .getName()).isEqualTo("SAMPLE1");
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindAllWithPageRequestQueryAnnotationNative_ThenReturnPageOfUsers() {
+        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", USER_EMAIL4, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE2", USER_EMAIL5, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", USER_EMAIL6, INACTIVE_STATUS));
+
+        Page<User> usersSortByNameLength = userRepository.findAllUsersWithPaginationNative(new PageRequest(1, 3));
+
+        assertThat(usersSortByNameLength.getContent()
+          .get(0)
+          .getName()).isEqualTo("SAMPLE1");
+    }
+
+    @Test
+    @Transactional
+    public void givenUsersInDB_WhenUpdateStatusForNameModifyingQueryAnnotationJPQL_ThenModifyMatchingUsers() {
+        userRepository.save(new User("SAMPLE", USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", USER_EMAIL4, ACTIVE_STATUS));
+
+        int updatedUsersSize = userRepository.updateUserSetStatusForName(INACTIVE_STATUS, "SAMPLE");
+
+        assertThat(updatedUsersSize).isEqualTo(2);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindByEmailsWithDynamicQuery_ThenReturnCollection() {
+
+        User user1 = new User();
+        user1.setEmail(USER_EMAIL);
+        userRepository.save(user1);
+
+        User user2 = new User();
+        user2.setEmail(USER_EMAIL2);
+        userRepository.save(user2);
+
+        User user3 = new User();
+        user3.setEmail(USER_EMAIL3);
+        userRepository.save(user3);
+
+        Set<String> emails = new HashSet<>();
+        emails.add(USER_EMAIL2);
+        emails.add(USER_EMAIL3);
+
+        Collection<User> usersWithEmails = userRepository.findUserByEmails(emails);
+
+        assertThat(usersWithEmails.size()).isEqualTo(2);
+    }
+
+    @Test
+    public void givenUsersInDBWhenFindByNameListReturnCollection() {
+
+        User user1 = new User();
+        user1.setName(USER_NAME_ADAM);
+        user1.setEmail(USER_EMAIL);
+        userRepository.save(user1);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
+        userRepository.save(user2);
+
+        List<String> names = Arrays.asList(USER_NAME_ADAM, USER_NAME_PETER);
+
+        List<User> usersWithNames = userRepository.findUserByNameList(names);
+
+        assertThat(usersWithNames.size()).isEqualTo(2);
+    }
+
+
+    @Test
+    @Transactional
+    public void whenInsertedWithQuery_ThenUserIsPersisted() {
+        userRepository.insertUser(USER_NAME_ADAM, 1, ACTIVE_STATUS, USER_EMAIL);
+        userRepository.insertUser(USER_NAME_PETER, 1, ACTIVE_STATUS, USER_EMAIL2);
+
+        User userAdam = userRepository.findUserByNameLike(USER_NAME_ADAM);
+        User userPeter = userRepository.findUserByNameLike(USER_NAME_PETER);
+
+        assertThat(userAdam).isNotNull();
+        assertThat(userAdam.getEmail()).isEqualTo(USER_EMAIL);
+        assertThat(userPeter).isNotNull();
+        assertThat(userPeter.getEmail()).isEqualTo(USER_EMAIL2);
+    }
+    
+    @After
+    public void cleanUp() {
+        userRepository.deleteAll();
+    }
+}
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryIntegrationTest.java
new file mode 100644
index 0000000000..ac8fdf8ea2
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryIntegrationTest.java
@@ -0,0 +1,37 @@
+package com.baeldung.boot.daos;
+
+import com.baeldung.boot.Application;
+import com.baeldung.boot.config.PersistenceConfiguration;
+import com.baeldung.boot.domain.User;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Created by adam.
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+@DirtiesContext
+public class UserRepositoryIntegrationTest extends UserRepositoryCommon {
+
+    @Test
+    @Transactional
+    public void givenUsersInDBWhenUpdateStatusForNameModifyingQueryAnnotationNativeThenModifyMatchingUsers() {
+        userRepository.save(new User("SAMPLE", USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", USER_EMAIL4, ACTIVE_STATUS));
+        userRepository.flush();
+
+        int updatedUsersSize = userRepository.updateUserSetStatusForNameNative(INACTIVE_STATUS, "SAMPLE");
+
+        assertThat(updatedUsersSize).isEqualTo(2);
+    }
+}
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCAutoIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCAutoIntegrationTest.java
new file mode 100644
index 0000000000..599546fdbf
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCAutoIntegrationTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.boot.daos;
+
+import com.baeldung.boot.domain.User;
+import com.baeldung.util.BaeldungPostgresqlContainer;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+import org.testcontainers.containers.PostgreSQLContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Created by adam.
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ActiveProfiles({"tc", "tc-auto"})
+public class UserRepositoryTCAutoIntegrationTest extends UserRepositoryCommon {
+
+    @ClassRule
+    public static PostgreSQLContainer postgreSQLContainer = BaeldungPostgresqlContainer.getInstance();
+
+    @Test
+    @Transactional
+    public void givenUsersInDB_WhenUpdateStatusForNameModifyingQueryAnnotationNativePostgres_ThenModifyMatchingUsers() {
+        userRepository.save(new User("SAMPLE", USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", USER_EMAIL4, ACTIVE_STATUS));
+        userRepository.flush();
+
+        int updatedUsersSize = userRepository.updateUserSetStatusForNameNativePostgres(INACTIVE_STATUS, "SAMPLE");
+
+        assertThat(updatedUsersSize).isEqualTo(2);
+    }
+}
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCIntegrationTest.java
new file mode 100644
index 0000000000..2c5f7bcfa6
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCIntegrationTest.java
@@ -0,0 +1,56 @@
+package com.baeldung.boot.daos;
+
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+import org.testcontainers.containers.PostgreSQLContainer;
+
+import com.baeldung.boot.domain.User;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ActiveProfiles("tc")
+@ContextConfiguration(initializers = {UserRepositoryTCIntegrationTest.Initializer.class})
+public class UserRepositoryTCIntegrationTest extends UserRepositoryCommon {
+
+    @ClassRule
+    public static PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer("postgres:11.1")
+      .withDatabaseName("integration-tests-db")
+      .withUsername("sa")
+      .withPassword("sa");
+
+    @Test
+    @Transactional
+    public void givenUsersInDB_WhenUpdateStatusForNameModifyingQueryAnnotationNative_ThenModifyMatchingUsers() {
+        userRepository.save(new User("SAMPLE", USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", USER_EMAIL4, ACTIVE_STATUS));
+        userRepository.flush();
+
+        int updatedUsersSize = userRepository.updateUserSetStatusForNameNativePostgres(INACTIVE_STATUS, "SAMPLE");
+
+        assertThat(updatedUsersSize).isEqualTo(2);
+    }
+
+    static class Initializer
+      implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+        public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
+            TestPropertyValues.of(
+              "spring.datasource.url=" + postgreSQLContainer.getJdbcUrl(),
+              "spring.datasource.username=" + postgreSQLContainer.getUsername(),
+              "spring.datasource.password=" + postgreSQLContainer.getPassword()
+            ).applyTo(configurableApplicationContext.getEnvironment());
+        }
+    }
+}
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/ddd/event/Aggregate2EventsIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/ddd/event/Aggregate2EventsIntegrationTest.java
similarity index 90%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/ddd/event/Aggregate2EventsIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/ddd/event/Aggregate2EventsIntegrationTest.java
index 3f650d4d63..e76b932cb9 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/ddd/event/Aggregate2EventsIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/ddd/event/Aggregate2EventsIntegrationTest.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package com.baeldung.ddd.event;
+package com.baeldung.boot.ddd.event;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
@@ -15,6 +15,10 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
+import com.baeldung.boot.ddd.event.Aggregate2;
+import com.baeldung.boot.ddd.event.Aggregate2Repository;
+import com.baeldung.boot.ddd.event.DomainEvent;
+
 @SpringJUnitConfig
 @SpringBootTest
 class Aggregate2EventsIntegrationTest {
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/ddd/event/Aggregate3EventsIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/ddd/event/Aggregate3EventsIntegrationTest.java
similarity index 90%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/ddd/event/Aggregate3EventsIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/ddd/event/Aggregate3EventsIntegrationTest.java
index 893dcac3f8..4193e932ee 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/ddd/event/Aggregate3EventsIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/ddd/event/Aggregate3EventsIntegrationTest.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package com.baeldung.ddd.event;
+package com.baeldung.boot.ddd.event;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
@@ -14,6 +14,10 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
+import com.baeldung.boot.ddd.event.Aggregate3;
+import com.baeldung.boot.ddd.event.Aggregate3Repository;
+import com.baeldung.boot.ddd.event.DomainEvent;
+
 @SpringJUnitConfig
 @SpringBootTest
 class Aggregate3EventsIntegrationTest {
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/ddd/event/AggregateEventsIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/ddd/event/AggregateEventsIntegrationTest.java
similarity index 91%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/ddd/event/AggregateEventsIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/ddd/event/AggregateEventsIntegrationTest.java
index f0e1147245..ac607063b2 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/ddd/event/AggregateEventsIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/ddd/event/AggregateEventsIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.ddd.event;
+package com.baeldung.boot.ddd.event;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
@@ -16,6 +16,11 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
+import com.baeldung.boot.ddd.event.Aggregate;
+import com.baeldung.boot.ddd.event.AggregateRepository;
+import com.baeldung.boot.ddd.event.DomainEvent;
+import com.baeldung.boot.ddd.event.DomainService;
+
 @SpringJUnitConfig
 @SpringBootTest
 class AggregateEventsIntegrationTest {
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/ddd/event/TestEventHandler.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/ddd/event/TestEventHandler.java
similarity index 68%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/ddd/event/TestEventHandler.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/ddd/event/TestEventHandler.java
index 721402c17a..0f499834eb 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/ddd/event/TestEventHandler.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/ddd/event/TestEventHandler.java
@@ -1,10 +1,12 @@
 /**
  *
  */
-package com.baeldung.ddd.event;
+package com.baeldung.boot.ddd.event;
 
 import org.springframework.transaction.event.TransactionalEventListener;
 
+import com.baeldung.boot.ddd.event.DomainEvent;
+
 interface TestEventHandler {
     @TransactionalEventListener
     void handleEvent(DomainEvent event);
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/passenger/PassengerRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/passenger/PassengerRepositoryIntegrationTest.java
similarity index 97%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/passenger/PassengerRepositoryIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/passenger/PassengerRepositoryIntegrationTest.java
index 8cd19cec03..afb97211f5 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/passenger/PassengerRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/passenger/PassengerRepositoryIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.passenger;
+package com.baeldung.boot.passenger;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
@@ -24,6 +24,9 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.baeldung.boot.passenger.Passenger;
+import com.baeldung.boot.passenger.PassengerRepository;
+
 @DataJpaTest
 @RunWith(SpringRunner.class)
 public class PassengerRepositoryIntegrationTest {
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/services/AbstractServicePersistenceIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/services/AbstractServicePersistenceIntegrationTest.java
similarity index 98%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/services/AbstractServicePersistenceIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/services/AbstractServicePersistenceIntegrationTest.java
index acac66f2f7..bf0c85fca6 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/services/AbstractServicePersistenceIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/services/AbstractServicePersistenceIntegrationTest.java
@@ -1,6 +1,7 @@
-package com.baeldung.services;
+package com.baeldung.boot.services;
 
-import com.baeldung.domain.Foo;
+import com.baeldung.boot.domain.Foo;
+import com.baeldung.boot.services.IOperations;
 import com.baeldung.util.IDUtil;
 import org.hamcrest.Matchers;
 import org.junit.Ignore;
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/services/FooServicePersistenceIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/services/FooServicePersistenceIntegrationTest.java
similarity index 85%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/services/FooServicePersistenceIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/services/FooServicePersistenceIntegrationTest.java
index fd17d033e1..f0e4aa7317 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/services/FooServicePersistenceIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/services/FooServicePersistenceIntegrationTest.java
@@ -1,11 +1,16 @@
-package com.baeldung.services;
+package com.baeldung.boot.services;
+
+import com.baeldung.boot.Application;
+import com.baeldung.boot.config.PersistenceConfiguration;
+import com.baeldung.boot.domain.Foo;
+import com.baeldung.boot.services.IFooService;
+import com.baeldung.boot.services.IOperations;
 
-import com.baeldung.config.PersistenceConfiguration;
-import com.baeldung.domain.Foo;
 import org.junit.Ignore;
 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.dao.DataIntegrityViolationException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.test.context.ContextConfiguration;
@@ -16,7 +21,7 @@ import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.junit.Assert.assertNotNull;
 
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {PersistenceConfiguration.class}, loader = AnnotationConfigContextLoader.class)
+@SpringBootTest(classes=Application.class)
 public class FooServicePersistenceIntegrationTest extends AbstractServicePersistenceIntegrationTest<Foo> {
 
     @Autowired
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/services/SpringDataJPABarAuditIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/services/SpringDataJPABarAuditIntegrationTest.java
similarity index 87%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/services/SpringDataJPABarAuditIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/services/SpringDataJPABarAuditIntegrationTest.java
index f3b857c73d..810cf70769 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/services/SpringDataJPABarAuditIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/services/SpringDataJPABarAuditIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.services;
+package com.baeldung.boot.services;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -16,16 +16,19 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.test.context.SpringBootTest;
 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.context.support.AnnotationConfigContextLoader;
 
-import com.baeldung.config.PersistenceConfiguration;
-import com.baeldung.domain.Bar;
+import com.baeldung.boot.Application;
+import com.baeldung.boot.config.PersistenceConfiguration;
+import com.baeldung.boot.domain.Bar;
+import com.baeldung.boot.services.IBarService;
 
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = { PersistenceConfiguration.class }, loader = AnnotationConfigContextLoader.class)
+@SpringBootTest(classes=Application.class)
 public class SpringDataJPABarAuditIntegrationTest {
 
     private static Logger logger = LoggerFactory.getLogger(SpringDataJPABarAuditIntegrationTest.class);
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/services/JpaMultipleDBIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/JpaMultipleDBIntegrationTest.java
similarity index 83%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/services/JpaMultipleDBIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/JpaMultipleDBIntegrationTest.java
index 71a3fb0b44..74f347caae 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/services/JpaMultipleDBIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/JpaMultipleDBIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.services;
+package com.baeldung.multipledb;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -10,6 +10,7 @@ import java.util.Optional;
 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.dao.DataIntegrityViolationException;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
@@ -17,17 +18,17 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.baeldung.config.PersistenceProductConfiguration;
-import com.baeldung.config.PersistenceUserConfiguration;
-import com.baeldung.dao.repositories.product.ProductRepository;
-import com.baeldung.dao.repositories.user.PossessionRepository;
-import com.baeldung.dao.repositories.user.UserRepository;
-import com.baeldung.domain.product.Product;
-import com.baeldung.domain.user.Possession;
-import com.baeldung.domain.user.User;
+import com.baeldung.boot.domain.Possession;
+import com.baeldung.boot.domain.User;
+import com.baeldung.boot.user.PossessionRepository;
+import com.baeldung.boot.user.UserRepository;
+import com.baeldung.multipledb.PersistenceProductConfiguration;
+import com.baeldung.multipledb.PersistenceUserConfiguration;
+import com.baeldung.multipledb.Product;
+import com.baeldung.multipledb.ProductRepository;
 
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = { PersistenceUserConfiguration.class, PersistenceProductConfiguration.class })
+@SpringBootTest(classes=MultipleDbApplication.class)
 @EnableTransactionManagement
 @DirtiesContext
 public class JpaMultipleDBIntegrationTest {
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/product/ProductRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/ProductRepositoryIntegrationTest.java
similarity index 93%
rename from persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/product/ProductRepositoryIntegrationTest.java
rename to persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/ProductRepositoryIntegrationTest.java
index 4caa0f0ca4..7b85cb479a 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/product/ProductRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/ProductRepositoryIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.dao.repositories.product;
+package com.baeldung.multipledb;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
@@ -13,6 +13,7 @@ import org.junit.Before;
 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.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -22,11 +23,12 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.baeldung.config.PersistenceProductConfiguration;
-import com.baeldung.domain.product.Product;
+import com.baeldung.multipledb.PersistenceProductConfiguration;
+import com.baeldung.multipledb.Product;
+import com.baeldung.multipledb.ProductRepository;
 
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = { PersistenceProductConfiguration.class })
+@SpringBootTest(classes=MultipleDbApplication.class)
 @EnableTransactionManagement
 public class ProductRepositoryIntegrationTest {
 
diff --git a/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringContextIntegrationTest.java
index 7f906bdbcd..e885d0fe51 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -5,7 +5,7 @@ import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.Application;
+import com.baeldung.boot.Application;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
diff --git a/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringJpaContextIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringJpaContextIntegrationTest.java
index 66b5b20b97..4a36407884 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringJpaContextIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringJpaContextIntegrationTest.java
@@ -6,10 +6,10 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.Application;
-import com.baeldung.config.PersistenceConfiguration;
-import com.baeldung.config.PersistenceProductConfiguration;
-import com.baeldung.config.PersistenceUserConfiguration;
+import com.baeldung.boot.Application;
+import com.baeldung.boot.config.PersistenceConfiguration;
+import com.baeldung.multipledb.PersistenceProductConfiguration;
+import com.baeldung.multipledb.PersistenceUserConfiguration;
 
 @RunWith(SpringRunner.class)
 @DataJpaTest(excludeAutoConfiguration = {

From e98a39ba255eda7ec75d1a5ca62814cfb153fb3d Mon Sep 17 00:00:00 2001
From: mikr <michael.krimgen@ximedes.com>
Date: Sun, 10 Mar 2019 19:28:09 +0100
Subject: [PATCH 003/295] BAEL-2562 New section in Generics article

---
 .../src/main/java/com/baeldung/generics/Generics.java    | 7 +++++++
 .../java/com/baeldung/generics/GenericsUnitTest.java     | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/generics/Generics.java b/core-java-lang-syntax/src/main/java/com/baeldung/generics/Generics.java
index e0536ca02e..1c4082c58b 100644
--- a/core-java-lang-syntax/src/main/java/com/baeldung/generics/Generics.java
+++ b/core-java-lang-syntax/src/main/java/com/baeldung/generics/Generics.java
@@ -1,5 +1,6 @@
 package com.baeldung.generics;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
@@ -28,4 +29,10 @@ public class Generics {
         buildings.forEach(Building::paint);
     }
 
+    public static List<Integer> createList(int a) {
+        List<Integer> list = new ArrayList<>();
+        list.add(a);
+        return list;
+    }
+
 }
\ No newline at end of file
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/generics/GenericsUnitTest.java b/core-java-lang-syntax/src/test/java/com/baeldung/generics/GenericsUnitTest.java
index aca0b182a0..0bdf0afc15 100644
--- a/core-java-lang-syntax/src/test/java/com/baeldung/generics/GenericsUnitTest.java
+++ b/core-java-lang-syntax/src/test/java/com/baeldung/generics/GenericsUnitTest.java
@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.hasItems;
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
@@ -66,4 +67,12 @@ public class GenericsUnitTest {
         }
     }
 
+    @Test
+    public void givenAnInt_whenAddedToAGenericIntegerList_thenAListItemCanBeAssignedToAnInt() {
+        int number = 7;
+        List<Integer> list = Generics.createList(number);
+        int otherNumber = list.get(0);
+        assertThat(otherNumber, is(number));
+    }
+
 }
\ No newline at end of file

From b1a4f6bb219a26f652a9820ca94ab07602780119 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Sat, 16 Mar 2019 11:35:29 +0530
Subject: [PATCH 004/295] BAEL2489 Avoid check for null statement in Java

---
 core-java/pom.xml                             | 26 ++++-------
 .../java/com/baeldung/nulls/APIContracts.java |  7 +--
 .../com/baeldung/nulls/Preconditions.java     | 15 ++++---
 .../baeldung/nulls/PrimitivesAndWrapper.java  |  8 +---
 .../java/com/baeldung/nulls/UsingObjects.java | 16 ++-----
 .../com/baeldung/nulls/UsingOptional.java     | 26 ++++++-----
 .../com/baeldung/nulls/UsingStringUtils.java  | 11 +++--
 .../nulls/PrimitivesAndWrapperTest.java       | 35 +++++++++++++++
 .../com/baeldung/nulls/UsingLombokTest.java   | 25 +++++++++++
 .../com/baeldung/nulls/UsingObjectsTest.java  | 31 +++++++++++++
 .../com/baeldung/nulls/UsingOptionalTest.java | 37 ++++++++++++++++
 .../baeldung/nulls/UsingStringUtilsTest.java  | 43 +++++++++++++++++++
 12 files changed, 221 insertions(+), 59 deletions(-)
 create mode 100644 core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperTest.java
 create mode 100644 core-java/src/test/java/com/baeldung/nulls/UsingLombokTest.java
 create mode 100644 core-java/src/test/java/com/baeldung/nulls/UsingObjectsTest.java
 create mode 100644 core-java/src/test/java/com/baeldung/nulls/UsingOptionalTest.java
 create mode 100644 core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsTest.java

diff --git a/core-java/pom.xml b/core-java/pom.xml
index e8548600f8..9c5a17d25c 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -216,8 +216,7 @@
                         <configuration>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
                                 </transformer>
                             </transformers>
@@ -272,7 +271,7 @@
                         <argument>-Xmx300m</argument>
                         <argument>-XX:+UseParallelGC</argument>
                         <argument>-classpath</argument>
-                        <classpath/>
+                        <classpath />
                         <argument>com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed</argument>
                     </arguments>
                 </configuration>
@@ -338,7 +337,7 @@
                                     <executable>java</executable>
                                     <arguments>
                                         <argument>-classpath</argument>
-                                        <classpath/>
+                                        <classpath />
                                         <argument>org.openjdk.jmh.Main</argument>
                                         <argument>.*</argument>
                                     </arguments>
@@ -371,8 +370,7 @@
                                         <manifest>
                                             <addClasspath>true</addClasspath>
                                         </manifest>
-                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF
-                                        </manifestFile>
+                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                                     </archive>
 
                                     <includes>
@@ -406,14 +404,12 @@
                                         <manifest>
                                             <addClasspath>true</addClasspath>
                                         </manifest>
-                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF
-                                        </manifestFile>
+                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                                     </archive>
 
                                     <includes>
                                         <include>com/baeldung/instrumentation/application/MyAtm.class</include>
-                                        <include>com/baeldung/instrumentation/application/MyAtmApplication.class
-                                        </include>
+                                        <include>com/baeldung/instrumentation/application/MyAtmApplication.class</include>
                                         <include>com/baeldung/instrumentation/application/Launcher.class</include>
                                     </includes>
                                 </configuration>
@@ -443,14 +439,12 @@
                                         <manifest>
                                             <addClasspath>true</addClasspath>
                                         </manifest>
-                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF
-                                        </manifestFile>
+                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                                     </archive>
 
                                     <includes>
                                         <include>com/baeldung/instrumentation/agent/AtmTransformer.class</include>
-                                        <include>com/baeldung/instrumentation/agent/MyInstrumentationAgent.class
-                                        </include>
+                                        <include>com/baeldung/instrumentation/agent/MyInstrumentationAgent.class</include>
                                     </includes>
                                 </configuration>
                             </execution>
@@ -462,7 +456,6 @@
     </profiles>
 
     <properties>
-
         <!-- marshalling -->
         <gson.version>2.8.2</gson.version>
 
@@ -483,12 +476,10 @@
 
         <!-- maven plugins -->
         <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
-
         <javamoney.moneta.version>1.1</javamoney.moneta.version>
         <h2database.version>1.4.197</h2database.version>
         <esapi.version>2.1.0.1</esapi.version>
         <jmh-core.version>1.19</jmh-core.version>
-
         <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
         <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
@@ -499,7 +490,6 @@
         <icu4j.version>61.1</icu4j.version>
         <!-- instrumentation -->
         <javaassist.version>3.21.0-GA</javaassist.version>
-
         <sun.tools.version>1.8.0</sun.tools.version>
         <intellij.annotations.version>16.0.2</intellij.annotations.version>
     </properties>
diff --git a/core-java/src/main/java/com/baeldung/nulls/APIContracts.java b/core-java/src/main/java/com/baeldung/nulls/APIContracts.java
index f8dfba25dd..7d6abf53b8 100644
--- a/core-java/src/main/java/com/baeldung/nulls/APIContracts.java
+++ b/core-java/src/main/java/com/baeldung/nulls/APIContracts.java
@@ -4,6 +4,7 @@ public class APIContracts {
 
     /**
      * Prints the value of {@code param} if not null. Prints {@code null} otherwise.
+     *
      * @param param
      */
     public void print(Object param) {
@@ -11,16 +12,16 @@ public class APIContracts {
     }
 
     /**
-     *
      * @return non null result
      * @throws Exception - if result is null
      */
     public Object process() throws Exception {
         Object result = doSomething();
-        if (result == null)
+        if (result == null) {
             throw new Exception("Processing fail. Got a null response");
-        else
+        } else {
             return result;
+        }
     }
 
     private Object doSomething() {
diff --git a/core-java/src/main/java/com/baeldung/nulls/Preconditions.java b/core-java/src/main/java/com/baeldung/nulls/Preconditions.java
index ff32db46dd..447026f1e3 100644
--- a/core-java/src/main/java/com/baeldung/nulls/Preconditions.java
+++ b/core-java/src/main/java/com/baeldung/nulls/Preconditions.java
@@ -3,22 +3,26 @@ package com.baeldung.nulls;
 public class Preconditions {
 
     public void goodAccept(String one, String two, String three) {
-        if (null == one || null == two || three == null)
+        if (one == null || two == null || three == null)
             throw new IllegalArgumentException();
+
+        process(one);
+        process(two);
+        process(three);
     }
 
-    public void badAccept(String one, String two, String three){
-        if (null == one)
+    public void badAccept(String one, String two, String three) {
+        if (one == null)
             throw new IllegalArgumentException();
         else
             process(one);
 
-        if (null == two)
+        if (two == null)
             throw new IllegalArgumentException();
         else
             process(two);
 
-        if (null == three)
+        if (three == null)
             throw new IllegalArgumentException();
         else
             process(three);
@@ -28,5 +32,4 @@ public class Preconditions {
     private void process(String one) {
     }
 
-
 }
diff --git a/core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java b/core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
index dce7a05308..8f662b3760 100644
--- a/core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
+++ b/core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
@@ -2,11 +2,11 @@ package com.baeldung.nulls;
 
 public class PrimitivesAndWrapper {
 
-    public static int sum(int a, int b) {
+    public static int primitiveSum(int a, int b) {
         return a + b;
     }
 
-    public static Integer sum(Integer a, Integer b) {
+    public static Integer wrapperSum(Integer a, Integer b) {
         return a + b;
     }
 
@@ -17,8 +17,4 @@ public class PrimitivesAndWrapper {
             throw new IllegalArgumentException();
     }
 
-    public static void main(String[] args) {
-        sum(0, 0);
-        sum(null, null);
-    }
 }
diff --git a/core-java/src/main/java/com/baeldung/nulls/UsingObjects.java b/core-java/src/main/java/com/baeldung/nulls/UsingObjects.java
index e8a3262ce7..7383ae84a7 100644
--- a/core-java/src/main/java/com/baeldung/nulls/UsingObjects.java
+++ b/core-java/src/main/java/com/baeldung/nulls/UsingObjects.java
@@ -4,21 +4,13 @@ import java.util.Objects;
 
 public class UsingObjects {
 
-    private String checked;
-
-    public void accept(Object param) {
+    public void accept(Object param) throws Exception {
         try {
             Objects.requireNonNull(param);
         } catch (NullPointerException e) {
-            //doSomethingElseToo
-            e.printStackTrace();
-        }
-    }
-
-    public void caller() throws Exception {
-        if (Objects.nonNull(checked))
-            accept(checked);
-        else
             throw new Exception();
+        }
+
+        //doSomething()
     }
 }
diff --git a/core-java/src/main/java/com/baeldung/nulls/UsingOptional.java b/core-java/src/main/java/com/baeldung/nulls/UsingOptional.java
index 626afc311d..6c17290a72 100644
--- a/core-java/src/main/java/com/baeldung/nulls/UsingOptional.java
+++ b/core-java/src/main/java/com/baeldung/nulls/UsingOptional.java
@@ -4,20 +4,24 @@ import java.util.Optional;
 
 public class UsingOptional {
 
-    public Optional<Object> process() {
-        if (isProcessed())
-            return Optional.of("dummy");
-        else
+    public Optional<Object> process(boolean processed) {
+
+        String response = doSomething(processed);
+
+        if (response == null) {
             return Optional.empty();
+        }
+
+        return Optional.of(response);
     }
 
-    public void caller() {
-        Optional<Object> result = process();
-        result.ifPresent(p -> System.out.println(p));
-        result.orElseThrow(() -> new IllegalArgumentException());
+    private String doSomething(boolean processed) {
+
+        if (processed) {
+            return "passed";
+        } else {
+            return null;
+        }
     }
 
-    private boolean isProcessed() {
-        return false;
-    }
 }
diff --git a/core-java/src/main/java/com/baeldung/nulls/UsingStringUtils.java b/core-java/src/main/java/com/baeldung/nulls/UsingStringUtils.java
index 8cbf3752e1..c7c73b73eb 100644
--- a/core-java/src/main/java/com/baeldung/nulls/UsingStringUtils.java
+++ b/core-java/src/main/java/com/baeldung/nulls/UsingStringUtils.java
@@ -1,17 +1,22 @@
 package com.baeldung.nulls;
 
-
 import org.apache.commons.lang3.StringUtils;
 
 public class UsingStringUtils {
 
     public void accept(String param) {
-        if (StringUtils.isNotEmpty(param))
+        if (StringUtils.isNotEmpty(param)) {
             System.out.println(param);
+        } else {
+            throw new IllegalArgumentException();
+        }
     }
 
     public void acceptOnlyNonBlank(String param) {
-        if (StringUtils.isNotBlank(param))
+        if (StringUtils.isNotBlank(param)) {
             System.out.println(param);
+        } else {
+            throw new IllegalArgumentException();
+        }
     }
 }
diff --git a/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperTest.java b/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperTest.java
new file mode 100644
index 0000000000..4e0f44e555
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperTest.java
@@ -0,0 +1,35 @@
+package com.baeldung.nulls;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+class PrimitivesAndWrapperTest {
+
+    @Test
+    public void givenWrappers_whenBothArgsNonNull_thenReturnResult() {
+
+        Integer sum = PrimitivesAndWrapper.wrapperSum(0, 0);
+
+        assertEquals(0, sum.intValue());
+    }
+
+    @Test()
+    public void givenWrappers_whenOneArgIsNull_thenThrowNullPointerException() {
+        assertThrows(NullPointerException.class, () -> PrimitivesAndWrapper.wrapperSum(null, 2));
+    }
+
+    @Test()
+    public void givenWrappers_whenBothArgsAreNull_thenThrowNullPointerException() {
+        assertThrows(NullPointerException.class, () -> PrimitivesAndWrapper.wrapperSum(null, null));
+    }
+
+    @Test()
+    public void givenWrappersWithNullCheck_whenAnyArgIsNull_thenThrowIllegalArgumentException() {
+        assertThrows(IllegalArgumentException.class, () -> PrimitivesAndWrapper.goodSum(null, 2));
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingLombokTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingLombokTest.java
new file mode 100644
index 0000000000..5a41d444a4
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingLombokTest.java
@@ -0,0 +1,25 @@
+package com.baeldung.nulls;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class UsingLombokTest {
+
+    private UsingLombok classUnderTest;
+
+    @BeforeEach
+    public void setup() {
+        classUnderTest = new UsingLombok();
+    }
+
+    @Test
+    public void whenNullArg_thenThrowNullPointerException() {
+
+        assertThrows(NullPointerException.class, () -> classUnderTest.accept(null));
+
+    }
+
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingObjectsTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingObjectsTest.java
new file mode 100644
index 0000000000..74170d980b
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingObjectsTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.nulls;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class UsingObjectsTest {
+
+    private UsingObjects classUnderTest;
+
+    @BeforeEach
+    public void setup() {
+        classUnderTest = new UsingObjects();
+    }
+
+    @Test
+    public void whenArgIsNull_thenThrowException() {
+
+        assertThrows(Exception.class, () -> classUnderTest.accept(null));
+    }
+
+    @Test
+    public void whenArgIsNonNull_thenDoesNotThrowException() {
+
+        assertDoesNotThrow(() -> classUnderTest.accept("test    "));
+    }
+
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingOptionalTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingOptionalTest.java
new file mode 100644
index 0000000000..5c42b9dff1
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingOptionalTest.java
@@ -0,0 +1,37 @@
+package com.baeldung.nulls;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class UsingOptionalTest {
+
+    private UsingOptional classUnderTest;
+
+    @BeforeEach
+    public void setup() {
+        classUnderTest = new UsingOptional();
+    }
+
+    @Test
+    public void whenArgIsFalse_thenReturnEmptyResponse() {
+        Optional<Object> result = classUnderTest.process(false);
+        assertFalse(result.isPresent());
+    }
+
+    @Test
+    public void whenArgIsTrue_thenReturnValidResponse() {
+        Optional<Object> result = classUnderTest.process(true);
+        assertTrue(result.isPresent());
+    }
+
+    @Test
+    public void whenArgIsFalse_thenChainResponseAndThrowException() {
+        assertThrows(Exception.class, () -> classUnderTest.process(false).orElseThrow(() -> new Exception()));
+    }
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsTest.java
new file mode 100644
index 0000000000..d10364b85e
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsTest.java
@@ -0,0 +1,43 @@
+package com.baeldung.nulls;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class UsingStringUtilsTest {
+
+    private UsingStringUtils classUnderTest;
+
+    @BeforeEach
+    public void setup() {
+        classUnderTest = new UsingStringUtils();
+    }
+
+    @Test
+    public void givenAccept_whenArgIsNull_throwIllegalArgumentException() {
+        Assertions.assertThrows(IllegalArgumentException.class, () -> classUnderTest.accept(null));
+    }
+
+    @Test
+    public void givenAccept_whenArgIsEmpty_throwIllegalArgumentException() {
+        Assertions.assertThrows(IllegalArgumentException.class, () -> classUnderTest.accept(""));
+    }
+
+    @Test
+    public void givenAcceptOnlyNonBlank_whenArgIsNull_throwIllegalArgumentException() {
+        Assertions.assertThrows(IllegalArgumentException.class, () -> classUnderTest.acceptOnlyNonBlank(null));
+    }
+
+    @Test
+    public void givenAcceptOnlyNonBlank_whenArgIsEmpty_throwIllegalArgumentException() {
+        Assertions.assertThrows(IllegalArgumentException.class, () -> classUnderTest.acceptOnlyNonBlank(""));
+    }
+
+    @Test
+    public void givenAcceptOnlyNonBlank_whenArgIsBlank_throwIllegalArgumentException() {
+        Assertions.assertThrows(IllegalArgumentException.class, () -> classUnderTest.acceptOnlyNonBlank(" "));
+    }
+
+}
\ No newline at end of file

From 55f7da49485868a475e191f504bd1166d655f8b0 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Sat, 16 Mar 2019 11:51:03 +0530
Subject: [PATCH 005/295] BAEL2489 Avoid check for null statement in Java

---
 ...vesAndWrapperTest.java => PrimitivesAndWrapperUnitTest.java} | 2 +-
 .../nulls/{UsingLombokTest.java => UsingLombokUnitTest.java}    | 2 +-
 .../nulls/{UsingObjectsTest.java => UsingObjectsUnitTest.java}  | 2 +-
 .../{UsingOptionalTest.java => UsingOptionalUnitTest.java}      | 2 +-
 ...{UsingStringUtilsTest.java => UsingStringUtilsUnitTest.java} | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename core-java/src/test/java/com/baeldung/nulls/{PrimitivesAndWrapperTest.java => PrimitivesAndWrapperUnitTest.java} (96%)
 rename core-java/src/test/java/com/baeldung/nulls/{UsingLombokTest.java => UsingLombokUnitTest.java} (94%)
 rename core-java/src/test/java/com/baeldung/nulls/{UsingObjectsTest.java => UsingObjectsUnitTest.java} (95%)
 rename core-java/src/test/java/com/baeldung/nulls/{UsingOptionalTest.java => UsingOptionalUnitTest.java} (97%)
 rename core-java/src/test/java/com/baeldung/nulls/{UsingStringUtilsTest.java => UsingStringUtilsUnitTest.java} (97%)

diff --git a/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperTest.java b/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
similarity index 96%
rename from core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperTest.java
rename to core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
index 4e0f44e555..67fe173883 100644
--- a/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperTest.java
+++ b/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
@@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.Test;
 
-class PrimitivesAndWrapperTest {
+class PrimitivesAndWrapperUnitTest {
 
     @Test
     public void givenWrappers_whenBothArgsNonNull_thenReturnResult() {
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingLombokTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
similarity index 94%
rename from core-java/src/test/java/com/baeldung/nulls/UsingLombokTest.java
rename to core-java/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
index 5a41d444a4..c157ad6630 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingLombokTest.java
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class UsingLombokTest {
+class UsingLombokUnitTest {
 
     private UsingLombok classUnderTest;
 
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingObjectsTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
similarity index 95%
rename from core-java/src/test/java/com/baeldung/nulls/UsingObjectsTest.java
rename to core-java/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
index 74170d980b..6939caa4fb 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingObjectsTest.java
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-class UsingObjectsTest {
+class UsingObjectsUnitTest {
 
     private UsingObjects classUnderTest;
 
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingOptionalTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
similarity index 97%
rename from core-java/src/test/java/com/baeldung/nulls/UsingOptionalTest.java
rename to core-java/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
index 5c42b9dff1..45367204b7 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingOptionalTest.java
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
@@ -9,7 +9,7 @@ import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-class UsingOptionalTest {
+class UsingOptionalUnitTest {
 
     private UsingOptional classUnderTest;
 
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
similarity index 97%
rename from core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsTest.java
rename to core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
index d10364b85e..451775abe1 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsTest.java
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class UsingStringUtilsTest {
+class UsingStringUtilsUnitTest {
 
     private UsingStringUtils classUnderTest;
 

From 66146ea761ecb3ef0fb01ea26807da0ca41dd3ac Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Tue, 19 Mar 2019 20:40:26 +0530
Subject: [PATCH 006/295] BAEL2489 Avoid check for null statement in Java

---
 .../com/baeldung/nulls/EmptyCollections.java  |  7 ++++---
 .../baeldung/nulls/FindBugsAnnotations.java   |  5 +++--
 .../com/baeldung/nulls/Preconditions.java     | 18 ++++++++++-------
 .../baeldung/nulls/PrimitivesAndWrapper.java  |  5 +++--
 .../java/com/baeldung/nulls/UsingObjects.java | 11 +++-------
 .../nulls/PrimitivesAndWrapperUnitTest.java   |  8 ++++----
 .../baeldung/nulls/UsingOptionalUnitTest.java |  5 +++++
 .../nulls/UsingStringUtilsUnitTest.java       | 20 +++++++++----------
 8 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/core-java/src/main/java/com/baeldung/nulls/EmptyCollections.java b/core-java/src/main/java/com/baeldung/nulls/EmptyCollections.java
index 95e49e4e91..5958cf8dc6 100644
--- a/core-java/src/main/java/com/baeldung/nulls/EmptyCollections.java
+++ b/core-java/src/main/java/com/baeldung/nulls/EmptyCollections.java
@@ -7,11 +7,12 @@ import java.util.stream.Stream;
 
 public class EmptyCollections {
 
-    public List<String> names(){
-        if (userExist())
+    public List<String> names() {
+        if (userExist()) {
             return Stream.of(readName()).collect(Collectors.toList());
-        else
+        } else {
             return Collections.emptyList();
+        }
     }
 
     private boolean userExist() {
diff --git a/core-java/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java b/core-java/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
index f879f033c9..a3804f6af5 100644
--- a/core-java/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
+++ b/core-java/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
@@ -16,10 +16,11 @@ public class FindBugsAnnotations {
     @Nonnull
     public Object process() throws Exception {
         Object result = doSomething();
-        if (result == null)
+        if (result == null) {
             throw new Exception("Processing fail. Got a null response");
-        else
+        } else {
             return result;
+        }
     }
 
     private Object doSomething() {
diff --git a/core-java/src/main/java/com/baeldung/nulls/Preconditions.java b/core-java/src/main/java/com/baeldung/nulls/Preconditions.java
index 447026f1e3..9d9633a13e 100644
--- a/core-java/src/main/java/com/baeldung/nulls/Preconditions.java
+++ b/core-java/src/main/java/com/baeldung/nulls/Preconditions.java
@@ -3,8 +3,9 @@ package com.baeldung.nulls;
 public class Preconditions {
 
     public void goodAccept(String one, String two, String three) {
-        if (one == null || two == null || three == null)
+        if (one == null || two == null || three == null) {
             throw new IllegalArgumentException();
+        }
 
         process(one);
         process(two);
@@ -12,20 +13,23 @@ public class Preconditions {
     }
 
     public void badAccept(String one, String two, String three) {
-        if (one == null)
+        if (one == null) {
             throw new IllegalArgumentException();
-        else
+        } else {
             process(one);
+        }
 
-        if (two == null)
+        if (two == null) {
             throw new IllegalArgumentException();
-        else
+        } else {
             process(two);
+        }
 
-        if (three == null)
+        if (three == null) {
             throw new IllegalArgumentException();
-        else
+        } else {
             process(three);
+        }
 
     }
 
diff --git a/core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java b/core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
index 8f662b3760..c75918c486 100644
--- a/core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
+++ b/core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
@@ -11,10 +11,11 @@ public class PrimitivesAndWrapper {
     }
 
     public static Integer goodSum(Integer a, Integer b) {
-        if (a != null && b != null)
+        if (a != null && b != null) {
             return a + b;
-        else
+        } else {
             throw new IllegalArgumentException();
+        }
     }
 
 }
diff --git a/core-java/src/main/java/com/baeldung/nulls/UsingObjects.java b/core-java/src/main/java/com/baeldung/nulls/UsingObjects.java
index 7383ae84a7..5384edee5e 100644
--- a/core-java/src/main/java/com/baeldung/nulls/UsingObjects.java
+++ b/core-java/src/main/java/com/baeldung/nulls/UsingObjects.java
@@ -4,13 +4,8 @@ import java.util.Objects;
 
 public class UsingObjects {
 
-    public void accept(Object param) throws Exception {
-        try {
-            Objects.requireNonNull(param);
-        } catch (NullPointerException e) {
-            throw new Exception();
-        }
-
-        //doSomething()
+    public void accept(Object param) {
+        Objects.requireNonNull(param);
+        // doSomething()
     }
 }
diff --git a/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java b/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
index 67fe173883..3c524387a4 100644
--- a/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
+++ b/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
@@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test;
 class PrimitivesAndWrapperUnitTest {
 
     @Test
-    public void givenWrappers_whenBothArgsNonNull_thenReturnResult() {
+    public void givenBothArgsNonNull_whenCallingWrapperSum_thenReturnSum() {
 
         Integer sum = PrimitivesAndWrapper.wrapperSum(0, 0);
 
@@ -16,17 +16,17 @@ class PrimitivesAndWrapperUnitTest {
     }
 
     @Test()
-    public void givenWrappers_whenOneArgIsNull_thenThrowNullPointerException() {
+    public void givenOneArgIsNull_whenCallingWrapperSum_thenThrowNullPointerException() {
         assertThrows(NullPointerException.class, () -> PrimitivesAndWrapper.wrapperSum(null, 2));
     }
 
     @Test()
-    public void givenWrappers_whenBothArgsAreNull_thenThrowNullPointerException() {
+    public void givenBothArgsNull_whenCallingWrapperSum_thenThrowNullPointerException() {
         assertThrows(NullPointerException.class, () -> PrimitivesAndWrapper.wrapperSum(null, null));
     }
 
     @Test()
-    public void givenWrappersWithNullCheck_whenAnyArgIsNull_thenThrowIllegalArgumentException() {
+    public void givenOneArgNull_whenCallingGoodSum_thenThrowIllegalArgumentException() {
         assertThrows(IllegalArgumentException.class, () -> PrimitivesAndWrapper.goodSum(null, 2));
     }
 
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
index 45367204b7..d9d245369b 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
@@ -20,18 +20,23 @@ class UsingOptionalUnitTest {
 
     @Test
     public void whenArgIsFalse_thenReturnEmptyResponse() {
+
         Optional<Object> result = classUnderTest.process(false);
+
         assertFalse(result.isPresent());
     }
 
     @Test
     public void whenArgIsTrue_thenReturnValidResponse() {
+
         Optional<Object> result = classUnderTest.process(true);
+
         assertTrue(result.isPresent());
     }
 
     @Test
     public void whenArgIsFalse_thenChainResponseAndThrowException() {
+
         assertThrows(Exception.class, () -> classUnderTest.process(false).orElseThrow(() -> new Exception()));
     }
 }
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
index 451775abe1..99b1dbe6b4 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
@@ -16,28 +16,28 @@ class UsingStringUtilsUnitTest {
     }
 
     @Test
-    public void givenAccept_whenArgIsNull_throwIllegalArgumentException() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> classUnderTest.accept(null));
+    public void givenArgIsNull_whenCallingAccept_throwIllegalArgumentException() {
+        assertThrows(IllegalArgumentException.class, () -> classUnderTest.accept(null));
     }
 
     @Test
-    public void givenAccept_whenArgIsEmpty_throwIllegalArgumentException() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> classUnderTest.accept(""));
+    public void givenArgIsEmpty_whenCallingAccept_throwIllegalArgumentException() {
+        assertThrows(IllegalArgumentException.class, () -> classUnderTest.accept(""));
     }
 
     @Test
-    public void givenAcceptOnlyNonBlank_whenArgIsNull_throwIllegalArgumentException() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> classUnderTest.acceptOnlyNonBlank(null));
+    public void givenArgIsNull_whenCallingAcceptOnlyNonBlank_throwIllegalArgumentException() {
+        assertThrows(IllegalArgumentException.class, () -> classUnderTest.acceptOnlyNonBlank(null));
     }
 
     @Test
-    public void givenAcceptOnlyNonBlank_whenArgIsEmpty_throwIllegalArgumentException() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> classUnderTest.acceptOnlyNonBlank(""));
+    public void givenArgIsEmpty_whenCallingAcceptOnlyNonBlank_throwIllegalArgumentException() {
+        assertThrows(IllegalArgumentException.class, () -> classUnderTest.acceptOnlyNonBlank(""));
     }
 
     @Test
-    public void givenAcceptOnlyNonBlank_whenArgIsBlank_throwIllegalArgumentException() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> classUnderTest.acceptOnlyNonBlank(" "));
+    public void givenArgIsBlank_whenCallingAcceptOnlyNonBlank_throwIllegalArgumentException() {
+        assertThrows(IllegalArgumentException.class, () -> classUnderTest.acceptOnlyNonBlank(" "));
     }
 
 }
\ No newline at end of file

From 2d3ac05704911c462ea62faca302731dd949e274 Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Sat, 23 Mar 2019 17:03:37 +0400
Subject: [PATCH 007/295] convert java8 to milliseconds

---
 .../com/baeldung/convert/ConvertDateTime.java | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java

diff --git a/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java b/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
new file mode 100644
index 0000000000..548912ea07
--- /dev/null
+++ b/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
@@ -0,0 +1,33 @@
+package com.baeldung.convert;
+
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+public class ConvertDateTime {
+
+    public static void main(String[] args) {
+
+        java8();
+        joda();
+    }
+
+    private static void joda() {
+        String s = "00:00:01.2";
+        DateTimeFormatter format = DateTimeFormat.forPattern("HH:mm:ss.S");
+        DateTime dateTime = format.parseDateTime(s);
+        System.out.println(dateTime.getMillisOfSecond());
+    }
+
+    private static void java8() {
+        LocalDateTime localDateTime = LocalDateTime.now();
+
+        ZoneId id = ZoneId.systemDefault();
+        ZonedDateTime zdt = ZonedDateTime.of(localDateTime, id);
+        System.out.println(zdt.toInstant().toEpochMilli());
+    }
+}

From 6c6e9ed53dc3a68523da6f53393065a943f9fe2c Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Sun, 24 Mar 2019 11:08:54 +0400
Subject: [PATCH 008/295] convert with simple date formatting

---
 .../com/baeldung/convert/ConvertDateTime.java | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java b/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
index 548912ea07..c4d771a7e6 100644
--- a/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
+++ b/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
@@ -4,16 +4,39 @@ import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.Calendar;
+import java.util.Date;
 
 public class ConvertDateTime {
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws ParseException {
 
         java8();
         joda();
+        Date date = simpleDateTimeFormatter();
+        calendar(date);
+    }
+
+    private static void calendar(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        System.out.println("Calender - Time in milliseconds : " + calendar.getTimeInMillis());
+    }
+
+    private static Date simpleDateTimeFormatter() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("dd-M-yyyy hh:mm:ss");
+        String dateInString = "22-01-2015 10:20:56";
+        Date date = sdf.parse(dateInString);
+
+        System.out.println(dateInString);
+        System.out.println("Date - Time in milliseconds : " + date.getTime());
+
+        return date;
     }
 
     private static void joda() {

From 7d87f2963c2fbc727d488f0b4c0b66bf12f4199d Mon Sep 17 00:00:00 2001
From: macroscopic64 <macromohan64@gmail.com>
Date: Mon, 25 Mar 2019 23:04:50 +0530
Subject: [PATCH 009/295] [BAEL-2073] Java 9 Migration Issues and Resolution

---
 prejpms/pom.xml                               | 73 +++++++++++++++++
 .../main/java/com/baeldung/prejpms/App.java   | 79 +++++++++++++++++++
 .../main/java/com/baeldung/prejpms/Book.java  | 39 +++++++++
 prejpms/src/main/resources/logback.xml        | 10 +++
 4 files changed, 201 insertions(+)
 create mode 100644 prejpms/pom.xml
 create mode 100644 prejpms/src/main/java/com/baeldung/prejpms/App.java
 create mode 100644 prejpms/src/main/java/com/baeldung/prejpms/Book.java
 create mode 100644 prejpms/src/main/resources/logback.xml

diff --git a/prejpms/pom.xml b/prejpms/pom.xml
new file mode 100644
index 0000000000..0f0216682e
--- /dev/null
+++ b/prejpms/pom.xml
@@ -0,0 +1,73 @@
+<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>prejpms</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	<name>pre-jpms</name>
+
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.25</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<finalName>pre-jpms</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.0</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.1.1</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>
+								${project.build.directory}/dependency-jars/
+							</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>com.baeldung.prejpms.App</mainClass>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>dependency-jars/</classpathPrefix>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+
+		</plugins>
+	</build>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+</project>
diff --git a/prejpms/src/main/java/com/baeldung/prejpms/App.java b/prejpms/src/main/java/com/baeldung/prejpms/App.java
new file mode 100644
index 0000000000..0b38201302
--- /dev/null
+++ b/prejpms/src/main/java/com/baeldung/prejpms/App.java
@@ -0,0 +1,79 @@
+package com.baeldung.prejpms;
+
+import java.io.StringWriter;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.sun.crypto.provider.SunJCE;
+
+import sun.misc.BASE64Encoder;
+import sun.reflect.Reflection;
+
+public class App {
+
+    private static final Logger logger = LoggerFactory.getLogger(App.class);
+
+    public static void main(String[] args) throws Exception {
+
+        getCrytpographyProviderName();
+        getCallStackClassNames();
+        getXmlFromObject(new Book(100, "Java Modules Architecture"));
+        getBase64EncodedString("Java");
+    }
+
+    private static void getCrytpographyProviderName() {
+        try {
+            logger.info("1. Java Cryptography Extension - Provider Name: " + new SunJCE().getName() + "\n");
+        } catch (Throwable e) {
+            logger.error(e.toString());
+        }
+    }
+
+    private static void getCallStackClassNames() {
+        try {
+            int i = 0;
+            StringBuffer sbStack = new StringBuffer();
+            while (true) {
+                Class<?> caller = Reflection.getCallerClass(i++);
+                if (caller == null) {
+                    break;
+                } else {
+                    sbStack.append(caller.getName())
+                        .append("\n");
+                }
+            }
+            logger.info("2. Call Stack Class Names:\n" + sbStack.toString());
+        } catch (Throwable e) {
+            logger.error(e.toString());
+        }
+    }
+
+    private static void getXmlFromObject(Book book) {
+        try {
+            Marshaller marshallerObj = JAXBContext.newInstance(Book.class)
+                .createMarshaller();
+            marshallerObj.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+
+            StringWriter sw = new StringWriter();
+            marshallerObj.marshal(book, sw);
+            logger.info("3. Xml for Book object:\n" + sw);
+        } catch (Throwable e) {
+            logger.error(e.toString());
+        }
+
+    }
+
+    private static void getBase64EncodedString(String inputString) {
+        try {
+            String encodedString = new BASE64Encoder().encode(inputString.getBytes());
+            logger.info("4. Base Encoded String: " + encodedString);
+        } catch (Throwable e) {
+            logger.error(e.toString());
+        }
+    }
+}
diff --git a/prejpms/src/main/java/com/baeldung/prejpms/Book.java b/prejpms/src/main/java/com/baeldung/prejpms/Book.java
new file mode 100644
index 0000000000..57b19bf3c1
--- /dev/null
+++ b/prejpms/src/main/java/com/baeldung/prejpms/Book.java
@@ -0,0 +1,39 @@
+package com.baeldung.prejpms;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "book")
+public class Book {
+    private long id;
+    private String name;
+
+    public Book() {
+        
+    }
+    
+    public Book(long id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    @XmlAttribute
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @XmlElement(name = "title")
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+}
diff --git a/prejpms/src/main/resources/logback.xml b/prejpms/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7c5914e58e
--- /dev/null
+++ b/prejpms/src/main/resources/logback.xml
@@ -0,0 +1,10 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>[%level] %msg%n</pattern>
+        </encoder>
+    </appender>
+    <root level="debug">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file

From c7c5d56eb392038c8f577537c44eeedcdf1ae7c5 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Tue, 26 Mar 2019 21:47:51 +0530
Subject: [PATCH 010/295] BAEL2489 Avoid check for null statement in Java

---
 patterns/design-patterns-2/pom.xml             | 18 ++++++++++++++++++
 .../java/com/baeldung/nulls/APIContracts.java  |  0
 .../java/com/baeldung/nulls/Assertions.java    |  0
 .../com/baeldung/nulls/EmptyCollections.java   |  0
 .../baeldung/nulls/FindBugsAnnotations.java    |  9 +++++----
 .../java/com/baeldung/nulls/Preconditions.java |  0
 .../baeldung/nulls/PrimitivesAndWrapper.java   |  0
 .../java/com/baeldung/nulls/UsingLombok.java   |  0
 .../java/com/baeldung/nulls/UsingObjects.java  |  0
 .../java/com/baeldung/nulls/UsingOptional.java |  0
 .../com/baeldung/nulls/UsingStringUtils.java   |  0
 .../nulls/PrimitivesAndWrapperUnitTest.java    |  4 ++--
 .../baeldung/nulls/UsingLombokUnitTest.java    |  3 +--
 .../baeldung/nulls/UsingObjectsUnitTest.java   |  9 ++++-----
 .../baeldung/nulls/UsingOptionalUnitTest.java  | 10 +++++-----
 .../nulls/UsingStringUtilsUnitTest.java        |  3 +--
 16 files changed, 36 insertions(+), 20 deletions(-)
 rename {core-java => patterns/design-patterns-2}/src/main/java/com/baeldung/nulls/APIContracts.java (100%)
 rename {core-java => patterns/design-patterns-2}/src/main/java/com/baeldung/nulls/Assertions.java (100%)
 rename {core-java => patterns/design-patterns-2}/src/main/java/com/baeldung/nulls/EmptyCollections.java (100%)
 rename {core-java => patterns/design-patterns-2}/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java (78%)
 rename {core-java => patterns/design-patterns-2}/src/main/java/com/baeldung/nulls/Preconditions.java (100%)
 rename {core-java => patterns/design-patterns-2}/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java (100%)
 rename {core-java => patterns/design-patterns-2}/src/main/java/com/baeldung/nulls/UsingLombok.java (100%)
 rename {core-java => patterns/design-patterns-2}/src/main/java/com/baeldung/nulls/UsingObjects.java (100%)
 rename {core-java => patterns/design-patterns-2}/src/main/java/com/baeldung/nulls/UsingOptional.java (100%)
 rename {core-java => patterns/design-patterns-2}/src/main/java/com/baeldung/nulls/UsingStringUtils.java (100%)
 rename {core-java => patterns/design-patterns-2}/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java (99%)
 rename {core-java => patterns/design-patterns-2}/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java (82%)
 rename {core-java => patterns/design-patterns-2}/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java (84%)
 rename {core-java => patterns/design-patterns-2}/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java (99%)
 rename {core-java => patterns/design-patterns-2}/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java (93%)

diff --git a/patterns/design-patterns-2/pom.xml b/patterns/design-patterns-2/pom.xml
index 2a0213065b..5c3e70b046 100644
--- a/patterns/design-patterns-2/pom.xml
+++ b/patterns/design-patterns-2/pom.xml
@@ -15,11 +15,29 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>${intellij.annotations.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
     </dependencies>
     
     <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>
+        <intellij.annotations.version>16.0.2</intellij.annotations.version>
+        <commons-lang3.version>3.5</commons-lang3.version>
     </properties>
 </project>
diff --git a/core-java/src/main/java/com/baeldung/nulls/APIContracts.java b/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/APIContracts.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/nulls/APIContracts.java
rename to patterns/design-patterns-2/src/main/java/com/baeldung/nulls/APIContracts.java
diff --git a/core-java/src/main/java/com/baeldung/nulls/Assertions.java b/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/Assertions.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/nulls/Assertions.java
rename to patterns/design-patterns-2/src/main/java/com/baeldung/nulls/Assertions.java
diff --git a/core-java/src/main/java/com/baeldung/nulls/EmptyCollections.java b/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/EmptyCollections.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/nulls/EmptyCollections.java
rename to patterns/design-patterns-2/src/main/java/com/baeldung/nulls/EmptyCollections.java
diff --git a/core-java/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java b/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
similarity index 78%
rename from core-java/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
rename to patterns/design-patterns-2/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
index a3804f6af5..697d5e4959 100644
--- a/core-java/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
+++ b/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
@@ -1,11 +1,12 @@
 package com.baeldung.nulls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 
 public class FindBugsAnnotations {
 
-    public void accept(@Nonnull Object param) {
+    public void accept(@NotNull Object param) {
         System.out.println(param.toString());
     }
 
@@ -13,7 +14,7 @@ public class FindBugsAnnotations {
         System.out.println("Printing " + param);
     }
 
-    @Nonnull
+    @NotNull
     public Object process() throws Exception {
         Object result = doSomething();
         if (result == null) {
diff --git a/core-java/src/main/java/com/baeldung/nulls/Preconditions.java b/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/Preconditions.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/nulls/Preconditions.java
rename to patterns/design-patterns-2/src/main/java/com/baeldung/nulls/Preconditions.java
diff --git a/core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java b/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
rename to patterns/design-patterns-2/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
diff --git a/core-java/src/main/java/com/baeldung/nulls/UsingLombok.java b/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/UsingLombok.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/nulls/UsingLombok.java
rename to patterns/design-patterns-2/src/main/java/com/baeldung/nulls/UsingLombok.java
diff --git a/core-java/src/main/java/com/baeldung/nulls/UsingObjects.java b/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/UsingObjects.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/nulls/UsingObjects.java
rename to patterns/design-patterns-2/src/main/java/com/baeldung/nulls/UsingObjects.java
diff --git a/core-java/src/main/java/com/baeldung/nulls/UsingOptional.java b/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/UsingOptional.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/nulls/UsingOptional.java
rename to patterns/design-patterns-2/src/main/java/com/baeldung/nulls/UsingOptional.java
diff --git a/core-java/src/main/java/com/baeldung/nulls/UsingStringUtils.java b/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/UsingStringUtils.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/nulls/UsingStringUtils.java
rename to patterns/design-patterns-2/src/main/java/com/baeldung/nulls/UsingStringUtils.java
diff --git a/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java b/patterns/design-patterns-2/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
similarity index 99%
rename from core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
rename to patterns/design-patterns-2/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
index 3c524387a4..49655619f6 100644
--- a/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
+++ b/patterns/design-patterns-2/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
@@ -1,10 +1,10 @@
 package com.baeldung.nulls;
 
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.jupiter.api.Test;
-
 class PrimitivesAndWrapperUnitTest {
 
     @Test
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java b/patterns/design-patterns-2/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
similarity index 82%
rename from core-java/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
rename to patterns/design-patterns-2/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
index c157ad6630..b322344aba 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
+++ b/patterns/design-patterns-2/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
@@ -1,10 +1,9 @@
 package com.baeldung.nulls;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class UsingLombokUnitTest {
 
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java b/patterns/design-patterns-2/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
similarity index 84%
rename from core-java/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
rename to patterns/design-patterns-2/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
index 6939caa4fb..e1f5a288e6 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
+++ b/patterns/design-patterns-2/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
@@ -1,12 +1,11 @@
 package com.baeldung.nulls;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
 class UsingObjectsUnitTest {
 
     private UsingObjects classUnderTest;
@@ -19,7 +18,7 @@ class UsingObjectsUnitTest {
     @Test
     public void whenArgIsNull_thenThrowException() {
 
-        assertThrows(Exception.class, () -> classUnderTest.accept(null));
+        assertThrows(NullPointerException.class, () -> classUnderTest.accept(null));
     }
 
     @Test
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java b/patterns/design-patterns-2/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
similarity index 99%
rename from core-java/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
rename to patterns/design-patterns-2/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
index d9d245369b..8f896cedfa 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
+++ b/patterns/design-patterns-2/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
@@ -1,14 +1,14 @@
 package com.baeldung.nulls;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Optional;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
 class UsingOptionalUnitTest {
 
     private UsingOptional classUnderTest;
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java b/patterns/design-patterns-2/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
similarity index 93%
rename from core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
rename to patterns/design-patterns-2/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
index 99b1dbe6b4..f7c51a7dc5 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
+++ b/patterns/design-patterns-2/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
@@ -1,10 +1,9 @@
 package com.baeldung.nulls;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class UsingStringUtilsUnitTest {
 

From 187199f924c6d3b4fc2c0387176f8bfab33f4751 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Wed, 27 Mar 2019 21:25:19 +0530
Subject: [PATCH 011/295] BAEL2489 Avoid check for null statement in Java -
 Removing unused pom changes

---
 core-java/pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/core-java/pom.xml b/core-java/pom.xml
index 9c5a17d25c..ff5235096a 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -129,12 +129,6 @@
             <scope>system</scope>
             <systemPath>${java.home}/../lib/tools.jar</systemPath>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>${intellij.annotations.version}</version>
-        </dependency>
-
 
     </dependencies>
 
@@ -491,6 +485,5 @@
         <!-- instrumentation -->
         <javaassist.version>3.21.0-GA</javaassist.version>
         <sun.tools.version>1.8.0</sun.tools.version>
-        <intellij.annotations.version>16.0.2</intellij.annotations.version>
     </properties>
 </project>

From de1c689114edd968f3d37c4baa127e8b06a3f2f4 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Thu, 28 Mar 2019 22:03:57 +0530
Subject: [PATCH 012/295] BAEL2489 Avoid check for null statement in Java -
 Removing unused pom changes

---
 core-java/pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core-java/pom.xml b/core-java/pom.xml
index ff5235096a..06f126e1d0 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -129,7 +129,6 @@
             <scope>system</scope>
             <systemPath>${java.home}/../lib/tools.jar</systemPath>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -450,6 +449,7 @@
     </profiles>
 
     <properties>
+
         <!-- marshalling -->
         <gson.version>2.8.2</gson.version>
 
@@ -470,10 +470,12 @@
 
         <!-- maven plugins -->
         <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+
         <javamoney.moneta.version>1.1</javamoney.moneta.version>
         <h2database.version>1.4.197</h2database.version>
         <esapi.version>2.1.0.1</esapi.version>
         <jmh-core.version>1.19</jmh-core.version>
+
         <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
         <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
@@ -484,6 +486,7 @@
         <icu4j.version>61.1</icu4j.version>
         <!-- instrumentation -->
         <javaassist.version>3.21.0-GA</javaassist.version>
+
         <sun.tools.version>1.8.0</sun.tools.version>
     </properties>
 </project>

From 0aeed3e745a08294bcbb716cea42b02e12178819 Mon Sep 17 00:00:00 2001
From: dev-chirag <41482403+dev-chirag@users.noreply.github.com>
Date: Thu, 28 Mar 2019 22:28:14 +0530
Subject: [PATCH 013/295] Delete pom.xml

Removing unused changes in core-java
---
 core-java/pom.xml | 492 ----------------------------------------------
 1 file changed, 492 deletions(-)
 delete mode 100644 core-java/pom.xml

diff --git a/core-java/pom.xml b/core-java/pom.xml
deleted file mode 100644
index 06f126e1d0..0000000000
--- a/core-java/pom.xml
+++ /dev/null
@@ -1,492 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>core-java</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>core-java</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
-    </parent>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.unix4j</groupId>
-            <artifactId>unix4j-command</artifactId>
-            <version>${unix4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.grep4j</groupId>
-            <artifactId>grep4j</artifactId>
-            <version>${grep4j.version}</version>
-        </dependency>
-        <!-- web -->
-        <!-- marshalling -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
-        <!-- logging -->
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- test scoped -->
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj-core.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.javamoney</groupId>
-            <artifactId>moneta</artifactId>
-            <version>${javamoney.moneta.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.owasp.esapi</groupId>
-            <artifactId>esapi</artifactId>
-            <version>${esapi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.messaging.mq</groupId>
-            <artifactId>fscontext</artifactId>
-            <version>${fscontext.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.codepoetics</groupId>
-            <artifactId>protonpack</artifactId>
-            <version>${protonpack.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>one.util</groupId>
-            <artifactId>streamex</artifactId>
-            <version>${streamex.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.vavr</groupId>
-            <artifactId>vavr</artifactId>
-            <version>${vavr.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-            <version>${jmh-core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh-generator-annprocess.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
-        </dependency>
-        <!-- instrumentation -->
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>${javaassist.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun</groupId>
-            <artifactId>tools</artifactId>
-            <version>${sun.tools.version}</version>
-            <scope>system</scope>
-            <systemPath>${java.home}/../lib/tools.jar</systemPath>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>core-java</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/libs</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven-jar-plugin.version}</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>libs/</classpathPrefix>
-                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
-                            <archive>
-                                <manifest>
-                                    <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
-                                </manifest>
-                            </archive>
-                            <descriptorRefs>
-                                <descriptorRef>jar-with-dependencies</descriptorRef>
-                            </descriptorRefs>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>${maven-shade-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>com.jolira</groupId>
-                <artifactId>onejar-maven-plugin</artifactId>
-                <version>${onejar-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
-                            <attachToBuild>true</attachToBuild>
-                            <filename>${project.build.finalName}-onejar.${project.packaging}</filename>
-                        </configuration>
-                        <goals>
-                            <goal>one-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>spring-boot</classifier>
-                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>${exec-maven-plugin.version}</version>
-                <configuration>
-                    <executable>java</executable>
-                    <mainClass>com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed</mainClass>
-                    <arguments>
-                        <argument>-Xmx300m</argument>
-                        <argument>-XX:+UseParallelGC</argument>
-                        <argument>-classpath</argument>
-                        <classpath />
-                        <argument>com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${maven-javadoc-plugin.version}</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>integration</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/*ManualTest.java</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/*IntegrationTest.java</include>
-                                        <include>**/*IntTest.java</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <test.mime>json</test.mime>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>${exec-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>run-benchmarks</id>
-                                <!-- <phase>integration-test</phase> -->
-                                <phase>none</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <classpathScope>test</classpathScope>
-                                    <executable>java</executable>
-                                    <arguments>
-                                        <argument>-classpath</argument>
-                                        <classpath />
-                                        <argument>org.openjdk.jmh.Main</argument>
-                                        <argument>.*</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <!-- java instrumentation profiles to build jars -->
-        <profile>
-            <id>buildAgentLoader</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                                <configuration>
-                                    <classifier>agentLoader</classifier>
-                                    <classesDirectory>target/classes</classesDirectory>
-                                    <archive>
-                                        <manifest>
-                                            <addClasspath>true</addClasspath>
-                                        </manifest>
-                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                                    </archive>
-
-                                    <includes>
-                                        <include>com/baeldung/instrumentation/application/AgentLoader.class</include>
-                                        <include>com/baeldung/instrumentation/application/Launcher.class</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>buildApplication</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                                <configuration>
-                                    <classifier>application</classifier>
-                                    <classesDirectory>target/classes</classesDirectory>
-                                    <archive>
-                                        <manifest>
-                                            <addClasspath>true</addClasspath>
-                                        </manifest>
-                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                                    </archive>
-
-                                    <includes>
-                                        <include>com/baeldung/instrumentation/application/MyAtm.class</include>
-                                        <include>com/baeldung/instrumentation/application/MyAtmApplication.class</include>
-                                        <include>com/baeldung/instrumentation/application/Launcher.class</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>buildAgent</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                                <configuration>
-                                    <classifier>agent</classifier>
-                                    <classesDirectory>target/classes</classesDirectory>
-                                    <archive>
-                                        <manifest>
-                                            <addClasspath>true</addClasspath>
-                                        </manifest>
-                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                                    </archive>
-
-                                    <includes>
-                                        <include>com/baeldung/instrumentation/agent/AtmTransformer.class</include>
-                                        <include>com/baeldung/instrumentation/agent/MyInstrumentationAgent.class</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <properties>
-
-        <!-- marshalling -->
-        <gson.version>2.8.2</gson.version>
-
-        <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
-        <commons-io.version>2.5</commons-io.version>
-        <commons-math3.version>3.6.1</commons-math3.version>
-        <decimal4j.version>1.0.3</decimal4j.version>
-        <unix4j.version>0.4</unix4j.version>
-        <grep4j.version>1.8.7</grep4j.version>
-        <fscontext.version>4.6-b01</fscontext.version>
-        <protonpack.version>1.13</protonpack.version>
-        <streamex.version>0.6.5</streamex.version>
-        <vavr.version>0.9.0</vavr.version>
-
-        <!-- testing -->
-        <assertj-core.version>3.10.0</assertj-core.version>
-
-        <!-- maven plugins -->
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
-
-        <javamoney.moneta.version>1.1</javamoney.moneta.version>
-        <h2database.version>1.4.197</h2database.version>
-        <esapi.version>2.1.0.1</esapi.version>
-        <jmh-core.version>1.19</jmh-core.version>
-
-        <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
-        <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
-        <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
-        <onejar-maven-plugin.version>1.4.4</onejar-maven-plugin.version>
-        <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
-        <spring-boot-maven-plugin.version>2.0.3.RELEASE</spring-boot-maven-plugin.version>
-        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
-        <icu4j.version>61.1</icu4j.version>
-        <!-- instrumentation -->
-        <javaassist.version>3.21.0-GA</javaassist.version>
-
-        <sun.tools.version>1.8.0</sun.tools.version>
-    </properties>
-</project>

From 4eb3c8567a65ef3fb7b7626130f21b9c1b0cfceb Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Thu, 28 Mar 2019 22:43:31 +0530
Subject: [PATCH 014/295] BAEL2489 Avoid check for null statement in Java -
 Removing unused pom changes

---
 core-java/pom.xml | 492 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 492 insertions(+)
 create mode 100644 core-java/pom.xml

diff --git a/core-java/pom.xml b/core-java/pom.xml
new file mode 100644
index 0000000000..463b65a4ce
--- /dev/null
+++ b/core-java/pom.xml
@@ -0,0 +1,492 @@
+<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>core-java</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.unix4j</groupId>
+            <artifactId>unix4j-command</artifactId>
+            <version>${unix4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.grep4j</groupId>
+            <artifactId>grep4j</artifactId>
+            <version>${grep4j.version}</version>
+        </dependency>
+        <!-- web -->
+        <!-- marshalling -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
+        </dependency>
+        <!-- logging -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.javamoney</groupId>
+            <artifactId>moneta</artifactId>
+            <version>${javamoney.moneta.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.owasp.esapi</groupId>
+            <artifactId>esapi</artifactId>
+            <version>${esapi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.messaging.mq</groupId>
+            <artifactId>fscontext</artifactId>
+            <version>${fscontext.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.codepoetics</groupId>
+            <artifactId>protonpack</artifactId>
+            <version>${protonpack.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>one.util</groupId>
+            <artifactId>streamex</artifactId>
+            <version>${streamex.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.vavr</groupId>
+            <artifactId>vavr</artifactId>
+            <version>${vavr.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh-core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh-generator-annprocess.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2database.version}</version>
+        </dependency>
+        <!-- instrumentation -->
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>${javaassist.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>tools</artifactId>
+            <version>${sun.tools.version}</version>
+            <scope>system</scope>
+            <systemPath>${java.home}/../lib/tools.jar</systemPath>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>core-java</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/libs</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>${maven-jar-plugin.version}</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>libs/</classpathPrefix>
+                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
+                            <archive>
+                                <manifest>
+                                    <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
+                                </manifest>
+                            </archive>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven-shade-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>com.jolira</groupId>
+                <artifactId>onejar-maven-plugin</artifactId>
+                <version>${onejar-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
+                            <attachToBuild>true</attachToBuild>
+                            <filename>${project.build.finalName}-onejar.${project.packaging}</filename>
+                        </configuration>
+                        <goals>
+                            <goal>one-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>spring-boot</classifier>
+                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>${exec-maven-plugin.version}</version>
+                <configuration>
+                    <executable>java</executable>
+                    <mainClass>com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed</mainClass>
+                    <arguments>
+                        <argument>-Xmx300m</argument>
+                        <argument>-XX:+UseParallelGC</argument>
+                        <argument>-classpath</argument>
+                        <classpath />
+                        <argument>com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed</argument>
+                    </arguments>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${maven-javadoc-plugin.version}</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>integration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>**/*ManualTest.java</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/*IntegrationTest.java</include>
+                                        <include>**/*IntTest.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <test.mime>json</test.mime>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>${exec-maven-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>run-benchmarks</id>
+                                <!-- <phase>integration-test</phase> -->
+                                <phase>none</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <classpathScope>test</classpathScope>
+                                    <executable>java</executable>
+                                    <arguments>
+                                        <argument>-classpath</argument>
+                                        <classpath />
+                                        <argument>org.openjdk.jmh.Main</argument>
+                                        <argument>.*</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- java instrumentation profiles to build jars -->
+        <profile>
+            <id>buildAgentLoader</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                                <configuration>
+                                    <classifier>agentLoader</classifier>
+                                    <classesDirectory>target/classes</classesDirectory>
+                                    <archive>
+                                        <manifest>
+                                            <addClasspath>true</addClasspath>
+                                        </manifest>
+                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                    </archive>
+
+                                    <includes>
+                                        <include>com/baeldung/instrumentation/application/AgentLoader.class</include>
+                                        <include>com/baeldung/instrumentation/application/Launcher.class</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>buildApplication</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                                <configuration>
+                                    <classifier>application</classifier>
+                                    <classesDirectory>target/classes</classesDirectory>
+                                    <archive>
+                                        <manifest>
+                                            <addClasspath>true</addClasspath>
+                                        </manifest>
+                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                    </archive>
+
+                                    <includes>
+                                        <include>com/baeldung/instrumentation/application/MyAtm.class</include>
+                                        <include>com/baeldung/instrumentation/application/MyAtmApplication.class</include>
+                                        <include>com/baeldung/instrumentation/application/Launcher.class</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>buildAgent</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                                <configuration>
+                                    <classifier>agent</classifier>
+                                    <classesDirectory>target/classes</classesDirectory>
+                                    <archive>
+                                        <manifest>
+                                            <addClasspath>true</addClasspath>
+                                        </manifest>
+                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                    </archive>
+
+                                    <includes>
+                                        <include>com/baeldung/instrumentation/agent/AtmTransformer.class</include>
+                                        <include>com/baeldung/instrumentation/agent/MyInstrumentationAgent.class</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <properties>
+        
+        <!-- marshalling -->
+        <gson.version>2.8.2</gson.version>
+
+        <!-- util -->
+        <commons-lang3.version>3.5</commons-lang3.version>
+        <commons-io.version>2.5</commons-io.version>
+        <commons-math3.version>3.6.1</commons-math3.version>
+        <decimal4j.version>1.0.3</decimal4j.version>
+        <unix4j.version>0.4</unix4j.version>
+        <grep4j.version>1.8.7</grep4j.version>
+        <fscontext.version>4.6-b01</fscontext.version>
+        <protonpack.version>1.13</protonpack.version>
+        <streamex.version>0.6.5</streamex.version>
+        <vavr.version>0.9.0</vavr.version>
+
+        <!-- testing -->
+        <assertj-core.version>3.10.0</assertj-core.version>
+
+        <!-- maven plugins -->
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+        
+        <javamoney.moneta.version>1.1</javamoney.moneta.version>
+        <h2database.version>1.4.197</h2database.version>
+        <esapi.version>2.1.0.1</esapi.version>
+        <jmh-core.version>1.19</jmh-core.version>
+       
+        <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
+        <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
+        <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
+        <onejar-maven-plugin.version>1.4.4</onejar-maven-plugin.version>
+        <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
+        <spring-boot-maven-plugin.version>2.0.3.RELEASE</spring-boot-maven-plugin.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <icu4j.version>61.1</icu4j.version>
+        <!-- instrumentation -->
+        <javaassist.version>3.21.0-GA</javaassist.version>
+        
+        <sun.tools.version>1.8.0</sun.tools.version>
+    </properties>
+</project>

From cef5964b6b5781b8b2bebb7b5e7a95d8c4378d09 Mon Sep 17 00:00:00 2001
From: Josephine Barboza <josephine.barboza@gmail.com>
Date: Sat, 30 Mar 2019 14:28:28 +0530
Subject: [PATCH 015/295] BAEL-2766 Maps in Groovy

---
 .../groovy/com/baeldung/map/MapTest.groovy    | 146 ++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 core-groovy/src/test/groovy/com/baeldung/map/MapTest.groovy

diff --git a/core-groovy/src/test/groovy/com/baeldung/map/MapTest.groovy b/core-groovy/src/test/groovy/com/baeldung/map/MapTest.groovy
new file mode 100644
index 0000000000..8bd9302412
--- /dev/null
+++ b/core-groovy/src/test/groovy/com/baeldung/map/MapTest.groovy
@@ -0,0 +1,146 @@
+package com.baeldung.groovy.map;
+
+import static groovy.test.GroovyAssert.*
+import org.junit.Test
+
+class MapTest{
+
+    @Test
+    void createMap() {
+
+        def emptyMap = [:]
+        assertNotNull(emptyMap)
+
+        assertTrue(emptyMap instanceof java.util.LinkedHashMap)
+
+        def map = [name:"Jerry", age: 42, city: "New York"]
+        assertTrue(map.size() == 3)
+    }
+
+    @Test
+    void addItemsToMap() {
+
+        def map = [name:"Jerry"]
+
+        map["age"] = 42
+
+        map.city = "New York"
+
+        def hobbyLiteral = "hobby"
+        def hobbyMap = [(hobbyLiteral): "Singing"]
+        map.putAll(hobbyMap)
+
+        assertTrue(map == [name:"Jerry", age: 42, city: "New York", hobby:"Singing"])
+
+        map.plus([1:20]) // returns new map
+
+        map << [2:30]
+
+    }
+
+    @Test
+    void getItemsFromMap() {
+
+        def map = [name:"Jerry", age: 42, city: "New York", hobby:"Singing"]
+
+        assertTrue(map["name"] == "Jerry")
+
+        assertTrue(map.name == "Jerry")
+
+        def propertyAge = "age"
+        assertTrue(map[propertyAge] == 42)
+    }
+
+    @Test
+    void removeItemsFromMap() {
+
+        def map = [1:20, a:30, 2:42, 4:34, ba:67, 6:39, 7:49]
+
+        def minusMap = map.minus([2:42, 4:34]);
+        assertTrue(minusMap == [1:20, a:30, ba:67, 6:39, 7:49])
+
+        minusMap.removeAll{it -> it.key instanceof String}
+        assertTrue( minusMap == [ 1:20, 6:39, 7:49])
+
+        minusMap.retainAll{it -> it.value %2 == 0}
+        assertTrue( minusMap == [1:20])
+    }
+
+    @Test
+    void iteratingOnMaps(){
+        def map = [name:"Jerry", age: 42, city: "New York", hobby:"Singing"]
+
+        map.each{ entry -> println "$entry.key: $entry.value" }
+
+        map.eachWithIndex{ entry, i -> println "$i $entry.key: $entry.value" }
+
+        map.eachWithIndex{ key, value, i -> println "$i $key: $value" }
+    }
+
+    @Test
+    void filteringAndSearchingMaps(){
+        def map = [name:"Jerry", age: 42, city: "New York", hobby:"Singing"]
+
+        assertTrue(map.find{ it.value == "New York"}.key == "city")
+
+        assertTrue(map.findAll{ it.value == "New York"} == [city : "New York"])
+
+        map.grep{it.value == "New York"}.each{ it -> assertTrue(it.key == "city" && it.value == "New York")}
+
+        assertTrue(map.every{it -> it.value instanceof String} == false)
+
+        assertTrue(map.any{it -> it.value instanceof String} == true)
+    }
+
+    @Test
+    void collect(){
+
+        def map = [1: [name:"Jerry", age: 42, city: "New York"],
+            2: [name:"Long", age: 25, city: "New York"],
+            3: [name:"Dustin", age: 29, city: "New York"],
+            4: [name:"Dustin", age: 34, city: "New York"]]
+
+        def names = map.collect{entry -> entry.value.name} // returns only list
+        assertTrue(names == ["Jerry", "Long", "Dustin", "Dustin"])
+
+        def uniqueNames = map.collect([] as HashSet){entry -> entry.value.name}
+        assertTrue(uniqueNames == ["Jerry", "Long", "Dustin"] as Set)
+
+        def idNames = map.collectEntries{key, value -> [key, value.name]}
+        assertTrue(idNames == [1:"Jerry", 2: "Long", 3:"Dustin", 4: "Dustin"])
+
+        def below30Names = map.findAll{it.value.age < 30}.collect{key, value -> value.name}
+        assertTrue(below30Names == ["Long", "Dustin"])
+
+
+    }
+
+    @Test
+    void group(){
+        def map = [1:20, 2: 40, 3: 11, 4: 93]
+
+        def subMap = map.groupBy{it.value % 2}
+        println subMap
+        assertTrue(subMap == [0:[1:20, 2:40 ], 1:[3:11, 4:93]])
+
+        def keySubMap = map.subMap([1, 2])
+        assertTrue(keySubMap == [1:20, 2:40])
+
+    }
+
+    @Test
+    void sorting(){
+        def map = [ab:20, a: 40, cb: 11, ba: 93]
+
+        def naturallyOrderedMap = map.sort()
+        assertTrue([a:40, ab:20, ba:93, cb:11] == naturallyOrderedMap)
+
+        def compSortedMap = map.sort({ k1, k2 -> k1 <=> k2 } as Comparator)
+        assertTrue([a:40, ab:20, ba:93, cb:11] == compSortedMap)
+
+        def cloSortedMap = map.sort({ it1, it2 -> it1.value <=> it1.value })
+        assertTrue([cb:11, ab:20, a:40, ba:93] == cloSortedMap)
+
+    }
+
+}
\ No newline at end of file

From af4e221fa85c8a171581e9136528d2255c351445 Mon Sep 17 00:00:00 2001
From: Denis Zhdanov <denzhdanov@gmail.com>
Date: Sun, 31 Mar 2019 08:15:02 +0800
Subject: [PATCH 016/295] BAEL-2779 Guide to classgraph library

---
 libraries/pom.xml                             |  7 ++
 .../classgraph/ClassGraphUnitTest.java        | 78 +++++++++++++++++++
 .../classgraph/ClassWithAnnotation.java       |  5 ++
 .../classgraph/FieldWithAnnotation.java       |  7 ++
 .../classgraph/MethodWithAnnotation.java      |  8 ++
 .../MethodWithAnnotationParameterDao.java     |  8 ++
 .../MethodWithAnnotationParameterWeb.java     |  8 ++
 .../baeldung/classgraph/TestAnnotation.java   | 14 ++++
 .../src/test/resources/classgraph/my.config   |  1 +
 9 files changed, 136 insertions(+)
 create mode 100644 libraries/src/test/java/com/baeldung/classgraph/ClassGraphUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/classgraph/ClassWithAnnotation.java
 create mode 100644 libraries/src/test/java/com/baeldung/classgraph/FieldWithAnnotation.java
 create mode 100644 libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotation.java
 create mode 100644 libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterDao.java
 create mode 100644 libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterWeb.java
 create mode 100644 libraries/src/test/java/com/baeldung/classgraph/TestAnnotation.java
 create mode 100644 libraries/src/test/resources/classgraph/my.config

diff --git a/libraries/pom.xml b/libraries/pom.xml
index 7823732224..a6179a843d 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -699,6 +699,12 @@
 			<version>${reflections.version}</version>
 		</dependency>
 
+        <dependency>
+            <groupId>io.github.classgraph</groupId>
+            <artifactId>classgraph</artifactId>
+            <version>${classgraph.version}</version>
+        </dependency>
+
     </dependencies>
 
     <repositories>
@@ -916,6 +922,7 @@
         <mockftpserver.version>2.7.1</mockftpserver.version>
         <commons-net.version>3.6</commons-net.version>
         <reflections.version>0.9.11</reflections.version>
+        <classgraph.version>4.8.22</classgraph.version>
 
     </properties>
 
diff --git a/libraries/src/test/java/com/baeldung/classgraph/ClassGraphUnitTest.java b/libraries/src/test/java/com/baeldung/classgraph/ClassGraphUnitTest.java
new file mode 100644
index 0000000000..5767396948
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/classgraph/ClassGraphUnitTest.java
@@ -0,0 +1,78 @@
+package com.baeldung.classgraph;
+
+import io.github.classgraph.*;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ClassGraphUnitTest {
+
+    @Test
+    public void whenClassAnnotationFilterIsDefined_thenTargetClassesCanBeFound() {
+        doTest(result -> {
+            ClassInfoList classInfos = result.getClassesWithAnnotation(TestAnnotation.class.getName());
+            assertThat(classInfos).extracting(ClassInfo::getName).contains(ClassWithAnnotation.class.getName());
+        });
+    }
+
+    @Test
+    public void whenMethodAnnotationFilterIsDefined_thenTargetClassesCanBeFound() {
+        doTest(result -> {
+            ClassInfoList classInfos = result.getClassesWithMethodAnnotation(TestAnnotation.class.getName());
+            assertThat(classInfos).extracting(ClassInfo::getName).contains(MethodWithAnnotation.class.getName());
+        });
+    }
+
+    @Test
+    public void whenMethodAnnotationValueFilterIsDefined_thenTargetClassesCanBeFound() {
+        doTest(result -> {
+            ClassInfoList classInfos = result.getClassesWithMethodAnnotation(TestAnnotation.class.getName());
+            ClassInfoList filteredClassInfos = classInfos.filter(classInfo -> {
+                return classInfo.getMethodInfo().stream().anyMatch(methodInfo -> {
+                    AnnotationInfo annotationInfo = methodInfo.getAnnotationInfo(TestAnnotation.class.getName());
+                    if (annotationInfo == null) {
+                        return false;
+                    }
+
+                    return "web".equals(annotationInfo.getParameterValues().getValue("value"));
+                });
+            });
+            assertThat(filteredClassInfos)
+                    .extracting(ClassInfo::getName)
+                    .contains(MethodWithAnnotationParameterWeb.class.getName());
+        });
+    }
+
+    @Test
+    public void whenFieldAnnotationFilterIsDefined_thenTargetClassesCanBeFound() {
+        doTest(result -> {
+            ClassInfoList classInfos = result.getClassesWithFieldAnnotation(TestAnnotation.class.getName());
+            assertThat(classInfos).extracting(ClassInfo::getName).contains(FieldWithAnnotation.class.getName());
+        });
+    }
+
+    @Test
+    public void whenResourceIsUsed_thenItCanBeFoundAndLoaded() throws IOException {
+        try (ScanResult result = new ClassGraph().whitelistPaths("classgraph").scan()) {
+            ResourceList resources = result.getResourcesWithExtension("config");
+            assertThat(resources).extracting(Resource::getPath).containsOnly("classgraph/my.config");
+            assertThat(resources.get(0).getContentAsString()).isEqualTo("my data");
+        }
+    }
+
+    private void doTest(Consumer<ScanResult> checker) {
+        try (ScanResult result = new ClassGraph().enableAllInfo()
+                                                 .whitelistPackages(getClass().getPackage().getName())
+                                                 .scan())
+        {
+            checker.accept(result);
+        }
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/classgraph/ClassWithAnnotation.java b/libraries/src/test/java/com/baeldung/classgraph/ClassWithAnnotation.java
new file mode 100644
index 0000000000..0f3eeef293
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/classgraph/ClassWithAnnotation.java
@@ -0,0 +1,5 @@
+package com.baeldung.classgraph;
+
+@TestAnnotation
+public class ClassWithAnnotation {
+}
diff --git a/libraries/src/test/java/com/baeldung/classgraph/FieldWithAnnotation.java b/libraries/src/test/java/com/baeldung/classgraph/FieldWithAnnotation.java
new file mode 100644
index 0000000000..c5d1cc6062
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/classgraph/FieldWithAnnotation.java
@@ -0,0 +1,7 @@
+package com.baeldung.classgraph;
+
+public class FieldWithAnnotation {
+
+    @TestAnnotation
+    private String s;
+}
diff --git a/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotation.java b/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotation.java
new file mode 100644
index 0000000000..12d0c9927c
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotation.java
@@ -0,0 +1,8 @@
+package com.baeldung.classgraph;
+
+public class MethodWithAnnotation {
+
+    @TestAnnotation
+    public void service() {
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterDao.java b/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterDao.java
new file mode 100644
index 0000000000..9e38f42013
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterDao.java
@@ -0,0 +1,8 @@
+package com.baeldung.classgraph;
+
+public class MethodWithAnnotationParameterDao {
+
+    @TestAnnotation("dao")
+    public void service() {
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterWeb.java b/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterWeb.java
new file mode 100644
index 0000000000..1ef3d46b6f
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterWeb.java
@@ -0,0 +1,8 @@
+package com.baeldung.classgraph;
+
+public class MethodWithAnnotationParameterWeb {
+
+    @TestAnnotation("web")
+    public void service() {
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/classgraph/TestAnnotation.java b/libraries/src/test/java/com/baeldung/classgraph/TestAnnotation.java
new file mode 100644
index 0000000000..f47ec180a9
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/classgraph/TestAnnotation.java
@@ -0,0 +1,14 @@
+package com.baeldung.classgraph;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.*;
+
+@Target({TYPE, METHOD, FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface TestAnnotation {
+
+    String value() default "";
+}
diff --git a/libraries/src/test/resources/classgraph/my.config b/libraries/src/test/resources/classgraph/my.config
new file mode 100644
index 0000000000..b99df573f6
--- /dev/null
+++ b/libraries/src/test/resources/classgraph/my.config
@@ -0,0 +1 @@
+my data
\ No newline at end of file

From 6b104db2bbb3e90af6ac94ffe8cd78c0b08765bc Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Tue, 2 Apr 2019 17:14:37 +0530
Subject: [PATCH 017/295] BAEL2489 Avoid check for null statement in Java -
 adding ofnullable to Optional example

---
 .../src/main/java/com/baeldung/nulls/UsingOptional.java     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/UsingOptional.java b/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/UsingOptional.java
index 6c17290a72..d5dd56e760 100644
--- a/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/UsingOptional.java
+++ b/patterns/design-patterns-2/src/main/java/com/baeldung/nulls/UsingOptional.java
@@ -8,11 +8,7 @@ public class UsingOptional {
 
         String response = doSomething(processed);
 
-        if (response == null) {
-            return Optional.empty();
-        }
-
-        return Optional.of(response);
+        return Optional.ofNullable(response);
     }
 
     private String doSomething(boolean processed) {

From b6bf4415a204bb604f8c17dabd92c96d8d07dc89 Mon Sep 17 00:00:00 2001
From: macroscopic64 <macromohan64@gmail.com>
Date: Wed, 3 Apr 2019 00:04:39 +0530
Subject: [PATCH 018/295] [BAEL-2073] Java 9 Migration Issues and Resolution

---
 .../main/java/com/baeldung/prejpms/App.java   | 36 +++++++++----------
 .../main/java/com/baeldung/prejpms/Book.java  |  4 +--
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/prejpms/src/main/java/com/baeldung/prejpms/App.java b/prejpms/src/main/java/com/baeldung/prejpms/App.java
index 0b38201302..1afaae30e4 100644
--- a/prejpms/src/main/java/com/baeldung/prejpms/App.java
+++ b/prejpms/src/main/java/com/baeldung/prejpms/App.java
@@ -16,7 +16,7 @@ import sun.reflect.Reflection;
 
 public class App {
 
-    private static final Logger logger = LoggerFactory.getLogger(App.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
 
     public static void main(String[] args) throws Exception {
 
@@ -28,28 +28,26 @@ public class App {
 
     private static void getCrytpographyProviderName() {
         try {
-            logger.info("1. Java Cryptography Extension - Provider Name: " + new SunJCE().getName() + "\n");
+            LOGGER.info("1. JCE Provider Name: {}\n", new SunJCE().getName());
         } catch (Throwable e) {
-            logger.error(e.toString());
+            LOGGER.error(e.toString());
         }
     }
 
     private static void getCallStackClassNames() {
         try {
-            int i = 0;
             StringBuffer sbStack = new StringBuffer();
-            while (true) {
-                Class<?> caller = Reflection.getCallerClass(i++);
-                if (caller == null) {
-                    break;
-                } else {
-                    sbStack.append(caller.getName())
-                        .append("\n");
-                }
-            }
-            logger.info("2. Call Stack Class Names:\n" + sbStack.toString());
+            int i = 0;
+            Class<?> caller = Reflection.getCallerClass(i++);
+            do {
+                sbStack.append(i + ".")
+                    .append(caller.getName())
+                    .append("\n");
+                caller = Reflection.getCallerClass(i++);
+            } while (caller != null);
+            LOGGER.info("2. Call Stack:\n{}", sbStack);
         } catch (Throwable e) {
-            logger.error(e.toString());
+            LOGGER.error(e.toString());
         }
     }
 
@@ -61,9 +59,9 @@ public class App {
 
             StringWriter sw = new StringWriter();
             marshallerObj.marshal(book, sw);
-            logger.info("3. Xml for Book object:\n" + sw);
+            LOGGER.info("3. Xml for Book object:\n{}", sw);
         } catch (Throwable e) {
-            logger.error(e.toString());
+            LOGGER.error(e.toString());
         }
 
     }
@@ -71,9 +69,9 @@ public class App {
     private static void getBase64EncodedString(String inputString) {
         try {
             String encodedString = new BASE64Encoder().encode(inputString.getBytes());
-            logger.info("4. Base Encoded String: " + encodedString);
+            LOGGER.info("4. Base Encoded String: {}", encodedString);
         } catch (Throwable e) {
-            logger.error(e.toString());
+            LOGGER.error(e.toString());
         }
     }
 }
diff --git a/prejpms/src/main/java/com/baeldung/prejpms/Book.java b/prejpms/src/main/java/com/baeldung/prejpms/Book.java
index 57b19bf3c1..6780c73738 100644
--- a/prejpms/src/main/java/com/baeldung/prejpms/Book.java
+++ b/prejpms/src/main/java/com/baeldung/prejpms/Book.java
@@ -10,9 +10,8 @@ public class Book {
     private String name;
 
     public Book() {
-        
     }
-    
+
     public Book(long id, String name) {
         this.id = id;
         this.name = name;
@@ -35,5 +34,4 @@ public class Book {
     public Long getId() {
         return id;
     }
-
 }

From 3b43bddf04bb0b25c51ffad2645a59c9dc5f8334 Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Thu, 4 Apr 2019 10:12:04 +0400
Subject: [PATCH 019/295] convert final

---
 .../com/baeldung/convert/ConvertDateTime.java | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java b/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
index c4d771a7e6..d52dd1b989 100644
--- a/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
+++ b/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
@@ -1,9 +1,5 @@
 package com.baeldung.convert;
 
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -22,35 +18,32 @@ public class ConvertDateTime {
         calendar(date);
     }
 
+    private static Date simpleDateTimeFormatter() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("dd-M-yyyy hh:mm:ss");
+        String dateInString = "22-04-2019 10:20:56";
+        Date date = sdf.parse(dateInString);
+
+        System.out.println("Date - Time in milliseconds : " + date.getTime());
+
+        return date;
+    }
+
     private static void calendar(Date date) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
         System.out.println("Calender - Time in milliseconds : " + calendar.getTimeInMillis());
     }
 
-    private static Date simpleDateTimeFormatter() throws ParseException {
-        SimpleDateFormat sdf = new SimpleDateFormat("dd-M-yyyy hh:mm:ss");
-        String dateInString = "22-01-2015 10:20:56";
-        Date date = sdf.parse(dateInString);
-
-        System.out.println(dateInString);
-        System.out.println("Date - Time in milliseconds : " + date.getTime());
-
-        return date;
-    }
-
     private static void joda() {
-        String s = "00:00:01.2";
-        DateTimeFormatter format = DateTimeFormat.forPattern("HH:mm:ss.S");
-        DateTime dateTime = format.parseDateTime(s);
-        System.out.println(dateTime.getMillisOfSecond());
+        org.joda.time.DateTime jodaDateTime = new org.joda.time.DateTime(new Date());
+        long delta = jodaDateTime.getMillis();
+        System.out.println("Joda - Time in milliseconds : " + delta);
     }
 
     private static void java8() {
         LocalDateTime localDateTime = LocalDateTime.now();
-
         ZoneId id = ZoneId.systemDefault();
         ZonedDateTime zdt = ZonedDateTime.of(localDateTime, id);
-        System.out.println(zdt.toInstant().toEpochMilli());
+        System.out.println("Java 8 - Time in milliseconds : " + zdt.toInstant().toEpochMilli());
     }
 }

From beccf32be8bb458777f8c54b8e3aa4ad999e3301 Mon Sep 17 00:00:00 2001
From: Vivek <vivekrmd@gmail.com>
Date: Sat, 13 Apr 2019 14:18:55 +0530
Subject: [PATCH 020/295] BAEL-2857 Defining a JPA Entity

---
 .../java/com/baeldung/jpa/entity/Student.java | 75 +++++++++++++++++
 .../main/java/com/baeldung/util/Gender.java   |  6 ++
 .../main/resources/META-INF/persistence.xml   | 20 +++++
 .../entity/StudentEntityIntegrationTest.java  | 83 +++++++++++++++++++
 4 files changed, 184 insertions(+)
 create mode 100644 persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java
 create mode 100644 persistence-modules/java-jpa/src/main/java/com/baeldung/util/Gender.java
 create mode 100644 persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/StudentEntityIntegrationTest.java

diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java
new file mode 100644
index 0000000000..6eced20779
--- /dev/null
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java
@@ -0,0 +1,75 @@
+package com.baeldung.jpa.entity;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+
+import com.baeldung.util.Gender;
+
+@Entity
+@Table(name="STUD_NAME")
+public class Student {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long id;
+	@Column(name = "STUD_NAME", length = 50, nullable = false, unique = false)
+	private String name;
+	@Transient
+	private Integer age;
+	@Temporal(TemporalType.DATE)
+	private Date birthDate;
+	@Enumerated(EnumType.STRING)
+	private Gender gender;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Integer getAge() {
+		return age;
+	}
+
+	public void setAge(Integer age) {
+		this.age = age;
+	}
+
+	public Date getBirthDate() {
+		return birthDate;
+	}
+
+	public void setBirthDate(Date birthDate) {
+		this.birthDate = birthDate;
+	}
+
+	public Gender getGender() {
+		return gender;
+	}
+
+	public void setGender(Gender gender) {
+		this.gender = gender;
+	}
+
+}
diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/util/Gender.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/util/Gender.java
new file mode 100644
index 0000000000..13f08d995c
--- /dev/null
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/util/Gender.java
@@ -0,0 +1,6 @@
+package com.baeldung.util;
+
+public enum Gender {
+	MALE,
+	FEMALE
+}
diff --git a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
index 5422afa4a3..2105a80d7d 100644
--- a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
@@ -129,5 +129,25 @@
             <property name="javax.persistence.sql-load-script-source" value="users.sql"/>
         </properties>
     </persistence-unit>
+    
+    <persistence-unit name="jpa-entity-definition">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.entity.Student</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver"
+                      value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url"
+                      value="jdbc:h2:mem:test" />
+            <property name="javax.persistence.jdbc.user" value="sa" />
+            <property name="javax.persistence.jdbc.password" value="" />
+            <property name="hibernate.dialect"
+                      value="org.hibernate.dialect.H2Dialect" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+            <property name="show_sql" value="true" />
+            <property name="hibernate.temp.use_jdbc_metadata_defaults"
+                      value="false" />
+        </properties>
+    </persistence-unit>
 
 </persistence>
\ No newline at end of file
diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/StudentEntityIntegrationTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/StudentEntityIntegrationTest.java
new file mode 100644
index 0000000000..2dc5d7c5f2
--- /dev/null
+++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/StudentEntityIntegrationTest.java
@@ -0,0 +1,83 @@
+package com.baeldung.jpa.entity;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import javax.persistence.TypedQuery;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.baeldung.util.Gender;
+
+public class StudentEntityIntegrationTest {
+
+	private EntityManagerFactory emf;
+	private EntityManager em;
+
+	@Before
+	public void setup() {
+		emf = Persistence.createEntityManagerFactory("jpa-entity-definition");
+		em = emf.createEntityManager();
+	}
+
+	@Test
+	public void persistStudentThenRetrieveTheDetails() {
+		Student student = createStudentWithRelevantDetails();
+		persist(student);
+		clearThePersistenceContext();
+		List<Student> students = getStudentsFromTable();
+		checkAssertionsWith(students);
+	}
+
+	@After
+	public void destroy() {
+		if (em != null) {
+			em.close();
+		}
+		if (emf != null) {
+			emf.close();
+		}
+	}
+
+	private void clearThePersistenceContext() {
+		em.clear();
+	}
+
+	private void checkAssertionsWith(List<Student> students) {
+		assertEquals(1, students.size());
+		Student john = students.get(0);
+		assertEquals(1L, john.getId().longValue());
+		assertEquals(null, john.getAge());
+		assertEquals("John", john.getName());
+	}
+
+	private List<Student> getStudentsFromTable() {
+		String selectQuery = "SELECT student FROM Student student";
+		TypedQuery<Student> selectFromStudentTypedQuery = em.createQuery(selectQuery, Student.class);
+		List<Student> students = selectFromStudentTypedQuery.getResultList();
+		return students;
+	}
+
+	private void persist(Student student) {
+		em.getTransaction().begin();
+		em.persist(student);
+		em.getTransaction().commit();
+	}
+
+	private Student createStudentWithRelevantDetails() {
+		Student student = new Student();
+		student.setAge(20); // the 'age' field has been annotated with @Transient
+		student.setName("John");
+		student.setBirthDate(new Date());
+		student.setGender(Gender.MALE);
+		return student;
+	}
+
+}

From 8271d0ab5a8f7ef6d7906fb4219cf18103a9d76b Mon Sep 17 00:00:00 2001
From: Vivek <vivekrmd@gmail.com>
Date: Sat, 13 Apr 2019 14:37:15 +0530
Subject: [PATCH 021/295] BAEL-2857 Defining a JPA Entity

---
 .../src/main/java/com/baeldung/jpa/entity/Student.java |  2 +-
 .../jpa/entity/StudentEntityIntegrationTest.java       | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java
index 6eced20779..17007fa126 100644
--- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java
@@ -17,7 +17,7 @@ import javax.persistence.Transient;
 import com.baeldung.util.Gender;
 
 @Entity
-@Table(name="STUD_NAME")
+@Table(name="STUD")
 public class Student {
 
 	@Id
diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/StudentEntityIntegrationTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/StudentEntityIntegrationTest.java
index 2dc5d7c5f2..fdaaba5439 100644
--- a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/StudentEntityIntegrationTest.java
+++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/StudentEntityIntegrationTest.java
@@ -2,6 +2,8 @@ package com.baeldung.jpa.entity;
 
 import static org.junit.Assert.assertEquals;
 
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 
@@ -75,9 +77,15 @@ public class StudentEntityIntegrationTest {
 		Student student = new Student();
 		student.setAge(20); // the 'age' field has been annotated with @Transient
 		student.setName("John");
-		student.setBirthDate(new Date());
+		Date date = getDate();
+		student.setBirthDate(date);
 		student.setGender(Gender.MALE);
 		return student;
 	}
 
+	private Date getDate() {
+		LocalDate localDate = LocalDate.of(2008, 7, 20);
+		return Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+	}
+
 }

From 5a3d6a0c518ebf57910fa677c0d986db590b3118 Mon Sep 17 00:00:00 2001
From: josephine-barboza <josephine.barboza@gmail.com>
Date: Sun, 14 Apr 2019 22:56:48 +0530
Subject: [PATCH 022/295] BAEL-2766 Added more asserts to add items to map

---
 core-groovy/src/test/groovy/com/baeldung/map/MapTest.groovy | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core-groovy/src/test/groovy/com/baeldung/map/MapTest.groovy b/core-groovy/src/test/groovy/com/baeldung/map/MapTest.groovy
index 8bd9302412..f1d528207f 100644
--- a/core-groovy/src/test/groovy/com/baeldung/map/MapTest.groovy
+++ b/core-groovy/src/test/groovy/com/baeldung/map/MapTest.groovy
@@ -31,7 +31,9 @@ class MapTest{
         map.putAll(hobbyMap)
 
         assertTrue(map == [name:"Jerry", age: 42, city: "New York", hobby:"Singing"])
-
+        assertTrue(hobbyMap.hobby == "Singing")
+        assertTrue(hobbyMap[hobbyLiteral] == "Singing")
+        
         map.plus([1:20]) // returns new map
 
         map << [2:30]
@@ -143,4 +145,4 @@ class MapTest{
 
     }
 
-}
\ No newline at end of file
+}

From 3ae6a124f0e36eb3f9aaee982bf63e927ea858c7 Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Mon, 15 Apr 2019 11:04:54 +0400
Subject: [PATCH 023/295] JODA INSTANT to millis

---
 .../main/java/com/baeldung/convert/ConvertDateTime.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java b/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
index d52dd1b989..d13075e063 100644
--- a/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
+++ b/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
@@ -1,5 +1,7 @@
 package com.baeldung.convert;
 
+import org.joda.time.Instant;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -35,9 +37,12 @@ public class ConvertDateTime {
     }
 
     private static void joda() {
-        org.joda.time.DateTime jodaDateTime = new org.joda.time.DateTime(new Date());
+        org.joda.time.DateTime jodaDateTime = new org.joda.time.DateTime();
         long delta = jodaDateTime.getMillis();
         System.out.println("Joda - Time in milliseconds : " + delta);
+
+        Instant jodaInstant = Instant.now();
+        System.out.println("Joda - Instant in milliseconds : " + jodaInstant.getMillis());
     }
 
     private static void java8() {

From cde706f8c984964b061c3875eaacf405b1c5bd07 Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date: Mon, 15 Apr 2019 20:47:23 +0200
Subject: [PATCH 024/295] root cause finder

---
 .../baeldung/exceptions/RootCauseFinder.java  | 61 +++++++++++++++++++
 .../exceptions/RootCauseFinderTest.java       | 51 ++++++++++++++++
 2 files changed, 112 insertions(+)
 create mode 100644 core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
 create mode 100644 core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java

diff --git a/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java b/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
new file mode 100644
index 0000000000..a7963c35a8
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
@@ -0,0 +1,61 @@
+package com.baeldung.exceptions;
+
+import java.util.Objects;
+
+/**
+ * Utility class to find root cause exceptions.
+ */
+public class RootCauseFinder {
+
+    public static Throwable findCauseUsingPlainJava(Throwable throwable) {
+        Objects.requireNonNull(throwable);
+        Throwable rootCause = throwable;
+        while (rootCause.getCause() != null) {
+            rootCause = rootCause.getCause();
+        }
+        return rootCause;
+    }
+
+    static class IntParser {
+
+        private IntParser() {
+        }
+
+        public static int parse(String input) throws InvalidNumber {
+            if (input == null || input.isEmpty()) {
+                throw new IllegalArgumentException();
+            }
+
+            try {
+                return new IntParser().stringToInt(input.trim());
+            } catch (NaNException ex) {
+                throw new InvalidNumber(input, ex);
+            }
+        }
+
+        private int stringToInt(String numberAsString) throws NaNException {
+            try {
+                return Integer.valueOf(numberAsString);
+            } catch (NumberFormatException ex) {
+                throw new NaNException(numberAsString, ex);
+            }
+        }
+
+    }
+
+    static class InvalidNumber extends Exception {
+
+        InvalidNumber(String input, Throwable thr) {
+            super("Invalid input for a number: " + input, thr);
+        }
+    }
+
+    static class NaNException extends Exception {
+
+        NaNException(String number, Throwable thr) {
+            super(number + "is not a number", thr);
+        }
+
+    }
+
+}
diff --git a/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java b/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
new file mode 100644
index 0000000000..1e58e3f602
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
@@ -0,0 +1,51 @@
+package com.baeldung.exceptions;
+
+import com.google.common.base.Throwables;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.junit.jupiter.api.Test;
+
+import static com.baeldung.exceptions.RootCauseFinder.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Tests the {@link RootCauseFinder}.
+ */
+public class RootCauseFinderTest {
+
+    @Test
+    public void givenNestedException_whenFindingRootCauseUsingJava_thenRootCauseFound() {
+        try {
+            IntParser.parse("text");
+        } catch (InvalidNumber ex) {
+            assertTrue(findCauseUsingPlainJava(ex) instanceof NumberFormatException);
+        }
+    }
+
+    @Test
+    public void givenNonNestedException_whenFindingRootCauseUsingJava_thenRootCauseFound() {
+        try {
+            IntParser.parse(null);
+        } catch (Exception ex) {
+            assertTrue(findCauseUsingPlainJava(ex) instanceof IllegalArgumentException);
+        }
+    }
+
+    @Test
+    public void givenNestedException_whenFindingRootCauseUsingApacheCommons_thenRootCauseFound() {
+        try {
+            IntParser.parse("text");
+        } catch (InvalidNumber ex) {
+            assertTrue(ExceptionUtils.getRootCause(ex) instanceof NumberFormatException);
+        }
+    }
+
+    @Test
+    public void givenNestedException_whenFindingRootCauseUsingGuava_thenRootCauseFound() {
+        try {
+            IntParser.parse("text");
+        } catch (InvalidNumber ex) {
+            assertTrue(Throwables.getRootCause(ex) instanceof NumberFormatException);
+        }
+    }
+
+}

From bbe21ca7e93016f53499cae850cc3b1065074571 Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Tue, 16 Apr 2019 12:19:46 +0400
Subject: [PATCH 025/295] Java 8 Instant

---
 .../java/com/baeldung/convert/ConvertDateTime.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java b/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
index d13075e063..d5003af746 100644
--- a/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
+++ b/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
@@ -3,7 +3,6 @@ package com.baeldung.convert;
 import org.joda.time.Instant;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -12,18 +11,16 @@ import java.util.Date;
 
 public class ConvertDateTime {
 
-    public static void main(String[] args) throws ParseException {
+    public static void main(String[] args) {
 
         java8();
         joda();
-        Date date = simpleDateTimeFormatter();
+        Date date = coreDate();
         calendar(date);
     }
 
-    private static Date simpleDateTimeFormatter() throws ParseException {
-        SimpleDateFormat sdf = new SimpleDateFormat("dd-M-yyyy hh:mm:ss");
-        String dateInString = "22-04-2019 10:20:56";
-        Date date = sdf.parse(dateInString);
+    private static Date coreDate() {
+        Date date = new Date();
 
         System.out.println("Date - Time in milliseconds : " + date.getTime());
 
@@ -46,6 +43,8 @@ public class ConvertDateTime {
     }
 
     private static void java8() {
+        long instantMillis = java.time.Instant.now().toEpochMilli();
+
         LocalDateTime localDateTime = LocalDateTime.now();
         ZoneId id = ZoneId.systemDefault();
         ZonedDateTime zdt = ZonedDateTime.of(localDateTime, id);

From eff19c7163d6a2d29f2c7f1b3b5d1038454697c7 Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Wed, 17 Apr 2019 11:13:46 +0400
Subject: [PATCH 026/295] create java-dates-2 module

---
 java-dates-2/pom.xml                          | 26 +++++++++++++++++++
 .../src/main/java}/ConvertDateTime.java       |  3 ---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 java-dates-2/pom.xml
 rename {java-dates/src/main/java/com/baeldung/convert => java-dates-2/src/main/java}/ConvertDateTime.java (95%)

diff --git a/java-dates-2/pom.xml b/java-dates-2/pom.xml
new file mode 100644
index 0000000000..427a7adc4b
--- /dev/null
+++ b/java-dates-2/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.baeldung</groupId>
+    <artifactId>java-dates-2</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>${joda-time.version}</version>
+        </dependency>
+    </dependencies>
+
+<properties>
+<joda-time.version>2.10</joda-time.version>
+
+<maven.compiler.source>1.8</maven.compiler.source>
+<maven.compiler.target>1.8</maven.compiler.target>
+</properties>
+
+</project>
\ No newline at end of file
diff --git a/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java b/java-dates-2/src/main/java/ConvertDateTime.java
similarity index 95%
rename from java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
rename to java-dates-2/src/main/java/ConvertDateTime.java
index d5003af746..9f4ac0062b 100644
--- a/java-dates/src/main/java/com/baeldung/convert/ConvertDateTime.java
+++ b/java-dates-2/src/main/java/ConvertDateTime.java
@@ -1,8 +1,5 @@
-package com.baeldung.convert;
-
 import org.joda.time.Instant;
 
-import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;

From f3f4c32f014bb46e212462cbaa5afbc38a94c4b0 Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Wed, 17 Apr 2019 12:05:08 +0400
Subject: [PATCH 027/295] JUnit to output millis

---
 java-dates-2/pom.xml                          |  7 +++
 .../src/main/java/ConvertDateTime.java        | 50 -------------------
 .../com/baeldung/convert/ConvertDateTime.java | 45 +++++++++++++++++
 .../convert/ConvertDateTimeUnitTest.java      | 13 +++++
 4 files changed, 65 insertions(+), 50 deletions(-)
 delete mode 100644 java-dates-2/src/main/java/ConvertDateTime.java
 create mode 100644 java-dates-2/src/main/java/com/baeldung/convert/ConvertDateTime.java
 create mode 100644 java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java

diff --git a/java-dates-2/pom.xml b/java-dates-2/pom.xml
index 427a7adc4b..3af13eee39 100644
--- a/java-dates-2/pom.xml
+++ b/java-dates-2/pom.xml
@@ -8,6 +8,13 @@
     <artifactId>java-dates-2</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>joda-time</groupId>
diff --git a/java-dates-2/src/main/java/ConvertDateTime.java b/java-dates-2/src/main/java/ConvertDateTime.java
deleted file mode 100644
index 9f4ac0062b..0000000000
--- a/java-dates-2/src/main/java/ConvertDateTime.java
+++ /dev/null
@@ -1,50 +0,0 @@
-import org.joda.time.Instant;
-
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.Calendar;
-import java.util.Date;
-
-public class ConvertDateTime {
-
-    public static void main(String[] args) {
-
-        java8();
-        joda();
-        Date date = coreDate();
-        calendar(date);
-    }
-
-    private static Date coreDate() {
-        Date date = new Date();
-
-        System.out.println("Date - Time in milliseconds : " + date.getTime());
-
-        return date;
-    }
-
-    private static void calendar(Date date) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
-        System.out.println("Calender - Time in milliseconds : " + calendar.getTimeInMillis());
-    }
-
-    private static void joda() {
-        org.joda.time.DateTime jodaDateTime = new org.joda.time.DateTime();
-        long delta = jodaDateTime.getMillis();
-        System.out.println("Joda - Time in milliseconds : " + delta);
-
-        Instant jodaInstant = Instant.now();
-        System.out.println("Joda - Instant in milliseconds : " + jodaInstant.getMillis());
-    }
-
-    private static void java8() {
-        long instantMillis = java.time.Instant.now().toEpochMilli();
-
-        LocalDateTime localDateTime = LocalDateTime.now();
-        ZoneId id = ZoneId.systemDefault();
-        ZonedDateTime zdt = ZonedDateTime.of(localDateTime, id);
-        System.out.println("Java 8 - Time in milliseconds : " + zdt.toInstant().toEpochMilli());
-    }
-}
diff --git a/java-dates-2/src/main/java/com/baeldung/convert/ConvertDateTime.java b/java-dates-2/src/main/java/com/baeldung/convert/ConvertDateTime.java
new file mode 100644
index 0000000000..b63b26da69
--- /dev/null
+++ b/java-dates-2/src/main/java/com/baeldung/convert/ConvertDateTime.java
@@ -0,0 +1,45 @@
+package com.baeldung.convert;
+
+import org.joda.time.Instant;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Calendar;
+import java.util.Date;
+
+public class ConvertDateTime {
+
+    public static long coreDate() {
+        Date date = new Date();
+        return date.getTime();
+    }
+
+    public static long calendar() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        return calendar.getTimeInMillis();
+    }
+
+    public static long jodaInstant() {
+        Instant jodaInstant = Instant.now();
+        return jodaInstant.getMillis();
+    }
+
+    public static long jodaDateTime() {
+        org.joda.time.DateTime jodaDateTime = new org.joda.time.DateTime();
+        return jodaDateTime.getMillis();
+    }
+
+    public static long java8Instant() {
+        return java.time.Instant.now().toEpochMilli();
+    }
+
+    public static long java8LocalDateTime() {
+
+        LocalDateTime localDateTime = LocalDateTime.now();
+        ZoneId id = ZoneId.systemDefault();
+        ZonedDateTime zdt = ZonedDateTime.of(localDateTime, id);
+        return zdt.toInstant().toEpochMilli();
+    }
+}
diff --git a/java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java b/java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java
new file mode 100644
index 0000000000..a2e15461d0
--- /dev/null
+++ b/java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java
@@ -0,0 +1,13 @@
+package com.baeldung.convert;
+
+import org.junit.Test;
+
+public class ConvertDateTimeUnitTest {
+
+    @Test
+    public void givenLocalDateTime_WhenGetMillis() {
+        long millis = ConvertDateTime.java8LocalDateTime();
+        System.out.println("LocalDateTime in milliseconds : " + millis);
+    }
+
+}

From 637f2e945aaceb5c4b3162660bd45fc0cd6de1b2 Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Thu, 18 Apr 2019 16:05:44 +0400
Subject: [PATCH 028/295] added unit tests

---
 .../convert/ConvertDateTimeUnitTest.java      | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java b/java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java
index a2e15461d0..616566732f 100644
--- a/java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java
+++ b/java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java
@@ -10,4 +10,33 @@ public class ConvertDateTimeUnitTest {
         System.out.println("LocalDateTime in milliseconds : " + millis);
     }
 
+    @Test
+    public void givenJava8Instant_WhenGetMillis() {
+        long millis = ConvertDateTime.java8Instant();
+        System.out.println("Java 8 Instant in milliseconds : " + millis);
+    }
+
+    @Test
+    public void givenDate_WhenGetMillis() {
+        long millis = ConvertDateTime.coreDate();
+        System.out.println("Core Date in milliseconds : " + millis);
+    }
+
+    @Test
+    public void givenCalendar_WhenGetMillis() {
+        long millis = ConvertDateTime.calendar();
+        System.out.println("Calendar in milliseconds : " + millis);
+    }
+
+    @Test
+    public void givenJodaInstant_WhenGetMillis() {
+        long millis = ConvertDateTime.jodaInstant();
+        System.out.println("JODA Instant in milliseconds : " + millis);
+    }
+
+    @Test
+    public void givenJODADateTime_WhenGetMillis() {
+        long millis = ConvertDateTime.jodaDateTime();
+        System.out.println("JODA DateTime in milliseconds : " + millis);
+    }
 }

From 12631714658e43f7e4b79ffd3765ed199251f390 Mon Sep 17 00:00:00 2001
From: Kacper Koza <kkoza11@gmail.com>
Date: Thu, 18 Apr 2019 22:21:35 +0200
Subject: [PATCH 029/295] read src/test/resources

---
 .../ReadResourceDirectoryTest.java            | 42 +++++++++++++++++++
 .../src/test/resources/example_resource.txt   |  0
 2 files changed, 42 insertions(+)
 create mode 100644 testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryTest.java
 create mode 100644 testing-modules/junit-5/src/test/resources/example_resource.txt

diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryTest.java
new file mode 100644
index 0000000000..20951dc7eb
--- /dev/null
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryTest.java
@@ -0,0 +1,42 @@
+package com.baeldung.resourcedirectory;
+
+import org.junit.Test;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class ReadResourceDirectoryTest {
+
+    @Test
+    public void shouldReadResourceAbsolutePathWithFile() {
+        String path = "src/test/resources";
+
+        File file = new File(path);
+        String absolutePath = file.getAbsolutePath();
+
+        System.out.println(absolutePath);
+    }
+
+    @Test
+    public void shouldReadResourceAbsolutePathWithResources() {
+        String resourceName = "example_resource.txt";
+
+        ClassLoader classLoader = getClass().getClassLoader();
+        File file = new File(classLoader.getResource(resourceName).getFile());
+        String absolutePath = file.getAbsolutePath();
+
+        System.out.println(absolutePath);
+    }
+
+    @Test
+    public void shouldReadResourceAbsolutePathWithPaths() {
+        Path resourceDirectory = Paths.get("src","test","resources");
+
+        String absolutePath = resourceDirectory.toFile().getAbsolutePath();
+
+        System.out.println(absolutePath);
+    }
+
+
+}
diff --git a/testing-modules/junit-5/src/test/resources/example_resource.txt b/testing-modules/junit-5/src/test/resources/example_resource.txt
new file mode 100644
index 0000000000..e69de29bb2

From d6235c73e623f227ef63ae94565e49b5763f428d Mon Sep 17 00:00:00 2001
From: Kacper Koza <kkoza11@gmail.com>
Date: Thu, 18 Apr 2019 22:25:17 +0200
Subject: [PATCH 030/295] master

---
 ...rceDirectoryTest.java => ReadResourceDirectoryUnitTest.java} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/{ReadResourceDirectoryTest.java => ReadResourceDirectoryUnitTest.java} (95%)

diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
similarity index 95%
rename from testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
index 20951dc7eb..89a144adfa 100644
--- a/testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
@@ -6,7 +6,7 @@ import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-public class ReadResourceDirectoryTest {
+public class ReadResourceDirectoryUnitTest {
 
     @Test
     public void shouldReadResourceAbsolutePathWithFile() {

From c587c0b5dd0cbbff2687b7915a9aac5472f4678c Mon Sep 17 00:00:00 2001
From: macroscopic64 <macromohan64@gmail.com>
Date: Fri, 19 Apr 2019 07:04:58 +0530
Subject: [PATCH 031/295] [BAEL-2073] Java 9 Migration Issues and Resolution

---
 {prejpms => core-java-modules/pre-jpms}/pom.xml                | 3 ++-
 .../pre-jpms}/src/main/java/com/baeldung/prejpms/App.java      | 0
 .../pre-jpms}/src/main/java/com/baeldung/prejpms/Book.java     | 0
 .../pre-jpms}/src/main/resources/logback.xml                   | 0
 4 files changed, 2 insertions(+), 1 deletion(-)
 rename {prejpms => core-java-modules/pre-jpms}/pom.xml (96%)
 rename {prejpms => core-java-modules/pre-jpms}/src/main/java/com/baeldung/prejpms/App.java (100%)
 rename {prejpms => core-java-modules/pre-jpms}/src/main/java/com/baeldung/prejpms/Book.java (100%)
 rename {prejpms => core-java-modules/pre-jpms}/src/main/resources/logback.xml (100%)

diff --git a/prejpms/pom.xml b/core-java-modules/pre-jpms/pom.xml
similarity index 96%
rename from prejpms/pom.xml
rename to core-java-modules/pre-jpms/pom.xml
index 0f0216682e..169cd21f3e 100644
--- a/prejpms/pom.xml
+++ b/core-java-modules/pre-jpms/pom.xml
@@ -2,7 +2,7 @@
 	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>prejpms</artifactId>
+	<artifactId>pre-jpms</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>pre-jpms</name>
@@ -11,6 +11,7 @@
         <artifactId>parent-modules</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
     </parent>
 
 	<dependencies>
diff --git a/prejpms/src/main/java/com/baeldung/prejpms/App.java b/core-java-modules/pre-jpms/src/main/java/com/baeldung/prejpms/App.java
similarity index 100%
rename from prejpms/src/main/java/com/baeldung/prejpms/App.java
rename to core-java-modules/pre-jpms/src/main/java/com/baeldung/prejpms/App.java
diff --git a/prejpms/src/main/java/com/baeldung/prejpms/Book.java b/core-java-modules/pre-jpms/src/main/java/com/baeldung/prejpms/Book.java
similarity index 100%
rename from prejpms/src/main/java/com/baeldung/prejpms/Book.java
rename to core-java-modules/pre-jpms/src/main/java/com/baeldung/prejpms/Book.java
diff --git a/prejpms/src/main/resources/logback.xml b/core-java-modules/pre-jpms/src/main/resources/logback.xml
similarity index 100%
rename from prejpms/src/main/resources/logback.xml
rename to core-java-modules/pre-jpms/src/main/resources/logback.xml

From 923019269cf8200221b109eda7ceabf55e1a7c4d Mon Sep 17 00:00:00 2001
From: Pavan Shankar Koli <pskoli93@gmail.com>
Date: Fri, 19 Apr 2019 17:12:33 +0530
Subject: [PATCH 032/295] BAEL-2770 Added code and test cases

---
 .../array/AddElementToEndOfArray.java         | 34 ++++++++++++++
 .../array/AddElementToEndOfArrayUnitTest.java | 46 +++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 core-java-arrays/src/main/java/com/baeldung/array/AddElementToEndOfArray.java
 create mode 100644 core-java-arrays/src/test/java/com/baeldung/array/AddElementToEndOfArrayUnitTest.java

diff --git a/core-java-arrays/src/main/java/com/baeldung/array/AddElementToEndOfArray.java b/core-java-arrays/src/main/java/com/baeldung/array/AddElementToEndOfArray.java
new file mode 100644
index 0000000000..1dc6600600
--- /dev/null
+++ b/core-java-arrays/src/main/java/com/baeldung/array/AddElementToEndOfArray.java
@@ -0,0 +1,34 @@
+package com.baeldung.array;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class AddElementToEndOfArray {
+
+    public Integer[] addElementUsingArraysCopyOf(Integer[] srcArray, int elementToAdd) {
+        Integer[] destArray = Arrays.copyOf(srcArray, srcArray.length + 1);
+
+        destArray[destArray.length-1] = elementToAdd;
+        return destArray;
+    }
+
+    public Integer[] addElementUsingArrayList(Integer[] srcArray, int elementToAdd) {
+        Integer[] destArray = new Integer[srcArray.length + 1];
+
+        ArrayList<Integer> arrayList = new ArrayList<>(Arrays.asList(srcArray));
+        arrayList.add(elementToAdd);
+
+        return arrayList.toArray(destArray);
+    }
+
+    public Integer[] addElementUsingSystemArrayCopy(Integer[] srcArray, int elementToAdd) {
+        Integer[] destArray = new Integer[srcArray.length + 1];
+
+        System.arraycopy(srcArray, 0, destArray, 0, srcArray.length);
+
+        destArray[destArray.length-1] = elementToAdd;
+
+        return destArray;
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/AddElementToEndOfArrayUnitTest.java b/core-java-arrays/src/test/java/com/baeldung/array/AddElementToEndOfArrayUnitTest.java
new file mode 100644
index 0000000000..beeed1a313
--- /dev/null
+++ b/core-java-arrays/src/test/java/com/baeldung/array/AddElementToEndOfArrayUnitTest.java
@@ -0,0 +1,46 @@
+package com.baeldung.array;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class AddElementToEndOfArrayUnitTest {
+
+    AddElementToEndOfArray addElementToEndOfArray;
+
+    @Before
+    public void init(){
+        addElementToEndOfArray = new AddElementToEndOfArray();
+    }
+
+    @Test
+    public void givenSourceArrayAndElement_whenAddElementUsingArraysCopyIsInvoked_thenNewElementMustBeAdded(){
+        Integer[] sourceArray = {1,2,3,4};
+        int elementToAdd = 5;
+
+        Integer[] destArray = addElementToEndOfArray.addElementUsingArraysCopyOf(sourceArray, elementToAdd);
+
+        assertEquals(elementToAdd, destArray[destArray.length-1].intValue());
+    }
+
+    @Test
+    public void givenSourceArrayAndElement_whenAddElementUsingArrayListIsInvoked_thenNewElementMustBeAdded(){
+        Integer[] sourceArray = {1,2,3,4};
+        int elementToAdd = 5;
+
+        Integer[] destArray = addElementToEndOfArray.addElementUsingArrayList(sourceArray, elementToAdd);
+
+        assertEquals(elementToAdd, destArray[destArray.length-1].intValue());
+    }
+
+    @Test
+    public void givenSourceArrayAndElement_whenAddElementUsingSystemArrayCopyIsInvoked_thenNewElementMustBeAdded(){
+        Integer[] sourceArray = {1,2,3,4};
+        int elementToAdd = 5;
+
+        Integer[] destArray = addElementToEndOfArray.addElementUsingSystemArrayCopy(sourceArray, elementToAdd);
+
+        assertEquals(elementToAdd, destArray[destArray.length-1].intValue());
+    }
+}

From 5eb2a6e04eb393f3c9534c4f8a2f1f8b6af6327b Mon Sep 17 00:00:00 2001
From: Liesheng Long <liesheng.long@gmail.com>
Date: Fri, 19 Apr 2019 19:08:52 -0400
Subject: [PATCH 033/295] add test code for running jar with arguments

---
 .../main/java/com/baeldung/jar/JarExample.java | 11 ++++++++++-
 .../java/com/baeldung/jar/JarExample2.java     | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 core-java/src/main/java/com/baeldung/jar/JarExample2.java

diff --git a/core-java/src/main/java/com/baeldung/jar/JarExample.java b/core-java/src/main/java/com/baeldung/jar/JarExample.java
index 5f33188adf..ff468ab6f3 100644
--- a/core-java/src/main/java/com/baeldung/jar/JarExample.java
+++ b/core-java/src/main/java/com/baeldung/jar/JarExample.java
@@ -3,7 +3,16 @@ package com.baeldung.jar;
 public class JarExample {
 
     public static void main(String[] args) {
-        System.out.println("Hello Baeldung Reader!");
+        System.out.println("Hello Baeldung Reader in JarExample!");
+        
+        if(args == null) {
+            System.out.println("You have not provided any arguments!");
+        }else {
+            System.out.println("There are "+args.length+" argument(s)!");
+            for(int i=0; i<args.length; i++) {
+                System.out.println("Argument("+(i+1)+"):" + args[i]);
+            }
+        }
     }
 
 }
diff --git a/core-java/src/main/java/com/baeldung/jar/JarExample2.java b/core-java/src/main/java/com/baeldung/jar/JarExample2.java
new file mode 100644
index 0000000000..6f4625a555
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/jar/JarExample2.java
@@ -0,0 +1,18 @@
+package com.baeldung.jar;
+
+public class JarExample2 {
+
+    public static void main(String[] args) {
+        System.out.println("Hello Baeldung Reader in JarExample2!");
+        
+        if(args == null) {
+            System.out.println("You have not provided any arguments!");
+        }else {
+            System.out.println("There are "+args.length+" argument(s)!");
+            for(int i=0; i<args.length; i++) {
+                System.out.println("Argument("+(i+1)+"):" + args[i]);
+            }
+        }
+    }
+
+}

From e5f11278c67067969e5d0770f0543c124eec698b Mon Sep 17 00:00:00 2001
From: Liesheng Long <liesheng.long@gmail.com>
Date: Fri, 19 Apr 2019 19:15:30 -0400
Subject: [PATCH 034/295] added link to the
 article:http://inprogress.baeldung.com/run-jar-application-with-command-line-arguments

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

diff --git a/core-java/README.md b/core-java/README.md
index c2d1b4a06b..322b700fd7 100644
--- a/core-java/README.md
+++ b/core-java/README.md
@@ -51,3 +51,4 @@
 - [Java Bitwise Operators](https://www.baeldung.com/java-bitwise-operators)
 - [Guide to Creating and Running a Jar File in Java](https://www.baeldung.com/java-create-jar)
 - [Making a JSON POST Request With HttpURLConnection](https://www.baeldung.com/httpurlconnection-post)
+- [Run Jar application with command line arguments](http://inprogress.baeldung.com/run-jar-application-with-command-line-arguments)

From f8d76eb5ac00d786c9cb35dbdc8067e1d89fcf97 Mon Sep 17 00:00:00 2001
From: isaolmez <isaolmez@gmail.com>
Date: Sat, 20 Apr 2019 22:53:09 +0300
Subject: [PATCH 035/295] BAEL-2809: Added code samples

---
 persistence-modules/spring-data-jpa-2/pom.xml | 19 ++--
 .../DatasourceProxyBeanPostProcessor.java     | 53 +++++++++++
 .../baeldung/batchinserts/model/School.java   | 45 +++++++++
 .../baeldung/batchinserts/model/Student.java  | 44 +++++++++
 .../application-batchinserts.properties       |  4 +
 .../JpaBatchInsertsIntegrationTest.java       | 92 +++++++++++++++++++
 .../JpaNoBatchInsertsIntegrationTest.java     | 39 ++++++++
 .../batchinserts/TestObjectHelper.java        | 20 ++++
 8 files changed, 309 insertions(+), 7 deletions(-)
 create mode 100644 persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/batchinserts/DatasourceProxyBeanPostProcessor.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/batchinserts/model/School.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/batchinserts/model/Student.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/main/resources/application-batchinserts.properties
 create mode 100644 persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/JpaBatchInsertsIntegrationTest.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/JpaNoBatchInsertsIntegrationTest.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/TestObjectHelper.java

diff --git a/persistence-modules/spring-data-jpa-2/pom.xml b/persistence-modules/spring-data-jpa-2/pom.xml
index 8e46112659..8d79647544 100644
--- a/persistence-modules/spring-data-jpa-2/pom.xml
+++ b/persistence-modules/spring-data-jpa-2/pom.xml
@@ -1,12 +1,12 @@
 <?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">
+    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>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-data-jpa-2</artifactId>
-	<name>spring-data-jpa</name>
-	
+    <name>spring-data-jpa</name>
+
     <parent>
         <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
@@ -19,12 +19,17 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-  
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
-      
+
+        <dependency>
+            <groupId>net.ttddyy</groupId>
+            <artifactId>datasource-proxy</artifactId>
+            <version>1.4.1</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/batchinserts/DatasourceProxyBeanPostProcessor.java b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/batchinserts/DatasourceProxyBeanPostProcessor.java
new file mode 100644
index 0000000000..504357db44
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/batchinserts/DatasourceProxyBeanPostProcessor.java
@@ -0,0 +1,53 @@
+package com.baeldung.batchinserts;
+
+import java.lang.reflect.Method;
+import javax.sql.DataSource;
+import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ReflectionUtils;
+
+@Component
+@Profile("batchinserts")
+public class DatasourceProxyBeanPostProcessor implements BeanPostProcessor {
+
+    @Override
+    public Object postProcessBeforeInitialization(final Object bean, final String beanName) throws BeansException {
+        return bean;
+    }
+
+    @Override
+    public Object postProcessAfterInitialization(final Object bean, final String beanName) throws BeansException {
+        if (bean instanceof DataSource) {
+            ProxyFactory factory = new ProxyFactory(bean);
+            factory.setProxyTargetClass(true);
+            factory.addAdvice(new ProxyDataSourceInterceptor((DataSource) bean));
+            return factory.getProxy();
+        }
+
+        return bean;
+    }
+
+    private static class ProxyDataSourceInterceptor implements MethodInterceptor {
+
+        private final DataSource dataSource;
+
+        public ProxyDataSourceInterceptor(final DataSource dataSource) {
+            this.dataSource = ProxyDataSourceBuilder.create(dataSource).name("Batch-Insert-Logger").asJson().countQuery().logQueryToSysOut().build();
+        }
+
+        @Override
+        public Object invoke(final MethodInvocation invocation) throws Throwable {
+            Method proxyMethod = ReflectionUtils.findMethod(dataSource.getClass(), invocation.getMethod().getName());
+            if (proxyMethod != null) {
+                return proxyMethod.invoke(dataSource, invocation.getArguments());
+            }
+            return invocation.proceed();
+        }
+    }
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/batchinserts/model/School.java b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/batchinserts/model/School.java
new file mode 100644
index 0000000000..6d2f333ac7
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/batchinserts/model/School.java
@@ -0,0 +1,45 @@
+package com.baeldung.batchinserts.model;
+
+import java.util.List;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Entity
+public class School {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private long id;
+
+    private String name;
+
+    @OneToMany(mappedBy = "school")
+    private List<Student> students;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<Student> getStudents() {
+        return students;
+    }
+
+    public void setStudents(List<Student> students) {
+        this.students = students;
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/batchinserts/model/Student.java b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/batchinserts/model/Student.java
new file mode 100644
index 0000000000..d38214f122
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/batchinserts/model/Student.java
@@ -0,0 +1,44 @@
+package com.baeldung.batchinserts.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class Student {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private long id;
+
+    private String name;
+
+    @ManyToOne
+    private School school;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public School getSchool() {
+        return school;
+    }
+
+    public void setSchool(School school) {
+        this.school = school;
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/main/resources/application-batchinserts.properties b/persistence-modules/spring-data-jpa-2/src/main/resources/application-batchinserts.properties
new file mode 100644
index 0000000000..bd37e8c155
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/main/resources/application-batchinserts.properties
@@ -0,0 +1,4 @@
+spring.jpa.show-sql=false
+
+spring.jpa.properties.hibernate.jdbc.batch_size=5
+spring.jpa.properties.hibernate.order_inserts=true
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/JpaBatchInsertsIntegrationTest.java b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/JpaBatchInsertsIntegrationTest.java
new file mode 100644
index 0000000000..dd61b7b6df
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/JpaBatchInsertsIntegrationTest.java
@@ -0,0 +1,92 @@
+package com.baeldung.batchinserts;
+
+import static com.baeldung.batchinserts.TestObjectHelper.createSchool;
+import static com.baeldung.batchinserts.TestObjectHelper.createStudent;
+
+import com.baeldung.batchinserts.model.School;
+import com.baeldung.batchinserts.model.Student;
+import java.util.List;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Transactional
+@ActiveProfiles("batchinserts")
+public class JpaBatchInsertsIntegrationTest {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    private static final int BATCH_SIZE = 5;
+
+    @Test
+    public void whenInsertingSingleTypeOfEntity_thenCreatesSingleBatch() {
+        for (int i = 0; i < 10; i++) {
+            School school = createSchool(i);
+            entityManager.persist(school);
+        }
+
+        entityManager.flush();
+    }
+
+    @Test
+    public void whenFlushingAfterBatch_ThenClearsMemory() {
+        for (int i = 0; i < 10; i++) {
+            if (i > 0 && i % BATCH_SIZE == 0) {
+                entityManager.flush();
+                entityManager.clear();
+            }
+
+            School school = createSchool(i);
+            entityManager.persist(school);
+        }
+
+        entityManager.flush();
+    }
+
+    @Test
+    public void whenThereAreMultipleEntities_ThenCreatesNewBatch() {
+        for (int i = 0; i < 10; i++) {
+            if (i > 0 && i % BATCH_SIZE == 0) {
+                entityManager.flush();
+                entityManager.clear();
+            }
+
+            School school = createSchool(i);
+            entityManager.persist(school);
+            Student firstStudent = createStudent(school);
+            Student secondStudent = createStudent(school);
+            entityManager.persist(firstStudent);
+            entityManager.persist(secondStudent);
+        }
+
+        entityManager.flush();
+    }
+
+    @Test
+    public void whenUpdatingEntities_thenCreatesBatch() {
+        for (int i = 0; i < 10; i++) {
+            School school = createSchool(i);
+            entityManager.persist(school);
+        }
+
+        entityManager.flush();
+
+        TypedQuery<School> schoolQuery = entityManager.createQuery("SELECT s from School s", School.class);
+        List<School> allSchools = schoolQuery.getResultList();
+
+        for (School school : allSchools) {
+            school.setName("Updated_" + school.getName());
+        }
+
+        entityManager.flush();
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/JpaNoBatchInsertsIntegrationTest.java b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/JpaNoBatchInsertsIntegrationTest.java
new file mode 100644
index 0000000000..20502c793d
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/JpaNoBatchInsertsIntegrationTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.batchinserts;
+
+import static com.baeldung.batchinserts.TestObjectHelper.createSchool;
+
+import com.baeldung.batchinserts.model.School;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Transactional
+@ActiveProfiles("batchinserts")
+@TestPropertySource(properties = "spring.jpa.properties.hibernate.jdbc.batch_size=-1")
+public class JpaNoBatchInsertsIntegrationTest {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Test
+    public void whenNotConfigured_ThenSendsInsertsSeparately() {
+        for (int i = 0; i < 10; i++) {
+            School school = createSchool(i);
+            entityManager.persist(school);
+        }
+    }
+
+    @After
+    public void tearDown() {
+        entityManager.flush();
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/TestObjectHelper.java b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/TestObjectHelper.java
new file mode 100644
index 0000000000..fcd26cb721
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/TestObjectHelper.java
@@ -0,0 +1,20 @@
+package com.baeldung.batchinserts;
+
+import com.baeldung.batchinserts.model.School;
+import com.baeldung.batchinserts.model.Student;
+
+public class TestObjectHelper {
+
+    public static School createSchool(int nameIdentifier) {
+        School school = new School();
+        school.setName("School" + (nameIdentifier + 1));
+        return school;
+    }
+
+    public static Student createStudent(School school) {
+        Student student = new Student();
+        student.setName("Student-" + school.getName());
+        student.setSchool(school);
+        return student;
+    }
+}

From 004b2cc5a8851dca573c6eb3f335345081257257 Mon Sep 17 00:00:00 2001
From: isaolmez <isaolmez@gmail.com>
Date: Sat, 20 Apr 2019 22:56:02 +0300
Subject: [PATCH 036/295] BAEL-2809: Added code samples

---
 .../src/main/resources/application-batchinserts.properties    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/persistence-modules/spring-data-jpa-2/src/main/resources/application-batchinserts.properties b/persistence-modules/spring-data-jpa-2/src/main/resources/application-batchinserts.properties
index bd37e8c155..4141f5668e 100644
--- a/persistence-modules/spring-data-jpa-2/src/main/resources/application-batchinserts.properties
+++ b/persistence-modules/spring-data-jpa-2/src/main/resources/application-batchinserts.properties
@@ -1,4 +1,6 @@
 spring.jpa.show-sql=false
 
 spring.jpa.properties.hibernate.jdbc.batch_size=5
-spring.jpa.properties.hibernate.order_inserts=true
\ No newline at end of file
+spring.jpa.properties.hibernate.order_inserts=true
+spring.jpa.properties.hibernate.order_updates=true
+spring.jpa.properties.hibernate.batch_versioned_data=true
\ No newline at end of file

From 4524ad57f96cff5451632b1161777726b914a7ca Mon Sep 17 00:00:00 2001
From: Liesheng Long <liesheng.long@gmail.com>
Date: Sat, 20 Apr 2019 22:50:04 -0400
Subject: [PATCH 037/295] Revert "add test code for running jar with arguments"

This reverts commit 5eb2a6e04eb393f3c9534c4f8a2f1f8b6af6327b.
---
 .../main/java/com/baeldung/jar/JarExample.java | 11 +----------
 .../java/com/baeldung/jar/JarExample2.java     | 18 ------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 core-java/src/main/java/com/baeldung/jar/JarExample2.java

diff --git a/core-java/src/main/java/com/baeldung/jar/JarExample.java b/core-java/src/main/java/com/baeldung/jar/JarExample.java
index ff468ab6f3..5f33188adf 100644
--- a/core-java/src/main/java/com/baeldung/jar/JarExample.java
+++ b/core-java/src/main/java/com/baeldung/jar/JarExample.java
@@ -3,16 +3,7 @@ package com.baeldung.jar;
 public class JarExample {
 
     public static void main(String[] args) {
-        System.out.println("Hello Baeldung Reader in JarExample!");
-        
-        if(args == null) {
-            System.out.println("You have not provided any arguments!");
-        }else {
-            System.out.println("There are "+args.length+" argument(s)!");
-            for(int i=0; i<args.length; i++) {
-                System.out.println("Argument("+(i+1)+"):" + args[i]);
-            }
-        }
+        System.out.println("Hello Baeldung Reader!");
     }
 
 }
diff --git a/core-java/src/main/java/com/baeldung/jar/JarExample2.java b/core-java/src/main/java/com/baeldung/jar/JarExample2.java
deleted file mode 100644
index 6f4625a555..0000000000
--- a/core-java/src/main/java/com/baeldung/jar/JarExample2.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.baeldung.jar;
-
-public class JarExample2 {
-
-    public static void main(String[] args) {
-        System.out.println("Hello Baeldung Reader in JarExample2!");
-        
-        if(args == null) {
-            System.out.println("You have not provided any arguments!");
-        }else {
-            System.out.println("There are "+args.length+" argument(s)!");
-            for(int i=0; i<args.length; i++) {
-                System.out.println("Argument("+(i+1)+"):" + args[i]);
-            }
-        }
-    }
-
-}

From 48b5417f7534e67aee172d5f390022310f92c44f Mon Sep 17 00:00:00 2001
From: Liesheng Long <liesheng.long@gmail.com>
Date: Sat, 20 Apr 2019 22:51:56 -0400
Subject: [PATCH 038/295] Revert "added link to the
 article:http://inprogress.baeldung.com/run-jar-application-with-command-line-arguments"

This reverts commit e5f11278c67067969e5d0770f0543c124eec698b.
---
 core-java/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core-java/README.md b/core-java/README.md
index 322b700fd7..c2d1b4a06b 100644
--- a/core-java/README.md
+++ b/core-java/README.md
@@ -51,4 +51,3 @@
 - [Java Bitwise Operators](https://www.baeldung.com/java-bitwise-operators)
 - [Guide to Creating and Running a Jar File in Java](https://www.baeldung.com/java-create-jar)
 - [Making a JSON POST Request With HttpURLConnection](https://www.baeldung.com/httpurlconnection-post)
-- [Run Jar application with command line arguments](http://inprogress.baeldung.com/run-jar-application-with-command-line-arguments)

From b787689731e8c67cdcfac3fc69f1002fa0beea5d Mon Sep 17 00:00:00 2001
From: Liesheng Long <liesheng.long@gmail.com>
Date: Sat, 20 Apr 2019 23:08:06 -0400
Subject: [PATCH 039/295] add test code for running jar with arguments

---
 core-java-8-2/.gitignore                      | 25 +++++++++++++++++++
 .../com/baeldung/jarArguments/JarExample.java | 18 +++++++++++++
 .../jarArguments/example_manifest.txt         |  1 +
 3 files changed, 44 insertions(+)
 create mode 100644 core-java-8-2/.gitignore
 create mode 100644 core-java-8-2/src/main/java/com/baeldung/jarArguments/JarExample.java
 create mode 100644 core-java-8-2/src/main/java/com/baeldung/jarArguments/example_manifest.txt

diff --git a/core-java-8-2/.gitignore b/core-java-8-2/.gitignore
new file mode 100644
index 0000000000..374c8bf907
--- /dev/null
+++ b/core-java-8-2/.gitignore
@@ -0,0 +1,25 @@
+*.class
+
+0.*
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+.resourceCache
+
+# Packaged files #
+*.jar
+*.war
+*.ear
+
+# Files generated by integration tests
+backup-pom.xml
+/bin/
+/temp
+
+#IntelliJ specific
+.idea/
+*.iml
\ No newline at end of file
diff --git a/core-java-8-2/src/main/java/com/baeldung/jarArguments/JarExample.java b/core-java-8-2/src/main/java/com/baeldung/jarArguments/JarExample.java
new file mode 100644
index 0000000000..c2fb809790
--- /dev/null
+++ b/core-java-8-2/src/main/java/com/baeldung/jarArguments/JarExample.java
@@ -0,0 +1,18 @@
+package com.baeldung.jarArguments;
+
+public class JarExample {
+
+    public static void main(String[] args) {
+        System.out.println("Hello Baeldung Reader in JarExample!");
+        
+        if(args == null) {
+            System.out.println("You have not provided any arguments!");
+        }else {
+            System.out.println("There are "+args.length+" argument(s)!");
+            for(int i=0; i<args.length; i++) {
+                System.out.println("Argument("+(i+1)+"):" + args[i]);
+            }
+        }
+    }
+
+}
diff --git a/core-java-8-2/src/main/java/com/baeldung/jarArguments/example_manifest.txt b/core-java-8-2/src/main/java/com/baeldung/jarArguments/example_manifest.txt
new file mode 100644
index 0000000000..71abcb05fb
--- /dev/null
+++ b/core-java-8-2/src/main/java/com/baeldung/jarArguments/example_manifest.txt
@@ -0,0 +1 @@
+Main-Class: com.baeldung.jarArguments.JarExample

From a9f1bb2f69139e6badbf005540d892622ef5b16f Mon Sep 17 00:00:00 2001
From: macroscopic64 <macromohan64@gmail.com>
Date: Sun, 21 Apr 2019 11:47:01 +0530
Subject: [PATCH 040/295] [BAEL-2073] Java 9 Migration Issues and Resolution

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

diff --git a/pom.xml b/pom.xml
index 0de4a36336..129e2a3e8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -397,6 +397,7 @@
                 <module>core-java-lang</module>
                 <module>core-java-lang-oop</module>
                 <module>core-java-lang-oop-2</module>
+                <module>core-java-modules</module>
                 <module>core-java-networking</module>
                 <module>core-java-perf</module>
                 <module>core-java-sun</module>
@@ -1067,6 +1068,7 @@
                 <module>core-java-lang</module>
                 <module>core-java-lang-oop</module>
                 <module>core-java-lang-oop-2</module>
+                <module>core-java-modules</module>
                 <module>core-java-networking</module>
                 <module>core-java-perf</module>
                 <module>core-java-sun</module>

From d3b1630927a7ebd76a0ddceaeea54137952fac51 Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Sun, 21 Apr 2019 11:37:57 +0300
Subject: [PATCH 041/295] rename config project, formatting

---
 pom.xml                                       |  3 +-
 spring-boot-configuration/README.MD           |  0
 spring-boot-configuration/pom.xml             | 41 -------------------
 .../.gitignore                                |  0
 spring-boot-ops-2/README.MD                   |  3 ++
 spring-boot-ops-2/pom.xml                     | 41 +++++++++++++++++++
 .../SpringBootConfigurationApplication.java   |  6 +--
 .../resources/application-tomcat.properties   |  0
 .../src/main/resources/application.properties |  0
 .../SpringContextIntegrationTest.java         |  6 +--
 10 files changed, 52 insertions(+), 48 deletions(-)
 delete mode 100644 spring-boot-configuration/README.MD
 delete mode 100644 spring-boot-configuration/pom.xml
 rename {spring-boot-configuration => spring-boot-ops-2}/.gitignore (100%)
 create mode 100644 spring-boot-ops-2/README.MD
 create mode 100644 spring-boot-ops-2/pom.xml
 rename {spring-boot-configuration => spring-boot-ops-2}/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java (65%)
 rename {spring-boot-configuration => spring-boot-ops-2}/src/main/resources/application-tomcat.properties (100%)
 rename {spring-boot-configuration => spring-boot-ops-2}/src/main/resources/application.properties (100%)
 rename {spring-boot-configuration => spring-boot-ops-2}/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java (86%)

diff --git a/pom.xml b/pom.xml
index 0de4a36336..f09ea36d4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -631,6 +631,7 @@
                 <module>spring-boot-mvc</module>
                 <module>spring-boot-mvc-birt</module>
                 <module>spring-boot-ops</module>
+                <module>spring-boot-ops-2</module>
                 <module>spring-boot-rest</module>
                 <module>spring-boot-data</module>
                 <module>spring-boot-property-exp</module>
@@ -1275,7 +1276,6 @@
                 <module>spring-boot-camel</module>
                 <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
                 <module>spring-boot-client</module>
-                <module>spring-boot-configuration</module>
                 <module>spring-boot-crud</module>
                 <module>spring-boot-ctx-fluent</module>
                 <module>spring-boot-custom-starter</module>
@@ -1287,6 +1287,7 @@
                 <module>spring-boot-mvc</module>
                 <module>spring-boot-mvc-birt</module>
                 <module>spring-boot-ops</module>
+                <module>spring-boot-ops-2</module>
                 <module>spring-boot-rest</module>
                 <module>spring-boot-data</module>
                 <module>spring-boot-property-exp</module>
diff --git a/spring-boot-configuration/README.MD b/spring-boot-configuration/README.MD
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/spring-boot-configuration/pom.xml b/spring-boot-configuration/pom.xml
deleted file mode 100644
index 2ecef7bb02..0000000000
--- a/spring-boot-configuration/pom.xml
+++ /dev/null
@@ -1,41 +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>
-
-	<parent>
-		<artifactId>parent-boot-2</artifactId>
-		<groupId>com.baeldung</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../parent-boot-2</relativePath>
-	</parent>
-
-	<groupId>com.baeldung</groupId>
-	<artifactId>spring-boot-configuration</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>spring-boot-configuration</name>
-	<description>Demo project for Spring Boot configuration</description>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
diff --git a/spring-boot-configuration/.gitignore b/spring-boot-ops-2/.gitignore
similarity index 100%
rename from spring-boot-configuration/.gitignore
rename to spring-boot-ops-2/.gitignore
diff --git a/spring-boot-ops-2/README.MD b/spring-boot-ops-2/README.MD
new file mode 100644
index 0000000000..20b30515fb
--- /dev/null
+++ b/spring-boot-ops-2/README.MD
@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [How to Configure Spring Boot Tomcat](https://www.baeldung.com/spring-boot-configure-tomcat)
\ No newline at end of file
diff --git a/spring-boot-ops-2/pom.xml b/spring-boot-ops-2/pom.xml
new file mode 100644
index 0000000000..dc5280df48
--- /dev/null
+++ b/spring-boot-ops-2/pom.xml
@@ -0,0 +1,41 @@
+<?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>
+
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-boot-ops-2</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-boot-ops-2</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/spring-boot-configuration/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java b/spring-boot-ops-2/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java
similarity index 65%
rename from spring-boot-configuration/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java
rename to spring-boot-ops-2/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java
index b4f5681475..96297459a4 100644
--- a/spring-boot-configuration/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java
+++ b/spring-boot-ops-2/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java
@@ -6,8 +6,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 public class SpringBootConfigurationApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(SpringBootConfigurationApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootConfigurationApplication.class, args);
+    }
 
 }
diff --git a/spring-boot-configuration/src/main/resources/application-tomcat.properties b/spring-boot-ops-2/src/main/resources/application-tomcat.properties
similarity index 100%
rename from spring-boot-configuration/src/main/resources/application-tomcat.properties
rename to spring-boot-ops-2/src/main/resources/application-tomcat.properties
diff --git a/spring-boot-configuration/src/main/resources/application.properties b/spring-boot-ops-2/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-configuration/src/main/resources/application.properties
rename to spring-boot-ops-2/src/main/resources/application.properties
diff --git a/spring-boot-configuration/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java b/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java
similarity index 86%
rename from spring-boot-configuration/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java
rename to spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java
index d6b2b50a2f..8ae49f6696 100644
--- a/spring-boot-configuration/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java
+++ b/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java
@@ -9,8 +9,8 @@ import org.springframework.test.context.junit4.SpringRunner;
 @SpringBootTest
 public class SpringContextIntegrationTest {
 
-	@Test
-	public void contextLoads() {
-	}
+    @Test
+    public void contextLoads() {
+    }
 
 }

From 884f0a7d8a230563683e2df4bb8f3fc22a7416d7 Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Sun, 21 Apr 2019 11:39:44 +0300
Subject: [PATCH 042/295] update pom

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

diff --git a/pom.xml b/pom.xml
index f09ea36d4f..f4bc47dd44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -821,7 +821,6 @@
 				<module>spring-boot-bootstrap</module>
 				<module>spring-boot-camel</module>
 				<module>spring-boot-client</module>
-				<module>spring-boot-configuration</module>
 				<module>spring-boot-custom-starter</module>
 				<module>greeter-spring-boot-autoconfigure</module>
 				<module>greeter-spring-boot-sample-app</module>

From 382216bdb1d464334916e6efc25f666ee6eb8ee4 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Sun, 21 Apr 2019 13:25:11 +0200
Subject: [PATCH 043/295] [BAEL-2882] Picocli

---
 picocli/pom.xml                               | 28 +++++++++++++
 .../com/baeldung/picocli/git/Application.java | 41 +++++++++++++++++++
 .../git/commands/declarative/GitCommand.java  | 32 +++++++++++++++
 .../git/commands/methods/GitCommand.java      | 27 ++++++++++++
 .../commands/programmative/GitCommand.java    | 26 ++++++++++++
 .../commands/subcommands/GitAddCommand.java   | 31 ++++++++++++++
 .../subcommands/GitCommitCommand.java         | 26 ++++++++++++
 .../subcommands/GitConfigCommand.java         | 24 +++++++++++
 .../picocli/git/model/ConfigElement.java      | 25 +++++++++++
 .../picocli/helloworld/HelloWorldCommand.java | 20 +++++++++
 pom.xml                                       |  1 +
 11 files changed, 281 insertions(+)
 create mode 100644 picocli/pom.xml
 create mode 100644 picocli/src/main/java/com/baeldung/picocli/git/Application.java
 create mode 100644 picocli/src/main/java/com/baeldung/picocli/git/commands/declarative/GitCommand.java
 create mode 100644 picocli/src/main/java/com/baeldung/picocli/git/commands/methods/GitCommand.java
 create mode 100644 picocli/src/main/java/com/baeldung/picocli/git/commands/programmative/GitCommand.java
 create mode 100644 picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitAddCommand.java
 create mode 100644 picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitCommitCommand.java
 create mode 100644 picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitConfigCommand.java
 create mode 100644 picocli/src/main/java/com/baeldung/picocli/git/model/ConfigElement.java
 create mode 100644 picocli/src/main/java/com/baeldung/picocli/helloworld/HelloWorldCommand.java

diff --git a/picocli/pom.xml b/picocli/pom.xml
new file mode 100644
index 0000000000..0334f5463d
--- /dev/null
+++ b/picocli/pom.xml
@@ -0,0 +1,28 @@
+<?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>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <artifactId>picocli</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>info.picocli</groupId>
+            <artifactId>picocli</artifactId>
+            <version>3.9.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>2.1.4.RELEASE</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/Application.java b/picocli/src/main/java/com/baeldung/picocli/git/Application.java
new file mode 100644
index 0000000000..04af524e45
--- /dev/null
+++ b/picocli/src/main/java/com/baeldung/picocli/git/Application.java
@@ -0,0 +1,41 @@
+package com.baeldung.picocli.git;
+
+import com.baeldung.picocli.git.commands.programmative.GitCommand;
+import com.baeldung.picocli.git.commands.subcommands.GitAddCommand;
+import com.baeldung.picocli.git.commands.subcommands.GitCommitCommand;
+import com.baeldung.picocli.git.commands.subcommands.GitConfigCommand;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import picocli.CommandLine;
+
+@SpringBootApplication
+public class Application implements CommandLineRunner {
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+    private GitCommand gitCommand;
+    private GitAddCommand addCommand;
+    private GitCommitCommand commitCommand;
+    private GitConfigCommand configCommand;
+
+    @Autowired
+    public Application(GitCommand gitCommand, GitAddCommand addCommand, GitCommitCommand commitCommand, GitConfigCommand configCommand) {
+        this.gitCommand = gitCommand;
+        this.addCommand = addCommand;
+        this.commitCommand = commitCommand;
+        this.configCommand = configCommand;
+    }
+
+    @Override
+    public void run(String... args) {
+        CommandLine commandLine = new CommandLine(gitCommand);
+        commandLine.addSubcommand("add", addCommand);
+        commandLine.addSubcommand("commit", commitCommand);
+        commandLine.addSubcommand("config", configCommand);
+
+        commandLine.parseWithHandler(new CommandLine.RunLast(), args);
+    }
+}
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/commands/declarative/GitCommand.java b/picocli/src/main/java/com/baeldung/picocli/git/commands/declarative/GitCommand.java
new file mode 100644
index 0000000000..f3c690a3e6
--- /dev/null
+++ b/picocli/src/main/java/com/baeldung/picocli/git/commands/declarative/GitCommand.java
@@ -0,0 +1,32 @@
+package com.baeldung.picocli.git.commands.declarative;
+
+import com.baeldung.picocli.git.model.ConfigElement;
+import com.baeldung.picocli.git.commands.subcommands.GitAddCommand;
+import com.baeldung.picocli.git.commands.subcommands.GitCommitCommand;
+import com.baeldung.picocli.git.commands.subcommands.GitConfigCommand;
+import picocli.CommandLine;
+
+import static picocli.CommandLine.*;
+import static picocli.CommandLine.Command;
+
+@Command(
+  name = "git",
+  subcommands = {
+    GitAddCommand.class,
+    GitCommitCommand.class,
+    GitConfigCommand.class
+  }
+)
+public class GitCommand implements Runnable {
+    public static void main(String[] args) {
+        CommandLine commandLine = new CommandLine(new GitCommand());
+        commandLine.registerConverter(ConfigElement.class, ConfigElement::from);
+
+        commandLine.parseWithHandler(new RunLast(), args);
+    }
+
+    @Override
+    public void run() {
+        System.out.println("The popular git command");
+    }
+}
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/commands/methods/GitCommand.java b/picocli/src/main/java/com/baeldung/picocli/git/commands/methods/GitCommand.java
new file mode 100644
index 0000000000..2c3e440b8b
--- /dev/null
+++ b/picocli/src/main/java/com/baeldung/picocli/git/commands/methods/GitCommand.java
@@ -0,0 +1,27 @@
+package com.baeldung.picocli.git.commands.methods;
+
+import picocli.CommandLine;
+
+import static picocli.CommandLine.Command;
+
+@Command(name = "git")
+public class GitCommand implements Runnable {
+    public static void main(String[] args) {
+        CommandLine.run(new GitCommand(), args);
+    }
+
+    @Override
+    public void run() {
+        System.out.println("The popular git command");
+    }
+
+    @Command(name = "add")
+    public void addCommand() {
+        System.out.println("Adding some files to the staging area");
+    }
+
+    @Command(name = "commit")
+    public void commitCommand() {
+        System.out.println("Committing files in the staging area, how wonderful?");
+    }
+}
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/commands/programmative/GitCommand.java b/picocli/src/main/java/com/baeldung/picocli/git/commands/programmative/GitCommand.java
new file mode 100644
index 0000000000..81ecfd78be
--- /dev/null
+++ b/picocli/src/main/java/com/baeldung/picocli/git/commands/programmative/GitCommand.java
@@ -0,0 +1,26 @@
+package com.baeldung.picocli.git.commands.programmative;
+
+import com.baeldung.picocli.git.commands.subcommands.GitAddCommand;
+import com.baeldung.picocli.git.commands.subcommands.GitCommitCommand;
+import org.springframework.stereotype.Component;
+import picocli.CommandLine;
+
+import static picocli.CommandLine.Command;
+import static picocli.CommandLine.RunLast;
+
+@Command(name = "git")
+@Component
+public class GitCommand implements Runnable {
+    public static void main(String[] args) {
+        CommandLine commandLine = new CommandLine(new GitCommand());
+        commandLine.addSubcommand("add", new GitAddCommand());
+        commandLine.addSubcommand("commit", new GitCommitCommand());
+
+        commandLine.parseWithHandler(new RunLast(), args);
+    }
+
+    @Override
+    public void run() {
+        System.out.println("The popular git command");
+    }
+}
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitAddCommand.java b/picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitAddCommand.java
new file mode 100644
index 0000000000..803cd8dc7d
--- /dev/null
+++ b/picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitAddCommand.java
@@ -0,0 +1,31 @@
+package com.baeldung.picocli.git.commands.subcommands;
+
+import org.springframework.stereotype.Component;
+
+import java.nio.file.Path;
+import java.util.List;
+
+import static picocli.CommandLine.*;
+
+@Command(
+  name = "add"
+)
+@Component
+public class GitAddCommand implements Runnable {
+    @Option(names = "-A")
+    private boolean allFiles;
+
+    @Parameters(index = "0..*")
+    private List<Path> files;
+
+    @Override
+    public void run() {
+        if (allFiles) {
+            System.out.println("Adding all files to the staging area");
+        }
+
+        if (files != null) {
+            files.forEach(path -> System.out.println("Adding " + path + " to the staging area"));
+        }
+    }
+}
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitCommitCommand.java b/picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitCommitCommand.java
new file mode 100644
index 0000000000..df4928983c
--- /dev/null
+++ b/picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitCommitCommand.java
@@ -0,0 +1,26 @@
+package com.baeldung.picocli.git.commands.subcommands;
+
+import org.springframework.stereotype.Component;
+
+import static picocli.CommandLine.Command;
+import static picocli.CommandLine.Option;
+
+@Command(
+  name = "commit"
+)
+@Component
+public class GitCommitCommand implements Runnable {
+    @Option(names = {"-m", "--message"}, required = true)
+    private String[] messages;
+
+    @Override
+    public void run() {
+        System.out.println("Committing files in the staging area, how wonderful?");
+        if (messages != null) {
+            System.out.println("The commit message is");
+            for (String message : messages) {
+                System.out.println(message);
+            }
+        }
+    }
+}
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitConfigCommand.java b/picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitConfigCommand.java
new file mode 100644
index 0000000000..80e14c0121
--- /dev/null
+++ b/picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitConfigCommand.java
@@ -0,0 +1,24 @@
+package com.baeldung.picocli.git.commands.subcommands;
+
+import com.baeldung.picocli.git.model.ConfigElement;
+import org.springframework.stereotype.Component;
+
+import static picocli.CommandLine.Command;
+import static picocli.CommandLine.Parameters;
+
+@Command(
+  name = "config"
+)
+@Component
+public class GitConfigCommand implements Runnable {
+    @Parameters(index = "0")
+    private ConfigElement element;
+
+    @Parameters(index = "1")
+    private String value;
+
+    @Override
+    public void run() {
+        System.out.println("Setting " + element.value() + " to " + value);
+    }
+}
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/model/ConfigElement.java b/picocli/src/main/java/com/baeldung/picocli/git/model/ConfigElement.java
new file mode 100644
index 0000000000..edc6573d88
--- /dev/null
+++ b/picocli/src/main/java/com/baeldung/picocli/git/model/ConfigElement.java
@@ -0,0 +1,25 @@
+package com.baeldung.picocli.git.model;
+
+import java.util.Arrays;
+
+public enum ConfigElement {
+    USERNAME("user.name"),
+    EMAIL("user.email");
+
+    private final String value;
+
+    ConfigElement(String value) {
+        this.value = value;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static ConfigElement from(String value) {
+        return Arrays.stream(values())
+          .filter(element -> element.value.equals(value))
+          .findFirst()
+          .orElseThrow(() -> new IllegalArgumentException("The argument " + value + " doesn't match any ConfigElement"));
+    }
+}
diff --git a/picocli/src/main/java/com/baeldung/picocli/helloworld/HelloWorldCommand.java b/picocli/src/main/java/com/baeldung/picocli/helloworld/HelloWorldCommand.java
new file mode 100644
index 0000000000..97a861e2f0
--- /dev/null
+++ b/picocli/src/main/java/com/baeldung/picocli/helloworld/HelloWorldCommand.java
@@ -0,0 +1,20 @@
+package com.baeldung.picocli.helloworld;
+
+import picocli.CommandLine;
+
+import static picocli.CommandLine.Command;
+
+@Command(
+  name = "hello",
+  description = "Says hello"
+)
+public class HelloWorldCommand implements Runnable {
+    public static void main(String[] args) {
+        CommandLine.run(new HelloWorldCommand(), args);
+    }
+
+    @Override
+    public void run() {
+        System.out.println("Hello World!");
+    }
+}
diff --git a/pom.xml b/pom.xml
index 0de4a36336..f237134112 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
 
     <modules>
         <module>lombok-custom</module>
+        <module>picocli</module>
     </modules>
 
 	<dependencies>

From 705b310302061a63d78192a9e08528514d55ec26 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 21 Apr 2019 19:36:14 +0530
Subject: [PATCH 044/295] [BAEL-13601] - Updated Custom Cookie article and
 moved code

---
 httpclient-simple/README.md                                    | 3 ++-
 .../org/baeldung/httpclient/sec/HttpClientCookieLiveTest.java  | 0
 httpclient/README.md                                           | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {httpclient => httpclient-simple}/src/test/java/org/baeldung/httpclient/sec/HttpClientCookieLiveTest.java (100%)

diff --git a/httpclient-simple/README.md b/httpclient-simple/README.md
index d1224359e0..a25bde04be 100644
--- a/httpclient-simple/README.md
+++ b/httpclient-simple/README.md
@@ -8,4 +8,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 ### Relevant Articles: 
 
 - [HttpClient 4 – Get the Status Code](http://www.baeldung.com/httpclient-status-code)
-- [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
\ No newline at end of file
+- [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
+- [HttpClient 4 – Send Custom Cookie](http://www.baeldung.com/httpclient-4-cookies)
\ No newline at end of file
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/sec/HttpClientCookieLiveTest.java b/httpclient-simple/src/test/java/org/baeldung/httpclient/sec/HttpClientCookieLiveTest.java
similarity index 100%
rename from httpclient/src/test/java/org/baeldung/httpclient/sec/HttpClientCookieLiveTest.java
rename to httpclient-simple/src/test/java/org/baeldung/httpclient/sec/HttpClientCookieLiveTest.java
diff --git a/httpclient/README.md b/httpclient/README.md
index ce98d7e72e..25270bdc98 100644
--- a/httpclient/README.md
+++ b/httpclient/README.md
@@ -7,7 +7,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
 
-- [HttpClient 4 – Send Custom Cookie](http://www.baeldung.com/httpclient-4-cookies)
 - [HttpClient 4 – Cancel Request](http://www.baeldung.com/httpclient-cancel-request)
 - [HttpClient 4 Cookbook](http://www.baeldung.com/httpclient4)
 - [Unshorten URLs with HttpClient](http://www.baeldung.com/unshorten-url-httpclient)

From 0ae452d0a6f1e1ff59a9003434ebc3e4f6f310bb Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Sun, 21 Apr 2019 17:14:55 +0300
Subject: [PATCH 045/295] update pom

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

diff --git a/pom.xml b/pom.xml
index f4bc47dd44..b0c350fb6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -619,7 +619,7 @@
                 <module>spring-boot-camel</module>
                 <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
                 <module>spring-boot-client</module>
-				<module>spring-boot-configuration</module>
+
                 <module>spring-boot-crud</module>
                 <module>spring-boot-ctx-fluent</module>
                 <module>spring-boot-custom-starter</module>

From 6ee4fba3275d258f40327a4147ab9053cc275138 Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Sun, 21 Apr 2019 17:41:00 +0300
Subject: [PATCH 046/295] update post controller

---
 .../com/baeldung/modelmapper/controller/PostRestController.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/controller/PostRestController.java b/spring-boot-rest/src/main/java/com/baeldung/modelmapper/controller/PostRestController.java
index c0cbca5220..68c17975d4 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/controller/PostRestController.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/modelmapper/controller/PostRestController.java
@@ -21,6 +21,7 @@ import com.baeldung.modelmapper.service.IPostService;
 import com.baeldung.modelmapper.service.IUserService;
 
 @Controller
+@RequestMapping("/posts")
 public class PostRestController {
     
     @Autowired

From 73ede4124c3aa5e121bdc4c20ba1b26c001e7702 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 21 Apr 2019 20:12:40 +0530
Subject: [PATCH 047/295] [BAEL-13599] - Updated Custom Header article and
 moved article to httpclient-simple

---
 httpclient-simple/README.md                                    | 3 ++-
 .../org/baeldung/httpclient/HttpClientHeadersLiveTest.java     | 0
 httpclient/README.md                                           | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {httpclient => httpclient-simple}/src/test/java/org/baeldung/httpclient/HttpClientHeadersLiveTest.java (100%)

diff --git a/httpclient-simple/README.md b/httpclient-simple/README.md
index d1224359e0..5a679c0a70 100644
--- a/httpclient-simple/README.md
+++ b/httpclient-simple/README.md
@@ -8,4 +8,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 ### Relevant Articles: 
 
 - [HttpClient 4 – Get the Status Code](http://www.baeldung.com/httpclient-status-code)
-- [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
\ No newline at end of file
+- [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
+- [Custom HTTP Header with the HttpClient](http://www.baeldung.com/httpclient-custom-http-header)
\ No newline at end of file
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientHeadersLiveTest.java b/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientHeadersLiveTest.java
similarity index 100%
rename from httpclient/src/test/java/org/baeldung/httpclient/HttpClientHeadersLiveTest.java
rename to httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientHeadersLiveTest.java
diff --git a/httpclient/README.md b/httpclient/README.md
index ce98d7e72e..ae5b741820 100644
--- a/httpclient/README.md
+++ b/httpclient/README.md
@@ -12,7 +12,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [HttpClient 4 Cookbook](http://www.baeldung.com/httpclient4)
 - [Unshorten URLs with HttpClient](http://www.baeldung.com/unshorten-url-httpclient)
 - [HttpClient 4 – Follow Redirects for POST](http://www.baeldung.com/httpclient-redirect-on-http-post)
-- [Custom HTTP Header with the HttpClient](http://www.baeldung.com/httpclient-custom-http-header)
 - [HttpClient Basic Authentication](http://www.baeldung.com/httpclient-4-basic-authentication)
 - [Multipart Upload with HttpClient 4](http://www.baeldung.com/httpclient-multipart-upload)
 - [HttpAsyncClient Tutorial](http://www.baeldung.com/httpasyncclient-tutorial)

From 1cdfa2e2d0817d65bdb58e8591149abb9f2a1d2a Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 21 Apr 2019 20:29:58 +0530
Subject: [PATCH 048/295] [BAEL-13598] - Updated HttpClient Timeout article.
 moved code

---
 httpclient-simple/README.md                        |  3 ++-
 .../httpclient/HttpClientTimeoutLiveTest.java      | 14 +++++++-------
 spring-security-rest-basic-auth/README.md          |  1 -
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename {httpclient => httpclient-simple}/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java (96%)

diff --git a/httpclient-simple/README.md b/httpclient-simple/README.md
index d1224359e0..b4d8d61993 100644
--- a/httpclient-simple/README.md
+++ b/httpclient-simple/README.md
@@ -8,4 +8,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 ### Relevant Articles: 
 
 - [HttpClient 4 – Get the Status Code](http://www.baeldung.com/httpclient-status-code)
-- [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
\ No newline at end of file
+- [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
+- [HttpClient Timeout](http://www.baeldung.com/httpclient-timeout)
\ No newline at end of file
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java b/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
similarity index 96%
rename from httpclient/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
rename to httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
index 74255e416c..9d14a20e22 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
+++ b/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
@@ -1,20 +1,20 @@
 package org.baeldung.httpclient;
 
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.config.SocketConfig;
-import org.apache.http.conn.HttpHostConnectException;
+import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.junit.After;
 import org.junit.Test;
 
-import java.io.IOException;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-
 public class HttpClientTimeoutLiveTest {
 
     private CloseableHttpResponse response;
@@ -71,7 +71,7 @@ public class HttpClientTimeoutLiveTest {
     /**
      * This simulates a timeout against a domain with multiple routes/IPs to it (not a single raw IP)
      */
-    @Test(expected = HttpHostConnectException.class)
+    @Test(expected = ConnectTimeoutException.class)
     public final void givenTimeoutIsConfigured_whenTimingOut_thenTimeoutException() throws IOException {
         final int timeout = 3;
 
diff --git a/spring-security-rest-basic-auth/README.md b/spring-security-rest-basic-auth/README.md
index 0a48a747c2..b905824161 100644
--- a/spring-security-rest-basic-auth/README.md
+++ b/spring-security-rest-basic-auth/README.md
@@ -7,6 +7,5 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
 
 ### Relevant Articles: 
 - [Basic Authentication with the RestTemplate](http://www.baeldung.com/how-to-use-resttemplate-with-basic-authentication-in-spring)
-- [HttpClient Timeout](http://www.baeldung.com/httpclient-timeout)
 - [A Custom Filter in the Spring Security Filter Chain](http://www.baeldung.com/spring-security-custom-filter)
 - [Spring Security Basic Authentication](http://www.baeldung.com/spring-security-basic-authentication)

From f6166bc514b5f89d6508aec63b9a8462f2c633ba Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 21 Apr 2019 21:17:28 +0530
Subject: [PATCH 049/295] [BAEL-13533] - Updated Posting with HttpClient
 article. moved article

---
 httpclient-simple/README.md                                    | 3 ++-
 .../org/baeldung/httpclient/HttpClientPostingLiveTest.java     | 0
 .../java/org/baeldung/httpclient/ProgressEntityWrapper.java    | 0
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename {httpclient => httpclient-simple}/src/test/java/org/baeldung/httpclient/HttpClientPostingLiveTest.java (100%)
 rename {httpclient => httpclient-simple}/src/test/java/org/baeldung/httpclient/ProgressEntityWrapper.java (100%)

diff --git a/httpclient-simple/README.md b/httpclient-simple/README.md
index d1224359e0..ca94a8c110 100644
--- a/httpclient-simple/README.md
+++ b/httpclient-simple/README.md
@@ -8,4 +8,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 ### Relevant Articles: 
 
 - [HttpClient 4 – Get the Status Code](http://www.baeldung.com/httpclient-status-code)
-- [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
\ No newline at end of file
+- [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
+- [Posting with HttpClient](https://www.baeldung.com/httpclient-post-http-request)
\ No newline at end of file
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientPostingLiveTest.java b/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientPostingLiveTest.java
similarity index 100%
rename from httpclient/src/test/java/org/baeldung/httpclient/HttpClientPostingLiveTest.java
rename to httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientPostingLiveTest.java
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/ProgressEntityWrapper.java b/httpclient-simple/src/test/java/org/baeldung/httpclient/ProgressEntityWrapper.java
similarity index 100%
rename from httpclient/src/test/java/org/baeldung/httpclient/ProgressEntityWrapper.java
rename to httpclient-simple/src/test/java/org/baeldung/httpclient/ProgressEntityWrapper.java

From 2041089e74f2070b47ae927feec9a109d7fa2a71 Mon Sep 17 00:00:00 2001
From: Jacob Stopak <jacob@initialcommit.io>
Date: Sun, 21 Apr 2019 13:13:28 -0700
Subject: [PATCH 050/295] Add code for BAEL-2892 v0.0.1:
 pass-exception-client-json-spring-boot

---
 .../.gitignore                                | 29 +++++++++++++
 .../pom.xml                                   | 43 +++++++++++++++++++
 .../CustomException.java                      | 11 +++++
 .../ErrorHandler.java                         | 21 +++++++++
 .../MainController.java                       | 20 +++++++++
 ...tionToClientJsonSpringBootApplication.java | 13 ++++++
 .../src/main/resources/application.properties |  1 +
 .../src/main/resources/static/.gitignore      |  4 ++
 .../src/main/resources/templates/.gitignore   |  4 ++
 ...oClientJsonSpringBootApplicationTests.java | 16 +++++++
 10 files changed, 162 insertions(+)
 create mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/.gitignore
 create mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
 create mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/CustomException.java
 create mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java
 create mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/MainController.java
 create mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplication.java
 create mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/application.properties
 create mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/static/.gitignore
 create mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/templates/.gitignore
 create mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplicationTests.java

diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/.gitignore b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/.gitignore
new file mode 100644
index 0000000000..153c9335eb
--- /dev/null
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/.gitignore
@@ -0,0 +1,29 @@
+HELP.md
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+
+### VS Code ###
+.vscode/
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
new file mode 100644
index 0000000000..28a699ad98
--- /dev/null
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
@@ -0,0 +1,43 @@
+<?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>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.1.4.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>com.baeldung</groupId>
+	<artifactId>pass-exception-to-client-json-spring-boot</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>pass-exception-to-client-json-spring-boot</name>
+	<description>Baeldung article code on how to pass exceptions to client in JSON format using Spring Boot</description>
+
+	<properties>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/CustomException.java b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/CustomException.java
new file mode 100644
index 0000000000..56fe80cd9a
--- /dev/null
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/CustomException.java
@@ -0,0 +1,11 @@
+package com.baeldung.passexceptiontoclientjsonspringboot;
+
+public class CustomException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+    public CustomException() {
+        super("Custom exception message.");
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java
new file mode 100644
index 0000000000..823689adb9
--- /dev/null
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java
@@ -0,0 +1,21 @@
+package com.baeldung.passexceptiontoclientjsonspringboot;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ControllerAdvice
+public class ErrorHandler {
+
+    @ExceptionHandler(CustomException.class)
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    @ResponseBody
+    public CustomException handleCustomException(CustomException ce) {
+
+        return ce;
+
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/MainController.java b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/MainController.java
new file mode 100644
index 0000000000..68df38fb73
--- /dev/null
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/MainController.java
@@ -0,0 +1,20 @@
+package com.baeldung.passexceptiontoclientjsonspringboot;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class MainController {
+
+    @GetMapping("/")
+    public String index() throws CustomException {
+
+        if (true) {
+            throw new CustomException();
+        }
+
+        return "index";
+
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplication.java b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplication.java
new file mode 100644
index 0000000000..77833c28fd
--- /dev/null
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.passexceptiontoclientjsonspringboot;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class PassExceptionToClientJsonSpringBootApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(PassExceptionToClientJsonSpringBootApplication.class, args);
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/application.properties b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/application.properties
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/application.properties
@@ -0,0 +1 @@
+
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/static/.gitignore b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/static/.gitignore
new file mode 100644
index 0000000000..5e7d2734cf
--- /dev/null
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/static/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/templates/.gitignore b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/templates/.gitignore
new file mode 100644
index 0000000000..5e7d2734cf
--- /dev/null
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/templates/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplicationTests.java b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplicationTests.java
new file mode 100644
index 0000000000..5e35c21f4c
--- /dev/null
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplicationTests.java
@@ -0,0 +1,16 @@
+package com.baeldung.passexceptiontoclientjsonspringboot;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class PassExceptionToClientJsonSpringBootApplicationTests {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}

From dfdee7aa7a0fc25b99a170033db693a2744c38ec Mon Sep 17 00:00:00 2001
From: TINO <TINO@LAPTOP-553D1R2S>
Date: Sun, 21 Apr 2019 23:28:39 +0300
Subject: [PATCH 051/295] BAEL - 2823

---
 .../entitygraph/model/Characteristic.java     | 43 +++++++++++++++++
 .../com/baeldung/entitygraph/model/Item.java  | 48 +++++++++++++++++++
 .../repository/CharacteristicsRepository.java | 13 +++++
 .../repository/ItemRepository.java            | 13 +++++
 .../EntityGraphIntegrationTest.java           | 39 +++++++++++++++
 .../src/test/resources/entitygraph-data.sql   |  7 +++
 6 files changed, 163 insertions(+)
 create mode 100644 persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/model/Characteristic.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/model/Item.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/repository/CharacteristicsRepository.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/repository/ItemRepository.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/entitygraph/EntityGraphIntegrationTest.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/test/resources/entitygraph-data.sql

diff --git a/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/model/Characteristic.java b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/model/Characteristic.java
new file mode 100644
index 0000000000..ae20375572
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/model/Characteristic.java
@@ -0,0 +1,43 @@
+package com.baeldung.entitygraph.model;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class Characteristic {
+
+    @Id
+    private Long id;
+    private String type;
+    
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn
+    private Item item;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Item getItem() {
+        return item;
+    }
+
+    public void setItem(Item item) {
+        this.item = item;
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/model/Item.java b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/model/Item.java
new file mode 100644
index 0000000000..e90a22ef62
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/model/Item.java
@@ -0,0 +1,48 @@
+package com.baeldung.entitygraph.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.NamedAttributeNode;
+import javax.persistence.NamedEntityGraph;
+import javax.persistence.OneToMany;
+
+@Entity
+@NamedEntityGraph(name = "Item.characteristics",
+    attributeNodes = @NamedAttributeNode("characteristics")
+)
+public class Item {
+
+    @Id
+    private Long id;
+    private String name;
+    
+    @OneToMany(mappedBy = "item")
+    private List<Characteristic> characteristics = new ArrayList<>();
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<Characteristic> getCharacteristics() {
+        return characteristics;
+    }
+
+    public void setCharacteristics(List<Characteristic> characteristics) {
+        this.characteristics = characteristics;
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/repository/CharacteristicsRepository.java b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/repository/CharacteristicsRepository.java
new file mode 100644
index 0000000000..87eb7af7aa
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/repository/CharacteristicsRepository.java
@@ -0,0 +1,13 @@
+package com.baeldung.entitygraph.repository;
+
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.baeldung.entitygraph.model.Characteristic;
+
+public interface CharacteristicsRepository extends JpaRepository<Characteristic , Long> {
+    
+    @EntityGraph(attributePaths = {"item"})
+    Characteristic findByType(String type);    
+    
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/repository/ItemRepository.java b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/repository/ItemRepository.java
new file mode 100644
index 0000000000..b2a5f223b3
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/repository/ItemRepository.java
@@ -0,0 +1,13 @@
+package com.baeldung.entitygraph.repository;
+
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.EntityGraph.EntityGraphType;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.baeldung.entitygraph.model.Item;
+
+public interface ItemRepository extends JpaRepository<Item, Long> {
+
+    @EntityGraph(value = "Item.characteristics", type = EntityGraphType.FETCH)
+    Item findByName(String name);
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/entitygraph/EntityGraphIntegrationTest.java b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/entitygraph/EntityGraphIntegrationTest.java
new file mode 100644
index 0000000000..24880a5dff
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/entitygraph/EntityGraphIntegrationTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.entitygraph;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.entitygraph.model.Characteristic;
+import com.baeldung.entitygraph.model.Item;
+import com.baeldung.entitygraph.repository.CharacteristicsRepository;
+import com.baeldung.entitygraph.repository.ItemRepository;
+
+@DataJpaTest
+@RunWith(SpringRunner.class)
+@Sql(scripts = "/entitygraph-data.sql")
+public class EntityGraphIntegrationTest {
+   
+    @Autowired
+    private ItemRepository itemRepo;
+    
+    @Autowired
+    private CharacteristicsRepository characteristicsRepo;
+    
+    @Test
+    public void givenEntityGraph_whenCalled_shouldRetrunDefinedFields() {
+        Item item = itemRepo.findByName("Table");
+        assertThat(item.getId()).isEqualTo(1L);
+    }
+    
+    @Test
+    public void givenAdhocEntityGraph_whenCalled_shouldRetrunDefinedFields() {
+        Characteristic characteristic = characteristicsRepo.findByType("Rigid");
+        assertThat(characteristic.getId()).isEqualTo(1L);
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/test/resources/entitygraph-data.sql b/persistence-modules/spring-data-jpa-2/src/test/resources/entitygraph-data.sql
new file mode 100644
index 0000000000..685ec2c605
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/test/resources/entitygraph-data.sql
@@ -0,0 +1,7 @@
+INSERT INTO Item(id,name) VALUES (1,'Table');
+INSERT INTO Item(id,name) VALUES (2,'Bottle');
+
+INSERT INTO Characteristic(id,item_id, type) VALUES (1,1,'Rigid');
+INSERT INTO Characteristic(id,item_id,type) VALUES (2,1,'Big');
+INSERT INTO Characteristic(id,item_id,type) VALUES (3,2,'Fragile');
+INSERT INTO Characteristic(id,item_id,type) VALUES (4,2,'Small');
\ No newline at end of file

From bac59e78bf7690cddacd4721fb0910770aa355aa Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 21 Apr 2019 23:39:19 +0300
Subject: [PATCH 052/295] Update FooUnitTest.java

---
 .../com/baeldung/convertcollectiontoarraylist/FooUnitTest.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/java-collections-conversions/src/test/java/com/baeldung/convertcollectiontoarraylist/FooUnitTest.java b/java-collections-conversions/src/test/java/com/baeldung/convertcollectiontoarraylist/FooUnitTest.java
index 5be4121bc7..1de600aebf 100644
--- a/java-collections-conversions/src/test/java/com/baeldung/convertcollectiontoarraylist/FooUnitTest.java
+++ b/java-collections-conversions/src/test/java/com/baeldung/convertcollectiontoarraylist/FooUnitTest.java
@@ -33,9 +33,6 @@ public class FooUnitTest {
         srcCollection.add(sam);
         srcCollection.add(alice);
         srcCollection.add(buffy);
-
-        // make sure the collection isn't sorted accidentally
-        assertFalse("Oops: source collection is already sorted!", isSorted(srcCollection));
     }
     
     /**

From 16493292f24436f653f880a75c85ea307ba6ec16 Mon Sep 17 00:00:00 2001
From: TINO <TINO@LAPTOP-553D1R2S>
Date: Mon, 22 Apr 2019 00:43:35 +0300
Subject: [PATCH 053/295] BAEL - 2823

---
 .../entitygraph/repository/CharacteristicsRepository.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/repository/CharacteristicsRepository.java b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/repository/CharacteristicsRepository.java
index 87eb7af7aa..9f923ab241 100644
--- a/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/repository/CharacteristicsRepository.java
+++ b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/entitygraph/repository/CharacteristicsRepository.java
@@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 
 import com.baeldung.entitygraph.model.Characteristic;
 
-public interface CharacteristicsRepository extends JpaRepository<Characteristic , Long> {
+public interface CharacteristicsRepository extends JpaRepository<Characteristic, Long> {
     
     @EntityGraph(attributePaths = {"item"})
     Characteristic findByType(String type);    

From b5baab70929f8fa7cd83ca51f807d0ebdc3e0a74 Mon Sep 17 00:00:00 2001
From: Jacob Stopak <jacob@initialcommit.io>
Date: Sun, 21 Apr 2019 15:22:14 -0700
Subject: [PATCH 054/295] Move @ResponseBody to class level, bump version to
 0.0.2

---
 .../pass-exception-to-client-json-spring-boot/pom.xml           | 2 +-
 .../passexceptiontoclientjsonspringboot/ErrorHandler.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
index 28a699ad98..d592cae351 100644
--- a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.baeldung</groupId>
 	<artifactId>pass-exception-to-client-json-spring-boot</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.2-SNAPSHOT</version>
 	<name>pass-exception-to-client-json-spring-boot</name>
 	<description>Baeldung article code on how to pass exceptions to client in JSON format using Spring Boot</description>
 
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java
index 823689adb9..d69f60b75e 100644
--- a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java
@@ -7,11 +7,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
 @ControllerAdvice
+@ResponseBody
 public class ErrorHandler {
 
     @ExceptionHandler(CustomException.class)
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
-    @ResponseBody
     public CustomException handleCustomException(CustomException ce) {
 
         return ce;

From 732a7413f419a40123e263ab2854c3d2a306d451 Mon Sep 17 00:00:00 2001
From: Denis Zhdanov <denzhdanov@gmail.com>
Date: Mon, 22 Apr 2019 08:13:32 +0800
Subject: [PATCH 055/295] Revert "BAEL-2779 Guide to classgraph library"

This reverts commit af4e221f as it was asked to move it to libraries-2
---
 libraries/pom.xml                             |  7 --
 .../classgraph/ClassGraphUnitTest.java        | 78 -------------------
 .../classgraph/ClassWithAnnotation.java       |  5 --
 .../classgraph/FieldWithAnnotation.java       |  7 --
 .../classgraph/MethodWithAnnotation.java      |  8 --
 .../MethodWithAnnotationParameterDao.java     |  8 --
 .../MethodWithAnnotationParameterWeb.java     |  8 --
 .../baeldung/classgraph/TestAnnotation.java   | 14 ----
 .../src/test/resources/classgraph/my.config   |  1 -
 9 files changed, 136 deletions(-)
 delete mode 100644 libraries/src/test/java/com/baeldung/classgraph/ClassGraphUnitTest.java
 delete mode 100644 libraries/src/test/java/com/baeldung/classgraph/ClassWithAnnotation.java
 delete mode 100644 libraries/src/test/java/com/baeldung/classgraph/FieldWithAnnotation.java
 delete mode 100644 libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotation.java
 delete mode 100644 libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterDao.java
 delete mode 100644 libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterWeb.java
 delete mode 100644 libraries/src/test/java/com/baeldung/classgraph/TestAnnotation.java
 delete mode 100644 libraries/src/test/resources/classgraph/my.config

diff --git a/libraries/pom.xml b/libraries/pom.xml
index a6179a843d..7823732224 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -699,12 +699,6 @@
 			<version>${reflections.version}</version>
 		</dependency>
 
-        <dependency>
-            <groupId>io.github.classgraph</groupId>
-            <artifactId>classgraph</artifactId>
-            <version>${classgraph.version}</version>
-        </dependency>
-
     </dependencies>
 
     <repositories>
@@ -922,7 +916,6 @@
         <mockftpserver.version>2.7.1</mockftpserver.version>
         <commons-net.version>3.6</commons-net.version>
         <reflections.version>0.9.11</reflections.version>
-        <classgraph.version>4.8.22</classgraph.version>
 
     </properties>
 
diff --git a/libraries/src/test/java/com/baeldung/classgraph/ClassGraphUnitTest.java b/libraries/src/test/java/com/baeldung/classgraph/ClassGraphUnitTest.java
deleted file mode 100644
index 5767396948..0000000000
--- a/libraries/src/test/java/com/baeldung/classgraph/ClassGraphUnitTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.baeldung.classgraph;
-
-import io.github.classgraph.*;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Consumer;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class ClassGraphUnitTest {
-
-    @Test
-    public void whenClassAnnotationFilterIsDefined_thenTargetClassesCanBeFound() {
-        doTest(result -> {
-            ClassInfoList classInfos = result.getClassesWithAnnotation(TestAnnotation.class.getName());
-            assertThat(classInfos).extracting(ClassInfo::getName).contains(ClassWithAnnotation.class.getName());
-        });
-    }
-
-    @Test
-    public void whenMethodAnnotationFilterIsDefined_thenTargetClassesCanBeFound() {
-        doTest(result -> {
-            ClassInfoList classInfos = result.getClassesWithMethodAnnotation(TestAnnotation.class.getName());
-            assertThat(classInfos).extracting(ClassInfo::getName).contains(MethodWithAnnotation.class.getName());
-        });
-    }
-
-    @Test
-    public void whenMethodAnnotationValueFilterIsDefined_thenTargetClassesCanBeFound() {
-        doTest(result -> {
-            ClassInfoList classInfos = result.getClassesWithMethodAnnotation(TestAnnotation.class.getName());
-            ClassInfoList filteredClassInfos = classInfos.filter(classInfo -> {
-                return classInfo.getMethodInfo().stream().anyMatch(methodInfo -> {
-                    AnnotationInfo annotationInfo = methodInfo.getAnnotationInfo(TestAnnotation.class.getName());
-                    if (annotationInfo == null) {
-                        return false;
-                    }
-
-                    return "web".equals(annotationInfo.getParameterValues().getValue("value"));
-                });
-            });
-            assertThat(filteredClassInfos)
-                    .extracting(ClassInfo::getName)
-                    .contains(MethodWithAnnotationParameterWeb.class.getName());
-        });
-    }
-
-    @Test
-    public void whenFieldAnnotationFilterIsDefined_thenTargetClassesCanBeFound() {
-        doTest(result -> {
-            ClassInfoList classInfos = result.getClassesWithFieldAnnotation(TestAnnotation.class.getName());
-            assertThat(classInfos).extracting(ClassInfo::getName).contains(FieldWithAnnotation.class.getName());
-        });
-    }
-
-    @Test
-    public void whenResourceIsUsed_thenItCanBeFoundAndLoaded() throws IOException {
-        try (ScanResult result = new ClassGraph().whitelistPaths("classgraph").scan()) {
-            ResourceList resources = result.getResourcesWithExtension("config");
-            assertThat(resources).extracting(Resource::getPath).containsOnly("classgraph/my.config");
-            assertThat(resources.get(0).getContentAsString()).isEqualTo("my data");
-        }
-    }
-
-    private void doTest(Consumer<ScanResult> checker) {
-        try (ScanResult result = new ClassGraph().enableAllInfo()
-                                                 .whitelistPackages(getClass().getPackage().getName())
-                                                 .scan())
-        {
-            checker.accept(result);
-        }
-    }
-}
diff --git a/libraries/src/test/java/com/baeldung/classgraph/ClassWithAnnotation.java b/libraries/src/test/java/com/baeldung/classgraph/ClassWithAnnotation.java
deleted file mode 100644
index 0f3eeef293..0000000000
--- a/libraries/src/test/java/com/baeldung/classgraph/ClassWithAnnotation.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.baeldung.classgraph;
-
-@TestAnnotation
-public class ClassWithAnnotation {
-}
diff --git a/libraries/src/test/java/com/baeldung/classgraph/FieldWithAnnotation.java b/libraries/src/test/java/com/baeldung/classgraph/FieldWithAnnotation.java
deleted file mode 100644
index c5d1cc6062..0000000000
--- a/libraries/src/test/java/com/baeldung/classgraph/FieldWithAnnotation.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.baeldung.classgraph;
-
-public class FieldWithAnnotation {
-
-    @TestAnnotation
-    private String s;
-}
diff --git a/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotation.java b/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotation.java
deleted file mode 100644
index 12d0c9927c..0000000000
--- a/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotation.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.baeldung.classgraph;
-
-public class MethodWithAnnotation {
-
-    @TestAnnotation
-    public void service() {
-    }
-}
diff --git a/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterDao.java b/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterDao.java
deleted file mode 100644
index 9e38f42013..0000000000
--- a/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterDao.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.baeldung.classgraph;
-
-public class MethodWithAnnotationParameterDao {
-
-    @TestAnnotation("dao")
-    public void service() {
-    }
-}
diff --git a/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterWeb.java b/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterWeb.java
deleted file mode 100644
index 1ef3d46b6f..0000000000
--- a/libraries/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterWeb.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.baeldung.classgraph;
-
-public class MethodWithAnnotationParameterWeb {
-
-    @TestAnnotation("web")
-    public void service() {
-    }
-}
diff --git a/libraries/src/test/java/com/baeldung/classgraph/TestAnnotation.java b/libraries/src/test/java/com/baeldung/classgraph/TestAnnotation.java
deleted file mode 100644
index f47ec180a9..0000000000
--- a/libraries/src/test/java/com/baeldung/classgraph/TestAnnotation.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.baeldung.classgraph;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-
-@Target({TYPE, METHOD, FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface TestAnnotation {
-
-    String value() default "";
-}
diff --git a/libraries/src/test/resources/classgraph/my.config b/libraries/src/test/resources/classgraph/my.config
deleted file mode 100644
index b99df573f6..0000000000
--- a/libraries/src/test/resources/classgraph/my.config
+++ /dev/null
@@ -1 +0,0 @@
-my data
\ No newline at end of file

From 541e0cc9d55e28c095c757f95e6330fe94b8d92e Mon Sep 17 00:00:00 2001
From: Denis Zhdanov <denzhdanov@gmail.com>
Date: Mon, 22 Apr 2019 08:17:20 +0800
Subject: [PATCH 056/295] BAEL-2779 Guide to classgraph library

---
 libraries-2/pom.xml                           | 12 +++
 .../classgraph/ClassGraphUnitTest.java        | 74 +++++++++++++++++++
 .../classgraph/ClassWithAnnotation.java       |  5 ++
 .../classgraph/FieldWithAnnotation.java       |  7 ++
 .../classgraph/MethodWithAnnotation.java      |  8 ++
 .../MethodWithAnnotationParameterDao.java     |  8 ++
 .../MethodWithAnnotationParameterWeb.java     |  8 ++
 .../baeldung/classgraph/TestAnnotation.java   | 14 ++++
 .../src/test/resources/classgraph/my.config   |  1 +
 9 files changed, 137 insertions(+)
 create mode 100644 libraries-2/src/test/java/com/baeldung/classgraph/ClassGraphUnitTest.java
 create mode 100644 libraries-2/src/test/java/com/baeldung/classgraph/ClassWithAnnotation.java
 create mode 100644 libraries-2/src/test/java/com/baeldung/classgraph/FieldWithAnnotation.java
 create mode 100644 libraries-2/src/test/java/com/baeldung/classgraph/MethodWithAnnotation.java
 create mode 100644 libraries-2/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterDao.java
 create mode 100644 libraries-2/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterWeb.java
 create mode 100644 libraries-2/src/test/java/com/baeldung/classgraph/TestAnnotation.java
 create mode 100644 libraries-2/src/test/resources/classgraph/my.config

diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml
index a839f56b56..965cb195bf 100644
--- a/libraries-2/pom.xml
+++ b/libraries-2/pom.xml
@@ -30,6 +30,16 @@
 	</repositories>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${assertj.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.github.classgraph</groupId>
+			<artifactId>classgraph</artifactId>
+			<version>${classgraph.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.jbpm</groupId>
 			<artifactId>jbpm-test</artifactId>
@@ -38,6 +48,8 @@
 	</dependencies>
 
 	<properties>
+		<assertj.version>3.6.2</assertj.version>
+		<classgraph.version>4.8.22</classgraph.version>
 		<jbpm.version>6.0.0.Final</jbpm.version>
 	</properties>
 </project>
diff --git a/libraries-2/src/test/java/com/baeldung/classgraph/ClassGraphUnitTest.java b/libraries-2/src/test/java/com/baeldung/classgraph/ClassGraphUnitTest.java
new file mode 100644
index 0000000000..3dc99e6a32
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/classgraph/ClassGraphUnitTest.java
@@ -0,0 +1,74 @@
+package com.baeldung.classgraph;
+
+import io.github.classgraph.*;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.function.Consumer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ClassGraphUnitTest {
+
+    @Test
+    public void whenClassAnnotationFilterIsDefined_thenTargetClassesCanBeFound() {
+        doTest(result -> {
+            ClassInfoList classInfos = result.getClassesWithAnnotation(TestAnnotation.class.getName());
+            assertThat(classInfos).extracting(ClassInfo::getName).contains(ClassWithAnnotation.class.getName());
+        });
+    }
+
+    @Test
+    public void whenMethodAnnotationFilterIsDefined_thenTargetClassesCanBeFound() {
+        doTest(result -> {
+            ClassInfoList classInfos = result.getClassesWithMethodAnnotation(TestAnnotation.class.getName());
+            assertThat(classInfos).extracting(ClassInfo::getName).contains(MethodWithAnnotation.class.getName());
+        });
+    }
+
+    @Test
+    public void whenMethodAnnotationValueFilterIsDefined_thenTargetClassesCanBeFound() {
+        doTest(result -> {
+            ClassInfoList classInfos = result.getClassesWithMethodAnnotation(TestAnnotation.class.getName());
+            ClassInfoList filteredClassInfos = classInfos.filter(classInfo -> {
+                return classInfo.getMethodInfo().stream().anyMatch(methodInfo -> {
+                    AnnotationInfo annotationInfo = methodInfo.getAnnotationInfo(TestAnnotation.class.getName());
+                    if (annotationInfo == null) {
+                        return false;
+                    }
+
+                    return "web".equals(annotationInfo.getParameterValues().getValue("value"));
+                });
+            });
+            assertThat(filteredClassInfos)
+                    .extracting(ClassInfo::getName)
+                    .contains(MethodWithAnnotationParameterWeb.class.getName());
+        });
+    }
+
+    @Test
+    public void whenFieldAnnotationFilterIsDefined_thenTargetClassesCanBeFound() {
+        doTest(result -> {
+            ClassInfoList classInfos = result.getClassesWithFieldAnnotation(TestAnnotation.class.getName());
+            assertThat(classInfos).extracting(ClassInfo::getName).contains(FieldWithAnnotation.class.getName());
+        });
+    }
+
+    @Test
+    public void whenResourceIsUsed_thenItCanBeFoundAndLoaded() throws IOException {
+        try (ScanResult result = new ClassGraph().whitelistPaths("classgraph").scan()) {
+            ResourceList resources = result.getResourcesWithExtension("config");
+            assertThat(resources).extracting(Resource::getPath).containsOnly("classgraph/my.config");
+            assertThat(resources.get(0).getContentAsString()).isEqualTo("my data");
+        }
+    }
+
+    private void doTest(Consumer<ScanResult> checker) {
+        try (ScanResult result = new ClassGraph().enableAllInfo()
+                                                 .whitelistPackages(getClass().getPackage().getName())
+                                                 .scan())
+        {
+            checker.accept(result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/libraries-2/src/test/java/com/baeldung/classgraph/ClassWithAnnotation.java b/libraries-2/src/test/java/com/baeldung/classgraph/ClassWithAnnotation.java
new file mode 100644
index 0000000000..fe476769a6
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/classgraph/ClassWithAnnotation.java
@@ -0,0 +1,5 @@
+package com.baeldung.classgraph;
+
+@TestAnnotation
+public class ClassWithAnnotation {
+}
\ No newline at end of file
diff --git a/libraries-2/src/test/java/com/baeldung/classgraph/FieldWithAnnotation.java b/libraries-2/src/test/java/com/baeldung/classgraph/FieldWithAnnotation.java
new file mode 100644
index 0000000000..f72a7621f9
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/classgraph/FieldWithAnnotation.java
@@ -0,0 +1,7 @@
+package com.baeldung.classgraph;
+
+public class FieldWithAnnotation {
+
+    @TestAnnotation
+    private String s;
+}
\ No newline at end of file
diff --git a/libraries-2/src/test/java/com/baeldung/classgraph/MethodWithAnnotation.java b/libraries-2/src/test/java/com/baeldung/classgraph/MethodWithAnnotation.java
new file mode 100644
index 0000000000..29a59c09ea
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/classgraph/MethodWithAnnotation.java
@@ -0,0 +1,8 @@
+package com.baeldung.classgraph;
+
+public class MethodWithAnnotation {
+
+    @TestAnnotation
+    public void service() {
+    }
+}
\ No newline at end of file
diff --git a/libraries-2/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterDao.java b/libraries-2/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterDao.java
new file mode 100644
index 0000000000..f01c2743eb
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterDao.java
@@ -0,0 +1,8 @@
+package com.baeldung.classgraph;
+
+public class MethodWithAnnotationParameterDao {
+
+    @TestAnnotation("dao")
+    public void service() {
+    }
+}
\ No newline at end of file
diff --git a/libraries-2/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterWeb.java b/libraries-2/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterWeb.java
new file mode 100644
index 0000000000..bf01f7d23c
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/classgraph/MethodWithAnnotationParameterWeb.java
@@ -0,0 +1,8 @@
+package com.baeldung.classgraph;
+
+public class MethodWithAnnotationParameterWeb {
+
+    @TestAnnotation("web")
+    public void service() {
+    }
+}
\ No newline at end of file
diff --git a/libraries-2/src/test/java/com/baeldung/classgraph/TestAnnotation.java b/libraries-2/src/test/java/com/baeldung/classgraph/TestAnnotation.java
new file mode 100644
index 0000000000..e3f5df92ed
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/classgraph/TestAnnotation.java
@@ -0,0 +1,14 @@
+package com.baeldung.classgraph;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.*;
+
+@Target({TYPE, METHOD, FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface TestAnnotation {
+
+    String value() default "";
+}
\ No newline at end of file
diff --git a/libraries-2/src/test/resources/classgraph/my.config b/libraries-2/src/test/resources/classgraph/my.config
new file mode 100644
index 0000000000..b99df573f6
--- /dev/null
+++ b/libraries-2/src/test/resources/classgraph/my.config
@@ -0,0 +1 @@
+my data
\ No newline at end of file

From 5d09d7c7b93a650e04580b7be1ecef6fef1eb0bf Mon Sep 17 00:00:00 2001
From: eric-martin <emart.tigers@gmail.com>
Date: Sun, 21 Apr 2019 19:57:25 -0500
Subject: [PATCH 057/295] Fix vaadin-maven-plugin configuration

---
 vaadin/pom.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/vaadin/pom.xml b/vaadin/pom.xml
index 145a6af293..ec69e240e2 100644
--- a/vaadin/pom.xml
+++ b/vaadin/pom.xml
@@ -70,17 +70,6 @@
                 <groupId>com.vaadin</groupId>
                 <artifactId>vaadin-maven-plugin</artifactId>
                 <version>${vaadin.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>update-theme</goal>
-                            <goal>update-widgetset</goal>
-                            <goal>compile</goal>
-                            <!-- Comment out compile-theme goal to use on-the-fly theme compilation -->
-                            <goal>compile-theme</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

From 16553936c7aed6022bc735466237e430321f34e8 Mon Sep 17 00:00:00 2001
From: "Sadanand S. Koli" <skhopp95@gmail.com>
Date: Mon, 22 Apr 2019 20:48:49 +0530
Subject: [PATCH 058/295] BAEL-2770 Fixed code formatting and improved test
 cases

---
 .../array/AddElementToEndOfArray.java         |  6 ++---
 .../array/AddElementToEndOfArrayUnitTest.java | 25 +++++++++++--------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/core-java-arrays/src/main/java/com/baeldung/array/AddElementToEndOfArray.java b/core-java-arrays/src/main/java/com/baeldung/array/AddElementToEndOfArray.java
index 1dc6600600..dcd61cdfa7 100644
--- a/core-java-arrays/src/main/java/com/baeldung/array/AddElementToEndOfArray.java
+++ b/core-java-arrays/src/main/java/com/baeldung/array/AddElementToEndOfArray.java
@@ -8,7 +8,7 @@ public class AddElementToEndOfArray {
     public Integer[] addElementUsingArraysCopyOf(Integer[] srcArray, int elementToAdd) {
         Integer[] destArray = Arrays.copyOf(srcArray, srcArray.length + 1);
 
-        destArray[destArray.length-1] = elementToAdd;
+        destArray[destArray.length - 1] = elementToAdd;
         return destArray;
     }
 
@@ -26,9 +26,9 @@ public class AddElementToEndOfArray {
 
         System.arraycopy(srcArray, 0, destArray, 0, srcArray.length);
 
-        destArray[destArray.length-1] = elementToAdd;
+        destArray[destArray.length - 1] = elementToAdd;
 
         return destArray;
     }
 
-}
\ No newline at end of file
+}
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/AddElementToEndOfArrayUnitTest.java b/core-java-arrays/src/test/java/com/baeldung/array/AddElementToEndOfArrayUnitTest.java
index beeed1a313..f6f1f954f6 100644
--- a/core-java-arrays/src/test/java/com/baeldung/array/AddElementToEndOfArrayUnitTest.java
+++ b/core-java-arrays/src/test/java/com/baeldung/array/AddElementToEndOfArrayUnitTest.java
@@ -3,44 +3,47 @@ package com.baeldung.array;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
 
 public class AddElementToEndOfArrayUnitTest {
 
     AddElementToEndOfArray addElementToEndOfArray;
 
     @Before
-    public void init(){
+    public void init() {
         addElementToEndOfArray = new AddElementToEndOfArray();
     }
 
     @Test
-    public void givenSourceArrayAndElement_whenAddElementUsingArraysCopyIsInvoked_thenNewElementMustBeAdded(){
-        Integer[] sourceArray = {1,2,3,4};
+    public void givenSourceArrayAndElement_whenAddElementUsingArraysCopyIsInvoked_thenNewElementMustBeAdded() {
+        Integer[] sourceArray = {1, 2, 3, 4};
         int elementToAdd = 5;
 
         Integer[] destArray = addElementToEndOfArray.addElementUsingArraysCopyOf(sourceArray, elementToAdd);
 
-        assertEquals(elementToAdd, destArray[destArray.length-1].intValue());
+        Integer[] expectedArray = {1, 2, 3, 4, 5};
+        assertArrayEquals(expectedArray, destArray);
     }
 
     @Test
-    public void givenSourceArrayAndElement_whenAddElementUsingArrayListIsInvoked_thenNewElementMustBeAdded(){
-        Integer[] sourceArray = {1,2,3,4};
+    public void givenSourceArrayAndElement_whenAddElementUsingArrayListIsInvoked_thenNewElementMustBeAdded() {
+        Integer[] sourceArray = {1, 2, 3, 4};
         int elementToAdd = 5;
 
         Integer[] destArray = addElementToEndOfArray.addElementUsingArrayList(sourceArray, elementToAdd);
 
-        assertEquals(elementToAdd, destArray[destArray.length-1].intValue());
+        Integer[] expectedArray = {1, 2, 3, 4, 5};
+        assertArrayEquals(expectedArray, destArray);
     }
 
     @Test
-    public void givenSourceArrayAndElement_whenAddElementUsingSystemArrayCopyIsInvoked_thenNewElementMustBeAdded(){
-        Integer[] sourceArray = {1,2,3,4};
+    public void givenSourceArrayAndElement_whenAddElementUsingSystemArrayCopyIsInvoked_thenNewElementMustBeAdded() {
+        Integer[] sourceArray = {1, 2, 3, 4};
         int elementToAdd = 5;
 
         Integer[] destArray = addElementToEndOfArray.addElementUsingSystemArrayCopy(sourceArray, elementToAdd);
 
-        assertEquals(elementToAdd, destArray[destArray.length-1].intValue());
+        Integer[] expectedArray = {1, 2, 3, 4, 5};
+        assertArrayEquals(expectedArray, destArray);
     }
 }

From b63f8882eab774d4a036bfae9deef937b5599a09 Mon Sep 17 00:00:00 2001
From: pcoates33 <pcoates33@users.noreply.github.com>
Date: Mon, 22 Apr 2019 18:12:56 +0100
Subject: [PATCH 059/295] BAEL-2837 Add sample Set operations in Java (#6697)

* BAEL-2837: Add sample set operations in Java

* BAEL-2837 add new module core-java-collections-set

* BAEL-2837 Updated readme.md file

* BAEL-2837 Tidy dependencies in pom.xml

* BAEL-2837 tidy white space in pom.xml

* BAEL-2837 Rename unit test class

* BAEL-2837 Removed unused logback-xml
---
 core-java-collections-set/README.md           |  6 ++
 core-java-collections-set/pom.xml             | 33 +++++++
 .../baeldung/set/SetOperationsUnitTest.java   | 93 +++++++++++++++++++
 pom.xml                                       |  2 +
 4 files changed, 134 insertions(+)
 create mode 100644 core-java-collections-set/README.md
 create mode 100644 core-java-collections-set/pom.xml
 create mode 100644 core-java-collections-set/src/test/java/com/baeldung/set/SetOperationsUnitTest.java

diff --git a/core-java-collections-set/README.md b/core-java-collections-set/README.md
new file mode 100644
index 0000000000..710484a2e1
--- /dev/null
+++ b/core-java-collections-set/README.md
@@ -0,0 +1,6 @@
+=========
+
+## Core Java Sets Cookbooks and Examples
+
+### Relevant Articles: 
+- [Set Operations in Java](http://www.baeldung.com/set-operations-in-java)
diff --git a/core-java-collections-set/pom.xml b/core-java-collections-set/pom.xml
new file mode 100644
index 0000000000..d5f7937645
--- /dev/null
+++ b/core-java-collections-set/pom.xml
@@ -0,0 +1,33 @@
+<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>core-java-collections-set</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-collections-set</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+    <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-collections4</artifactId>
+        <version>${commons-collections4.version}</version>
+    </dependency>
+    </dependencies>
+
+    <properties>
+        <commons-collections4.version>4.3</commons-collections4.version>
+        <guava.version>27.1-jre</guava.version>
+    </properties>
+</project>
diff --git a/core-java-collections-set/src/test/java/com/baeldung/set/SetOperationsUnitTest.java b/core-java-collections-set/src/test/java/com/baeldung/set/SetOperationsUnitTest.java
new file mode 100644
index 0000000000..7c25585e49
--- /dev/null
+++ b/core-java-collections-set/src/test/java/com/baeldung/set/SetOperationsUnitTest.java
@@ -0,0 +1,93 @@
+package com.baeldung.set;
+
+import static org.junit.Assert.*;
+
+import org.apache.commons.collections4.SetUtils;
+import org.junit.Test;
+
+import com.google.common.collect.Sets;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class SetOperationsUnitTest {
+
+    private Set<Integer> setA = setOf(1,2,3,4);
+    private Set<Integer> setB = setOf(2,4,6,8);
+    
+    private static Set<Integer> setOf(Integer... values) {
+        return new HashSet<Integer>(Arrays.asList(values));
+    }
+    
+    @Test
+    public void givenTwoSets_WhenWeRetainAll_ThenWeIntersectThem() {
+        Set<Integer> intersectSet = new HashSet<>(setA);
+        intersectSet.retainAll(setB);
+        assertEquals(setOf(2,4), intersectSet);
+    }
+    
+    @Test
+    public void givenTwoSets_WhenWeAddAll_ThenWeUnionThem() {
+        Set<Integer> unionSet = new HashSet<>(setA);
+        unionSet.addAll(setB);
+        assertEquals(setOf(1,2,3,4,6,8), unionSet);
+    }
+    
+    @Test
+    public void givenTwoSets_WhenRemoveAll_ThenWeGetTheDifference() {
+        Set<Integer> differenceSet = new HashSet<>(setA);
+        differenceSet.removeAll(setB);
+        assertEquals(setOf(1,3), differenceSet);
+    }
+    
+    @Test
+    public void givenTwoStreams_WhenWeFilterThem_ThenWeCanGetTheIntersect() {
+        Set<Integer> intersectSet = setA.stream()
+            .filter(setB::contains)
+            .collect(Collectors.toSet());
+        assertEquals(setOf(2,4), intersectSet);
+    }
+    
+    @Test
+    public void givenTwoStreams_WhenWeConcatThem_ThenWeGetTheUnion() {
+        Set<Integer> unionSet = Stream.concat(setA.stream(), setB.stream())
+            .collect(Collectors.toSet());
+        assertEquals(setOf(1,2,3,4,6,8), unionSet);
+    }
+    
+    @Test
+    public void givenTwoStreams_WhenWeFilterThem_ThenWeCanGetTheDifference() {
+        Set<Integer> differenceSet = setA.stream()
+            .filter(val -> !setB.contains(val))
+            .collect(Collectors.toSet());
+        assertEquals(setOf(1,3), differenceSet);
+    }
+    
+    @Test
+    public void givenTwoSets_WhenWeUseApacheCommonsIntersect_ThenWeGetTheIntersect() {
+        Set<Integer> intersectSet = SetUtils.intersection(setA, setB);
+        assertEquals(setOf(2,4), intersectSet);
+    }
+    
+    @Test
+    public void givenTwoSets_WhenWeUseApacheCommonsUnion_ThenWeGetTheUnion() {
+        Set<Integer> unionSet = SetUtils.union(setA, setB);
+        assertEquals(setOf(1,2,3,4,6,8), unionSet);
+    }
+    
+    
+    @Test
+    public void givenTwoSets_WhenWeUseGuavaIntersect_ThenWeGetTheIntersect() {
+        Set<Integer> intersectSet = Sets.intersection(setA, setB);
+        assertEquals(setOf(2,4), intersectSet);
+    }
+    
+    @Test
+    public void givenTwoSets_WhenWeUseGuavaUnion_ThenWeGetTheUnion() {
+        Set<Integer> unionSet = Sets.union(setA, setB);
+        assertEquals(setOf(1,2,3,4,6,8), unionSet);
+    }
+}
diff --git a/pom.xml b/pom.xml
index 0de4a36336..901bc94f96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -389,6 +389,7 @@
                 <module>core-java-collections</module>
                 <module>core-java-collections-map</module>
                 <module>core-java-collections-list</module>
+                <module>core-java-collections-set</module>
                 <module>core-java-concurrency-basic</module>
                 <module>core-java-concurrency-collections</module>
                 <module>core-java-io</module>
@@ -1059,6 +1060,7 @@
                 <module>core-java-collections</module>
                 <module>core-java-collections-map</module>
                 <module>core-java-collections-list</module>
+                <module>core-java-collections-set</module>
                 <module>core-java-concurrency-basic</module>
                 <module>core-java-concurrency-collections</module>
                 <module>core-java-io</module>

From 77338c7fb1326625a2bc9f8d43cac224d352fcd5 Mon Sep 17 00:00:00 2001
From: Adrian Precub <adi.precub@gmail.com>
Date: Mon, 22 Apr 2019 20:21:41 +0300
Subject: [PATCH 060/295] BAEL-2587: Spring Security integration with Amazon
 Cognito (#6730)

* BAEL-2587: Spring Security integration with Amazon Cognito

* BAEL-2587: Spring Security integration with Amazon Cognito - remove unnecessary stuff

* BAEL-2587: Spring Security integration with Amazon Cognito - rename config file

* BAEL-2587: Spring Security integration with Amazon Cognito - separate folder for cognito
---
 .../cognito/CognitoWebConfiguration.java      | 16 ++++++++++
 .../cognito/SpringCognitoApplication.java     | 14 ++++++++
 .../resources/cognito/application_cognito.yml | 15 +++++++++
 .../src/main/resources/cognito/home.html      | 32 +++++++++++++++++++
 .../src/main/resources/cognito/style.css      |  9 ++++++
 5 files changed, 86 insertions(+)
 create mode 100644 spring-5-security-oauth/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java
 create mode 100644 spring-5-security-oauth/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java
 create mode 100644 spring-5-security-oauth/src/main/resources/cognito/application_cognito.yml
 create mode 100644 spring-5-security-oauth/src/main/resources/cognito/home.html
 create mode 100644 spring-5-security-oauth/src/main/resources/cognito/style.css

diff --git a/spring-5-security-oauth/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java b/spring-5-security-oauth/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java
new file mode 100644
index 0000000000..ae03e0a802
--- /dev/null
+++ b/spring-5-security-oauth/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java
@@ -0,0 +1,16 @@
+package com.baeldung.cognito;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+@PropertySource("cognito/application_cognito.yml")
+public class CognitoWebConfiguration implements WebMvcConfigurer {
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+        registry.addViewController("/").setViewName("home");
+    }
+}
diff --git a/spring-5-security-oauth/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java b/spring-5-security-oauth/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java
new file mode 100644
index 0000000000..7f7b751cd9
--- /dev/null
+++ b/spring-5-security-oauth/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java
@@ -0,0 +1,14 @@
+package com.baeldung.cognito;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
+
+@SpringBootApplication
+@PropertySource("cognito/application_cognito.yml")
+public class SpringCognitoApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringCognitoApplication.class, args);
+    }
+}
diff --git a/spring-5-security-oauth/src/main/resources/cognito/application_cognito.yml b/spring-5-security-oauth/src/main/resources/cognito/application_cognito.yml
new file mode 100644
index 0000000000..0a28dbccb4
--- /dev/null
+++ b/spring-5-security-oauth/src/main/resources/cognito/application_cognito.yml
@@ -0,0 +1,15 @@
+spring:
+  security:
+    oauth2:
+      client:
+        registration:
+          cognito:
+            client-id: clientId
+            client-secret: clientSecret
+            scope: openid
+            redirectUriTemplate: "http://localhost:8080/login/oauth2/code/cognito"
+            clientName: cognito-client-name
+        provider:
+          cognito:
+            issuerUri: https://cognito-idp.{region}.amazonaws.com/{poolId}
+            usernameAttribute: cognito:username
diff --git a/spring-5-security-oauth/src/main/resources/cognito/home.html b/spring-5-security-oauth/src/main/resources/cognito/home.html
new file mode 100644
index 0000000000..f0bd9e52a8
--- /dev/null
+++ b/spring-5-security-oauth/src/main/resources/cognito/home.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>OAuth2 Cognito Demo</title>
+
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css">
+    <link rel="stylesheet" th:href="@{/cognito/style.css}">
+</head>
+<body>
+<section class="section">
+    <div class="container has-text-centered">
+        <div>
+            <h1 class="title">OAuth2 Spring Security Cognito Demo</h1>
+
+            <div sec:authorize="isAuthenticated()">
+                <div class="box">
+                    Hello, <strong th:text="${#authentication.name}"></strong>!
+                </div>
+            </div>
+
+            <div sec:authorize="isAnonymous()">
+                <div class="box">
+                    <a class="button login is-primary" th:href="@{/oauth2/authorization/cognito}">Log in with Amazon Cognito</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+</body>
+</html>
diff --git a/spring-5-security-oauth/src/main/resources/cognito/style.css b/spring-5-security-oauth/src/main/resources/cognito/style.css
new file mode 100644
index 0000000000..45190d6d70
--- /dev/null
+++ b/spring-5-security-oauth/src/main/resources/cognito/style.css
@@ -0,0 +1,9 @@
+.login {
+    background-color: #7289da;
+    color: #fff;
+}
+
+.login:hover {
+    background-color: #697ec4;
+    color: #fff;
+}

From a90ea4c46b0a4133b1a45eb7f37cfc7d18665e51 Mon Sep 17 00:00:00 2001
From: Saravanan Kandaswamy <saravanan.kandaswamy@unisys.com>
Date: Tue, 23 Apr 2019 09:35:48 +0530
Subject: [PATCH 061/295] Fixed the Compilation issue for AutoValue module

---
 .../baeldung/autofactory/provided/IntermediateAssembler.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/autovalue/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java b/autovalue/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java
index e0ee8879a5..65d0eb6f58 100644
--- a/autovalue/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java
+++ b/autovalue/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java
@@ -1,8 +1,9 @@
 package com.baeldung.autofactory.provided;
 
+import com.baeldung.autofactory.model.Camera;
 import com.google.auto.factory.AutoFactory;
 import com.google.auto.factory.Provided;
-import javafx.scene.Camera;
+
 
 import javax.inject.Provider;
 

From 21ea070f21a9eb1f72fc9a6a2ad7f41a1441365b Mon Sep 17 00:00:00 2001
From: Saravanan Kandaswamy <kandaswamy.saran@gmail.com>
Date: Tue, 23 Apr 2019 09:35:48 +0530
Subject: [PATCH 062/295] Fixed the Compilation issue for AutoValue module

---
 .../baeldung/autofactory/provided/IntermediateAssembler.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/autovalue/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java b/autovalue/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java
index e0ee8879a5..65d0eb6f58 100644
--- a/autovalue/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java
+++ b/autovalue/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java
@@ -1,8 +1,9 @@
 package com.baeldung.autofactory.provided;
 
+import com.baeldung.autofactory.model.Camera;
 import com.google.auto.factory.AutoFactory;
 import com.google.auto.factory.Provided;
-import javafx.scene.Camera;
+
 
 import javax.inject.Provider;
 

From 5d989661f3e9eccd88cf0745b14ef5403dd47c64 Mon Sep 17 00:00:00 2001
From: mikr <michael.krimgen@ximedes.com>
Date: Tue, 23 Apr 2019 09:09:01 +0200
Subject: [PATCH 063/295] BAEL-2580 JVM Platform Annotations in Kotlin

---
 .../com/baeldung/jvmannotations/Document.kt   | 31 +++++++++
 .../baeldung/jvmannotations/HtmlDocument.java |  9 +++
 .../com/baeldung/jvmannotations/Message.kt    | 66 +++++++++++++++++++
 .../jvmannotations/MessageConverter.kt        |  6 ++
 4 files changed, 112 insertions(+)
 create mode 100644 core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/Document.kt
 create mode 100644 core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/HtmlDocument.java
 create mode 100644 core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/Message.kt
 create mode 100644 core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/MessageConverter.kt

diff --git a/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/Document.kt b/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/Document.kt
new file mode 100644
index 0000000000..3f9922b88b
--- /dev/null
+++ b/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/Document.kt
@@ -0,0 +1,31 @@
+package com.baeldung.jvmannotations
+
+import java.util.*
+
+interface Document {
+
+    @JvmDefault
+    fun getType() = "document"
+}
+
+class TextDocument : Document {
+    override fun getType() = "text"
+
+    fun transformList(list : List<Number>) : List<Number> {
+        return list.filter { n -> n.toInt() > 1 }
+    }
+
+    fun transformListInverseWildcards(list : List<@JvmSuppressWildcards Number>) : List<@JvmWildcard Number> {
+        return list.filter { n -> n.toInt() > 1 }
+    }
+
+    var list : List<@JvmWildcard Any> = ArrayList()
+}
+
+class XmlDocument(d : Document) : Document by d
+
+fun main() {
+    val myDocument = TextDocument()
+    val myTextDocument = XmlDocument(myDocument)
+    println("${myDocument.getType()} ${myTextDocument.getType()}")
+}
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/HtmlDocument.java b/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/HtmlDocument.java
new file mode 100644
index 0000000000..feb71772cb
--- /dev/null
+++ b/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/HtmlDocument.java
@@ -0,0 +1,9 @@
+package com.baeldung.jvmannotations;
+
+public class HtmlDocument implements Document {
+
+    @Override
+    public String getType() {
+        return "HTML";
+    }
+}
\ No newline at end of file
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/Message.kt b/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/Message.kt
new file mode 100644
index 0000000000..80180bd924
--- /dev/null
+++ b/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/Message.kt
@@ -0,0 +1,66 @@
+@file:JvmName("MessageHelper")
+@file:JvmMultifileClass //used
+package com.baeldung.jvmannotations
+
+import java.util.*
+
+@JvmName("getMyUsername")
+fun getMyName() : String {
+    return "myUserId"
+}
+
+object MessageBroker {
+    @JvmStatic
+    var totalMessagesSent = 0
+
+    const val maxMessageLength = 0
+
+    @JvmStatic
+    fun clearAllMessages() {
+    }
+
+    @JvmStatic
+    @JvmOverloads
+    @Throws(Exception::class)
+    fun findMessages(sender : String, type : String = "text", maxResults : Int = 10) : List<Message> {
+        if(sender.isEmpty()) {
+            throw Exception()
+        }
+        return ArrayList()
+    }
+}
+
+class Message {
+
+    // this would cause a compilation error since sender is immutable
+    // @set:JvmName("setSender")
+    val sender = "myself"
+
+    // this works as name is overridden
+    @JvmName("getSenderName")
+    fun getSender() : String = "from:$sender"
+
+    @get:JvmName("getReceiverName")
+    @set:JvmName("setReceiverName")
+    var receiver : String = ""
+
+    @get:JvmName("getContent")
+    @set:JvmName("setContent")
+    var text = ""
+
+    // generates a warning
+    @get:JvmName("getId")
+    private val id = 0
+
+    @get:JvmName("hasAttachment")
+    var hasAttachment = true
+
+    var isEncrypted = true
+
+    fun setReceivers(receiverNames : List<String>) {
+    }
+
+    @JvmName("setReceiverIds")
+    fun setReceivers(receiverNames : List<Int>) {
+    }
+}
\ No newline at end of file
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/MessageConverter.kt b/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/MessageConverter.kt
new file mode 100644
index 0000000000..3b19b12e10
--- /dev/null
+++ b/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/MessageConverter.kt
@@ -0,0 +1,6 @@
+@file:JvmMultifileClass
+@file:JvmName("MessageHelper") //applies to all top level functions / variables / constants
+package com.baeldung.jvmannotations
+
+fun convert(message: Message) {
+}

From 68af2f59d3377b1a83409f509245b630cf27f746 Mon Sep 17 00:00:00 2001
From: Alexander Molochko <alexander@crosp.net>
Date: Tue, 23 Apr 2019 15:46:50 +0300
Subject: [PATCH 064/295] WebClient request with parameters

---
 .../SpringWebClientRequestsApp.java           |  12 ++
 .../WebClientRequestsTest.java                | 151 ++++++++++++++++++
 2 files changed, 163 insertions(+)
 create mode 100644 spring-5-webflux/src/main/java/com/baeldung/spring/webclientrequests/SpringWebClientRequestsApp.java
 create mode 100644 spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsTest.java

diff --git a/spring-5-webflux/src/main/java/com/baeldung/spring/webclientrequests/SpringWebClientRequestsApp.java b/spring-5-webflux/src/main/java/com/baeldung/spring/webclientrequests/SpringWebClientRequestsApp.java
new file mode 100644
index 0000000000..314fe2fdf9
--- /dev/null
+++ b/spring-5-webflux/src/main/java/com/baeldung/spring/webclientrequests/SpringWebClientRequestsApp.java
@@ -0,0 +1,12 @@
+package com.baeldung.spring.webclientrequests;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringWebClientRequestsApp {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringWebClientRequestsApp.class, args);
+    }
+}
diff --git a/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsTest.java b/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsTest.java
new file mode 100644
index 0000000000..3055f1521d
--- /dev/null
+++ b/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsTest.java
@@ -0,0 +1,151 @@
+package com.baeldung.spring.webclientrequests;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.reactive.function.client.ClientRequest;
+import org.springframework.web.reactive.function.client.ClientResponse;
+import org.springframework.web.reactive.function.client.ExchangeFunction;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.util.DefaultUriBuilderFactory;
+import reactor.core.publisher.Mono;
+
+import static org.mockito.Mockito.*;
+
+@RunWith(SpringRunner.class)
+@WebFluxTest
+public class WebClientRequestsTest {
+
+    private static final String BASE_URL = "https://example.com";
+
+    private WebClient webClient;
+
+    @Captor
+    private ArgumentCaptor<ClientRequest> argumentCaptor;
+
+    private ExchangeFunction exchangeFunction;
+
+    @Before
+    public void init() {
+        MockitoAnnotations.initMocks(this);
+        this.exchangeFunction = mock(ExchangeFunction.class);
+        ClientResponse mockResponse = mock(ClientResponse.class);
+        when(this.exchangeFunction.exchange(this.argumentCaptor.capture())).thenReturn(Mono.just(mockResponse));
+        this.webClient = WebClient
+                .builder()
+                .baseUrl(BASE_URL)
+                .exchangeFunction(exchangeFunction)
+                .build();
+    }
+
+    @Test
+    public void whenUriComponentEncoding_thenQueryParamsNotEscaped() {
+        DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory(BASE_URL);
+        factory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.URI_COMPONENT);
+        this.webClient = WebClient
+                .builder()
+                .uriBuilderFactory(factory)
+                .baseUrl(BASE_URL)
+                .exchangeFunction(exchangeFunction)
+                .build();
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/posts/")
+                        .queryParam("title", "Baeldung")
+                        .queryParam("authorId", "99")
+                        .queryParam("date", "13/04/2019")
+                        .build())
+                .retrieve();
+        verifyCalledUrl("/posts/?title=Baeldung&authorId=99&date=13/04/2019");
+    }
+
+    @Test
+    public void whenCallSimpleURI_thenURIMatched() {
+        this.webClient.get()
+                .uri("/posts")
+                .retrieve();
+        verifyCalledUrl("/posts");
+    }
+
+    @Test
+    public void whenCallSinglePathSegmentUri_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/posts/{id}")
+                        .build(2))
+                .retrieve();
+        verifyCalledUrl("/posts/2");
+    }
+
+    @Test
+    public void whenCallMultiplePathSegmentsUri_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/posts/{id}/comments/{commentId}")
+                        .build(2, 13))
+                .retrieve();
+        verifyCalledUrl("/posts/2/comments/13");
+    }
+
+    @Test
+    public void whenCallSingleQueryParams_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/posts/")
+                        .queryParam("title", "Baeldung")
+                        .queryParam("authorId", "99")
+                        .queryParam("date", "13/04/2019")
+                        .build())
+                .retrieve();
+        verifyCalledUrl("/posts/?title=Baeldung&authorId=99&date=13/04/2019");
+    }
+
+    @Test
+    public void whenCallSingleQueryParamsPlaceholders_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/posts/")
+                        .queryParam("title", "{title}")
+                        .queryParam("authorId", "{authorId}")
+                        .queryParam("date", "{date}")
+                        .build("Baeldung", "99", "13/04/2019"))
+                .retrieve();
+        verifyCalledUrl("/posts/?title=Baeldung&authorId=99&date=13%2F04%2F2019");
+    }
+
+    @Test
+    public void whenCallArrayQueryParamsBrackets_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/posts/")
+                        .queryParam("tag[]", "Spring", "Kotlin")
+                        .build())
+                .retrieve();
+        verifyCalledUrl("/posts/?tag%5B%5D=Spring&tag%5B%5D=Kotlin");
+    }
+
+    @Test
+    public void whenCallArrayQueryParams_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/posts/")
+                        .queryParam("category", "Web", "Mobile")
+                        .build())
+                .retrieve();
+        verifyCalledUrl("/posts/?category=Web&category=Mobile");
+    }
+
+    private void verifyCalledUrl(String relativeUrl) {
+        ClientRequest request = this.argumentCaptor.getValue();
+        Assert.assertEquals(String.format("%s%s", BASE_URL, relativeUrl), request.url().toString());
+        Mockito.verify(this.exchangeFunction).exchange(request);
+        verifyNoMoreInteractions(this.exchangeFunction);
+    }
+}

From 8463567986d58dac5cfbb60971a7ba95840354f3 Mon Sep 17 00:00:00 2001
From: Jacob Stopak <jacob@initialcommit.io>
Date: Tue, 23 Apr 2019 15:57:57 -0700
Subject: [PATCH 065/295] Minor refactor, bump to version 0.0.3

---
 .../pass-exception-to-client-json-spring-boot/pom.xml  |  2 +-
 .../MainController.java                                | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
index d592cae351..33a3aba03b 100644
--- a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.baeldung</groupId>
 	<artifactId>pass-exception-to-client-json-spring-boot</artifactId>
-	<version>0.0.2-SNAPSHOT</version>
+	<version>0.0.3-SNAPSHOT</version>
 	<name>pass-exception-to-client-json-spring-boot</name>
 	<description>Baeldung article code on how to pass exceptions to client in JSON format using Spring Boot</description>
 
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/MainController.java b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/MainController.java
index 68df38fb73..82c0c022a8 100644
--- a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/MainController.java
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/MainController.java
@@ -7,14 +7,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 public class MainController {
 
     @GetMapping("/")
-    public String index() throws CustomException {
-
-        if (true) {
-            throw new CustomException();
-        }
-
-        return "index";
-
+    public void index() throws CustomException {
+        throw new CustomException();
     }
 
 }
\ No newline at end of file

From 21512f008d1da4bdd653d08628dfb8f4e46154e6 Mon Sep 17 00:00:00 2001
From: KevinGilmore <kpg102@gmail.com>
Date: Tue, 23 Apr 2019 22:14:19 -0500
Subject: [PATCH 066/295] BAEL-2840: update README (#6809)

* BAEL-2246: add link back to article

* BAEL-2174: rename core-java-net module to core-java-networking

* BAEL-2174: add link back to article

* BAEL-2363 BAEL-2337 BAEL-1996 BAEL-2277 add links back to articles

* BAEL-2367: add link back to article

* BAEL-2335: add link back to article

* BAEL-2413: add link back to article

* Update README.MD

* BAEL-2577: add link back to article

* BAEL-2490: add link back to article

* BAEL-2471: add link back to article

* BAEL-2583: add link back to article

* BAEL-2738: add link back to article

* BAEL-2711: Add spring-boot-angular module to root pom

* BAEL-2544 BAEL-2711 BAEL-2575 BAEL-2657 Add links back to articles

* BAEL-2736: Add link back to article

* BAEL-2789: Add link back to article

* BAEL-2489: add link back to article

* BAEL-2840: add link back to article
---
 spring-data-rest/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-data-rest/README.md b/spring-data-rest/README.md
index 1624a3abfd..abbacb69cc 100644
--- a/spring-data-rest/README.md
+++ b/spring-data-rest/README.md
@@ -22,3 +22,4 @@ To view the running application, visit [http://localhost:8080](http://localhost:
 - [Spring Data REST Events with @RepositoryEventHandler](http://www.baeldung.com/spring-data-rest-events)
 - [Customizing HTTP Endpoints in Spring Data REST](https://www.baeldung.com/spring-data-rest-customize-http-endpoints)
 - [Spring Boot with SQLite](https://www.baeldung.com/spring-boot-sqlite)
+- [Spring Data Web Support](https://www.baeldung.com/spring-data-web-support)

From a2002dde521fe0191a5d73c438aa75ee99e58300 Mon Sep 17 00:00:00 2001
From: Jacob Stopak <jacob@initialcommit.io>
Date: Tue, 23 Apr 2019 23:38:51 -0700
Subject: [PATCH 067/295] Add integration test, bump version to 0.0.4

---
 .../pom.xml                                      |  2 +-
 .../ErrorHandler.java                            |  2 --
 .../MainControllerIntegrationTest.java           | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/MainControllerIntegrationTest.java

diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
index 33a3aba03b..8237955aef 100644
--- a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.baeldung</groupId>
 	<artifactId>pass-exception-to-client-json-spring-boot</artifactId>
-	<version>0.0.3-SNAPSHOT</version>
+	<version>0.0.4-SNAPSHOT</version>
 	<name>pass-exception-to-client-json-spring-boot</name>
 	<description>Baeldung article code on how to pass exceptions to client in JSON format using Spring Boot</description>
 
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java
index d69f60b75e..b39d2811dd 100644
--- a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java
@@ -13,9 +13,7 @@ public class ErrorHandler {
     @ExceptionHandler(CustomException.class)
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     public CustomException handleCustomException(CustomException ce) {
-
         return ce;
-
     }
 
 }
\ No newline at end of file
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/MainControllerIntegrationTest.java b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/MainControllerIntegrationTest.java
new file mode 100644
index 0000000000..a615dc5096
--- /dev/null
+++ b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/MainControllerIntegrationTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.passexceptiontoclientjsonspringboot;
+
+import org.junit.Test;
+
+public class MainControllerIntegrationTest {
+
+	@Test(expected = CustomException.class)
+	public void givenIndex_thenCustomException() throws CustomException {
+	    
+		MainController mainController = new MainController();
+		
+		mainController.index();
+		
+	}
+
+}
\ No newline at end of file

From f9a337f7cff758e2e432b831dec32b6041483e8f Mon Sep 17 00:00:00 2001
From: Juan Moreno <earth001@users.noreply.github.com>
Date: Wed, 24 Apr 2019 09:30:30 -0300
Subject: [PATCH 068/295] CHORE Moved BAEL-2655's code from core-kotlin-2 to
 core-kotlin-io (#6807)

---
 core-kotlin-io/pom.xml                        | 33 +++++++++++++++----
 .../com/baeldung/console/ConsoleIOUnitTest.kt |  0
 .../org.mockito.plugins.MockMaker             |  0
 3 files changed, 26 insertions(+), 7 deletions(-)
 rename {core-kotlin-2 => core-kotlin-io}/src/test/kotlin/com/baeldung/console/ConsoleIOUnitTest.kt (100%)
 rename {core-kotlin-2 => core-kotlin-io}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%)

diff --git a/core-kotlin-io/pom.xml b/core-kotlin-io/pom.xml
index 2e21079d7f..a0b688a223 100644
--- a/core-kotlin-io/pom.xml
+++ b/core-kotlin-io/pom.xml
@@ -20,9 +20,21 @@
             <version>${kotlin.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>${byte-buddy.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -37,6 +49,12 @@
             <version>${kotlin.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit5</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -69,10 +87,11 @@
     </build>
 
     <properties>
-        <kotlin.version>1.2.71</kotlin.version>
-        <junit.platform.version>1.1.1</junit.platform.version>
-        <junit.vintage.version>5.2.0</junit.vintage.version>
+        <kotlin.version>1.3.30</kotlin.version>
+        <junit.jupiter.version>5.4.2</junit.jupiter.version>
+        <mockito.version>2.27.0</mockito.version>
+        <byte-buddy.version>1.9.12</byte-buddy.version>
         <assertj.version>3.10.0</assertj.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/console/ConsoleIOUnitTest.kt b/core-kotlin-io/src/test/kotlin/com/baeldung/console/ConsoleIOUnitTest.kt
similarity index 100%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/console/ConsoleIOUnitTest.kt
rename to core-kotlin-io/src/test/kotlin/com/baeldung/console/ConsoleIOUnitTest.kt
diff --git a/core-kotlin-2/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/core-kotlin-io/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
similarity index 100%
rename from core-kotlin-2/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
rename to core-kotlin-io/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

From ebde3334395b0050503ed3c38d9cb04d55892116 Mon Sep 17 00:00:00 2001
From: Alejandro Gervasio <alejandro.gervasio@gmail.com>
Date: Wed, 24 Apr 2019 09:49:12 -0300
Subject: [PATCH 069/295] Multi-module Maven Project using Java Modules (#6766)

* Initial Commit

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update root pom.xml

* Update root pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml
---
 .../daomodule/pom.xml                         | 14 +++++
 .../src/main/java/com/baeldung/dao/Dao.java   | 12 ++++
 .../daomodule/src/main/java/module-info.java  |  3 +
 .../entitiymodule/pom.xml                     | 18 ++++++
 .../main/java/com/baeldung/entity/User.java   | 19 ++++++
 .../src/main/java/module-info.java            |  3 +
 .../mainppmodule/pom.xml                      | 32 ++++++++++
 .../com/baeldung/mainapp/Application.java     | 19 ++++++
 .../src/main/java/module-info.java            |  6 ++
 .../multimodule-maven-project/pom.xml         | 58 +++++++++++++++++++
 .../userdaomodule/pom.xml                     | 31 ++++++++++
 .../java/com/baeldung/userdao/UserDao.java    | 32 ++++++++++
 .../src/main/java/module-info.java            |  6 ++
 .../userdao/test/UserDaoUnitTest.java         | 36 ++++++++++++
 maven-java-11/pom.xml                         | 22 +++++++
 pom.xml                                       |  1 +
 16 files changed, 312 insertions(+)
 create mode 100644 maven-java-11/multimodule-maven-project/daomodule/pom.xml
 create mode 100644 maven-java-11/multimodule-maven-project/daomodule/src/main/java/com/baeldung/dao/Dao.java
 create mode 100644 maven-java-11/multimodule-maven-project/daomodule/src/main/java/module-info.java
 create mode 100644 maven-java-11/multimodule-maven-project/entitiymodule/pom.xml
 create mode 100644 maven-java-11/multimodule-maven-project/entitiymodule/src/main/java/com/baeldung/entity/User.java
 create mode 100644 maven-java-11/multimodule-maven-project/entitiymodule/src/main/java/module-info.java
 create mode 100644 maven-java-11/multimodule-maven-project/mainppmodule/pom.xml
 create mode 100644 maven-java-11/multimodule-maven-project/mainppmodule/src/main/java/com/baeldung/mainapp/Application.java
 create mode 100644 maven-java-11/multimodule-maven-project/mainppmodule/src/main/java/module-info.java
 create mode 100644 maven-java-11/multimodule-maven-project/pom.xml
 create mode 100644 maven-java-11/multimodule-maven-project/userdaomodule/pom.xml
 create mode 100644 maven-java-11/multimodule-maven-project/userdaomodule/src/main/java/com/baeldung/userdao/UserDao.java
 create mode 100644 maven-java-11/multimodule-maven-project/userdaomodule/src/main/java/module-info.java
 create mode 100644 maven-java-11/multimodule-maven-project/userdaomodule/src/test/java/com/baeldung/userdao/test/UserDaoUnitTest.java
 create mode 100644 maven-java-11/pom.xml

diff --git a/maven-java-11/multimodule-maven-project/daomodule/pom.xml b/maven-java-11/multimodule-maven-project/daomodule/pom.xml
new file mode 100644
index 0000000000..de9be656d4
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/daomodule/pom.xml
@@ -0,0 +1,14 @@
+<?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>
+    <parent>
+        <groupId>com.baeldung.multimodule-maven-project</groupId>
+        <artifactId>multimodule-maven-project</artifactId>
+        <version>1.0</version>
+    </parent>
+    <groupId>com.baeldung.daomodule</groupId>
+    <artifactId>daomodule</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0</version>
+    <name>daomodule</name>
+</project>
diff --git a/maven-java-11/multimodule-maven-project/daomodule/src/main/java/com/baeldung/dao/Dao.java b/maven-java-11/multimodule-maven-project/daomodule/src/main/java/com/baeldung/dao/Dao.java
new file mode 100644
index 0000000000..f86ae8abb3
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/daomodule/src/main/java/com/baeldung/dao/Dao.java
@@ -0,0 +1,12 @@
+package com.baeldung.dao;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface Dao<T> {
+
+    Optional<T> findById(int id);
+
+    List<T> findAll();
+
+}
diff --git a/maven-java-11/multimodule-maven-project/daomodule/src/main/java/module-info.java b/maven-java-11/multimodule-maven-project/daomodule/src/main/java/module-info.java
new file mode 100644
index 0000000000..072d7ad007
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/daomodule/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+module com.baeldung.dao {
+    exports com.baeldung.dao;
+}
diff --git a/maven-java-11/multimodule-maven-project/entitiymodule/pom.xml b/maven-java-11/multimodule-maven-project/entitiymodule/pom.xml
new file mode 100644
index 0000000000..8e700e62b5
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/entitiymodule/pom.xml
@@ -0,0 +1,18 @@
+<?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>
+    <parent>
+        <groupId>com.baeldung.multimodule-maven-project</groupId>
+        <artifactId>multimodule-maven-project</artifactId>
+        <version>1.0</version>
+    </parent>
+    <groupId>com.baeldung.entitymodule</groupId>
+    <artifactId>entitymodule</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0</version>
+    <name>entitymodule</name>
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+</project>
diff --git a/maven-java-11/multimodule-maven-project/entitiymodule/src/main/java/com/baeldung/entity/User.java b/maven-java-11/multimodule-maven-project/entitiymodule/src/main/java/com/baeldung/entity/User.java
new file mode 100644
index 0000000000..22022a2e6d
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/entitiymodule/src/main/java/com/baeldung/entity/User.java
@@ -0,0 +1,19 @@
+package com.baeldung.entity;
+
+public class User {
+
+    private final String name;
+
+    public User(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" + "name=" + name + '}';
+    }
+}
diff --git a/maven-java-11/multimodule-maven-project/entitiymodule/src/main/java/module-info.java b/maven-java-11/multimodule-maven-project/entitiymodule/src/main/java/module-info.java
new file mode 100644
index 0000000000..67a3097352
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/entitiymodule/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+module com.baeldung.entity {
+    exports com.baeldung.entity;
+}
diff --git a/maven-java-11/multimodule-maven-project/mainppmodule/pom.xml b/maven-java-11/multimodule-maven-project/mainppmodule/pom.xml
new file mode 100644
index 0000000000..d2c94527f1
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/mainppmodule/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>
+    <parent>
+        <groupId>com.baeldung.multimodule-maven-project</groupId>
+        <artifactId>multimodule-maven-project</artifactId>
+        <version>1.0</version>
+    </parent>
+    <groupId>com.baeldung.mainappmodule</groupId>
+    <artifactId>mainappmodule</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>mainappmodule</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>com.baeldung.entitymodule</groupId>
+            <artifactId>entitymodule</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baeldung.daomodule</groupId>
+            <artifactId>daomodule</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baeldung.userdaomodule</groupId>
+            <artifactId>userdaomodule</artifactId>
+            <version>1.0</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/maven-java-11/multimodule-maven-project/mainppmodule/src/main/java/com/baeldung/mainapp/Application.java b/maven-java-11/multimodule-maven-project/mainppmodule/src/main/java/com/baeldung/mainapp/Application.java
new file mode 100644
index 0000000000..0c0df7461b
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/mainppmodule/src/main/java/com/baeldung/mainapp/Application.java
@@ -0,0 +1,19 @@
+package com.baeldung.mainapp;
+
+import com.baeldung.dao.Dao;
+import com.baeldung.entity.User;
+import com.baeldung.userdao.UserDao;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Application {
+    
+    public static void main(String[] args) {
+        Map<Integer, User> users = new HashMap<>();
+        users.put(1, new User("Julie"));
+        users.put(2, new User("David"));
+        Dao userDao = new UserDao(users);
+        userDao.findAll().forEach(System.out::println);
+    }
+    
+}
diff --git a/maven-java-11/multimodule-maven-project/mainppmodule/src/main/java/module-info.java b/maven-java-11/multimodule-maven-project/mainppmodule/src/main/java/module-info.java
new file mode 100644
index 0000000000..c688fcf7de
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/mainppmodule/src/main/java/module-info.java
@@ -0,0 +1,6 @@
+module com.baeldung.mainapp {
+    requires com.baeldung.entity;
+    requires com.baeldung.userdao;
+    requires com.baeldung.dao;
+    uses com.baeldung.dao.Dao;
+}
diff --git a/maven-java-11/multimodule-maven-project/pom.xml b/maven-java-11/multimodule-maven-project/pom.xml
new file mode 100644
index 0000000000..f22541738c
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/pom.xml
@@ -0,0 +1,58 @@
+<?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.multimodule-maven-project</groupId>
+    <artifactId>multimodule-maven-project</artifactId>
+    <version>1.0</version>
+    <packaging>pom</packaging>
+    <name>multimodule-maven-project</name>
+    <parent>
+        <groupId>com.baeldung.maven-java-11</groupId>
+        <artifactId>maven-java-11</artifactId>
+        <version>1.0</version>
+    </parent>
+    
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.12</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>3.12.2</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.0</version>
+                    <configuration>
+                        <source>11</source>
+                        <target>11</target>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    
+    <modules>
+        <module>entitymodule</module>
+        <module>daomodule</module>
+        <module>userdaomodule</module>
+        <module>mainappmodule</module>
+    </modules>
+    
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+</project>
diff --git a/maven-java-11/multimodule-maven-project/userdaomodule/pom.xml b/maven-java-11/multimodule-maven-project/userdaomodule/pom.xml
new file mode 100644
index 0000000000..b4fe7f0398
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/userdaomodule/pom.xml
@@ -0,0 +1,31 @@
+<?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>
+    <parent>
+        <groupId>com.baeldung.multimodule-maven-project</groupId>
+        <artifactId>multimodule-maven-project</artifactId>
+        <version>1.0</version>
+    </parent>
+    <groupId>com.baeldung.userdaomodule</groupId>
+    <artifactId>userdaomodule</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>userdaomodule</name>
+    <dependencies>
+        <dependency>
+            <groupId>com.baeldung.entitymodule</groupId>
+            <artifactId>entitymodule</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baeldung.daomodule</groupId>
+            <artifactId>daomodule</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/maven-java-11/multimodule-maven-project/userdaomodule/src/main/java/com/baeldung/userdao/UserDao.java b/maven-java-11/multimodule-maven-project/userdaomodule/src/main/java/com/baeldung/userdao/UserDao.java
new file mode 100644
index 0000000000..1f1ea38a60
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/userdaomodule/src/main/java/com/baeldung/userdao/UserDao.java
@@ -0,0 +1,32 @@
+package com.baeldung.userdao;
+
+import com.baeldung.dao.Dao;
+import com.baeldung.entity.User;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public class UserDao implements Dao<User> {
+
+    private final Map<Integer, User> users;
+
+    public UserDao() {
+        users = new HashMap<>();
+    }
+
+    public UserDao(Map<Integer, User> users) {
+        this.users = users;
+    }
+
+    @Override
+    public List<User> findAll() {
+        return new ArrayList<>(users.values());
+    }
+
+    @Override
+    public Optional<User> findById(int id) {
+        return Optional.ofNullable(users.get(id));
+    }
+}
\ No newline at end of file
diff --git a/maven-java-11/multimodule-maven-project/userdaomodule/src/main/java/module-info.java b/maven-java-11/multimodule-maven-project/userdaomodule/src/main/java/module-info.java
new file mode 100644
index 0000000000..f1cb217e23
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/userdaomodule/src/main/java/module-info.java
@@ -0,0 +1,6 @@
+module com.baeldung.userdao {
+    requires com.baeldung.entity;
+    requires com.baeldung.dao;
+    provides com.baeldung.dao.Dao with com.baeldung.userdao.UserDao;
+    exports com.baeldung.userdao;
+}
diff --git a/maven-java-11/multimodule-maven-project/userdaomodule/src/test/java/com/baeldung/userdao/test/UserDaoUnitTest.java b/maven-java-11/multimodule-maven-project/userdaomodule/src/test/java/com/baeldung/userdao/test/UserDaoUnitTest.java
new file mode 100644
index 0000000000..191d17ff32
--- /dev/null
+++ b/maven-java-11/multimodule-maven-project/userdaomodule/src/test/java/com/baeldung/userdao/test/UserDaoUnitTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.userdao.test;
+
+import com.baeldung.dao.Dao;
+import com.baeldung.entity.User;
+import com.baeldung.userdao.UserDao;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+import org.junit.Before;
+import org.junit.Test;
+
+public class UserDaoUnitTest {
+    
+    private Dao userDao;
+    
+    @Before
+    public void setUpUserDaoInstance() {
+        Map<Integer, User> users = new HashMap<>();
+        users.put(1, new User("Julie"));
+        users.put(2, new User("David"));
+        userDao = new UserDao(users);
+    }
+    
+    @Test
+    public void givenUserDaoIntance_whenCalledFindById_thenCorrect() {
+       assertThat(userDao.findById(1), isA(Optional.class));
+    } 
+    
+    @Test
+    public void givenUserDaoIntance_whenCalledFindAll_thenCorrect() {
+       assertThat(userDao.findAll(), isA(List.class));
+    } 
+}
diff --git a/maven-java-11/pom.xml b/maven-java-11/pom.xml
new file mode 100644
index 0000000000..4342fa740f
--- /dev/null
+++ b/maven-java-11/pom.xml
@@ -0,0 +1,22 @@
+<?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.maven-java-11</groupId>
+    <artifactId>maven-java-11</artifactId>
+    <version>1.0</version>
+    <packaging>pom</packaging>
+    <name>maven-java-11</name>
+    <parent>
+	<artifactId>parent-modules</artifactId>
+	<groupId>com.baeldung</groupId>
+	<version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modules>
+        <name>multimodule-maven-project</name>
+    </modules>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+</project>
diff --git a/pom.xml b/pom.xml
index 901bc94f96..4590056154 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1170,6 +1170,7 @@
 
                 <module>mapstruct</module>
                 <module>maven</module>
+                <module>maven-java-11</module>
                 <module>maven-archetype</module>
                 <!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->
                 <module>maven-polyglot/maven-polyglot-json-extension</module>

From a89a07db5fab44296bb8bbf7d8005653b80cd213 Mon Sep 17 00:00:00 2001
From: Michael Pratt <michael.pratt-nr@raytheon.com>
Date: Wed, 24 Apr 2019 13:49:04 +0000
Subject: [PATCH 070/295] [BAEL-2732] Adding in BSON examples from article

---
 persistence-modules/java-mongodb/pom.xml      |  4 +-
 .../java/com/baeldung/MongoBsonExample.java   | 79 +++++++++++++++++++
 2 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 persistence-modules/java-mongodb/src/main/java/com/baeldung/MongoBsonExample.java

diff --git a/persistence-modules/java-mongodb/pom.xml b/persistence-modules/java-mongodb/pom.xml
index 9658ef567f..0f5efedb96 100644
--- a/persistence-modules/java-mongodb/pom.xml
+++ b/persistence-modules/java-mongodb/pom.xml
@@ -35,8 +35,8 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <mongo.version>3.4.1</mongo.version>
+        <mongo.version>3.10.1</mongo.version>
         <flapdoodle.version>1.11</flapdoodle.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/MongoBsonExample.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/MongoBsonExample.java
new file mode 100644
index 0000000000..0ad3dfae30
--- /dev/null
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/MongoBsonExample.java
@@ -0,0 +1,79 @@
+package com.baeldung;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import org.bson.Document;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class MongoBsonExample
+{
+   public static void main(String[] args)
+   {
+      //
+      // 4.1 Connect to cluster (default is localhost:27017)
+      //
+
+      MongoClient mongoClient = MongoClients.create();
+      MongoDatabase database = mongoClient.getDatabase("myDB");
+      MongoCollection<Document> collection = database.getCollection("employees");
+
+      //
+      // 4.2 Insert new document
+      //
+
+      Document employee = new Document()
+                             .append("first_name", "Joe")
+                             .append("last_name", "Smith")
+                             .append("title", "Java Developer")
+                             .append("years_of_service", 3)
+                             .append("skills", Arrays.asList("java", "spring", "mongodb"))
+                             .append("manager", new Document()
+                                                   .append("first_name", "Sally")
+                                                   .append("last_name", "Johanson"));
+      collection.insertOne(employee);
+
+      //
+      // 4.3 Find documents
+      //
+
+
+      Document query = new Document("last_name", "Smith");
+      List results = new ArrayList<>();
+      collection.find(query).into(results);
+
+      query =
+         new Document("$or", Arrays.asList(
+            new Document("last_name", "Smith"),
+            new Document("first_name", "Joe")));
+      results = new ArrayList<>();
+      collection.find(query).into(results);
+
+      //
+      // 4.4 Update document
+      //
+
+      query = new Document(
+         "skills",
+         new Document(
+            "$elemMatch",
+            new Document("$eq", "spring")));
+      Document update = new Document(
+         "$push",
+         new Document("skills", "security"));
+      collection.updateMany(query, update);
+
+      //
+      // 4.5 Delete documents
+      //
+
+      query = new Document(
+         "years_of_service",
+         new Document("$lt", 0));
+      collection.deleteMany(query);
+   }
+}

From b798326b2960404c7c2438c1c814655e034d3190 Mon Sep 17 00:00:00 2001
From: Seun Matt <smatt382@gmail.com>
Date: Wed, 24 Apr 2019 16:05:24 +0100
Subject: [PATCH 071/295]  improvement BAEL-2897 (#6795)

* added example code for BAEL-2083

* updated example code for BAEL-2083

* added example code for BAEL-2849

* updated the example code with data.sql

* improvement BAEL-2897

* updated the persistence module

* updated readme
---
 persistence-modules/pom.xml                                     | 2 +-
 .../.gitignore                                                  | 0
 .../{spring-boot-h2 => spring-boot-persistence-h2}/README.md    | 1 +
 .../pom.xml                                                     | 2 +-
 .../baeldung/h2db/auto/configuration/AutoConfigurationDemo.java | 0
 .../java/com/baeldung/h2db/demo/client/ClientSpringBootApp.java | 0
 .../main/java/com/baeldung/h2db/demo/server/SpringBootApp.java  | 0
 .../com/baeldung/h2db/springboot/SpringBootH2Application.java   | 0
 .../java/com/baeldung/h2db/springboot/daos/UserRepository.java  | 0
 .../src/main/java/com/baeldung/h2db/springboot/models/User.java | 0
 .../src/main/resources/application.properties                   | 0
 .../src/main/resources/data.sql                                 | 0
 .../src/test/java/com/baeldung/SpringBootH2IntegrationTest.java | 0
 .../test/java/com/baeldung/SpringContextIntegrationTest.java    | 0
 14 files changed, 3 insertions(+), 2 deletions(-)
 rename persistence-modules/{spring-boot-h2/spring-boot-h2-database => spring-boot-persistence-h2}/.gitignore (100%)
 rename persistence-modules/{spring-boot-h2 => spring-boot-persistence-h2}/README.md (67%)
 rename persistence-modules/{spring-boot-h2/spring-boot-h2-database => spring-boot-persistence-h2}/pom.xml (97%)
 rename persistence-modules/{spring-boot-h2/spring-boot-h2-database => spring-boot-persistence-h2}/src/main/java/com/baeldung/h2db/auto/configuration/AutoConfigurationDemo.java (100%)
 rename persistence-modules/{spring-boot-h2/spring-boot-h2-database => spring-boot-persistence-h2}/src/main/java/com/baeldung/h2db/demo/client/ClientSpringBootApp.java (100%)
 rename persistence-modules/{spring-boot-h2/spring-boot-h2-database => spring-boot-persistence-h2}/src/main/java/com/baeldung/h2db/demo/server/SpringBootApp.java (100%)
 rename persistence-modules/{spring-boot-h2/spring-boot-h2-database => spring-boot-persistence-h2}/src/main/java/com/baeldung/h2db/springboot/SpringBootH2Application.java (100%)
 rename persistence-modules/{spring-boot-h2/spring-boot-h2-database => spring-boot-persistence-h2}/src/main/java/com/baeldung/h2db/springboot/daos/UserRepository.java (100%)
 rename persistence-modules/{spring-boot-h2/spring-boot-h2-database => spring-boot-persistence-h2}/src/main/java/com/baeldung/h2db/springboot/models/User.java (100%)
 rename persistence-modules/{spring-boot-h2/spring-boot-h2-database => spring-boot-persistence-h2}/src/main/resources/application.properties (100%)
 rename persistence-modules/{spring-boot-h2/spring-boot-h2-database => spring-boot-persistence-h2}/src/main/resources/data.sql (100%)
 rename persistence-modules/{spring-boot-h2/spring-boot-h2-database => spring-boot-persistence-h2}/src/test/java/com/baeldung/SpringBootH2IntegrationTest.java (100%)
 rename persistence-modules/{spring-boot-h2/spring-boot-h2-database => spring-boot-persistence-h2}/src/test/java/com/baeldung/SpringContextIntegrationTest.java (100%)

diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index ee55325b20..67a5c36fed 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -35,7 +35,7 @@
         <module>querydsl</module>
         <module>redis</module>
         <module>solr</module>
-        <module>spring-boot-h2/spring-boot-h2-database</module>
+        <module>spring-boot-persistence-h2</module>
         <module>spring-boot-persistence</module>
         <module>spring-boot-persistence-mongodb</module>
         <module>spring-data-cassandra</module>
diff --git a/persistence-modules/spring-boot-h2/spring-boot-h2-database/.gitignore b/persistence-modules/spring-boot-persistence-h2/.gitignore
similarity index 100%
rename from persistence-modules/spring-boot-h2/spring-boot-h2-database/.gitignore
rename to persistence-modules/spring-boot-persistence-h2/.gitignore
diff --git a/persistence-modules/spring-boot-h2/README.md b/persistence-modules/spring-boot-persistence-h2/README.md
similarity index 67%
rename from persistence-modules/spring-boot-h2/README.md
rename to persistence-modules/spring-boot-persistence-h2/README.md
index af5f395440..377b7c8939 100644
--- a/persistence-modules/spring-boot-h2/README.md
+++ b/persistence-modules/spring-boot-persistence-h2/README.md
@@ -1,2 +1,3 @@
 ### Relevant Articles: 
 - [Access the Same In-Memory H2 Database in Multiple Spring Boot Applications](https://www.baeldung.com/spring-boot-access-h2-database-multiple-apps)
+- [Spring Boot With H2 Database](https://www.baeldung.com/spring-boot-h2-database)
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-h2/spring-boot-h2-database/pom.xml b/persistence-modules/spring-boot-persistence-h2/pom.xml
similarity index 97%
rename from persistence-modules/spring-boot-h2/spring-boot-h2-database/pom.xml
rename to persistence-modules/spring-boot-persistence-h2/pom.xml
index 882b88b535..4c8073ddb4 100644
--- a/persistence-modules/spring-boot-h2/spring-boot-h2-database/pom.xml
+++ b/persistence-modules/spring-boot-persistence-h2/pom.xml
@@ -14,7 +14,7 @@
         <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/auto/configuration/AutoConfigurationDemo.java b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/auto/configuration/AutoConfigurationDemo.java
similarity index 100%
rename from persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/auto/configuration/AutoConfigurationDemo.java
rename to persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/auto/configuration/AutoConfigurationDemo.java
diff --git a/persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/client/ClientSpringBootApp.java b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/demo/client/ClientSpringBootApp.java
similarity index 100%
rename from persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/client/ClientSpringBootApp.java
rename to persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/demo/client/ClientSpringBootApp.java
diff --git a/persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/server/SpringBootApp.java b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/demo/server/SpringBootApp.java
similarity index 100%
rename from persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/server/SpringBootApp.java
rename to persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/demo/server/SpringBootApp.java
diff --git a/persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/springboot/SpringBootH2Application.java b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/springboot/SpringBootH2Application.java
similarity index 100%
rename from persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/springboot/SpringBootH2Application.java
rename to persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/springboot/SpringBootH2Application.java
diff --git a/persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/springboot/daos/UserRepository.java b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/springboot/daos/UserRepository.java
similarity index 100%
rename from persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/springboot/daos/UserRepository.java
rename to persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/springboot/daos/UserRepository.java
diff --git a/persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/springboot/models/User.java b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/springboot/models/User.java
similarity index 100%
rename from persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/springboot/models/User.java
rename to persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/springboot/models/User.java
diff --git a/persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/resources/application.properties b/persistence-modules/spring-boot-persistence-h2/src/main/resources/application.properties
similarity index 100%
rename from persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/resources/application.properties
rename to persistence-modules/spring-boot-persistence-h2/src/main/resources/application.properties
diff --git a/persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/resources/data.sql b/persistence-modules/spring-boot-persistence-h2/src/main/resources/data.sql
similarity index 100%
rename from persistence-modules/spring-boot-h2/spring-boot-h2-database/src/main/resources/data.sql
rename to persistence-modules/spring-boot-persistence-h2/src/main/resources/data.sql
diff --git a/persistence-modules/spring-boot-h2/spring-boot-h2-database/src/test/java/com/baeldung/SpringBootH2IntegrationTest.java b/persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/SpringBootH2IntegrationTest.java
similarity index 100%
rename from persistence-modules/spring-boot-h2/spring-boot-h2-database/src/test/java/com/baeldung/SpringBootH2IntegrationTest.java
rename to persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/SpringBootH2IntegrationTest.java
diff --git a/persistence-modules/spring-boot-h2/spring-boot-h2-database/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/SpringContextIntegrationTest.java
similarity index 100%
rename from persistence-modules/spring-boot-h2/spring-boot-h2-database/src/test/java/com/baeldung/SpringContextIntegrationTest.java
rename to persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/SpringContextIntegrationTest.java

From fb70eda7b8d348729b4c28c115e61b2d3c9207be Mon Sep 17 00:00:00 2001
From: Sam Millington <s.j.millington@hotmail.co.uk>
Date: Wed, 24 Apr 2019 18:53:46 +0100
Subject: [PATCH 072/295] [BAEL-2835] Added Guide to FastUtil code (#6805)

---
 fastUtil/pom.xml                              | 44 ++++++++++++++
 .../java/com/baeldung/BigArraysUnitTest.java  | 23 ++++++++
 ...FastUtilTypeSpecificBenchmarkUnitTest.java | 58 +++++++++++++++++++
 .../FastUtilTypeSpecificUnitTest.java         | 20 +++++++
 4 files changed, 145 insertions(+)
 create mode 100644 fastUtil/pom.xml
 create mode 100644 fastUtil/src/test/java/com/baeldung/BigArraysUnitTest.java
 create mode 100644 fastUtil/src/test/java/com/baeldung/FastUtilTypeSpecificBenchmarkUnitTest.java
 create mode 100644 fastUtil/src/test/java/com/baeldung/FastUtilTypeSpecificUnitTest.java

diff --git a/fastUtil/pom.xml b/fastUtil/pom.xml
new file mode 100644
index 0000000000..fcd9020747
--- /dev/null
+++ b/fastUtil/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.baeldung</groupId>
+    <artifactId>fastUtil</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+<!-- https://mvnrepository.com/artifact/it.unimi.dsi/fastutil -->
+<dependency>
+    <groupId>it.unimi.dsi</groupId>
+    <artifactId>fastutil</artifactId>
+    <version>8.2.2</version>
+</dependency>
+<!-- https://mvnrepository.com/artifact/junit/junit -->
+<dependency>
+    <groupId>junit</groupId>
+    <artifactId>junit</artifactId>
+    <version>4.12</version>
+    <scope>test</scope>
+</dependency>
+<!-- https://mvnrepository.com/artifact/org.openjdk.jmh/jmh-core -->
+<dependency>
+    <groupId>org.openjdk.jmh</groupId>
+    <artifactId>jmh-core</artifactId>
+    <version>1.19</version>
+    <scope>test</scope>
+</dependency>
+<dependency>
+    <groupId>org.openjdk.jmh</groupId>
+    <artifactId>jmh-generator-annprocess</artifactId>
+    <version>1.19</version>
+    <scope>test</scope>
+</dependency>
+
+
+
+    </dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/fastUtil/src/test/java/com/baeldung/BigArraysUnitTest.java b/fastUtil/src/test/java/com/baeldung/BigArraysUnitTest.java
new file mode 100644
index 0000000000..a794d1a2f6
--- /dev/null
+++ b/fastUtil/src/test/java/com/baeldung/BigArraysUnitTest.java
@@ -0,0 +1,23 @@
+package com.baeldung;
+
+import it.unimi.dsi.fastutil.ints.IntBigArrays;
+import org.junit.Test;
+
+import static junit.framework.Assert.assertEquals;
+
+public class BigArraysUnitTest {
+
+  @Test
+  public void givenValidAray_whenWrapped_checkAccessFromIntBigArraysMethodsCorrect() {
+    int[] oneDArray = new int[] { 2, 1, 5, 2, 1, 7 };
+    int[][] twoDArray = IntBigArrays.wrap(oneDArray.clone());
+
+    int firstIndex = IntBigArrays.get(twoDArray, 0);
+    int lastIndex = IntBigArrays.get(twoDArray, IntBigArrays.length(twoDArray)-1);
+
+    assertEquals(2, firstIndex);
+    assertEquals(7, lastIndex);
+
+  }
+
+}
diff --git a/fastUtil/src/test/java/com/baeldung/FastUtilTypeSpecificBenchmarkUnitTest.java b/fastUtil/src/test/java/com/baeldung/FastUtilTypeSpecificBenchmarkUnitTest.java
new file mode 100644
index 0000000000..2c77989fe5
--- /dev/null
+++ b/fastUtil/src/test/java/com/baeldung/FastUtilTypeSpecificBenchmarkUnitTest.java
@@ -0,0 +1,58 @@
+package com.baeldung;
+
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@State(Scope.Benchmark)
+public class FastUtilTypeSpecificBenchmarkUnitTest {
+
+  @Param({"100", "1000", "10000", "100000"})
+  public int setSize;
+
+  @Benchmark
+  public IntSet givenFastUtilsIntSetWithInitialSizeSet_whenPopulated_checkTimeTaken() {
+    IntSet intSet = new IntOpenHashSet(setSize);
+    for(int i = 0; i < setSize; i++){
+      intSet.add(i);
+    }
+    return intSet;
+  }
+
+
+  @Benchmark
+  public Set<Integer> givenCollectionsHashSetWithInitialSizeSet_whenPopulated_checkTimeTaken() {
+    Set<Integer> intSet = new HashSet<Integer>(setSize);
+    for(int i = 0; i < setSize; i++){
+      intSet.add(i);
+    }
+    return intSet;
+  }
+
+  public static void main(String... args) throws RunnerException {
+    Options opts = new OptionsBuilder()
+            .include(".*")
+            .warmupIterations(1)
+            .measurementIterations(2)
+            .jvmArgs("-Xms2g", "-Xmx2g")
+            .shouldDoGC(true)
+            .forks(1)
+            .build();
+
+    new Runner(opts).run();
+  }
+
+
+
+
+}
diff --git a/fastUtil/src/test/java/com/baeldung/FastUtilTypeSpecificUnitTest.java b/fastUtil/src/test/java/com/baeldung/FastUtilTypeSpecificUnitTest.java
new file mode 100644
index 0000000000..61295cc6f1
--- /dev/null
+++ b/fastUtil/src/test/java/com/baeldung/FastUtilTypeSpecificUnitTest.java
@@ -0,0 +1,20 @@
+package com.baeldung;
+
+import it.unimi.dsi.fastutil.doubles.Double2DoubleMap;
+import it.unimi.dsi.fastutil.doubles.Double2DoubleOpenHashMap;
+import org.junit.Test;
+
+import static junit.framework.Assert.assertEquals;
+
+
+public class FastUtilTypeSpecificUnitTest {
+
+  @Test
+  public void givenValidDouble2DoubleMap_whenContentsQueried_checkCorrect(){
+    Double2DoubleMap d2dMap = new Double2DoubleOpenHashMap();
+    d2dMap.put(2.0, 5.5);
+    d2dMap.put(3.0, 6.6);
+    assertEquals(5.5, d2dMap.get(2.0));
+  }
+
+}

From cf98eefb624296a7301247fdc723c4725537b166 Mon Sep 17 00:00:00 2001
From: Muhammad Asif Anwar <asifanwar451@gmail.com>
Date: Wed, 24 Apr 2019 21:55:46 +0400
Subject: [PATCH 073/295] gitflow-incremental-builder upgrade (#6811)

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

diff --git a/pom.xml b/pom.xml
index 4590056154..745275488c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1498,8 +1498,9 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<gib.referenceBranch>refs/remotes/origin/master</gib.referenceBranch>
-		<gib.skipTestsForNotImpactedModules>true</gib.skipTestsForNotImpactedModules>
+		<gib.referenceBranch>refs/remotes/origin/master</gib.referenceBranch>		
+		<gib.skipTestsForUpstreamModules>true</gib.skipTestsForUpstreamModules>
+		<gib.buildUpstream>false</gib.buildUpstream>
 		<gib.failOnMissingGitDir>false</gib.failOnMissingGitDir>
 		<gib.failOnError>false</gib.failOnError>
 		<gib.enabled>false</gib.enabled>
@@ -1540,7 +1541,7 @@
 		<directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
 		<maven-install-plugin.version>2.5.1</maven-install-plugin.version>
 		<custom-pmd.version>0.0.1</custom-pmd.version>
-		<gitflow-incremental-builder.version>3.4</gitflow-incremental-builder.version>
+		<gitflow-incremental-builder.version>3.8</gitflow-incremental-builder.version>
 		<maven-jxr-plugin.version>2.3</maven-jxr-plugin.version>
 		<!-- <maven-pmd-plugin.version>3.9.0</maven-pmd-plugin.version> -->
 		<maven-pmd-plugin.version>3.8</maven-pmd-plugin.version>

From d5ba7790ef71f3611b4ffce2e41f746fbedd4c9c Mon Sep 17 00:00:00 2001
From: kwoyke <krzysztofwoyke@gmail.com>
Date: Wed, 24 Apr 2019 20:02:04 +0200
Subject: [PATCH 074/295] BAEL-2855 Add a new section in
 ConfigurationProperties article (#6808)

---
 .../baeldung/properties/ConfigProperties.java |  7 +++++
 .../java/org/baeldung/properties/Item.java    | 31 +++++++++++++++++++
 .../src/main/resources/configprops.properties |  4 +++
 .../ConfigPropertiesIntegrationTest.java      |  7 +++++
 .../resources/configprops-test.properties     |  3 ++
 5 files changed, 52 insertions(+)
 create mode 100644 spring-boot/src/main/java/org/baeldung/properties/Item.java

diff --git a/spring-boot/src/main/java/org/baeldung/properties/ConfigProperties.java b/spring-boot/src/main/java/org/baeldung/properties/ConfigProperties.java
index 3698d8ef30..1a3c985fe4 100644
--- a/spring-boot/src/main/java/org/baeldung/properties/ConfigProperties.java
+++ b/spring-boot/src/main/java/org/baeldung/properties/ConfigProperties.java
@@ -9,6 +9,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.validation.annotation.Validated;
@@ -80,4 +81,10 @@ public class ConfigProperties {
     public void setCredentials(Credentials credentials) {
         this.credentials = credentials;
     }
+
+    @Bean
+    @ConfigurationProperties(prefix = "item")
+    public Item item(){
+        return new Item();
+    }
 }
diff --git a/spring-boot/src/main/java/org/baeldung/properties/Item.java b/spring-boot/src/main/java/org/baeldung/properties/Item.java
new file mode 100644
index 0000000000..0314654ada
--- /dev/null
+++ b/spring-boot/src/main/java/org/baeldung/properties/Item.java
@@ -0,0 +1,31 @@
+package org.baeldung.properties;
+
+public class Item {
+
+    private String name;
+    private int size;
+
+    public Item() {
+    }
+
+    public Item(String name, int size) {
+        this.name = name;
+        this.size = size;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+}
diff --git a/spring-boot/src/main/resources/configprops.properties b/spring-boot/src/main/resources/configprops.properties
index 2dad11f9cc..424b3632f9 100644
--- a/spring-boot/src/main/resources/configprops.properties
+++ b/spring-boot/src/main/resources/configprops.properties
@@ -17,4 +17,8 @@ mail.credentials.username=john
 mail.credentials.password=password
 mail.credentials.authMethod=SHA1
 
+#Bean method properties
+item.name=Item name
+item.size=42
+
 
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 4ba6bf29d8..f864fd4f8c 100644
--- a/spring-boot/src/test/java/org/baeldung/properties/ConfigPropertiesIntegrationTest.java
+++ b/spring-boot/src/test/java/org/baeldung/properties/ConfigPropertiesIntegrationTest.java
@@ -53,4 +53,11 @@ public class ConfigPropertiesIntegrationTest {
         Assert.assertEquals("Incorrectly bound object property, username", "john", credentials.getUsername());
         Assert.assertEquals("Incorrectly bound object property, password", "password", credentials.getPassword());
     }
+
+    @Test
+    public void whenBeanMethodAnnotatedThenPropertiesCorrectlyBound(){
+        Item item = properties.item();
+        Assert.assertEquals("Incorrectly bound object property, item.name","Test item name", item.getName());
+        Assert.assertEquals("Incorrectly bound object property, item.size", 21, item.getSize());
+    }
 }
diff --git a/spring-boot/src/test/resources/configprops-test.properties b/spring-boot/src/test/resources/configprops-test.properties
index 697771ae6e..ea11f2159e 100644
--- a/spring-boot/src/test/resources/configprops-test.properties
+++ b/spring-boot/src/test/resources/configprops-test.properties
@@ -17,3 +17,6 @@ mail.credentials.username=john
 mail.credentials.password=password
 mail.credentials.authMethod=SHA1
 
+#Bean method properties
+item.name=Test item name
+item.size=21

From 61f44f5c1790f3403df3b679d2260aa68483b128 Mon Sep 17 00:00:00 2001
From: Alexander Molochko <alexander@crosp.net>
Date: Wed, 24 Apr 2019 15:22:49 -0700
Subject: [PATCH 075/295] Change Test name

---
 ...ebClientRequestsTest.java => WebClientRequestsUnitTest.java} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/{WebClientRequestsTest.java => WebClientRequestsUnitTest.java} (99%)

diff --git a/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsTest.java b/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsUnitTest.java
similarity index 99%
rename from spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsTest.java
rename to spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsUnitTest.java
index 3055f1521d..62fca0ba9d 100644
--- a/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsTest.java
+++ b/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsUnitTest.java
@@ -21,7 +21,7 @@ import static org.mockito.Mockito.*;
 
 @RunWith(SpringRunner.class)
 @WebFluxTest
-public class WebClientRequestsTest {
+public class WebClientRequestsUnitTest {
 
     private static final String BASE_URL = "https://example.com";
 

From 786fa105559831e6777234a331dd23720c23ec64 Mon Sep 17 00:00:00 2001
From: macroscopic64 <macromohan64@gmail.com>
Date: Thu, 25 Apr 2019 06:53:50 +0530
Subject: [PATCH 076/295] [BAEL-2073] Java 9 Migration Issues and Resolution

---
 core-java-modules/pom.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 core-java-modules/pom.xml

diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
new file mode 100644
index 0000000000..ad49cceb9d
--- /dev/null
+++ b/core-java-modules/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-modules</artifactId>
+    <name>core-java-modules</name>
+    <packaging>pom</packaging>
+    
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>pre-jpms</module>
+    </modules>
+
+</project>
\ No newline at end of file

From 156f9b69067a00de1ca67ba2cfae4b357e073f4f Mon Sep 17 00:00:00 2001
From: eric-martin <emart.tigers@gmail.com>
Date: Wed, 24 Apr 2019 22:53:09 -0500
Subject: [PATCH 077/295] BAEL-2800: Moved core-java-collections-map to
 java-collections-maps-2

---
 core-java-collections-map/README.md           |  6 --
 core-java-collections-map/pom.xml             | 78 -------------------
 java-collections-maps-2/pom.xml               | 13 ++++
 .../java/com/baeldung/map}/CopyHashMap.java   |  2 +-
 .../baeldung/map}/CopyHashMapUnitTest.java    |  2 +-
 .../test/java/com/baeldung/map}/Employee.java |  2 +-
 pom.xml                                       |  2 -
 7 files changed, 16 insertions(+), 89 deletions(-)
 delete mode 100644 core-java-collections-map/README.md
 delete mode 100644 core-java-collections-map/pom.xml
 rename {core-java-collections-map/src/main/java/com/baeldung/copyinghashmap => java-collections-maps-2/src/main/java/com/baeldung/map}/CopyHashMap.java (98%)
 rename {core-java-collections-map/src/test/java/com/baeldung/copyinghashmap => java-collections-maps-2/src/test/java/com/baeldung/map}/CopyHashMapUnitTest.java (98%)
 rename {core-java-collections-map/src/test/java/com/baeldung/copyinghashmap => java-collections-maps-2/src/test/java/com/baeldung/map}/Employee.java (91%)

diff --git a/core-java-collections-map/README.md b/core-java-collections-map/README.md
deleted file mode 100644
index da02928118..0000000000
--- a/core-java-collections-map/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-=========
-
-## Core Java Collections 2
-
-### Relevant Articles: 
-- Java - Copying a HashMap
diff --git a/core-java-collections-map/pom.xml b/core-java-collections-map/pom.xml
deleted file mode 100644
index 8c0aef54bf..0000000000
--- a/core-java-collections-map/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>core-java-collections-map</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>core-java-collections-map</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>${commons-collections4.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.collections</groupId>
-            <artifactId>eclipse-collections</artifactId>
-            <version>${eclipse.collections.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-            <version>${openjdk.jmh.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${openjdk.jmh.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-exec</artifactId>
-            <version>${commons-exec.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <openjdk.jmh.version>1.19</openjdk.jmh.version>
-        <junit.platform.version>1.2.0</junit.platform.version>
-        <commons-lang3.version>3.8.1</commons-lang3.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
-        <collections-generic.version>4.01</collections-generic.version>
-        <avaitility.version>1.7.0</avaitility.version>
-        <assertj.version>3.11.1</assertj.version>
-        <eclipse.collections.version>7.1.0</eclipse.collections.version>
-		<commons-exec.version>1.3</commons-exec.version>
-    </properties>
-</project>
diff --git a/java-collections-maps-2/pom.xml b/java-collections-maps-2/pom.xml
index 4ab94a7ae3..5f27eaa2d8 100644
--- a/java-collections-maps-2/pom.xml
+++ b/java-collections-maps-2/pom.xml
@@ -36,6 +36,17 @@
             <artifactId>colt</artifactId>
             <version>${colt.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <properties>
@@ -43,6 +54,8 @@
         <trove4j.version>3.0.2</trove4j.version>
         <fastutil.version>8.1.0</fastutil.version>
         <colt.version>1.2.0</colt.version>
+        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <assertj.version>3.11.1</assertj.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-collections-map/src/main/java/com/baeldung/copyinghashmap/CopyHashMap.java b/java-collections-maps-2/src/main/java/com/baeldung/map/CopyHashMap.java
similarity index 98%
rename from core-java-collections-map/src/main/java/com/baeldung/copyinghashmap/CopyHashMap.java
rename to java-collections-maps-2/src/main/java/com/baeldung/map/CopyHashMap.java
index e1649f593c..2ebc9413c8 100644
--- a/core-java-collections-map/src/main/java/com/baeldung/copyinghashmap/CopyHashMap.java
+++ b/java-collections-maps-2/src/main/java/com/baeldung/map/CopyHashMap.java
@@ -1,4 +1,4 @@
-package com.baeldung.copyinghashmap;
+package com.baeldung.map;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core-java-collections-map/src/test/java/com/baeldung/copyinghashmap/CopyHashMapUnitTest.java b/java-collections-maps-2/src/test/java/com/baeldung/map/CopyHashMapUnitTest.java
similarity index 98%
rename from core-java-collections-map/src/test/java/com/baeldung/copyinghashmap/CopyHashMapUnitTest.java
rename to java-collections-maps-2/src/test/java/com/baeldung/map/CopyHashMapUnitTest.java
index 400696d97a..c400eea153 100644
--- a/core-java-collections-map/src/test/java/com/baeldung/copyinghashmap/CopyHashMapUnitTest.java
+++ b/java-collections-maps-2/src/test/java/com/baeldung/map/CopyHashMapUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.copyinghashmap;
+package com.baeldung.map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/core-java-collections-map/src/test/java/com/baeldung/copyinghashmap/Employee.java b/java-collections-maps-2/src/test/java/com/baeldung/map/Employee.java
similarity index 91%
rename from core-java-collections-map/src/test/java/com/baeldung/copyinghashmap/Employee.java
rename to java-collections-maps-2/src/test/java/com/baeldung/map/Employee.java
index b47fdc768e..7963fa811c 100644
--- a/core-java-collections-map/src/test/java/com/baeldung/copyinghashmap/Employee.java
+++ b/java-collections-maps-2/src/test/java/com/baeldung/map/Employee.java
@@ -1,4 +1,4 @@
-package com.baeldung.copyinghashmap;
+package com.baeldung.map;
 
 import java.io.Serializable;
 
diff --git a/pom.xml b/pom.xml
index 745275488c..49313d9d2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -387,7 +387,6 @@
                 <!--<module>core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
                 <module>core-java-arrays</module>
                 <module>core-java-collections</module>
-                <module>core-java-collections-map</module>
                 <module>core-java-collections-list</module>
                 <module>core-java-collections-set</module>
                 <module>core-java-concurrency-basic</module>
@@ -1058,7 +1057,6 @@
                 <!--<module>core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
                 <module>core-java-arrays</module>
                 <module>core-java-collections</module>
-                <module>core-java-collections-map</module>
                 <module>core-java-collections-list</module>
                 <module>core-java-collections-set</module>
                 <module>core-java-concurrency-basic</module>

From 81b323a69552d08764f7c865afd57bb99fabfb16 Mon Sep 17 00:00:00 2001
From: Kacper Koza <kkoza11@gmail.com>
Date: Thu, 25 Apr 2019 09:12:44 +0200
Subject: [PATCH 078/295] Extract junit-5-configuration

---
 .../junit-5-configuration/README.md           |  2 +
 testing-modules/junit-5-configuration/pom.xml | 41 +++++++++++++++++++
 .../ReadResourceDirectoryUnitTest.java        |  2 +-
 .../src/test/resources/example_resource.txt   |  0
 testing-modules/pom.xml                       |  1 +
 5 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 testing-modules/junit-5-configuration/README.md
 create mode 100644 testing-modules/junit-5-configuration/pom.xml
 rename testing-modules/{junit-5 => junit-5-configuration}/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java (93%)
 rename testing-modules/{junit-5 => junit-5-configuration}/src/test/resources/example_resource.txt (100%)

diff --git a/testing-modules/junit-5-configuration/README.md b/testing-modules/junit-5-configuration/README.md
new file mode 100644
index 0000000000..c274391766
--- /dev/null
+++ b/testing-modules/junit-5-configuration/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- 
diff --git a/testing-modules/junit-5-configuration/pom.xml b/testing-modules/junit-5-configuration/pom.xml
new file mode 100644
index 0000000000..aa488ebb8b
--- /dev/null
+++ b/testing-modules/junit-5-configuration/pom.xml
@@ -0,0 +1,41 @@
+<?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>junit-5-configuration</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>junit-5-configuration</name>
+    <description>Intro to JUnit 5 configuration</description>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit.jupiter.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+        <junit.jupiter.version>5.3.1</junit.jupiter.version>
+        <junit.platform.version>1.2.0</junit.platform.version>
+        <junit.vintage.version>5.2.0</junit.vintage.version>
+    </properties>
+
+</project>
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
similarity index 93%
rename from testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
rename to testing-modules/junit-5-configuration/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
index 89a144adfa..5a91cf5e81 100644
--- a/testing-modules/junit-5/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
+++ b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
@@ -31,7 +31,7 @@ public class ReadResourceDirectoryUnitTest {
 
     @Test
     public void shouldReadResourceAbsolutePathWithPaths() {
-        Path resourceDirectory = Paths.get("src","test","resources");
+        Path resourceDirectory = Paths.get("src", "test", "resources");
 
         String absolutePath = resourceDirectory.toFile().getAbsolutePath();
 
diff --git a/testing-modules/junit-5/src/test/resources/example_resource.txt b/testing-modules/junit-5-configuration/src/test/resources/example_resource.txt
similarity index 100%
rename from testing-modules/junit-5/src/test/resources/example_resource.txt
rename to testing-modules/junit-5-configuration/src/test/resources/example_resource.txt
diff --git a/testing-modules/pom.xml b/testing-modules/pom.xml
index 39047fb756..40ed63bc12 100644
--- a/testing-modules/pom.xml
+++ b/testing-modules/pom.xml
@@ -32,5 +32,6 @@
         <module>test-containers</module>
         <module>testing</module>
         <module>testng</module>
+        <module>junit-5-configuration</module>
     </modules>
 </project>

From 068f4d1eb6d02326df02631d24f3952e39f74bc2 Mon Sep 17 00:00:00 2001
From: Kacper Koza <kkoza11@gmail.com>
Date: Thu, 25 Apr 2019 09:24:36 +0200
Subject: [PATCH 079/295] master

---
 .../ReadResourceDirectoryUnitTest.java        | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
index 5a91cf5e81..20fa372abd 100644
--- a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
+++ b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
@@ -1,5 +1,6 @@
 package com.baeldung.resourcedirectory;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.File;
@@ -9,17 +10,28 @@ import java.nio.file.Paths;
 public class ReadResourceDirectoryUnitTest {
 
     @Test
-    public void shouldReadResourceAbsolutePathWithFile() {
+    public void givenResourcePath_whenReadAbsolutePathWithFile_thenAbsolutePathEndsWithDirectory() {
         String path = "src/test/resources";
 
         File file = new File(path);
         String absolutePath = file.getAbsolutePath();
 
         System.out.println(absolutePath);
+        Assert.assertTrue(absolutePath.endsWith("src/test/resources"));
     }
 
     @Test
-    public void shouldReadResourceAbsolutePathWithResources() {
+    public void givenResourcePath_whenReadAbsolutePathWithPaths_thenAbsolutePathEndsWithDirectory() {
+        Path resourceDirectory = Paths.get("src", "test", "resources");
+
+        String absolutePath = resourceDirectory.toFile().getAbsolutePath();
+
+        System.out.println(absolutePath);
+        Assert.assertTrue(absolutePath.endsWith("src/test/resources"));
+    }
+
+    @Test
+    public void givenResourceFile_whenReadResourceWithClassLoader_thenPathEndWithFilename() {
         String resourceName = "example_resource.txt";
 
         ClassLoader classLoader = getClass().getClassLoader();
@@ -27,16 +39,7 @@ public class ReadResourceDirectoryUnitTest {
         String absolutePath = file.getAbsolutePath();
 
         System.out.println(absolutePath);
+        Assert.assertTrue(absolutePath.endsWith("/example_resource.txt"));
     }
 
-    @Test
-    public void shouldReadResourceAbsolutePathWithPaths() {
-        Path resourceDirectory = Paths.get("src", "test", "resources");
-
-        String absolutePath = resourceDirectory.toFile().getAbsolutePath();
-
-        System.out.println(absolutePath);
-    }
-
-
 }

From f1ef8d933588cb46b3e9b0860460e67b3ddeee6b Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Thu, 25 Apr 2019 14:06:00 +0400
Subject: [PATCH 080/295] move the code to unit tests

---
 .../com/baeldung/convert/ConvertDateTime.java | 45 ----------------
 .../convert/ConvertDateTimeUnitTest.java      | 53 ++++++++++++-------
 2 files changed, 35 insertions(+), 63 deletions(-)
 delete mode 100644 java-dates-2/src/main/java/com/baeldung/convert/ConvertDateTime.java

diff --git a/java-dates-2/src/main/java/com/baeldung/convert/ConvertDateTime.java b/java-dates-2/src/main/java/com/baeldung/convert/ConvertDateTime.java
deleted file mode 100644
index b63b26da69..0000000000
--- a/java-dates-2/src/main/java/com/baeldung/convert/ConvertDateTime.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.baeldung.convert;
-
-import org.joda.time.Instant;
-
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.Calendar;
-import java.util.Date;
-
-public class ConvertDateTime {
-
-    public static long coreDate() {
-        Date date = new Date();
-        return date.getTime();
-    }
-
-    public static long calendar() {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(new Date());
-        return calendar.getTimeInMillis();
-    }
-
-    public static long jodaInstant() {
-        Instant jodaInstant = Instant.now();
-        return jodaInstant.getMillis();
-    }
-
-    public static long jodaDateTime() {
-        org.joda.time.DateTime jodaDateTime = new org.joda.time.DateTime();
-        return jodaDateTime.getMillis();
-    }
-
-    public static long java8Instant() {
-        return java.time.Instant.now().toEpochMilli();
-    }
-
-    public static long java8LocalDateTime() {
-
-        LocalDateTime localDateTime = LocalDateTime.now();
-        ZoneId id = ZoneId.systemDefault();
-        ZonedDateTime zdt = ZonedDateTime.of(localDateTime, id);
-        return zdt.toInstant().toEpochMilli();
-    }
-}
diff --git a/java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java b/java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java
index 616566732f..cd31ccc799 100644
--- a/java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java
+++ b/java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java
@@ -1,42 +1,59 @@
 package com.baeldung.convert;
 
+import org.joda.time.Instant;
+import org.junit.Assert;
 import org.junit.Test;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Calendar;
+import java.util.Date;
+
 public class ConvertDateTimeUnitTest {
 
+    public final long millis = 1556175797428L;
+
     @Test
-    public void givenLocalDateTime_WhenGetMillis() {
-        long millis = ConvertDateTime.java8LocalDateTime();
-        System.out.println("LocalDateTime in milliseconds : " + millis);
+    public void givenLocalDateTime_WhenToEpochMillis_ThenMillis() {
+        ZoneId id = ZoneId.systemDefault();
+
+        LocalDateTime localDateTime =
+                LocalDateTime.ofInstant(java.time.Instant.ofEpochMilli(millis), id);
+
+        ZonedDateTime zdt = ZonedDateTime.of(localDateTime, id);
+
+        Assert.assertEquals(millis, zdt.toInstant().toEpochMilli());
     }
 
     @Test
-    public void givenJava8Instant_WhenGetMillis() {
-        long millis = ConvertDateTime.java8Instant();
-        System.out.println("Java 8 Instant in milliseconds : " + millis);
+    public void givenJava8Instant_WhenGToEpochMillis_ThenMillis() {
+        java.time.Instant instant = java.time.Instant.ofEpochMilli(millis);
+        Assert.assertEquals(millis, instant.toEpochMilli());
     }
 
     @Test
-    public void givenDate_WhenGetMillis() {
-        long millis = ConvertDateTime.coreDate();
-        System.out.println("Core Date in milliseconds : " + millis);
+    public void givenDate_WhenGetTime_ThenMillis() {
+        Date date = new Date(millis);
+        Assert.assertEquals(millis, date.getTime());
     }
 
     @Test
-    public void givenCalendar_WhenGetMillis() {
-        long millis = ConvertDateTime.calendar();
-        System.out.println("Calendar in milliseconds : " + millis);
+    public void givenCalendar_WhenGetTimeInMillis_ThenMillis() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date(millis));
+        Assert.assertEquals(millis, calendar.getTimeInMillis());
     }
 
     @Test
-    public void givenJodaInstant_WhenGetMillis() {
-        long millis = ConvertDateTime.jodaInstant();
-        System.out.println("JODA Instant in milliseconds : " + millis);
+    public void givenJodaInstant_WhenGetMillis_ThenMillis() {
+        Instant jodaInstant = Instant.ofEpochMilli(millis);
+        Assert.assertEquals(millis, jodaInstant.getMillis());
     }
 
     @Test
-    public void givenJODADateTime_WhenGetMillis() {
-        long millis = ConvertDateTime.jodaDateTime();
-        System.out.println("JODA DateTime in milliseconds : " + millis);
+    public void givenJODADateTime_WhenGetMillis_ThenMillis() {
+        org.joda.time.DateTime jodaDateTime = new org.joda.time.DateTime(millis);
+        Assert.assertEquals(millis, jodaDateTime.getMillis());
     }
 }

From 92c8e8757ea50b027c47c41991448ed1a1d93161 Mon Sep 17 00:00:00 2001
From: Ali Dehghani <ali.dehghani.g@gmail.com>
Date: Thu, 25 Apr 2019 18:26:30 +0430
Subject: [PATCH 081/295] Upgrade to JUnit 5.4.2 and Platform 1.4.2.

---
 testing-modules/junit-5/pom.xml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/testing-modules/junit-5/pom.xml b/testing-modules/junit-5/pom.xml
index a5a1ddaf0b..1d1b0bc574 100644
--- a/testing-modules/junit-5/pom.xml
+++ b/testing-modules/junit-5/pom.xml
@@ -103,13 +103,6 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.junit.platform</groupId>
-                        <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>${junit.platform.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -130,10 +123,10 @@
     </build>
 
     <properties>
-        <junit.jupiter.version>5.3.1</junit.jupiter.version>
+        <junit.jupiter.version>5.4.2</junit.jupiter.version>
         <mockito.junit.jupiter.version>2.23.0</mockito.junit.jupiter.version>
-        <junit.platform.version>1.2.0</junit.platform.version>
-        <junit.vintage.version>5.2.0</junit.vintage.version>
+        <junit.platform.version>1.4.2</junit.platform.version>
+        <junit.vintage.version>5.4.2</junit.vintage.version>
         <log4j2.version>2.8.2</log4j2.version>
         <h2.version>1.4.196</h2.version>
         <powermock.version>2.0.0-RC.1</powermock.version>

From bee2f9fc57b623088107f13eb88da9465422b2bc Mon Sep 17 00:00:00 2001
From: Ali Dehghani <ali.dehghani.g@gmail.com>
Date: Thu, 25 Apr 2019 18:26:58 +0430
Subject: [PATCH 082/295] Added a simple NullSource test.

---
 .../java/com/baeldung/parameterized/StringsUnitTest.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/parameterized/StringsUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/parameterized/StringsUnitTest.java
index 7d02a5a74b..96d0d4199a 100644
--- a/testing-modules/junit-5/src/test/java/com/baeldung/parameterized/StringsUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/parameterized/StringsUnitTest.java
@@ -86,7 +86,11 @@ class StringsUnitTest {
         assertEquals(expected, actualValue);
     }
 
-
+    @ParameterizedTest
+    @NullSource
+    void isBlank_ShouldReturnTrueForNullInputs(String input) {
+        assertTrue(Strings.isBlank(input));
+    }
 
     private static Stream<Arguments> provideStringsForIsBlank() {
         return Stream.of(

From 97675738f1beb38daa2f43469427851e80ced2e6 Mon Sep 17 00:00:00 2001
From: Ali Dehghani <ali.dehghani.g@gmail.com>
Date: Thu, 25 Apr 2019 19:46:44 +0430
Subject: [PATCH 083/295] Added more tests.

---
 .../parameterized/StringsUnitTest.java        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/parameterized/StringsUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/parameterized/StringsUnitTest.java
index 96d0d4199a..6aea7668f1 100644
--- a/testing-modules/junit-5/src/test/java/com/baeldung/parameterized/StringsUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/parameterized/StringsUnitTest.java
@@ -92,6 +92,25 @@ class StringsUnitTest {
         assertTrue(Strings.isBlank(input));
     }
 
+    @ParameterizedTest
+    @EmptySource
+    void isBlank_ShouldReturnTrueForEmptyStrings(String input) {
+        assertTrue(Strings.isBlank(input));
+    }
+
+    @ParameterizedTest
+    @NullAndEmptySource
+    void isBlank_ShouldReturnTrueForNullAndEmptyStrings(String input) {
+        assertTrue(Strings.isBlank(input));
+    }
+
+    @ParameterizedTest
+    @NullAndEmptySource
+    @ValueSource(strings = {"  ", "\t", "\n"})
+    void isBlank_ShouldReturnTrueForAllTypesOfBlankStrings(String input) {
+        assertTrue(Strings.isBlank(input));
+    }
+
     private static Stream<Arguments> provideStringsForIsBlank() {
         return Stream.of(
                 Arguments.of(null, true), // null strings should be considered blank

From b539d4bd5d358546c97552f77376506e4428af04 Mon Sep 17 00:00:00 2001
From: Juan Vaccari <juan.vaccari@gfk.com>
Date: Thu, 25 Apr 2019 19:00:34 +0100
Subject: [PATCH 084/295] BAEL-2652 Add read resource file cases

---
 .../kotlin/com/baeldung/filesystem/FileReader.kt |  4 ++++
 .../com/baeldung/filesystem/FileReaderTest.kt    | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/core-kotlin/src/main/kotlin/com/baeldung/filesystem/FileReader.kt b/core-kotlin/src/main/kotlin/com/baeldung/filesystem/FileReader.kt
index 8539378c91..886a3fc51e 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/filesystem/FileReader.kt
+++ b/core-kotlin/src/main/kotlin/com/baeldung/filesystem/FileReader.kt
@@ -17,4 +17,8 @@ class FileReader {
       File(fileName).inputStream().readBytes().toString(Charsets.UTF_8)
 
     fun readFileDirectlyAsText(fileName: String): String = File(fileName).readText(Charsets.UTF_8)
+
+    fun readFileUsingGetResource(fileName: String) = this::class.java.getResource(fileName).readText(Charsets.UTF_8)
+
+    fun readFileAsLinesUsingGetResourceAsStream(fileName: String) = this::class.java.getResourceAsStream(fileName).bufferedReader().readLines()
 }
\ No newline at end of file
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/filesystem/FileReaderTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/filesystem/FileReaderTest.kt
index 67795dda14..ad541c446e 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/filesystem/FileReaderTest.kt
+++ b/core-kotlin/src/test/kotlin/com/baeldung/filesystem/FileReaderTest.kt
@@ -48,4 +48,20 @@ internal class FileReaderTest {
 
         assertTrue { text.contains("Hello to Kotlin") }
     }
+
+    @Test
+    fun whenReadFileAsTextUsingGetResource_thenCorrect() {
+        val text = fileReader.readFileUsingGetResource("/Kotlin.in")
+
+        assertTrue { text.contains("1. Concise") }
+    }
+
+    @Test
+    fun whenReadFileUsingGetResourceAsStream_thenCorrect() {
+        val lines = fileReader.readFileAsLinesUsingGetResourceAsStream("/Kotlin.in")
+
+        assertTrue { lines.contains("3. Interoperable") }
+    }
+
+
 }
\ No newline at end of file

From db614845279fb83631f152b49e920d8fbf50954d Mon Sep 17 00:00:00 2001
From: Josephine Barboza <josephine.barboza@gmail.com>
Date: Thu, 25 Apr 2019 23:33:54 +0530
Subject: [PATCH 085/295] BAEL-2766 Added core-groovy-collections module

---
 core-groovy-collections/README.md             |   6 +
 core-groovy-collections/pom.xml               | 131 ++++++++++++++++
 .../groovy/com/baeldung/map/MapTest.groovy    | 148 ++++++++++++++++++
 pom.xml                                       |   2 +
 4 files changed, 287 insertions(+)
 create mode 100644 core-groovy-collections/README.md
 create mode 100644 core-groovy-collections/pom.xml
 create mode 100644 core-groovy-collections/src/test/groovy/com/baeldung/map/MapTest.groovy

diff --git a/core-groovy-collections/README.md b/core-groovy-collections/README.md
new file mode 100644
index 0000000000..482e33bce1
--- /dev/null
+++ b/core-groovy-collections/README.md
@@ -0,0 +1,6 @@
+# Groovy
+
+## Relevant articles:
+
+- [Maps in Groovy](http://www.baeldung.com/)
+
diff --git a/core-groovy-collections/pom.xml b/core-groovy-collections/pom.xml
new file mode 100644
index 0000000000..bf3ae26592
--- /dev/null
+++ b/core-groovy-collections/pom.xml
@@ -0,0 +1,131 @@
+<?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>core-groovy-collections</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>core-groovy-collections</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>${groovy.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>${groovy-all.version}</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-dateutil</artifactId>
+            <version>${groovy.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-sql</artifactId>
+            <version>${groovy-sql.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>${hsqldb.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-core</artifactId>
+            <version>${spock-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <version>${gmavenplus-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>addSources</goal>
+                            <goal>addTestSources</goal>
+                            <goal>compile</goal>
+                            <goal>compileTests</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${maven-failsafe-plugin.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.platform</groupId>
+                        <artifactId>junit-platform-surefire-provider</artifactId>
+                        <version>${junit.platform.version}</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>junit5</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/*Test5.java</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.20.1</version>
+                <configuration>
+                <useFile>false</useFile>
+                <includes>
+                    <include>**/*Test.java</include>
+                    <include>**/*Spec.java</include>
+                </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>central</id>
+            <url>http://jcenter.bintray.com</url>
+        </repository>
+    </repositories>
+
+    <properties>
+        <junit.platform.version>1.0.0</junit.platform.version>
+        <groovy.version>2.5.6</groovy.version>
+        <groovy-all.version>2.5.6</groovy-all.version>
+        <groovy-sql.version>2.5.6</groovy-sql.version>
+        <hsqldb.version>2.4.0</hsqldb.version>
+        <spock-core.version>1.1-groovy-2.4</spock-core.version>
+        <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
+    </properties>
+</project>
+
diff --git a/core-groovy-collections/src/test/groovy/com/baeldung/map/MapTest.groovy b/core-groovy-collections/src/test/groovy/com/baeldung/map/MapTest.groovy
new file mode 100644
index 0000000000..c6105eb1c4
--- /dev/null
+++ b/core-groovy-collections/src/test/groovy/com/baeldung/map/MapTest.groovy
@@ -0,0 +1,148 @@
+package com.baeldung.map;
+
+import static groovy.test.GroovyAssert.*
+import org.junit.Test
+
+class MapTest{
+
+    @Test
+    void createMap() {
+
+        def emptyMap = [:]
+        assertNotNull(emptyMap)
+
+        assertTrue(emptyMap instanceof java.util.LinkedHashMap)
+
+        def map = [name:"Jerry", age: 42, city: "New York"]
+        assertTrue(map.size() == 3)
+    }
+
+    @Test
+    void addItemsToMap() {
+
+        def map = [name:"Jerry"]
+
+        map["age"] = 42
+
+        map.city = "New York"
+
+        def hobbyLiteral = "hobby"
+        def hobbyMap = [(hobbyLiteral): "Singing"]
+        map.putAll(hobbyMap)
+
+        assertTrue(map == [name:"Jerry", age: 42, city: "New York", hobby:"Singing"])
+        assertTrue(hobbyMap.hobby == "Singing")
+        assertTrue(hobbyMap[hobbyLiteral] == "Singing")
+        
+        map.plus([1:20]) // returns new map
+
+        map << [2:30]
+
+    }
+
+    @Test
+    void getItemsFromMap() {
+
+        def map = [name:"Jerry", age: 42, city: "New York", hobby:"Singing"]
+
+        assertTrue(map["name"] == "Jerry")
+
+        assertTrue(map.name == "Jerry")
+
+        def propertyAge = "age"
+        assertTrue(map[propertyAge] == 42)
+    }
+
+    @Test
+    void removeItemsFromMap() {
+
+        def map = [1:20, a:30, 2:42, 4:34, ba:67, 6:39, 7:49]
+
+        def minusMap = map.minus([2:42, 4:34]);
+        assertTrue(minusMap == [1:20, a:30, ba:67, 6:39, 7:49])
+
+        minusMap.removeAll{it -> it.key instanceof String}
+        assertTrue( minusMap == [ 1:20, 6:39, 7:49])
+
+        minusMap.retainAll{it -> it.value %2 == 0}
+        assertTrue( minusMap == [1:20])
+    }
+
+    @Test
+    void iteratingOnMaps(){
+        def map = [name:"Jerry", age: 42, city: "New York", hobby:"Singing"]
+
+        map.each{ entry -> println "$entry.key: $entry.value" }
+
+        map.eachWithIndex{ entry, i -> println "$i $entry.key: $entry.value" }
+
+        map.eachWithIndex{ key, value, i -> println "$i $key: $value" }
+    }
+
+    @Test
+    void filteringAndSearchingMaps(){
+        def map = [name:"Jerry", age: 42, city: "New York", hobby:"Singing"]
+
+        assertTrue(map.find{ it.value == "New York"}.key == "city")
+
+        assertTrue(map.findAll{ it.value == "New York"} == [city : "New York"])
+
+        map.grep{it.value == "New York"}.each{ it -> assertTrue(it.key == "city" && it.value == "New York")}
+
+        assertTrue(map.every{it -> it.value instanceof String} == false)
+
+        assertTrue(map.any{it -> it.value instanceof String} == true)
+    }
+
+    @Test
+    void collect(){
+
+        def map = [1: [name:"Jerry", age: 42, city: "New York"],
+            2: [name:"Long", age: 25, city: "New York"],
+            3: [name:"Dustin", age: 29, city: "New York"],
+            4: [name:"Dustin", age: 34, city: "New York"]]
+
+        def names = map.collect{entry -> entry.value.name} // returns only list
+        assertTrue(names == ["Jerry", "Long", "Dustin", "Dustin"])
+
+        def uniqueNames = map.collect([] as HashSet){entry -> entry.value.name}
+        assertTrue(uniqueNames == ["Jerry", "Long", "Dustin"] as Set)
+
+        def idNames = map.collectEntries{key, value -> [key, value.name]}
+        assertTrue(idNames == [1:"Jerry", 2: "Long", 3:"Dustin", 4: "Dustin"])
+
+        def below30Names = map.findAll{it.value.age < 30}.collect{key, value -> value.name}
+        assertTrue(below30Names == ["Long", "Dustin"])
+
+
+    }
+
+    @Test
+    void group(){
+        def map = [1:20, 2: 40, 3: 11, 4: 93]
+
+        def subMap = map.groupBy{it.value % 2}
+        println subMap
+        assertTrue(subMap == [0:[1:20, 2:40 ], 1:[3:11, 4:93]])
+
+        def keySubMap = map.subMap([1, 2])
+        assertTrue(keySubMap == [1:20, 2:40])
+
+    }
+
+    @Test
+    void sorting(){
+        def map = [ab:20, a: 40, cb: 11, ba: 93]
+
+        def naturallyOrderedMap = map.sort()
+        assertTrue([a:40, ab:20, ba:93, cb:11] == naturallyOrderedMap)
+
+        def compSortedMap = map.sort({ k1, k2 -> k1 <=> k2 } as Comparator)
+        assertTrue([a:40, ab:20, ba:93, cb:11] == compSortedMap)
+
+        def cloSortedMap = map.sort({ it1, it2 -> it1.value <=> it1.value })
+        assertTrue([cb:11, ab:20, a:40, ba:93] == cloSortedMap)
+
+    }
+
+}
diff --git a/pom.xml b/pom.xml
index 64710a39a6..c67374e5d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -377,6 +377,7 @@
                 <module>checker-plugin</module>
                 <module>core-groovy</module>
                 <module>core-groovy-2</module>
+		<module>core-groovy-collections</module>
                 <!-- <module>core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
                 <!-- <module>core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
                 <!-- <module>core-java-12</module> --> <!-- We haven't upgraded to java 12. Fixing in BAEL-10841 -->
@@ -1051,6 +1052,7 @@
                 <module>checker-plugin</module>
                 <module>core-groovy</module>
                 <module>core-groovy-2</module>
+                <module>core-groovy-collections</module>
                 <!-- <module>core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
                 <!-- <module>core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
                 <module>core-java-8</module>

From 5adb5186f0bf56cf0e2ec05e74f0d6d6a751c4c4 Mon Sep 17 00:00:00 2001
From: Alexander Molochko <alexander@crosp.net>
Date: Thu, 25 Apr 2019 11:19:54 -0700
Subject: [PATCH 086/295] Add comma-separated example

---
 .../webclientrequests/WebClientRequestsUnitTest.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsUnitTest.java b/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsUnitTest.java
index 62fca0ba9d..c1bab1ecf5 100644
--- a/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsUnitTest.java
+++ b/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsUnitTest.java
@@ -131,6 +131,7 @@ public class WebClientRequestsUnitTest {
         verifyCalledUrl("/posts/?tag%5B%5D=Spring&tag%5B%5D=Kotlin");
     }
 
+
     @Test
     public void whenCallArrayQueryParams_thenURIMatched() {
         this.webClient.get()
@@ -142,6 +143,17 @@ public class WebClientRequestsUnitTest {
         verifyCalledUrl("/posts/?category=Web&category=Mobile");
     }
 
+    @Test
+    public void whenCallArrayQueryParamsComma_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/posts/")
+                        .queryParam("category",  String.join(",", "Web", "Mobile"))
+                        .build())
+                .retrieve();
+        verifyCalledUrl("/posts/?category=Web,Mobile");
+    }
+
     private void verifyCalledUrl(String relativeUrl) {
         ClientRequest request = this.argumentCaptor.getValue();
         Assert.assertEquals(String.format("%s%s", BASE_URL, relativeUrl), request.url().toString());

From 46f5e0dc939fe40326bc16fafa5e6b77d177e74f Mon Sep 17 00:00:00 2001
From: isaolmez <isaolmez@gmail.com>
Date: Fri, 26 Apr 2019 11:10:34 +0300
Subject: [PATCH 087/295] BAEL-2809: Added code samples

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

diff --git a/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/JpaBatchInsertsIntegrationTest.java b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/JpaBatchInsertsIntegrationTest.java
index dd61b7b6df..9e81dbc04d 100644
--- a/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/JpaBatchInsertsIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/batchinserts/JpaBatchInsertsIntegrationTest.java
@@ -9,6 +9,7 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
+import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -27,16 +28,16 @@ public class JpaBatchInsertsIntegrationTest {
 
     private static final int BATCH_SIZE = 5;
 
+    @Transactional
     @Test
     public void whenInsertingSingleTypeOfEntity_thenCreatesSingleBatch() {
         for (int i = 0; i < 10; i++) {
             School school = createSchool(i);
             entityManager.persist(school);
         }
-
-        entityManager.flush();
     }
 
+    @Transactional
     @Test
     public void whenFlushingAfterBatch_ThenClearsMemory() {
         for (int i = 0; i < 10; i++) {
@@ -48,10 +49,9 @@ public class JpaBatchInsertsIntegrationTest {
             School school = createSchool(i);
             entityManager.persist(school);
         }
-
-        entityManager.flush();
     }
 
+    @Transactional
     @Test
     public void whenThereAreMultipleEntities_ThenCreatesNewBatch() {
         for (int i = 0; i < 10; i++) {
@@ -67,10 +67,9 @@ public class JpaBatchInsertsIntegrationTest {
             entityManager.persist(firstStudent);
             entityManager.persist(secondStudent);
         }
-
-        entityManager.flush();
     }
 
+    @Transactional
     @Test
     public void whenUpdatingEntities_thenCreatesBatch() {
         for (int i = 0; i < 10; i++) {
@@ -86,7 +85,10 @@ public class JpaBatchInsertsIntegrationTest {
         for (School school : allSchools) {
             school.setName("Updated_" + school.getName());
         }
+    }
 
+    @After
+    public void tearDown() {
         entityManager.flush();
     }
 }

From adb8759e3028b0858ac8982ac08bf7303f9e4e5e Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Fri, 26 Apr 2019 14:30:12 +0300
Subject: [PATCH 088/295] refactor module spring-boot-ex

---
 pom.xml                                       |  5 ++-
 .../.gitignore                                |  0
 .../pom.xml                                   | 43 -------------------
 ...tionToClientJsonSpringBootApplication.java | 13 ------
 .../MainControllerIntegrationTest.java        | 16 -------
 spring-boot-exceptions/pom.xml                | 37 ++++++++++++++++
 .../jsonexception}/CustomException.java       |  2 +-
 .../baeldung/jsonexception}/ErrorHandler.java |  2 +-
 .../jsonexception/JsonErrorApplication.java   | 13 ++++++
 .../jsonexception}/MainController.java        |  2 +-
 .../src/main/resources/application.properties |  0
 .../src/main/resources/static/.gitignore      |  0
 .../src/main/resources/templates/.gitignore   |  0
 .../MainControllerIntegrationTest.java        | 19 ++++++++
 .../SpringContextIntegrationTest.java}        | 10 ++---
 15 files changed, 81 insertions(+), 81 deletions(-)
 rename spring-boot-exceptions/{pass-exception-to-client-json-spring-boot => }/.gitignore (100%)
 delete mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
 delete mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplication.java
 delete mode 100644 spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/MainControllerIntegrationTest.java
 create mode 100644 spring-boot-exceptions/pom.xml
 rename spring-boot-exceptions/{pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot => src/main/java/com/baeldung/jsonexception}/CustomException.java (76%)
 rename spring-boot-exceptions/{pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot => src/main/java/com/baeldung/jsonexception}/ErrorHandler.java (90%)
 create mode 100644 spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/JsonErrorApplication.java
 rename spring-boot-exceptions/{pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot => src/main/java/com/baeldung/jsonexception}/MainController.java (81%)
 rename spring-boot-exceptions/{pass-exception-to-client-json-spring-boot => }/src/main/resources/application.properties (100%)
 rename spring-boot-exceptions/{pass-exception-to-client-json-spring-boot => }/src/main/resources/static/.gitignore (100%)
 rename spring-boot-exceptions/{pass-exception-to-client-json-spring-boot => }/src/main/resources/templates/.gitignore (100%)
 create mode 100644 spring-boot-exceptions/src/test/java/com/baeldung/jsonexception/MainControllerIntegrationTest.java
 rename spring-boot-exceptions/{pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplicationTests.java => src/test/java/com/baeldung/jsonexception/SpringContextIntegrationTest.java} (58%)

diff --git a/pom.xml b/pom.xml
index 17ab605e7a..4344347d18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -628,6 +628,7 @@
                 <module>spring-boot-custom-starter</module>
                 <module>spring-boot-disable-console-logging</module>
                 <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
+                <module>spring-boot-exceptions</module>
                 <module>spring-boot-jasypt</module>
                 <module>spring-boot-keycloak</module>
                 <module>spring-boot-logging-log4j2</module>
@@ -825,7 +826,8 @@
 				<module>spring-boot-client</module>
 				<module>spring-boot-configuration</module>
 				<module>spring-boot-custom-starter</module>
-				<module>greeter-spring-boot-autoconfigure</module>
+                                <module>spring-boot-exceptions</module>
+		 		<module>greeter-spring-boot-autoconfigure</module>
 				<module>greeter-spring-boot-sample-app</module>
 				<module>persistence-modules/spring-boot-h2/spring-boot-h2-database</module>
 				<module>spring-boot-jasypt</module>
@@ -1286,6 +1288,7 @@
                 <module>spring-boot-ctx-fluent</module>
                 <module>spring-boot-custom-starter</module>
                 <module>spring-boot-disable-console-logging</module>
+                <module>spring-boot-exceptions</module>
                 <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
                 <module>spring-boot-jasypt</module>
                 <module>spring-boot-keycloak</module>
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/.gitignore b/spring-boot-exceptions/.gitignore
similarity index 100%
rename from spring-boot-exceptions/pass-exception-to-client-json-spring-boot/.gitignore
rename to spring-boot-exceptions/.gitignore
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
deleted file mode 100644
index 8237955aef..0000000000
--- a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/pom.xml
+++ /dev/null
@@ -1,43 +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>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.4.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-	<groupId>com.baeldung</groupId>
-	<artifactId>pass-exception-to-client-json-spring-boot</artifactId>
-	<version>0.0.4-SNAPSHOT</version>
-	<name>pass-exception-to-client-json-spring-boot</name>
-	<description>Baeldung article code on how to pass exceptions to client in JSON format using Spring Boot</description>
-
-	<properties>
-		<java.version>1.8</java.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplication.java b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplication.java
deleted file mode 100644
index 77833c28fd..0000000000
--- a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplication.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.baeldung.passexceptiontoclientjsonspringboot;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class PassExceptionToClientJsonSpringBootApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(PassExceptionToClientJsonSpringBootApplication.class, args);
-    }
-
-}
\ No newline at end of file
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/MainControllerIntegrationTest.java b/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/MainControllerIntegrationTest.java
deleted file mode 100644
index a615dc5096..0000000000
--- a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/MainControllerIntegrationTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.baeldung.passexceptiontoclientjsonspringboot;
-
-import org.junit.Test;
-
-public class MainControllerIntegrationTest {
-
-	@Test(expected = CustomException.class)
-	public void givenIndex_thenCustomException() throws CustomException {
-	    
-		MainController mainController = new MainController();
-		
-		mainController.index();
-		
-	}
-
-}
\ No newline at end of file
diff --git a/spring-boot-exceptions/pom.xml b/spring-boot-exceptions/pom.xml
new file mode 100644
index 0000000000..105f60e295
--- /dev/null
+++ b/spring-boot-exceptions/pom.xml
@@ -0,0 +1,37 @@
+<?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>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-boot-exceptions</artifactId>
+    <version>0.0.4-SNAPSHOT</version>
+    <name>pass-exception-to-client-json-spring-boot</name>
+    <description>Baeldung article code on how to pass exceptions to client in JSON format using Spring Boot</description>
+
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/CustomException.java b/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/CustomException.java
similarity index 76%
rename from spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/CustomException.java
rename to spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/CustomException.java
index 56fe80cd9a..f1a1d94f54 100644
--- a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/CustomException.java
+++ b/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/CustomException.java
@@ -1,4 +1,4 @@
-package com.baeldung.passexceptiontoclientjsonspringboot;
+package com.baeldung.jsonexception;
 
 public class CustomException extends RuntimeException {
 
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java b/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/ErrorHandler.java
similarity index 90%
rename from spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java
rename to spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/ErrorHandler.java
index b39d2811dd..a890dfa3a2 100644
--- a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/ErrorHandler.java
+++ b/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/ErrorHandler.java
@@ -1,4 +1,4 @@
-package com.baeldung.passexceptiontoclientjsonspringboot;
+package com.baeldung.jsonexception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;
diff --git a/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/JsonErrorApplication.java b/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/JsonErrorApplication.java
new file mode 100644
index 0000000000..188584bd7c
--- /dev/null
+++ b/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/JsonErrorApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.jsonexception;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class JsonErrorApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(JsonErrorApplication.class, args);
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/MainController.java b/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/MainController.java
similarity index 81%
rename from spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/MainController.java
rename to spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/MainController.java
index 82c0c022a8..5d73c239a4 100644
--- a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/java/com/baeldung/passexceptiontoclientjsonspringboot/MainController.java
+++ b/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/MainController.java
@@ -1,4 +1,4 @@
-package com.baeldung.passexceptiontoclientjsonspringboot;
+package com.baeldung.jsonexception;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/application.properties b/spring-boot-exceptions/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/application.properties
rename to spring-boot-exceptions/src/main/resources/application.properties
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/static/.gitignore b/spring-boot-exceptions/src/main/resources/static/.gitignore
similarity index 100%
rename from spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/static/.gitignore
rename to spring-boot-exceptions/src/main/resources/static/.gitignore
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/templates/.gitignore b/spring-boot-exceptions/src/main/resources/templates/.gitignore
similarity index 100%
rename from spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/main/resources/templates/.gitignore
rename to spring-boot-exceptions/src/main/resources/templates/.gitignore
diff --git a/spring-boot-exceptions/src/test/java/com/baeldung/jsonexception/MainControllerIntegrationTest.java b/spring-boot-exceptions/src/test/java/com/baeldung/jsonexception/MainControllerIntegrationTest.java
new file mode 100644
index 0000000000..77e71b7d21
--- /dev/null
+++ b/spring-boot-exceptions/src/test/java/com/baeldung/jsonexception/MainControllerIntegrationTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.jsonexception;
+
+import org.junit.Test;
+
+import com.baeldung.jsonexception.CustomException;
+import com.baeldung.jsonexception.MainController;
+
+public class MainControllerIntegrationTest {
+
+    @Test(expected = CustomException.class)
+    public void givenIndex_thenCustomException() throws CustomException {
+
+        MainController mainController = new MainController();
+
+        mainController.index();
+
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplicationTests.java b/spring-boot-exceptions/src/test/java/com/baeldung/jsonexception/SpringContextIntegrationTest.java
similarity index 58%
rename from spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplicationTests.java
rename to spring-boot-exceptions/src/test/java/com/baeldung/jsonexception/SpringContextIntegrationTest.java
index 5e35c21f4c..aa91e242ab 100644
--- a/spring-boot-exceptions/pass-exception-to-client-json-spring-boot/src/test/java/com/baeldung/passexceptiontoclientjsonspringboot/PassExceptionToClientJsonSpringBootApplicationTests.java
+++ b/spring-boot-exceptions/src/test/java/com/baeldung/jsonexception/SpringContextIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.passexceptiontoclientjsonspringboot;
+package com.baeldung.jsonexception;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -7,10 +7,10 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class PassExceptionToClientJsonSpringBootApplicationTests {
+public class SpringContextIntegrationTest {
 
-	@Test
-	public void contextLoads() {
-	}
+    @Test
+    public void contextLoads() {
+    }
 
 }

From 7c73610226936b6283bad8d8164b7f7410e8c1e2 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Fri, 26 Apr 2019 22:57:17 +0300
Subject: [PATCH 089/295] Update SpringContextIntegrationTest.java

---
 .../springbootconfiguration/SpringContextIntegrationTest.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java b/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java
index 8ae49f6696..24bef73ef9 100644
--- a/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java
+++ b/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java
@@ -12,5 +12,4 @@ public class SpringContextIntegrationTest {
     @Test
     public void contextLoads() {
     }
-
 }

From 7cca99a327cce4cb69bc053e1b2da85e999fe3ab Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Fri, 26 Apr 2019 22:58:57 +0300
Subject: [PATCH 090/295] Update README.md

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

diff --git a/libraries-security/README.md b/libraries-security/README.md
index 6923e0474e..b9bbf11cdf 100644
--- a/libraries-security/README.md
+++ b/libraries-security/README.md
@@ -2,3 +2,4 @@
 
 - [Guide to ScribeJava](https://www.baeldung.com/scribejava)
 - [Guide to Passay](https://www.baeldung.com/java-passay)
+- [Guide to Google Tink](https://www.baeldung.com/google-tink)

From 1e65e6a7b8d68a6cbd6d6a1ba71b885713ec2a0a Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sat, 27 Apr 2019 00:03:46 +0300
Subject: [PATCH 091/295] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 4344347d18..a43e2d65c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1175,7 +1175,7 @@
 
                 <module>mapstruct</module>
                 <module>maven</module>
-                <module>maven-java-11</module>
+                <!-- <module>maven-java-11</module> --> <!-- we haven't upgraded to Java 11 -->
                 <module>maven-archetype</module>
                 <!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->
                 <module>maven-polyglot/maven-polyglot-json-extension</module>

From 25407f2a4315b8ef8d4b75eb8260520a98a1a0c3 Mon Sep 17 00:00:00 2001
From: jose <larroquester@gmail.com>
Date: Sat, 27 Apr 2019 00:36:55 -0300
Subject: [PATCH 092/295] BAEL-2832: new java-strings-2 project, with tests and
 benchmar

---
 java-strings-2/pom.xml                        | 150 ++++++++++++++++++
 .../SubstringSearchPerformanceComparison.java |  58 +++++++
 java-strings-2/src/main/resources/logback.xml |  13 ++
 .../string/search/SubstringSearch.java        |  70 ++++++++
 java-strings-2/src/test/resources/.gitignore  |  13 ++
 5 files changed, 304 insertions(+)
 create mode 100755 java-strings-2/pom.xml
 create mode 100644 java-strings-2/src/main/java/com/baeldung/string/search/performance/SubstringSearchPerformanceComparison.java
 create mode 100644 java-strings-2/src/main/resources/logback.xml
 create mode 100644 java-strings-2/src/test/java/com/baeldung/string/search/SubstringSearch.java
 create mode 100644 java-strings-2/src/test/resources/.gitignore

diff --git a/java-strings-2/pom.xml b/java-strings-2/pom.xml
new file mode 100755
index 0000000000..c314cd8cad
--- /dev/null
+++ b/java-strings-2/pom.xml
@@ -0,0 +1,150 @@
+<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>java-strings-2</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>java-strings-2</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>${commons-codec.version}</version>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh-core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh-core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.ibm.icu</groupId>
+            <artifactId>icu4j</artifactId>
+            <version>${icu4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vdurmont</groupId>
+            <artifactId>emoji-java</artifactId>
+            <version>${emoji-java.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter-api.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>${hamcrest-library.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Added for password generation -->
+        <dependency>
+            <groupId>org.passay</groupId>
+            <artifactId>passay</artifactId>
+            <version>${passay.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>${commons-text.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ahocorasick</groupId>
+            <artifactId>ahocorasick</artifactId>
+            <version>${ahocorasick.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>java-strings-2</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <compilerArgument>-parameters</compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- util -->
+        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <commons-codec.version>1.10</commons-codec.version>
+        <!-- testing -->
+        <assertj.version>3.6.1</assertj.version>
+        <jmh-core.version>1.19</jmh-core.version>
+        <icu4j.version>61.1</icu4j.version>
+        <guava.version>27.0.1-jre</guava.version>
+        <emoji-java.version>4.0.0</emoji-java.version>
+        <junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
+        <hamcrest-library.version>1.3</hamcrest-library.version>
+        <passay.version>1.3.1</passay.version>
+        <commons-text.version>1.4</commons-text.version>
+        <ahocorasick.version>0.4.0</ahocorasick.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/java-strings-2/src/main/java/com/baeldung/string/search/performance/SubstringSearchPerformanceComparison.java b/java-strings-2/src/main/java/com/baeldung/string/search/performance/SubstringSearchPerformanceComparison.java
new file mode 100644
index 0000000000..bf33c47a7e
--- /dev/null
+++ b/java-strings-2/src/main/java/com/baeldung/string/search/performance/SubstringSearchPerformanceComparison.java
@@ -0,0 +1,58 @@
+package com.baeldung.string.search.performance;
+
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang3.StringUtils;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+
+/**
+ * Based on https://github.com/tedyoung/indexof-contains-benchmark
+ */
+@Fork(5)
+@State(Scope.Benchmark)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+public class SubstringSearchPerformanceComparison {
+
+    private String message;
+
+    private Pattern pattern;
+
+    public static void main(String[] args) throws Exception {
+        org.openjdk.jmh.Main.main(args);
+    }
+
+    @Setup
+    public void setup() {
+        message = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum";
+        pattern = Pattern.compile("(?<!\\S)" + "eiusmod" + "(?!\\S)");
+    }
+
+    @Benchmark
+    public int indexOf() {
+        return message.indexOf("eiusmod");
+    }
+
+    @Benchmark
+    public boolean contains() {
+        return message.contains("eiusmod");
+    }
+
+    @Benchmark
+    public boolean containsStringUtilsIgnoreCase() {
+        return StringUtils.containsIgnoreCase(message, "eiusmod");
+    }
+
+    @Benchmark
+    public boolean searchWithPattern() {
+        return pattern.matcher(message).find();
+    }
+}
\ No newline at end of file
diff --git a/java-strings-2/src/main/resources/logback.xml b/java-strings-2/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/java-strings-2/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/java-strings-2/src/test/java/com/baeldung/string/search/SubstringSearch.java b/java-strings-2/src/test/java/com/baeldung/string/search/SubstringSearch.java
new file mode 100644
index 0000000000..4a5adb45ef
--- /dev/null
+++ b/java-strings-2/src/test/java/com/baeldung/string/search/SubstringSearch.java
@@ -0,0 +1,70 @@
+package com.baeldung.string.search;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * BAEL-2832: Different ways to check if a Substring could be found in a String.
+ */
+public class SubstringSearch {
+
+    @Test
+    public void searchSubstringWithIndexOf() {
+        Assert.assertEquals(9, "Bohemian Rhapsodyan".indexOf("Rhap"));
+
+        // indexOf will return -1, because it's case sensitive
+        Assert.assertEquals(-1, "Bohemian Rhapsodyan".indexOf("rhap"));
+
+        // indexOf will return 9, because it's all lowercase
+        Assert.assertEquals(9, "Bohemian Rhapsodyan".toLowerCase()
+            .indexOf("rhap"));
+
+        // it will return 6, because it's the first occurrence. Sorry Queen for being blasphemic
+        Assert.assertEquals(6, "Bohemian Rhapsodyan".indexOf("an"));
+    }
+
+    @Test
+    public void searchSubstringWithContains() {
+        Assert.assertTrue("Hey Ho, let's go".contains("Hey"));
+
+        // contains will return false, because it's case sensitive
+        Assert.assertFalse("Hey Ho, let's go".contains("hey"));
+
+        // contains will return true, because it's all lowercase
+        Assert.assertTrue("Hey Ho, let's go".toLowerCase().contains("hey"));
+
+        // contains will return false, because 'jey' can't be found
+        Assert.assertFalse("Hey Ho, let's go".contains("jey"));
+    }
+
+    @Test
+    public void searchSubstringWithStringUtils() {
+        Assert.assertTrue(StringUtils.containsIgnoreCase("Runaway train", "train"));
+
+        // it will also be true, because ignores case ;)
+        Assert.assertTrue(StringUtils.containsIgnoreCase("Runaway train", "Train"));
+    }
+
+    @Test
+    public void searchUsingPattern() {
+
+        // We create the Pattern first
+        Pattern pattern = Pattern.compile("(?<!\\S)" + "road" + "(?!\\S)");
+
+        // We need to create the Matcher after
+        Matcher matcher = pattern.matcher("Hit the road Jack");
+
+        // find will return true when the first match is found
+        Assert.assertTrue(matcher.find());
+
+        // We will create a different matcher with a different text
+        matcher = pattern.matcher("and don't you come back no more");
+
+        // find will return false, because 'road' can't be find as a substring
+        Assert.assertFalse(matcher.find());
+    }
+}
\ No newline at end of file
diff --git a/java-strings-2/src/test/resources/.gitignore b/java-strings-2/src/test/resources/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/java-strings-2/src/test/resources/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file

From 80514b2a8d936192869f17bdf79da123a43cfac8 Mon Sep 17 00:00:00 2001
From: Alexander Molochko <alexander@crosp.net>
Date: Fri, 26 Apr 2019 20:38:35 -0700
Subject: [PATCH 093/295] Change posts resource to products

---
 .../WebClientRequestsUnitTest.java            | 187 +++++++++---------
 1 file changed, 94 insertions(+), 93 deletions(-)

diff --git a/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsUnitTest.java b/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsUnitTest.java
index c1bab1ecf5..8919daa9fb 100644
--- a/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsUnitTest.java
+++ b/spring-5-webflux/src/test/java/com/baeldung/spring/webclientrequests/WebClientRequestsUnitTest.java
@@ -45,6 +45,95 @@ public class WebClientRequestsUnitTest {
                 .build();
     }
 
+
+    @Test
+    public void whenCallSimpleURI_thenURIMatched() {
+        this.webClient.get()
+                .uri("/products")
+                .retrieve();
+        verifyCalledUrl("/products");
+    }
+
+    @Test
+    public void whenCallSinglePathSegmentUri_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/products/{id}")
+                        .build(2))
+                .retrieve();
+        verifyCalledUrl("/products/2");
+    }
+
+    @Test
+    public void whenCallMultiplePathSegmentsUri_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/products/{id}/attributes/{attributeId}")
+                        .build(2, 13))
+                .retrieve();
+        verifyCalledUrl("/products/2/attributes/13");
+    }
+
+    @Test
+    public void whenCallSingleQueryParams_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/products/")
+                        .queryParam("name", "AndroidPhone")
+                        .queryParam("color", "black")
+                        .queryParam("deliveryDate", "13/04/2019")
+                        .build())
+                .retrieve();
+        verifyCalledUrl("/products/?name=AndroidPhone&color=black&deliveryDate=13/04/2019");
+    }
+
+    @Test
+    public void whenCallSingleQueryParamsPlaceholders_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/products/")
+                        .queryParam("name", "{title}")
+                        .queryParam("color", "{authorId}")
+                        .queryParam("deliveryDate", "{date}")
+                        .build("AndroidPhone", "black", "13/04/2019"))
+                .retrieve();
+        verifyCalledUrl("/products/?name=AndroidPhone&color=black&deliveryDate=13%2F04%2F2019");
+    }
+
+    @Test
+    public void whenCallArrayQueryParamsBrackets_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/products/")
+                        .queryParam("tag[]", "Snapdragon", "NFC")
+                        .build())
+                .retrieve();
+        verifyCalledUrl("/products/?tag%5B%5D=Snapdragon&tag%5B%5D=NFC");
+    }
+
+
+    @Test
+    public void whenCallArrayQueryParams_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/products/")
+                        .queryParam("category", "Phones", "Tablets")
+                        .build())
+                .retrieve();
+        verifyCalledUrl("/products/?category=Phones&category=Tablets");
+    }
+
+    @Test
+    public void whenCallArrayQueryParamsComma_thenURIMatched() {
+        this.webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/products/")
+                        .queryParam("category", String.join(",", "Phones", "Tablets"))
+                        .build())
+                .retrieve();
+        verifyCalledUrl("/products/?category=Phones,Tablets");
+    }
+
     @Test
     public void whenUriComponentEncoding_thenQueryParamsNotEscaped() {
         DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory(BASE_URL);
@@ -57,101 +146,13 @@ public class WebClientRequestsUnitTest {
                 .build();
         this.webClient.get()
                 .uri(uriBuilder -> uriBuilder
-                        .path("/posts/")
-                        .queryParam("title", "Baeldung")
-                        .queryParam("authorId", "99")
-                        .queryParam("date", "13/04/2019")
+                        .path("/products/")
+                        .queryParam("name", "AndroidPhone")
+                        .queryParam("color", "black")
+                        .queryParam("deliveryDate", "13/04/2019")
                         .build())
                 .retrieve();
-        verifyCalledUrl("/posts/?title=Baeldung&authorId=99&date=13/04/2019");
-    }
-
-    @Test
-    public void whenCallSimpleURI_thenURIMatched() {
-        this.webClient.get()
-                .uri("/posts")
-                .retrieve();
-        verifyCalledUrl("/posts");
-    }
-
-    @Test
-    public void whenCallSinglePathSegmentUri_thenURIMatched() {
-        this.webClient.get()
-                .uri(uriBuilder -> uriBuilder
-                        .path("/posts/{id}")
-                        .build(2))
-                .retrieve();
-        verifyCalledUrl("/posts/2");
-    }
-
-    @Test
-    public void whenCallMultiplePathSegmentsUri_thenURIMatched() {
-        this.webClient.get()
-                .uri(uriBuilder -> uriBuilder
-                        .path("/posts/{id}/comments/{commentId}")
-                        .build(2, 13))
-                .retrieve();
-        verifyCalledUrl("/posts/2/comments/13");
-    }
-
-    @Test
-    public void whenCallSingleQueryParams_thenURIMatched() {
-        this.webClient.get()
-                .uri(uriBuilder -> uriBuilder
-                        .path("/posts/")
-                        .queryParam("title", "Baeldung")
-                        .queryParam("authorId", "99")
-                        .queryParam("date", "13/04/2019")
-                        .build())
-                .retrieve();
-        verifyCalledUrl("/posts/?title=Baeldung&authorId=99&date=13/04/2019");
-    }
-
-    @Test
-    public void whenCallSingleQueryParamsPlaceholders_thenURIMatched() {
-        this.webClient.get()
-                .uri(uriBuilder -> uriBuilder
-                        .path("/posts/")
-                        .queryParam("title", "{title}")
-                        .queryParam("authorId", "{authorId}")
-                        .queryParam("date", "{date}")
-                        .build("Baeldung", "99", "13/04/2019"))
-                .retrieve();
-        verifyCalledUrl("/posts/?title=Baeldung&authorId=99&date=13%2F04%2F2019");
-    }
-
-    @Test
-    public void whenCallArrayQueryParamsBrackets_thenURIMatched() {
-        this.webClient.get()
-                .uri(uriBuilder -> uriBuilder
-                        .path("/posts/")
-                        .queryParam("tag[]", "Spring", "Kotlin")
-                        .build())
-                .retrieve();
-        verifyCalledUrl("/posts/?tag%5B%5D=Spring&tag%5B%5D=Kotlin");
-    }
-
-
-    @Test
-    public void whenCallArrayQueryParams_thenURIMatched() {
-        this.webClient.get()
-                .uri(uriBuilder -> uriBuilder
-                        .path("/posts/")
-                        .queryParam("category", "Web", "Mobile")
-                        .build())
-                .retrieve();
-        verifyCalledUrl("/posts/?category=Web&category=Mobile");
-    }
-
-    @Test
-    public void whenCallArrayQueryParamsComma_thenURIMatched() {
-        this.webClient.get()
-                .uri(uriBuilder -> uriBuilder
-                        .path("/posts/")
-                        .queryParam("category",  String.join(",", "Web", "Mobile"))
-                        .build())
-                .retrieve();
-        verifyCalledUrl("/posts/?category=Web,Mobile");
+        verifyCalledUrl("/products/?name=AndroidPhone&color=black&deliveryDate=13/04/2019");
     }
 
     private void verifyCalledUrl(String relativeUrl) {

From caa9f36a158d71302e6751a0eef804cfb1253970 Mon Sep 17 00:00:00 2001
From: jose <larroquester@gmail.com>
Date: Sat, 27 Apr 2019 00:40:12 -0300
Subject: [PATCH 094/295] BAEL-2832: added java-strings-2 module to main
 pom.xml

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

diff --git a/pom.xml b/pom.xml
index 5e1098d216..403e3c7ed5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -462,6 +462,7 @@
                 <module>java-streams</module>
                 <module>java-streams-2</module>
                 <module>java-strings</module>
+                <module>java-strings-2</module>
                 <module>java-vavr-stream</module>
                 <module>java-websocket</module>
                 <module>javafx</module>
@@ -1133,6 +1134,7 @@
                 <module>java-streams</module>
                 <module>java-streams-2</module>
                 <module>java-strings</module>
+                <module>java-strings-2</module>
                 <module>java-vavr-stream</module>
                 <module>java-websocket</module>
                 <module>javafx</module>

From 5ef87d3a2d05285532825b88c00035665688de1d Mon Sep 17 00:00:00 2001
From: Alejandro Gervasio <alejandro.gervasio@gmail.com>
Date: Sat, 27 Apr 2019 02:42:17 -0300
Subject: [PATCH 095/295] Update pom.xml

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

diff --git a/maven-java-11/pom.xml b/maven-java-11/pom.xml
index 4342fa740f..ff95840523 100644
--- a/maven-java-11/pom.xml
+++ b/maven-java-11/pom.xml
@@ -12,7 +12,7 @@
 	<version>1.0.0-SNAPSHOT</version>
     </parent>
     <modules>
-        <name>multimodule-maven-project</name>
+        <module>multimodule-maven-project</module>
     </modules>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From 4de89f8a63f6d3249cc0f2aff96b577f095d723c Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Sat, 27 Apr 2019 08:02:14 +0200
Subject: [PATCH 096/295] [BAEL-2843] Fixed some tests to match articles
 updates

---
 .../com/baeldung/java8/optional/OptionalUnitTest.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java b/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java
index 4cb2551fae..bd7943c77b 100644
--- a/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java
+++ b/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java
@@ -27,34 +27,35 @@ public class OptionalUnitTest {
     @Test
     public void givenNonNull_whenCreatesNonNullable_thenCorrect() {
         String name = "baeldung";
-        Optional.of(name);
+        Optional<String> opt = Optional.of(name);
+        assertTrue(opt.isPresent());
     }
 
     @Test(expected = NullPointerException.class)
     public void givenNull_whenThrowsErrorOnCreate_thenCorrect() {
         String name = null;
-        Optional<String> opt = Optional.of(name);
+        Optional.of(name);
     }
 
     @Test
     public void givenNonNull_whenCreatesOptional_thenCorrect() {
         String name = "baeldung";
         Optional<String> opt = Optional.of(name);
-        assertEquals("Optional[baeldung]", opt.toString());
+        assertTrue(opt.isPresent());
     }
 
     @Test
     public void givenNonNull_whenCreatesNullable_thenCorrect() {
         String name = "baeldung";
         Optional<String> opt = Optional.ofNullable(name);
-        assertEquals("Optional[baeldung]", opt.toString());
+        assertTrue(opt.isPresent());
     }
 
     @Test
     public void givenNull_whenCreatesNullable_thenCorrect() {
         String name = null;
         Optional<String> opt = Optional.ofNullable(name);
-        assertEquals("Optional.empty", opt.toString());
+        assertFalse(opt.isPresent());
     }
     // Checking Value With isPresent()
 

From 3b05e26abf340725579ddcfd433df145f1554746 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 27 Apr 2019 19:48:09 +0530
Subject: [PATCH 097/295] [BAEL-13458] - Update Spring REST Metrics article,
 spring boot 2, micrometer implementation

---
 spring-rest-full/pom.xml                      |  6 ++--
 .../service/common/AbstractService.java       |  2 +-
 .../java/org/baeldung/spring/Application.java |  2 +-
 .../java/org/baeldung/spring/WebConfig.java   |  5 ++-
 .../web/metric/ActuatorMetricService.java     | 18 ++++++-----
 .../metric/CustomActuatorMetricService.java   | 31 +++++++++----------
 .../src/main/resources/application.properties |  2 +-
 7 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/spring-rest-full/pom.xml b/spring-rest-full/pom.xml
index ee6e5dbe3e..a85393b7a8 100644
--- a/spring-rest-full/pom.xml
+++ b/spring-rest-full/pom.xml
@@ -8,10 +8,10 @@
     <packaging>war</packaging>
 
     <parent>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-1</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
@@ -129,6 +129,7 @@
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
+            <version>${javassist.version}</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -287,6 +288,7 @@
         <!-- util -->
         <guava.version>19.0</guava.version>
         <commons-lang3.version>3.5</commons-lang3.version>
+        <javassist.version>3.25.0-GA</javassist.version>
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
diff --git a/spring-rest-full/src/main/java/org/baeldung/persistence/service/common/AbstractService.java b/spring-rest-full/src/main/java/org/baeldung/persistence/service/common/AbstractService.java
index 059516eeba..ceefbbe0e3 100644
--- a/spring-rest-full/src/main/java/org/baeldung/persistence/service/common/AbstractService.java
+++ b/spring-rest-full/src/main/java/org/baeldung/persistence/service/common/AbstractService.java
@@ -17,7 +17,7 @@ public abstract class AbstractService<T extends Serializable> implements IOperat
     @Override
     @Transactional(readOnly = true)
     public T findOne(final long id) {
-        return getDao().findOne(id);
+        return getDao().findById(id).orElse(null);
     }
 
     // read - all
diff --git a/spring-rest-full/src/main/java/org/baeldung/spring/Application.java b/spring-rest-full/src/main/java/org/baeldung/spring/Application.java
index 950e2085a6..ca72a4ef56 100644
--- a/spring-rest-full/src/main/java/org/baeldung/spring/Application.java
+++ b/spring-rest-full/src/main/java/org/baeldung/spring/Application.java
@@ -7,7 +7,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.context.request.RequestContextListener;
diff --git a/spring-rest-full/src/main/java/org/baeldung/spring/WebConfig.java b/spring-rest-full/src/main/java/org/baeldung/spring/WebConfig.java
index 86cb93175a..a0db08d93d 100644
--- a/spring-rest-full/src/main/java/org/baeldung/spring/WebConfig.java
+++ b/spring-rest-full/src/main/java/org/baeldung/spring/WebConfig.java
@@ -6,13 +6,13 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
 @Configuration
 @ComponentScan("org.baeldung.web")
 @EnableWebMvc
-public class WebConfig extends WebMvcConfigurerAdapter {
+public class WebConfig implements WebMvcConfigurer {
 
     public WebConfig() {
         super();
@@ -29,7 +29,6 @@ public class WebConfig extends WebMvcConfigurerAdapter {
     // API
     @Override
     public void addViewControllers(final ViewControllerRegistry registry) {
-        super.addViewControllers(registry);
         registry.addViewController("/graph.html");
         registry.addViewController("/homepage.html");
     }
diff --git a/spring-rest-full/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java b/spring-rest-full/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java
index 89e3a22d45..4dcec17b9e 100644
--- a/spring-rest-full/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java
+++ b/spring-rest-full/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java
@@ -6,16 +6,18 @@ import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics;
-import org.springframework.boot.actuate.metrics.Metric;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.MeterRegistry;
+
 @Service
 public class ActuatorMetricService implements IActuatorMetricService {
 
     @Autowired
-    private MetricReaderPublicMetrics publicMetrics;
+    private MeterRegistry publicMetrics;
 
     private final List<ArrayList<Integer>> statusMetricsByMinute;
     private final List<String> statusList;
@@ -68,7 +70,7 @@ public class ActuatorMetricService implements IActuatorMetricService {
     private void exportMetrics() {
         final ArrayList<Integer> lastMinuteStatuses = initializeStatuses(statusList.size());
 
-        for (final Metric<?> counterMetric : publicMetrics.metrics()) {
+        for (final Meter counterMetric : publicMetrics.getMeters()) {
             updateMetrics(counterMetric, lastMinuteStatuses);
         }
 
@@ -83,17 +85,17 @@ public class ActuatorMetricService implements IActuatorMetricService {
         return counterList;
     }
 
-    private void updateMetrics(final Metric<?> counterMetric, final ArrayList<Integer> statusCount) {
+    private void updateMetrics(final Meter counterMetric, final ArrayList<Integer> statusCount) {
         String status = "";
         int index = -1;
         int oldCount = 0;
 
-        if (counterMetric.getName().contains("counter.status.")) {
-            status = counterMetric.getName().substring(15, 18); // example 404, 200
+        if (counterMetric.getId().getName().contains("counter.status.")) {
+            status = counterMetric.getId().getName().substring(15, 18); // example 404, 200
             appendStatusIfNotExist(status, statusCount);
             index = statusList.indexOf(status);
             oldCount = statusCount.get(index) == null ? 0 : statusCount.get(index);
-            statusCount.set(index, counterMetric.getValue().intValue() + oldCount);
+            statusCount.set(index, (int)((Counter) counterMetric).count() + oldCount);
         }
     }
 
diff --git a/spring-rest-full/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java b/spring-rest-full/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java
index 852a9fae99..cf30686e52 100644
--- a/spring-rest-full/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java
+++ b/spring-rest-full/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java
@@ -6,20 +6,18 @@ import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.metrics.CounterService;
-import org.springframework.boot.actuate.metrics.Metric;
-import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository;
-import org.springframework.boot.actuate.metrics.repository.MetricRepository;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.search.Search;
+
 @Service
 public class CustomActuatorMetricService implements ICustomActuatorMetricService {
 
-    private MetricRepository repo;
-
     @Autowired
-    private CounterService counter;
+    private MeterRegistry registry;
 
     private final List<ArrayList<Integer>> statusMetricsByMinute;
     private final List<String> statusList;
@@ -27,7 +25,6 @@ public class CustomActuatorMetricService implements ICustomActuatorMetricService
 
     public CustomActuatorMetricService() {
         super();
-        repo = new InMemoryMetricRepository();
         statusMetricsByMinute = new ArrayList<ArrayList<Integer>>();
         statusList = new ArrayList<String>();
     }
@@ -36,9 +33,10 @@ public class CustomActuatorMetricService implements ICustomActuatorMetricService
 
     @Override
     public void increaseCount(final int status) {
-        counter.increment("status." + status);
-        if (!statusList.contains("counter.status." + status)) {
-            statusList.add("counter.status." + status);
+        String counterName = "counter.status." + status;
+        registry.counter(counterName).increment(1);
+        if (!statusList.contains(counterName)) {
+            statusList.add(counterName);
         }
     }
 
@@ -78,17 +76,16 @@ public class CustomActuatorMetricService implements ICustomActuatorMetricService
 
     @Scheduled(fixedDelay = 60000)
     private void exportMetrics() {
-        Metric<?> metric;
         final ArrayList<Integer> statusCount = new ArrayList<Integer>();
         for (final String status : statusList) {
-            metric = repo.findOne(status);
-            if (metric != null) {
-                statusCount.add(metric.getValue().intValue());
-                repo.reset(status);
+            Search search = registry.find(status);
+            if (search != null) {
+                Counter counter = search.counter();
+                statusCount.add(counter != null ? ((int) counter.count()) : 0);
+                registry.remove(counter);
             } else {
                 statusCount.add(0);
             }
-
         }
         statusMetricsByMinute.add(statusCount);
     }
diff --git a/spring-rest-full/src/main/resources/application.properties b/spring-rest-full/src/main/resources/application.properties
index 6c7461f12c..52d93b4cff 100644
--- a/spring-rest-full/src/main/resources/application.properties
+++ b/spring-rest-full/src/main/resources/application.properties
@@ -1,3 +1,3 @@
 server.port=8082
-server.context-path=/spring-rest-full
+server.servlet.context-path=/spring-rest-full
 endpoints.metrics.enabled=true
\ No newline at end of file

From f0277ca4b0cafb0ef4a670b05e08ebe6319fc600 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Sat, 27 Apr 2019 22:36:54 +0530
Subject: [PATCH 098/295] BAEL2848 JUnit Tagging and Filtering Tests

---
 testing-modules/junit-5-2/pom.xml             | 167 ++++++++++++++++++
 .../baeldung/junit/tags/example/Employee.java |  44 +++++
 .../junit/tags/example/EmployeeDAO.java       |  66 +++++++
 .../junit/tags/example/EmployeeRowMapper.java |  21 +++
 .../junit/tags/example/SpringJdbcConfig.java  |  20 +++
 .../src/main/resources/jdbc/schema.sql        |   7 +
 .../main/resources/jdbc/springJdbc-config.xml |  19 ++
 .../src/main/resources/jdbc/test-data.sql     |   7 +
 .../EmployeeDAOCategoryIntegrationTest.java   |  67 +++++++
 .../categories/EmployeeDAOUnitTestSuite.java  |  12 ++
 .../baeldung/categories/IntegrationTest.java  |   4 +
 .../com/baeldung/categories/UnitTest.java     |   4 +
 .../example/EmployeeDAOIntegrationTest.java   |  42 +++++
 .../junit/tags/example/EmployeeUnitTest.java  |  41 +++++
 .../EmployeeDAOCategoryIntegrationTest.java   |  69 ++++++++
 .../tags/EmployeeDAOIntegrationTest.java      |  70 ++++++++
 .../baeldung/tags/EmployeeDAOTestSuite.java   |  12 ++
 testing-modules/pom.xml                       |   1 +
 18 files changed, 673 insertions(+)
 create mode 100644 testing-modules/junit-5-2/pom.xml
 create mode 100644 testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/Employee.java
 create mode 100644 testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java
 create mode 100644 testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java
 create mode 100644 testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java
 create mode 100644 testing-modules/junit-5-2/src/main/resources/jdbc/schema.sql
 create mode 100644 testing-modules/junit-5-2/src/main/resources/jdbc/springJdbc-config.xml
 create mode 100644 testing-modules/junit-5-2/src/main/resources/jdbc/test-data.sql
 create mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java
 create mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java
 create mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/categories/IntegrationTest.java
 create mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/categories/UnitTest.java
 create mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeDAOIntegrationTest.java
 create mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeUnitTest.java
 create mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOCategoryIntegrationTest.java
 create mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java
 create mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java

diff --git a/testing-modules/junit-5-2/pom.xml b/testing-modules/junit-5-2/pom.xml
new file mode 100644
index 0000000000..ec535f8413
--- /dev/null
+++ b/testing-modules/junit-5-2/pom.xml
@@ -0,0 +1,167 @@
+<?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>
+    <!-- NOT NEEDED - JSP <groupId>com.baeldung</groupId> -->
+    <artifactId>junit-5-2</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>junit-5-2</name>
+    <description>JUnit-5 extended</description>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${junit.platform.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit.jupiter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junit.vintage.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-migrationsupport</artifactId>
+            <version>${junit.vintage.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+    
+    <profiles>
+        <profile>
+            <id>filtering</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.junit.platform</groupId>
+                                <artifactId>junit-platform-surefire-provider</artifactId>
+                                <version>${junit.platform.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <excludes>
+                                **/*IntegrationTest.java
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>category</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                        <configuration>
+                            <groups>com.baeldung.categories.UnitTest</groups>
+                            <excludedGroups>com.baeldung.categories.IntegrationTest</excludedGroups>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>tags</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                        <configuration>
+                            <groups>UnitTest</groups>
+                            <excludedGroups>IntegrationTest</excludedGroups>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+
+    <properties>
+        <junit.jupiter.version>5.3.1</junit.jupiter.version>
+        <mockito.junit.jupiter.version>2.23.0</mockito.junit.jupiter.version>
+        <junit.platform.version>1.2.0</junit.platform.version>
+        <junit.vintage.version>5.2.0</junit.vintage.version>
+        <log4j2.version>2.8.2</log4j2.version>
+        <h2.version>1.4.196</h2.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <spring.version>5.0.6.RELEASE</spring.version>
+    </properties>
+
+</project>
diff --git a/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/Employee.java b/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/Employee.java
new file mode 100644
index 0000000000..66f41ee885
--- /dev/null
+++ b/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/Employee.java
@@ -0,0 +1,44 @@
+package com.baeldung.junit.tags.example;
+
+public class Employee {
+    private int id;
+
+    private String firstName;
+
+    private String lastName;
+
+    private String address;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(final String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(final String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(final String address) {
+        this.address = address;
+    }
+
+}
diff --git a/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java b/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java
new file mode 100644
index 0000000000..21375dbed1
--- /dev/null
+++ b/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java
@@ -0,0 +1,66 @@
+package com.baeldung.junit.tags.example;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.core.namedparam.SqlParameterSource;
+import org.springframework.jdbc.core.namedparam.SqlParameterSourceUtils;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class EmployeeDAO {
+
+    private JdbcTemplate jdbcTemplate;
+
+    private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
+    private SimpleJdbcInsert simpleJdbcInsert;
+
+    @Autowired
+    public void setDataSource(final DataSource dataSource) {
+        jdbcTemplate = new JdbcTemplate(dataSource);
+
+        namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
+        simpleJdbcInsert = new SimpleJdbcInsert(dataSource).withTableName("EMPLOYEE");
+
+    }
+
+    public int getCountOfEmployees() {
+        return jdbcTemplate.queryForObject("SELECT COUNT(*) FROM EMPLOYEE", Integer.class);
+    }
+
+    public List<Employee> getAllEmployees() {
+        return jdbcTemplate.query("SELECT * FROM EMPLOYEE", new EmployeeRowMapper());
+    }
+
+    public int addEmplyee(final int id) {
+        return jdbcTemplate.update("INSERT INTO EMPLOYEE VALUES (?, ?, ?, ?)", id, "Bill", "Gates", "USA");
+    }
+
+    public int addEmplyeeUsingSimpelJdbcInsert(final Employee emp) {
+        final Map<String, Object> parameters = new HashMap<String, Object>();
+        parameters.put("ID", emp.getId());
+        parameters.put("FIRST_NAME", emp.getFirstName());
+        parameters.put("LAST_NAME", emp.getLastName());
+        parameters.put("ADDRESS", emp.getAddress());
+
+        return simpleJdbcInsert.execute(parameters);
+    }
+
+    // for testing
+    public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+}
diff --git a/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java b/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java
new file mode 100644
index 0000000000..f480aac9a2
--- /dev/null
+++ b/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java
@@ -0,0 +1,21 @@
+package com.baeldung.junit.tags.example;
+
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class EmployeeRowMapper implements RowMapper<Employee> {
+
+    @Override
+    public Employee mapRow(final ResultSet rs, final int rowNum) throws SQLException {
+        final Employee employee = new Employee();
+
+        employee.setId(rs.getInt("ID"));
+        employee.setFirstName(rs.getString("FIRST_NAME"));
+        employee.setLastName(rs.getString("LAST_NAME"));
+        employee.setAddress(rs.getString("ADDRESS"));
+
+        return employee;
+    }
+}
diff --git a/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java b/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java
new file mode 100644
index 0000000000..3ddef7e5d4
--- /dev/null
+++ b/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java
@@ -0,0 +1,20 @@
+package com.baeldung.junit.tags.example;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+
+import javax.sql.DataSource;
+
+@Configuration
+@ComponentScan("com.baeldung.junit.tags.example")
+public class SpringJdbcConfig {
+
+    @Bean
+    public DataSource dataSource() {
+        return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2).addScript("classpath:jdbc/schema.sql").addScript("classpath:jdbc/test-data.sql").build();
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-2/src/main/resources/jdbc/schema.sql b/testing-modules/junit-5-2/src/main/resources/jdbc/schema.sql
new file mode 100644
index 0000000000..c86d35cdae
--- /dev/null
+++ b/testing-modules/junit-5-2/src/main/resources/jdbc/schema.sql
@@ -0,0 +1,7 @@
+CREATE TABLE EMPLOYEE
+(
+	ID int  NOT NULL PRIMARY KEY,
+	FIRST_NAME varchar(255),
+	LAST_NAME varchar(255),
+	ADDRESS varchar(255),
+);
\ No newline at end of file
diff --git a/testing-modules/junit-5-2/src/main/resources/jdbc/springJdbc-config.xml b/testing-modules/junit-5-2/src/main/resources/jdbc/springJdbc-config.xml
new file mode 100644
index 0000000000..5fd2699b41
--- /dev/null
+++ b/testing-modules/junit-5-2/src/main/resources/jdbc/springJdbc-config.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
+>
+
+    <bean id="employeeDao" class="org.baeldung.jdbc.EmployeeDAO">
+        <property name="dataSource" ref="dataSource"/>
+    </bean>
+
+    <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+        <property name="driverClassName" value="${jdbc.driverClassName}"/>
+        <property name="url" value="${jdbc.url}"/>
+        <property name="username" value="${jdbc.username}"/>
+        <property name="password" value="${jdbc.password}"/>
+    </bean>
+
+    <context:property-placeholder location="jdbc.properties"/>
+</beans>
\ No newline at end of file
diff --git a/testing-modules/junit-5-2/src/main/resources/jdbc/test-data.sql b/testing-modules/junit-5-2/src/main/resources/jdbc/test-data.sql
new file mode 100644
index 0000000000..b9ef8fec25
--- /dev/null
+++ b/testing-modules/junit-5-2/src/main/resources/jdbc/test-data.sql
@@ -0,0 +1,7 @@
+INSERT INTO EMPLOYEE VALUES (1, 'James', 'Gosling', 'Canada');
+
+INSERT INTO EMPLOYEE VALUES (2, 'Donald', 'Knuth', 'USA');
+
+INSERT INTO EMPLOYEE VALUES (3, 'Linus', 'Torvalds', 'Finland');
+
+INSERT INTO EMPLOYEE VALUES (4, 'Dennis', 'Ritchie', 'USA');
\ No newline at end of file
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java
new file mode 100644
index 0000000000..202ac728a6
--- /dev/null
+++ b/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java
@@ -0,0 +1,67 @@
+package com.baeldung.categories;
+
+import org.hamcrest.CoreMatchers;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.junit.tags.example.Employee;
+import com.baeldung.junit.tags.example.EmployeeDAO;
+import com.baeldung.junit.tags.example.SpringJdbcConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { SpringJdbcConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class EmployeeDAOCategoryIntegrationTest {
+
+    @Autowired
+    private EmployeeDAO employeeDao;
+
+    @Mock
+    private JdbcTemplate jdbcTemplate;
+    private EmployeeDAO employeeDAO;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        employeeDAO = new EmployeeDAO();
+        employeeDAO.setJdbcTemplate(jdbcTemplate);
+    }
+
+    @Test
+    @Category(IntegrationTest.class)
+    public void testAddEmployeeUsingSimpelJdbcInsert() {
+        final Employee emp = new Employee();
+        emp.setId(12);
+        emp.setFirstName("testFirstName");
+        emp.setLastName("testLastName");
+        emp.setAddress("testAddress");
+
+        Assert.assertEquals(employeeDao.addEmplyeeUsingSimpelJdbcInsert(emp), 1);
+    }
+
+    @Test
+    @Category(UnitTest.class)
+    public void givenNumberOfEmployeeWhenCountEmployeeThenCountMatch() {
+
+        // given
+        Mockito.when(jdbcTemplate.queryForObject(Mockito.any(String.class), Mockito.eq(Integer.class)))
+                .thenReturn(1);
+
+        // when
+        int countOfEmployees = employeeDAO.getCountOfEmployees();
+
+        // then
+        Assert.assertThat(countOfEmployees, CoreMatchers.is(1));
+    }
+
+}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java
new file mode 100644
index 0000000000..252e7ffe64
--- /dev/null
+++ b/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java
@@ -0,0 +1,12 @@
+package com.baeldung.categories;
+
+import org.junit.experimental.categories.Categories;
+import org.junit.experimental.categories.Categories.IncludeCategory;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Categories.class)
+@IncludeCategory(UnitTest.class)
+@SuiteClasses(EmployeeDAOCategoryIntegrationTest.class)
+public class EmployeeDAOUnitTestSuite {
+}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/IntegrationTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/IntegrationTest.java
new file mode 100644
index 0000000000..9ced880ffc
--- /dev/null
+++ b/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/IntegrationTest.java
@@ -0,0 +1,4 @@
+package com.baeldung.categories;
+
+public interface IntegrationTest {
+}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/UnitTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/UnitTest.java
new file mode 100644
index 0000000000..3790fc1d91
--- /dev/null
+++ b/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/UnitTest.java
@@ -0,0 +1,4 @@
+package com.baeldung.categories;
+
+public interface UnitTest {
+}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeDAOIntegrationTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeDAOIntegrationTest.java
new file mode 100644
index 0000000000..9b95b3701d
--- /dev/null
+++ b/testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeDAOIntegrationTest.java
@@ -0,0 +1,42 @@
+package com.baeldung.junit.tags.example;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { SpringJdbcConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class EmployeeDAOIntegrationTest {
+
+    @Autowired
+    private EmployeeDAO employeeDao;
+
+    @Test
+    public void testQueryMethod() {
+        Assert.assertEquals(employeeDao.getAllEmployees().size(), 4);
+    }
+
+    @Test
+    public void testUpdateMethod() {
+        Assert.assertEquals(employeeDao.addEmplyee(5), 1);
+    }
+
+    @Test
+    public void testAddEmployeeUsingSimpelJdbcInsert() {
+        final Employee emp = new Employee();
+        emp.setId(11);
+        emp.setFirstName("testFirstName");
+        emp.setLastName("testLastName");
+        emp.setAddress("testAddress");
+
+        Assert.assertEquals(employeeDao.addEmplyeeUsingSimpelJdbcInsert(emp), 1);
+    }
+}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeUnitTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeUnitTest.java
new file mode 100644
index 0000000000..6ffb5586cc
--- /dev/null
+++ b/testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeUnitTest.java
@@ -0,0 +1,41 @@
+package com.baeldung.junit.tags.example;
+
+import org.hamcrest.CoreMatchers;
+import org.junit.Assert;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+public class EmployeeUnitTest {
+
+    @Mock
+    private JdbcTemplate jdbcTemplate;
+
+    private EmployeeDAO employeeDAO;
+
+    @BeforeEach
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        employeeDAO = new EmployeeDAO();
+        employeeDAO.setJdbcTemplate(jdbcTemplate);
+    }
+
+    @Test
+    public void givenNumberOfEmployeeWhenCountEmployeeThenCountMatch() {
+
+        // given
+        Mockito.when(jdbcTemplate.queryForObject(Mockito.any(String.class), Mockito.eq(Integer.class)))
+            .thenReturn(1);
+
+        // when
+        int countOfEmployees = employeeDAO.getCountOfEmployees();
+
+        // then
+        Assert.assertThat(countOfEmployees, CoreMatchers.is(1));
+    }
+}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOCategoryIntegrationTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOCategoryIntegrationTest.java
new file mode 100644
index 0000000000..1b1518337d
--- /dev/null
+++ b/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOCategoryIntegrationTest.java
@@ -0,0 +1,69 @@
+package com.baeldung.tags;
+
+import org.hamcrest.CoreMatchers;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.categories.IntegrationTest;
+import com.baeldung.categories.UnitTest;
+import com.baeldung.junit.tags.example.Employee;
+import com.baeldung.junit.tags.example.EmployeeDAO;
+import com.baeldung.junit.tags.example.SpringJdbcConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { SpringJdbcConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class EmployeeDAOCategoryIntegrationTest {
+
+    @Autowired
+    private EmployeeDAO employeeDao;
+
+    @Mock
+    private JdbcTemplate jdbcTemplate;
+    private EmployeeDAO employeeDAO;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        employeeDAO = new EmployeeDAO();
+        employeeDAO.setJdbcTemplate(jdbcTemplate);
+    }
+
+    @Test
+    @Category(IntegrationTest.class)
+    public void testAddEmployeeUsingSimpelJdbcInsert() {
+        final Employee emp = new Employee();
+        emp.setId(12);
+        emp.setFirstName("testFirstName");
+        emp.setLastName("testLastName");
+        emp.setAddress("testAddress");
+
+        Assert.assertEquals(employeeDao.addEmplyeeUsingSimpelJdbcInsert(emp), 1);
+    }
+
+    @Test
+    @Category(UnitTest.class)
+    public void givenNumberOfEmployeeWhenCountEmployeeThenCountMatch() {
+
+        // given
+        Mockito.when(jdbcTemplate.queryForObject(Mockito.any(String.class), Mockito.eq(Integer.class)))
+                .thenReturn(1);
+
+        // when
+        int countOfEmployees = employeeDAO.getCountOfEmployees();
+
+        // then
+        Assert.assertThat(countOfEmployees, CoreMatchers.is(1));
+    }
+
+}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java
new file mode 100644
index 0000000000..7c16f5eb29
--- /dev/null
+++ b/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java
@@ -0,0 +1,70 @@
+package com.baeldung.tags;
+
+import org.hamcrest.CoreMatchers;
+import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.junit.tags.example.Employee;
+import com.baeldung.junit.tags.example.EmployeeDAO;
+import com.baeldung.junit.tags.example.SpringJdbcConfig;
+
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = { SpringJdbcConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class EmployeeDAOIntegrationTest {
+
+    @Autowired
+    private EmployeeDAO employeeDao;
+
+    @Mock
+    private JdbcTemplate jdbcTemplate;
+    private EmployeeDAO employeeDAO;
+
+    @BeforeEach
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        employeeDAO = new EmployeeDAO();
+        employeeDAO.setJdbcTemplate(jdbcTemplate);
+    }
+
+    @Test
+    @Tag("IntegrationTest")
+    public void testAddEmployeeUsingSimpelJdbcInsert() {
+        final Employee emp = new Employee();
+        emp.setId(12);
+        emp.setFirstName("testFirstName");
+        emp.setLastName("testLastName");
+        emp.setAddress("testAddress");
+
+        Assertions.assertEquals(employeeDao.addEmplyeeUsingSimpelJdbcInsert(emp), 1);
+    }
+
+    @Test
+    @Tag("UnitTest")
+    public void givenNumberOfEmployeeWhenCountEmployeeThenCountMatch() {
+
+        // given
+        Mockito.when(jdbcTemplate.queryForObject(Mockito.any(String.class), Mockito.eq(Integer.class)))
+                .thenReturn(1);
+
+        // when
+        int countOfEmployees = employeeDAO.getCountOfEmployees();
+
+        // then
+        Assertions.assertEquals(1, countOfEmployees);
+    }
+
+}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java
new file mode 100644
index 0000000000..783e5a81a2
--- /dev/null
+++ b/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java
@@ -0,0 +1,12 @@
+package com.baeldung.tags;
+
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.platform.suite.api.IncludeTags;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.runner.RunWith;
+
+@RunWith(JUnitPlatform.class)
+@SelectPackages("com.baeldung.tags")
+@IncludeTags("UnitTest")
+public class EmployeeDAOTestSuite {
+}
diff --git a/testing-modules/pom.xml b/testing-modules/pom.xml
index 39047fb756..45952efb00 100644
--- a/testing-modules/pom.xml
+++ b/testing-modules/pom.xml
@@ -32,5 +32,6 @@
         <module>test-containers</module>
         <module>testing</module>
         <module>testng</module>
+        <module>junit-5-2</module>
     </modules>
 </project>

From bd9882b50a701149d52d7db34ef6081bf158b7f9 Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Sat, 27 Apr 2019 21:37:51 +0300
Subject: [PATCH 099/295] move code to kotlin-2

---
 .../src/main/kotlin/com/baeldung/jvmannotations/Document.kt       | 0
 .../src/main/kotlin/com/baeldung/jvmannotations/HtmlDocument.java | 0
 .../src/main/kotlin/com/baeldung/jvmannotations/Message.kt        | 0
 .../main/kotlin/com/baeldung/jvmannotations/MessageConverter.kt   | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename {core-kotlin => core-kotlin-2}/src/main/kotlin/com/baeldung/jvmannotations/Document.kt (100%)
 rename {core-kotlin => core-kotlin-2}/src/main/kotlin/com/baeldung/jvmannotations/HtmlDocument.java (100%)
 rename {core-kotlin => core-kotlin-2}/src/main/kotlin/com/baeldung/jvmannotations/Message.kt (100%)
 rename {core-kotlin => core-kotlin-2}/src/main/kotlin/com/baeldung/jvmannotations/MessageConverter.kt (100%)

diff --git a/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/Document.kt b/core-kotlin-2/src/main/kotlin/com/baeldung/jvmannotations/Document.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/Document.kt
rename to core-kotlin-2/src/main/kotlin/com/baeldung/jvmannotations/Document.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/HtmlDocument.java b/core-kotlin-2/src/main/kotlin/com/baeldung/jvmannotations/HtmlDocument.java
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/HtmlDocument.java
rename to core-kotlin-2/src/main/kotlin/com/baeldung/jvmannotations/HtmlDocument.java
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/Message.kt b/core-kotlin-2/src/main/kotlin/com/baeldung/jvmannotations/Message.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/Message.kt
rename to core-kotlin-2/src/main/kotlin/com/baeldung/jvmannotations/Message.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/MessageConverter.kt b/core-kotlin-2/src/main/kotlin/com/baeldung/jvmannotations/MessageConverter.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/jvmannotations/MessageConverter.kt
rename to core-kotlin-2/src/main/kotlin/com/baeldung/jvmannotations/MessageConverter.kt

From e84255194b921a3e0c21422f30141534bbaeddea Mon Sep 17 00:00:00 2001
From: Johan Janssen <johanjanssen2001@gmail.com>
Date: Sun, 28 Apr 2019 05:01:11 +0200
Subject: [PATCH 100/295] Added Maven profiles example. (#6833)

---
 maven/profiles/pom.xml | 88 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 maven/profiles/pom.xml

diff --git a/maven/profiles/pom.xml b/maven/profiles/pom.xml
new file mode 100644
index 0000000000..110016f3a2
--- /dev/null
+++ b/maven/profiles/pom.xml
@@ -0,0 +1,88 @@
+<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>profiles</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+	<name>profiles</name>
+
+    <profiles>
+        <profile>
+            <id>no-tests</id>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
+        </profile>
+        <profile>
+            <id>integration-tests</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>mutation-tests</id>
+        </profile>
+        <profile>
+            <id>active-on-jdk-11</id>
+            <activation>
+                <jdk>11</jdk>
+            </activation>
+        </profile>
+        <profile>
+            <id>active-on-windows-10</id>
+            <activation>
+                <os>
+                    <name>windows 10</name>
+                    <family>Windows</family>
+                    <arch>amd64</arch>
+                    <version>10.0</version>
+                </os>
+            </activation>
+        </profile>
+        <profile>
+            <id>active-on-property-environment</id>
+            <activation>
+                <property>
+                    <name>environment</name>
+                    <value>!test</value>
+                </property>
+            </activation>
+        </profile>
+        <profile>
+            <id>active-on-missing-file</id>
+            <activation>
+                <file>
+                    <missing>target/testreport.html</missing>
+                </file>
+            </activation>
+        </profile>
+        <profile>
+            <id>active-on-present-file</id>
+            <activation>
+                <file>
+                    <exists>target/artifact.jar</exists>
+                </file>
+            </activation>
+        </profile>
+    </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-help-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>show-profiles</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>active-profiles</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

From 6cc3c4c487d63cb7dd45dae283be78178b639a41 Mon Sep 17 00:00:00 2001
From: Liesheng Long <liesheng.long@gmail.com>
Date: Sun, 28 Apr 2019 00:33:53 -0400
Subject: [PATCH 101/295] relocate the sample manifest file

---
 .../com/baeldung/jarArguments => resources}/example_manifest.txt  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core-java-8-2/src/main/{java/com/baeldung/jarArguments => resources}/example_manifest.txt (100%)

diff --git a/core-java-8-2/src/main/java/com/baeldung/jarArguments/example_manifest.txt b/core-java-8-2/src/main/resources/example_manifest.txt
similarity index 100%
rename from core-java-8-2/src/main/java/com/baeldung/jarArguments/example_manifest.txt
rename to core-java-8-2/src/main/resources/example_manifest.txt

From e14aab23b15a862f1700c988adf949663ff31129 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 28 Apr 2019 15:09:24 +0530
Subject: [PATCH 102/295] [BAEL-13600] - Removed old section 6, and corrected
 the JUNIT name, replaced section 3 with new code

---
 .../org/baeldung/client/RestClientLiveManualTest.java | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/httpclient-simple/src/test/java/org/baeldung/client/RestClientLiveManualTest.java b/httpclient-simple/src/test/java/org/baeldung/client/RestClientLiveManualTest.java
index 53f259c21d..696d414ae7 100644
--- a/httpclient-simple/src/test/java/org/baeldung/client/RestClientLiveManualTest.java
+++ b/httpclient-simple/src/test/java/org/baeldung/client/RestClientLiveManualTest.java
@@ -46,16 +46,11 @@ public class RestClientLiveManualTest {
     // old httpClient will throw UnsupportedOperationException
     @Ignore
     @Test
-    public final void givenAcceptingAllCertificates_whenHttpsUrlIsConsumed_thenException_1() throws GeneralSecurityException {
+    public final void givenAcceptingAllCertificates_whenHttpsUrlIsConsumed_thenOk_1() throws GeneralSecurityException {
         final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
         final CloseableHttpClient httpClient = (CloseableHttpClient) requestFactory.getHttpClient();
 
-        final TrustStrategy acceptingTrustStrategy = new TrustStrategy() {
-            @Override
-            public final boolean isTrusted(final X509Certificate[] certificate, final String authType) {
-                return true;
-            }
-        };
+        final TrustStrategy acceptingTrustStrategy = (cert, authType) -> true;
         final SSLSocketFactory sf = new SSLSocketFactory(acceptingTrustStrategy, ALLOW_ALL_HOSTNAME_VERIFIER);
         httpClient.getConnectionManager().getSchemeRegistry().register(new Scheme("https", 8443, sf));
 
@@ -65,7 +60,7 @@ public class RestClientLiveManualTest {
     
     // new httpClient : 4.4 and above
     @Test
-    public final void givenAcceptingAllCertificates_whenHttpsUrlIsConsumed_thenException_2() throws GeneralSecurityException {
+    public final void givenAcceptingAllCertificates_whenHttpsUrlIsConsumed_thenOk_2() throws GeneralSecurityException {
 
         final TrustStrategy acceptingTrustStrategy = (cert, authType) -> true;
         final SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(null, acceptingTrustStrategy).build();

From e3a40972fe8c267a676d62ffdec5096c57bf59fc Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 28 Apr 2019 16:31:11 +0530
Subject: [PATCH 103/295] [BAEL-13598] - Added old API, moved TimerTask Junit
 to httpclient-simple

---
 .../httpclient/HttpClientTimeoutLiveTest.java | 46 ++++++++++++++++++-
 .../baeldung/client/RawClientLiveTest.java    | 22 +--------
 2 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java b/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
index 9d14a20e22..8041080b3d 100644
--- a/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
+++ b/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
@@ -4,14 +4,21 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
 
 import java.io.IOException;
+import java.util.Timer;
+import java.util.TimerTask;
 
+import org.apache.http.HttpResponse;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.params.ClientPNames;
 import org.apache.http.config.SocketConfig;
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.params.CoreConnectionPNames;
+import org.apache.http.params.HttpParams;
 import org.junit.After;
 import org.junit.Test;
 
@@ -25,6 +32,20 @@ public class HttpClientTimeoutLiveTest {
     }
 
     // tests
+    @Test
+    public final void givenUsingOldApi_whenSettingTimeoutViaParameter_thenCorrect() throws IOException {
+        
+        DefaultHttpClient httpClient = new DefaultHttpClient();
+        int timeout = 5; // seconds
+        HttpParams httpParams = httpClient.getParams();
+        httpParams.setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout * 1000);
+        httpParams.setParameter(CoreConnectionPNames.SO_TIMEOUT, timeout * 1000);
+        httpParams.setParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000));
+        
+        final HttpGet request = new HttpGet("http://www.github.com");
+        HttpResponse execute = httpClient.execute(request);
+        assertThat(execute.getStatusLine().getStatusCode(), equalTo(200));
+    }
 
     @Test
     public final void givenUsingNewApi_whenSettingTimeoutViaRequestConfig_thenCorrect() throws IOException {
@@ -33,8 +54,6 @@ public class HttpClientTimeoutLiveTest {
         final CloseableHttpClient client = HttpClientBuilder.create().setDefaultRequestConfig(config).build();
         final HttpGet request = new HttpGet("http://www.github.com");
 
-        // httpParams.setLongParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000)); // https://issues.apache.org/jira/browse/HTTPCLIENT-1418
-
         response = client.execute(request);
 
         assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
@@ -81,5 +100,28 @@ public class HttpClientTimeoutLiveTest {
         final HttpGet request = new HttpGet("http://www.google.com:81");
         client.execute(request);
     }
+    
+    @Test
+    public void whenSecuredRestApiIsConsumed_then200OK() throws IOException {
+        CloseableHttpClient httpClient = HttpClientBuilder.create().build();
 
+        int timeout = 20; // seconds
+        RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(timeout * 1000)
+          .setConnectTimeout(timeout * 1000).setSocketTimeout(timeout * 1000).build();
+        HttpGet getMethod = new HttpGet("http://localhost:8082/httpclient-simple/api/bars/1");
+        getMethod.setConfig(requestConfig);
+
+        int hardTimeout = 5; // seconds
+        TimerTask task = new TimerTask() {
+            @Override
+            public void run() {
+                getMethod.abort();
+            }
+        };
+        new Timer(true).schedule(task, hardTimeout * 1000);
+
+        HttpResponse response = httpClient.execute(getMethod);
+        System.out.println("HTTP Status of response: " + response.getStatusLine().getStatusCode());
+    }
+    
 }
diff --git a/spring-security-mvc-digest-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java b/spring-security-mvc-digest-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java
index 90c2a29968..e8dcf82ebc 100644
--- a/spring-security-mvc-digest-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java
+++ b/spring-security-mvc-digest-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java
@@ -1,7 +1,8 @@
 package org.baeldung.client;
 
+import java.io.IOException;
+
 import org.apache.http.HttpResponse;
-import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
@@ -12,10 +13,6 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
-import java.io.IOException;
-import java.util.Timer;
-import java.util.TimerTask;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = {ClientConfig.class}, loader = AnnotationConfigContextLoader.class)
 public class RawClientLiveTest {
@@ -25,22 +22,7 @@ public class RawClientLiveTest {
     @Test
     public void whenSecuredRestApiIsConsumed_then200OK() throws IOException {
         CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-
-        int timeout = 20; // seconds
-        RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(timeout)
-          .setConnectTimeout(timeout).setSocketTimeout(timeout).build();
         HttpGet getMethod = new HttpGet("http://localhost:8082/spring-security-rest-basic-auth/api/bars/1");
-        getMethod.setConfig(requestConfig);
-
-        int hardTimeout = 5; // seconds
-        TimerTask task = new TimerTask() {
-            @Override
-            public void run() {
-                getMethod.abort();
-            }
-        };
-        new Timer(true).schedule(task, hardTimeout * 1000);
-
         HttpResponse response = httpClient.execute(getMethod);
         System.out.println("HTTP Status of response: " + response.getStatusLine().getStatusCode());
     }

From 5639e470d1e493a4416f3936c849e528224352a5 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 28 Apr 2019 22:20:42 +0530
Subject: [PATCH 104/295] [BAEL-12908] - Created algorithms-miscellaneous-3
 module

---
 algorithms-miscellaneous-1/README.md          |  2 -
 algorithms-miscellaneous-2/README.md          |  3 --
 algorithms-miscellaneous-3/.gitignore         |  4 ++
 algorithms-miscellaneous-3/README.md          |  7 ++++
 algorithms-miscellaneous-3/pom.xml            | 39 +++++++++++++++++++
 .../enumstatemachine/LeaveRequestState.java   |  0
 .../romannumerals/RomanArabicConverter.java   |  0
 .../romannumerals/RomanNumeral.java           |  0
 .../LinkedListFindMiddle.java                 |  0
 .../twopointertechnique/MyNode.java           |  0
 .../twopointertechnique/RotateArray.java      |  0
 .../twopointertechnique/TwoSum.java           |  0
 .../src/main/resources/logback.xml            | 13 +++++++
 .../analysis/AnalysisRunnerLiveTest.java      |  0
 .../LeaveRequestStateUnitTest.java            |  0
 .../RomanArabicConverterUnitTest.java         |  0
 .../LinkedListFindMiddleUnitTest.java         |  0
 .../RotateArrayUnitTest.java                  |  0
 .../twopointertechnique/TwoSumUnitTest.java   |  0
 pom.xml                                       |  2 +
 20 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 algorithms-miscellaneous-3/.gitignore
 create mode 100644 algorithms-miscellaneous-3/README.md
 create mode 100644 algorithms-miscellaneous-3/pom.xml
 rename {algorithms-miscellaneous-1 => algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java (100%)
 rename {algorithms-miscellaneous-2 => algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java (100%)
 rename {algorithms-miscellaneous-2 => algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java (100%)
 rename {algorithms-miscellaneous-1 => algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java (100%)
 rename {algorithms-miscellaneous-1 => algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java (100%)
 rename {algorithms-miscellaneous-1 => algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java (100%)
 rename {algorithms-miscellaneous-1 => algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java (100%)
 create mode 100644 algorithms-miscellaneous-3/src/main/resources/logback.xml
 rename {algorithms-miscellaneous-2 => algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java (100%)
 rename {algorithms-miscellaneous-1 => algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java (100%)
 rename {algorithms-miscellaneous-2 => algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java (100%)
 rename {algorithms-miscellaneous-1 => algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java (100%)
 rename {algorithms-miscellaneous-1 => algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java (100%)
 rename {algorithms-miscellaneous-1 => algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java (100%)

diff --git a/algorithms-miscellaneous-1/README.md b/algorithms-miscellaneous-1/README.md
index ea6d6f379b..479c2792f6 100644
--- a/algorithms-miscellaneous-1/README.md
+++ b/algorithms-miscellaneous-1/README.md
@@ -14,7 +14,5 @@
 - [Calculate Factorial in Java](https://www.baeldung.com/java-calculate-factorial)
 - [Find Substrings That Are Palindromes in Java](https://www.baeldung.com/java-palindrome-substrings)
 - [Find the Longest Substring without Repeating Characters](https://www.baeldung.com/java-longest-substring-without-repeated-characters)
-- [Java Two Pointer Technique](https://www.baeldung.com/java-two-pointer-technique)
 - [Permutations of an Array in Java](https://www.baeldung.com/java-array-permutations)
-- [Implementing Simple State Machines with Java Enums](https://www.baeldung.com/java-enum-simple-state-machine)
 - [Generate Combinations in Java](https://www.baeldung.com/java-combinations-algorithm)
diff --git a/algorithms-miscellaneous-2/README.md b/algorithms-miscellaneous-2/README.md
index d693a44f66..de054566ed 100644
--- a/algorithms-miscellaneous-2/README.md
+++ b/algorithms-miscellaneous-2/README.md
@@ -8,9 +8,6 @@
 - [Create a Sudoku Solver in Java](http://www.baeldung.com/java-sudoku)
 - [Displaying Money Amounts in Words](http://www.baeldung.com/java-money-into-words)
 - [A Collaborative Filtering Recommendation System in Java](http://www.baeldung.com/java-collaborative-filtering-recommendations)
-- [Converting Between Roman and Arabic Numerals in Java](http://www.baeldung.com/java-convert-roman-arabic)
-- [Practical Java Examples of the Big O Notation](http://www.baeldung.com/java-algorithm-complexity)
-- [An Introduction to the Theory of Big-O Notation](http://www.baeldung.com/big-o-notation)
 - [Check If Two Rectangles Overlap In Java](https://www.baeldung.com/java-check-if-two-rectangles-overlap)
 - [Calculate the Distance Between Two Points in Java](https://www.baeldung.com/java-distance-between-two-points)
 - [Find the Intersection of Two Lines in Java](https://www.baeldung.com/java-intersection-of-two-lines)
diff --git a/algorithms-miscellaneous-3/.gitignore b/algorithms-miscellaneous-3/.gitignore
new file mode 100644
index 0000000000..30b2b7442c
--- /dev/null
+++ b/algorithms-miscellaneous-3/.gitignore
@@ -0,0 +1,4 @@
+/target/
+.settings/
+.classpath
+.project
\ No newline at end of file
diff --git a/algorithms-miscellaneous-3/README.md b/algorithms-miscellaneous-3/README.md
new file mode 100644
index 0000000000..f299492d9c
--- /dev/null
+++ b/algorithms-miscellaneous-3/README.md
@@ -0,0 +1,7 @@
+## Relevant articles:
+
+- [Java Two Pointer Technique](https://www.baeldung.com/java-two-pointer-technique)
+- [Implementing Simple State Machines with Java Enums](https://www.baeldung.com/java-enum-simple-state-machine)
+- [Converting Between Roman and Arabic Numerals in Java](http://www.baeldung.com/java-convert-roman-arabic)
+- [Practical Java Examples of the Big O Notation](http://www.baeldung.com/java-algorithm-complexity)
+- [An Introduction to the Theory of Big-O Notation](http://www.baeldung.com/big-o-notation)
\ No newline at end of file
diff --git a/algorithms-miscellaneous-3/pom.xml b/algorithms-miscellaneous-3/pom.xml
new file mode 100644
index 0000000000..c4017144c8
--- /dev/null
+++ b/algorithms-miscellaneous-3/pom.xml
@@ -0,0 +1,39 @@
+<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>algorithms-miscellaneous-3</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>algorithms-miscellaneous-3</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${org.assertj.core.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>${exec-maven-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <properties>
+        <org.assertj.core.version>3.9.0</org.assertj.core.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java
similarity index 100%
rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java
rename to algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java
diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java
similarity index 100%
rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java
rename to algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java
diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java
similarity index 100%
rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java
rename to algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java
diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java
similarity index 100%
rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java
rename to algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java
diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java
similarity index 100%
rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java
rename to algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java
diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java
similarity index 100%
rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java
rename to algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java
diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java
similarity index 100%
rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java
rename to algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java
diff --git a/algorithms-miscellaneous-3/src/main/resources/logback.xml b/algorithms-miscellaneous-3/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/algorithms-miscellaneous-3/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java b/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java
similarity index 100%
rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java
rename to algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java
diff --git a/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java b/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java
similarity index 100%
rename from algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java
rename to algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java
diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java b/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java
similarity index 100%
rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java
rename to algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java
diff --git a/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java b/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java
similarity index 100%
rename from algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java
rename to algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java
diff --git a/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java b/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java
similarity index 100%
rename from algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java
rename to algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java
diff --git a/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java b/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java
similarity index 100%
rename from algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java
rename to algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java
diff --git a/pom.xml b/pom.xml
index de6f47d71d..cdcbd77d7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,6 +339,7 @@
                 <module>algorithms-genetic</module>
                 <module>algorithms-miscellaneous-1</module>
                 <module>algorithms-miscellaneous-2</module>
+                <module>algorithms-miscellaneous-3</module>
                 <module>algorithms-sorting</module>
                 <module>animal-sniffer-mvn-plugin</module>
                 <module>annotations</module>
@@ -1017,6 +1018,7 @@
                 <module>algorithms-genetic</module>
                 <module>algorithms-miscellaneous-1</module>
                 <module>algorithms-miscellaneous-2</module>
+                <module>algorithms-miscellaneous-3</module>
                 <module>algorithms-sorting</module>
                 <module>animal-sniffer-mvn-plugin</module>
                 <module>annotations</module>

From f8d8ef684d73daadddbdf0c53f79e5e73b28b4c5 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Sun, 28 Apr 2019 20:30:24 +0300
Subject: [PATCH 105/295] jackson support for kotlin

---
 kotlin-libraries-2/.gitignore                 |  14 +++
 kotlin-libraries-2/README.md                  |   1 +
 kotlin-libraries-2/pom.xml                    |  34 ++++++
 kotlin-libraries-2/resources/logback.xml      |  11 ++
 .../com/baeldung/kotlin/jackson/Book.kt       |   8 ++
 .../com/baeldung/kotlin/jackson/Movie.kt      |   3 +
 .../kotlin/jackson/JacksonUnitTest.kt         | 114 ++++++++++++++++++
 7 files changed, 185 insertions(+)
 create mode 100644 kotlin-libraries-2/.gitignore
 create mode 100644 kotlin-libraries-2/README.md
 create mode 100644 kotlin-libraries-2/pom.xml
 create mode 100644 kotlin-libraries-2/resources/logback.xml
 create mode 100644 kotlin-libraries-2/src/main/kotlin/com/baeldung/kotlin/jackson/Book.kt
 create mode 100644 kotlin-libraries-2/src/main/kotlin/com/baeldung/kotlin/jackson/Movie.kt
 create mode 100644 kotlin-libraries-2/src/test/kotlin/com/baeldung/kotlin/jackson/JacksonUnitTest.kt

diff --git a/kotlin-libraries-2/.gitignore b/kotlin-libraries-2/.gitignore
new file mode 100644
index 0000000000..0c017e8f8c
--- /dev/null
+++ b/kotlin-libraries-2/.gitignore
@@ -0,0 +1,14 @@
+/bin/
+
+#ignore gradle
+.gradle/
+
+
+#ignore build and generated files
+build/
+node/
+out/
+
+#ignore installed node modules and package lock file
+node_modules/
+package-lock.json
diff --git a/kotlin-libraries-2/README.md b/kotlin-libraries-2/README.md
new file mode 100644
index 0000000000..ff12555376
--- /dev/null
+++ b/kotlin-libraries-2/README.md
@@ -0,0 +1 @@
+## Relevant articles:
diff --git a/kotlin-libraries-2/pom.xml b/kotlin-libraries-2/pom.xml
new file mode 100644
index 0000000000..e2e261cb1b
--- /dev/null
+++ b/kotlin-libraries-2/pom.xml
@@ -0,0 +1,34 @@
+<?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>kotlin-libraries-2</artifactId>
+    <name>kotlin-libraries-2</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-kotlin</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent-kotlin</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-kotlin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+
+        
+    </dependencies>
+
+    <properties>
+    </properties>
+
+</project>
diff --git a/kotlin-libraries-2/resources/logback.xml b/kotlin-libraries-2/resources/logback.xml
new file mode 100644
index 0000000000..9452207268
--- /dev/null
+++ b/kotlin-libraries-2/resources/logback.xml
@@ -0,0 +1,11 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT"/>
+  </root>
+</configuration>
\ No newline at end of file
diff --git a/kotlin-libraries-2/src/main/kotlin/com/baeldung/kotlin/jackson/Book.kt b/kotlin-libraries-2/src/main/kotlin/com/baeldung/kotlin/jackson/Book.kt
new file mode 100644
index 0000000000..4ff47ea987
--- /dev/null
+++ b/kotlin-libraries-2/src/main/kotlin/com/baeldung/kotlin/jackson/Book.kt
@@ -0,0 +1,8 @@
+package com.baeldung.kotlin.jackson
+
+import com.fasterxml.jackson.annotation.*
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+data class Book(var title: String, @JsonProperty("author") var authorName: String) {
+    var genres: List<String>? = emptyList()
+}
\ No newline at end of file
diff --git a/kotlin-libraries-2/src/main/kotlin/com/baeldung/kotlin/jackson/Movie.kt b/kotlin-libraries-2/src/main/kotlin/com/baeldung/kotlin/jackson/Movie.kt
new file mode 100644
index 0000000000..445b6013d5
--- /dev/null
+++ b/kotlin-libraries-2/src/main/kotlin/com/baeldung/kotlin/jackson/Movie.kt
@@ -0,0 +1,3 @@
+package com.baeldung.kotlin.jackson
+
+data class Movie(var name: String, var studio: String, var rating: Float? = 1f)
\ No newline at end of file
diff --git a/kotlin-libraries-2/src/test/kotlin/com/baeldung/kotlin/jackson/JacksonUnitTest.kt b/kotlin-libraries-2/src/test/kotlin/com/baeldung/kotlin/jackson/JacksonUnitTest.kt
new file mode 100644
index 0000000000..84171d9019
--- /dev/null
+++ b/kotlin-libraries-2/src/test/kotlin/com/baeldung/kotlin/jackson/JacksonUnitTest.kt
@@ -0,0 +1,114 @@
+package com.baeldung.kotlin.jackson
+
+import org.junit.Test
+import kotlin.test.assertTrue
+import kotlin.test.assertFalse
+import kotlin.test.assertEquals
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.KotlinModule
+
+class JacksonUnitTest {
+    //val mapper = jacksonObjectMapper()   
+    val mapper = ObjectMapper().registerModule(KotlinModule())
+ 
+
+    @Test
+    fun whenSerializeMovie_thenSuccess() {               
+        val movie =  Movie("Endgame", "Marvel", 9.2f)
+        val serialized = mapper.writeValueAsString(movie)
+        
+        val json = """{"name":"Endgame","studio":"Marvel","rating":9.2}"""
+        assertEquals(serialized, json)      
+    }
+    
+    @Test
+    fun whenDeserializeMovie_thenSuccess() {               
+        val json = """{"name":"Endgame","studio":"Marvel","rating":9.2}"""
+        // val movie: Movie =  mapper.readValue(json)
+        val movie =  mapper.readValue<Movie>(json)
+        
+        assertEquals(movie.name, "Endgame")   
+        assertEquals(movie.studio, "Marvel")   
+        assertEquals(movie.rating, 9.2f)   
+    }
+    
+    @Test
+    fun whenDeserializeMovieWithMissingValue_thenUseDefaultValue() {               
+        val json = """{"name":"Endgame","studio":"Marvel"}"""
+        val movie: Movie =  mapper.readValue(json)
+        
+        assertEquals(movie.name, "Endgame")   
+        assertEquals(movie.studio, "Marvel")   
+        assertEquals(movie.rating, 1f)   
+    }     
+    
+    @Test
+    fun whenSerializeMap_thenSuccess() {               
+        val map =  mapOf(1 to "one", 2 to "two")
+        val serialized = mapper.writeValueAsString(map)
+        
+        val json = """{"1":"one","2":"two"}"""
+        assertEquals(serialized, json)      
+    }    
+    
+    @Test
+    fun whenDeserializeMap_thenSuccess() {               
+        val json = """{"1":"one","2":"two"}"""
+        val aMap: Map<Int,String> =  mapper.readValue(json)
+        
+        assertEquals(aMap[1], "one")   
+        assertEquals(aMap[2], "two")   
+    }
+    
+    @Test
+    fun whenSerializeList_thenSuccess() {
+        val movie1 =  Movie("Endgame", "Marvel", 9.2f)
+        val movie2 =  Movie("Shazam", "Warner Bros", 7.6f)
+        val movieList = listOf(movie1, movie2)
+        val serialized = mapper.writeValueAsString(movieList)
+        
+        val json = """[{"name":"Endgame","studio":"Marvel","rating":9.2},{"name":"Shazam","studio":"Warner Bros","rating":7.6}]"""
+        assertEquals(serialized, json)        
+    }
+    
+    @Test
+    fun whenDeserializeList_thenSuccess() {
+        val json = """[{"name":"Endgame","studio":"Marvel","rating":9.2},{"name":"Shazam","studio":"Warner Bros","rating":7.6}]"""
+        val movieList: List<Movie> = mapper.readValue(json)
+            
+        val movie1 =  Movie("Endgame", "Marvel", 9.2f)
+        val movie2 =  Movie("Shazam", "Warner Bros", 7.6f)
+        assertTrue(movieList.contains(movie1))                    
+        assertTrue(movieList.contains(movie2))                    
+    }
+    
+    @Test
+    fun whenSerializeBook_thenSuccess() {               
+        val book =  Book("Oliver Twist", "Charles Dickens")
+        val serialized = mapper.writeValueAsString(book)
+        
+        val json = """{"title":"Oliver Twist","author":"Charles Dickens"}"""
+        assertEquals(serialized, json)      
+    }    
+    
+    @Test
+    fun whenDeserializeBook_thenSuccess() {               
+        val json = """{"title":"Oliver Twist","author":"Charles Dickens"}"""
+        val book: Book =  mapper.readValue(json)
+        
+        assertEquals(book.title, "Oliver Twist")   
+        assertEquals(book.authorName, "Charles Dickens")   
+    }
+
+    @Test
+    fun givenJsonInclude_whenSerializeBook_thenEmptyFieldExcluded() {               
+        val book =  Book("Oliver Twist", "Charles Dickens")
+        val serialized = mapper.writeValueAsString(book)
+        
+        val json = """{"title":"Oliver Twist","author":"Charles Dickens"}"""
+        assertEquals(serialized, json)      
+    }
+    
+}
\ No newline at end of file

From 3c52628de2d9734c00d7c2054dc3bb83ecdebafd Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Sun, 28 Apr 2019 20:30:54 +0300
Subject: [PATCH 106/295] add module kotlin-libraries-2 to parent pom

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

diff --git a/pom.xml b/pom.xml
index 64710a39a6..a8b476ad14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -489,6 +489,7 @@
 
                 <!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
                 <module>kotlin-libraries</module>
+                <module>kotlin-libraries-2</module>
 
                 <!-- <module>lagom</module> --> <!-- Not a maven project -->
                 <module>libraries</module>

From 566ce43d9061c5ea82770afa1d8d51452522d057 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 28 Apr 2019 23:25:52 +0530
Subject: [PATCH 107/295] [BAEL-12897] - Moved set related articles from
 core-java-collections, core-java to core-java-collections-set

---
 core-java-collections-set/README.md                          | 5 +++++
 .../src/main/java/com/baeldung/enumset/EnumSets.java         | 0
 .../test/java/com/baeldung/collection/WhenUsingHashSet.java  | 0
 .../test/java/com/baeldung/collection/WhenUsingTreeSet.java  | 0
 .../com/baeldung/java/set/HashSetInitalizingUnitTest.java    | 0
 .../src/test/java/com/baeldung/java/set/SetUnitTest.java     | 0
 core-java-collections/README.md                              | 5 -----
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename {core-java-collections => core-java-collections-set}/src/main/java/com/baeldung/enumset/EnumSets.java (100%)
 rename {core-java-collections => core-java-collections-set}/src/test/java/com/baeldung/collection/WhenUsingHashSet.java (100%)
 rename {core-java-collections => core-java-collections-set}/src/test/java/com/baeldung/collection/WhenUsingTreeSet.java (100%)
 rename {core-java-collections => core-java-collections-set}/src/test/java/com/baeldung/java/set/HashSetInitalizingUnitTest.java (100%)
 rename {core-java => core-java-collections-set}/src/test/java/com/baeldung/java/set/SetUnitTest.java (100%)

diff --git a/core-java-collections-set/README.md b/core-java-collections-set/README.md
index 710484a2e1..217e9ee6a5 100644
--- a/core-java-collections-set/README.md
+++ b/core-java-collections-set/README.md
@@ -4,3 +4,8 @@
 
 ### Relevant Articles: 
 - [Set Operations in Java](http://www.baeldung.com/set-operations-in-java)
+- [HashSet and TreeSet Comparison](http://www.baeldung.com/java-hashset-vs-treeset)
+- [A Guide to HashSet in Java](http://www.baeldung.com/java-hashset)
+- [A Guide to TreeSet in Java](http://www.baeldung.com/java-tree-set)
+- [Initializing HashSet at the Time of Construction](http://www.baeldung.com/java-initialize-hashset)
+- [Guide to EnumSet](https://www.baeldung.com/java-enumset)
\ No newline at end of file
diff --git a/core-java-collections/src/main/java/com/baeldung/enumset/EnumSets.java b/core-java-collections-set/src/main/java/com/baeldung/enumset/EnumSets.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/enumset/EnumSets.java
rename to core-java-collections-set/src/main/java/com/baeldung/enumset/EnumSets.java
diff --git a/core-java-collections/src/test/java/com/baeldung/collection/WhenUsingHashSet.java b/core-java-collections-set/src/test/java/com/baeldung/collection/WhenUsingHashSet.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/collection/WhenUsingHashSet.java
rename to core-java-collections-set/src/test/java/com/baeldung/collection/WhenUsingHashSet.java
diff --git a/core-java-collections/src/test/java/com/baeldung/collection/WhenUsingTreeSet.java b/core-java-collections-set/src/test/java/com/baeldung/collection/WhenUsingTreeSet.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/collection/WhenUsingTreeSet.java
rename to core-java-collections-set/src/test/java/com/baeldung/collection/WhenUsingTreeSet.java
diff --git a/core-java-collections/src/test/java/com/baeldung/java/set/HashSetInitalizingUnitTest.java b/core-java-collections-set/src/test/java/com/baeldung/java/set/HashSetInitalizingUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/java/set/HashSetInitalizingUnitTest.java
rename to core-java-collections-set/src/test/java/com/baeldung/java/set/HashSetInitalizingUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/java/set/SetUnitTest.java b/core-java-collections-set/src/test/java/com/baeldung/java/set/SetUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/java/set/SetUnitTest.java
rename to core-java-collections-set/src/test/java/com/baeldung/java/set/SetUnitTest.java
diff --git a/core-java-collections/README.md b/core-java-collections/README.md
index 43f5bfc384..b34293769d 100644
--- a/core-java-collections/README.md
+++ b/core-java-collections/README.md
@@ -4,14 +4,10 @@
 
 ### Relevant Articles: 
 - [Java – Combine Multiple Collections](http://www.baeldung.com/java-combine-multiple-collections)
-- [HashSet and TreeSet Comparison](http://www.baeldung.com/java-hashset-vs-treeset)
 - [Collect a Java Stream to an Immutable Collection](http://www.baeldung.com/java-stream-immutable-collection)
 - [Introduction to the Java ArrayDeque](http://www.baeldung.com/java-array-deque)
-- [A Guide to HashSet in Java](http://www.baeldung.com/java-hashset)
-- [A Guide to TreeSet in Java](http://www.baeldung.com/java-tree-set)
 - [Getting the Size of an Iterable in Java](http://www.baeldung.com/java-iterable-size)
 - [How to Filter a Collection in Java](http://www.baeldung.com/java-collection-filtering)
-- [Initializing HashSet at the Time of Construction](http://www.baeldung.com/java-initialize-hashset)
 - [Removing the First Element of an Array](https://www.baeldung.com/java-array-remove-first-element)
 - [Fail-Safe Iterator vs Fail-Fast Iterator](http://www.baeldung.com/java-fail-safe-vs-fail-fast-iterator)
 - [Shuffling Collections In Java](http://www.baeldung.com/java-shuffle-collection)
@@ -23,7 +19,6 @@
 - [Time Complexity of Java Collections](https://www.baeldung.com/java-collections-complexity)
 - [Operating on and Removing an Item from Stream](https://www.baeldung.com/java-use-remove-item-stream)
 - [An Introduction to Synchronized Java Collections](https://www.baeldung.com/java-synchronized-collections)
-- [Guide to EnumSet](https://www.baeldung.com/java-enumset)
 - [Removing Elements from Java Collections](https://www.baeldung.com/java-collection-remove-elements)
 - [Combining Different Types of Collections in Java](https://www.baeldung.com/java-combine-collections)
 - [Sorting in Java](http://www.baeldung.com/java-sorting)

From 60c545f5fef9f401f8b1a87638edb87d481962cb Mon Sep 17 00:00:00 2001
From: Alexander Molochko <alexander@crosp.net>
Date: Sun, 28 Apr 2019 16:09:24 -0700
Subject: [PATCH 108/295] Update README file

---
 spring-5-webflux/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-5-webflux/README.md b/spring-5-webflux/README.md
index 84c3d5a4ca..4345c8746b 100644
--- a/spring-5-webflux/README.md
+++ b/spring-5-webflux/README.md
@@ -2,3 +2,4 @@
 
 - [Spring Boot Reactor Netty Configuration](https://www.baeldung.com/spring-boot-reactor-netty)
 - [How to Return 404 with Spring WebFlux](https://www.baeldung.com/spring-webflux-404)
+- [WebClient request with parameters](https://www.baeldung.com/webclient-request-with-parameters)

From cbb94a97c01dc890ec10101815c0a7c628f70022 Mon Sep 17 00:00:00 2001
From: Rodrigo Graciano <rodrigolgraciano@gmail.com>
Date: Sun, 28 Apr 2019 23:50:58 -0400
Subject: [PATCH 109/295] BAEL-2877 Quarkus IO

---
 pom.xml                                       |   4 +-
 quarkus/.dockerignore                         |   4 +
 .../.mvn/wrapper/MavenWrapperDownloader.java  | 117 +++++++
 quarkus/.mvn/wrapper/maven-wrapper.jar        | Bin 0 -> 50709 bytes
 quarkus/.mvn/wrapper/maven-wrapper.properties |   2 +
 quarkus/mvnw                                  | 305 ++++++++++++++++++
 quarkus/mvnw.cmd                              | 172 ++++++++++
 quarkus/pom.xml                               | 113 +++++++
 quarkus/src/main/docker/Dockerfile.jvm        |  21 ++
 quarkus/src/main/docker/Dockerfile.native     |  22 ++
 .../com/baeldung/quarkus/HelloResource.java   |  28 ++
 .../com/baeldung/quarkus/HelloService.java    |  16 +
 .../resources/META-INF/resources/index.html   | 152 +++++++++
 .../src/main/resources/application.properties |   3 +
 .../baeldung/quarkus/HelloResourceTest.java   |  21 ++
 .../quarkus/NativeHelloResourceIT.java        |   9 +
 16 files changed, 988 insertions(+), 1 deletion(-)
 create mode 100644 quarkus/.dockerignore
 create mode 100755 quarkus/.mvn/wrapper/MavenWrapperDownloader.java
 create mode 100755 quarkus/.mvn/wrapper/maven-wrapper.jar
 create mode 100755 quarkus/.mvn/wrapper/maven-wrapper.properties
 create mode 100755 quarkus/mvnw
 create mode 100755 quarkus/mvnw.cmd
 create mode 100644 quarkus/pom.xml
 create mode 100644 quarkus/src/main/docker/Dockerfile.jvm
 create mode 100644 quarkus/src/main/docker/Dockerfile.native
 create mode 100644 quarkus/src/main/java/com/baeldung/quarkus/HelloResource.java
 create mode 100644 quarkus/src/main/java/com/baeldung/quarkus/HelloService.java
 create mode 100644 quarkus/src/main/resources/META-INF/resources/index.html
 create mode 100644 quarkus/src/main/resources/application.properties
 create mode 100644 quarkus/src/test/java/com/baeldung/quarkus/HelloResourceTest.java
 create mode 100644 quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java

diff --git a/pom.xml b/pom.xml
index de6f47d71d..32c35f28fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,7 @@
     <modules>
         <module>lombok-custom</module>
         <module>picocli</module>
+				<module>quarkus</module>
     </modules>
 
 	<dependencies>
@@ -530,6 +531,7 @@
                 <module>protobuffer</module>
 
                 <module>persistence-modules</module>
+								<module>quarkus</module>
 
                 <module>rabbitmq</module>
                 <!-- <module>raml</module> --> <!-- Not a maven project -->
@@ -1504,7 +1506,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<gib.referenceBranch>refs/remotes/origin/master</gib.referenceBranch>		
+		<gib.referenceBranch>refs/remotes/origin/master</gib.referenceBranch>
 		<gib.skipTestsForUpstreamModules>true</gib.skipTestsForUpstreamModules>
 		<gib.buildUpstream>false</gib.buildUpstream>
 		<gib.failOnMissingGitDir>false</gib.failOnMissingGitDir>
diff --git a/quarkus/.dockerignore b/quarkus/.dockerignore
new file mode 100644
index 0000000000..b86c7ac340
--- /dev/null
+++ b/quarkus/.dockerignore
@@ -0,0 +1,4 @@
+*
+!target/*-runner
+!target/*-runner.jar
+!target/lib/*
\ No newline at end of file
diff --git a/quarkus/.mvn/wrapper/MavenWrapperDownloader.java b/quarkus/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100755
index 0000000000..b20a55a7a9
--- /dev/null
+++ b/quarkus/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.3";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + " .jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}
diff --git a/quarkus/.mvn/wrapper/maven-wrapper.jar b/quarkus/.mvn/wrapper/maven-wrapper.jar
new file mode 100755
index 0000000000000000000000000000000000000000..e89f07c229cbd97f4e39b0eddba64604d1dca9f6
GIT binary patch
literal 50709
zcmbTd18}8Xvo<`jZBK0OWRgrYv2An5wllG9+qRR5ZDV5F#y8J<-h==A-+Ai1->zC!
zch!A&uhqSJ_i9{AP7(|p{R=cS^p`JRi2scL{K5QrlonRvrx%wIVFddkCkge}H(x;i
z`Gws7NQnMl38ndE#6^S^l^CQ&5~KNHdzp}hAAQ$}vBXSKave>y8^1zhHlxN-BU;5X
zMPk_4Xv*hSts{IQU0x%t>VpX;nB;(TjtQ5cPLA?APWy*{m&vVQc8&?xiQd}FbcFuF
zCrc!d*JR$e5;cw?nqy-}#<$}b<}#pe*T*or!`!DWsK?0#!L*$7EO}l*slKX}qblE=
z7E{mT8>NTk-f5KQDAHM=qSBPPWK7dqpx*XSwPgDM{+FcTf({2If8?MA`SM5d|4Bti
z|5Z{eeP^KczoaOf|3A5z4TGb;g}%Mnzr=|0?->1KUGy&Y`nI+}`+tco+y9=et&J6f
zt-Z~k863@k4z!Z=G?U{~^=#9C1;Bv><0vEjl~nD-_!6!7xD4Iso&+7uh?Jxh0|@K^
zMN;9xaS|3eCVBy;9mqed?3SHC`1_x!Isc6RS@+<7-rCrk{7VAC{gX!DR^QMR_%D&7
z{C`RR-!}WN_5O42e`D~!*%grg_P+%D-&XSPj09|K93340?6tJMnYE&$zP%&Rp25&k
z-@zeKWyBdx6umPr2s1Ag9CA;O)ZkYfl#?wqNO($*?^hB$Lx27hc=}Sy#@M#Ri?~_<
zWsIB7zEP@jlRoKd09xHt^d4hehk2u=c#?xm!%>;LveRaJ^+ow?w$JAS`Y-Xf96h|g
z8X%*oyYLiNtIA?>ODRvyy+q*JD)|^{R8CKTbqYYB8KN2E3Fm?CM6yj~b^_wu-8%LV
zLhvd>AJ-tF2TOLG<!PuA6sa%xoCXw{<!ln0BD*5VVZE#LP$GjkuJ*>=Or;rt^C7}p
zo)sUG{<hmsf*Blt1;~M!J!UDyPHNewCAL5xRH)4?!A-skr>ir08^%O8Cy%VZ++1to
zMFAi5PSa-lvp1W4TtK8c4L!z7x*5lP*Q%sa5F!{Gv5g`g?tIbFxTAneW^fjcCG<DE
z`K=Ll@JxA5vHpXe5<Y*#FwE(qW7-YjW5>Kpp`t!_xFPI|#>^~D)NVjCeZ84xP}2Z&
z&exvl#-4U+UJQS1k{dX!@d^&V<n#mVJcO19D+X(YKnix7;t9pJ32Br;{)_|`Y<)4-
zsA7~+OtH`vCYkL9KP-)T=Xz6z&YT_L4E^QQ>Q&Tk>jGQNoia^DRAVJ!*u#*DzJV4X
zY!{sdw9`;?1POTDoj9r?i>x2Ri87@+^)=A^#{M_h7z0Lz(FmGIT`sctvtL+vi%=*P
zN=o>sEq9lCMtWQ->^4xLg!a{FhQ@(9ik3#FM;Vo*@ZMmuRzkU_*iqiH_}n+h4gm+E
zy2+^8JBfyZX{5$Kjv1(_q+k%ZEfxIhgG*@&y%+u2R7PZj<xnt%Lfo9QZ+?`tO4z=I
zTG%!`x4P2tJ4assX3<)X6kF9-$%Zxi0==lPCc)BRJE-bXR|1=Pa*iJ184^3KqaU``
ziU;X1tDap#s_81CU-bywAUJ~rH7n)izx>wc@6)QgP&~A(pL!8q*_i{7e@hQ(vu2FZ
zYig%yks#4qUPxmLis3rm5Q+7K(iR11uJci2Ei>^bU;IvhQuPj65z~2GG}Gspc8{)B
z!gYE6a9(x*Gc3TeKbo2$XTXqGt_^^y6M+{MQ(;MSHK<A~)oRV#u`2ZmoOD!RyhYw9
zY&mJ<SSRb=-uu<LmnVbq#LKI6#cu)9a#*!P>M11#)RwD^8>*5~c2n&ky{Tbl)@BQo
zKRBHdgwAG(h}K+CAU4(@QORS4CPWh^OpiH4wOEI(wZJMi3_4ba>!1H-uMC57%6D-`
z2`tGje*)Ewb3UL?-!Y$)f$DUgo^*%c?q8~#?OO3m^~^d%a1+?ZDK|fS#&AJCzpJCz
zcg8PFo`!n9m5<(Vc%fmPEdkC$LaLy+OJ!O?&#@ojw%7W1nR|gWa+Q*!7_wKc3VQKH
zK1g6Y2RMsynCO{eyi#Ou=`DV8<*9GlB23NOIvOLqv%y#Iw90?tW<|ePaNymG>XdE2
znSN#ARqESkE3gr*;_KNyliM4lG3HieMNTCz;ZoP#V_3O}gv{p`fz(}O7u#jG;dAC3
z$q}VyjhXg4%Dr;83(4BhIe8=&sos`%7kOa{GHmfh8_p*pcR!Ufw}NjGs$Qga6$082
zIxx6F!BL?ee;s8iIV3HhrrY5y+(Ms3Q%FTkpsc2#(@?&iRmt`UKWG}^Bi5PpDX@uI
zZ6M>quGOw1;lg!wU%kY8g_tqTF){M9ufumM4tn$!&^uZZ<z1ZH|9sBw&f3!db|X#-
zV)0~&q5EFzZ4EVy!6a1>FE+i6sPKs{qUFx4`sLWk-7FbBzp?$QQZjm*3+wpR2js7~
zV0QU!Pyph~7d_bjdN%!c7tQi_E?Nj^tnXy$C}iVeZE2%#1hgk({-=jlw30>RNA^xy
zB+Lk&HxGY;lo)8zi^lENpDr5cFMtrhFnH2SayFaNa!K!`5AZ1@LeCH7`$YuI=v4Cm
zL84{vQ139sJ!NG4a9C}__eJSyz6ZN6ZdN-R$+eyGjh7F3mT%sZ33;_T+=~}pTAN^0
z?mBAvIn19-@B)l)s|$Uw8c|wS46UJ6K8+aY&Yz%5F*!IOu1a<3_7$vtbPJ0iUTxi2
zY*9&6>gRS@Fs)dtnBJ_vzXg1#AA}SeDD`6SJ5TQBRi_-25pLN;pH&r@2O&g!lVi{g
z`Q0rBjaL!vI7M`xU?CS}8w%A3lP=Y_kERpP=`er%zB3=W-If8Sm35s>x6h`=rbZpB
zs@9gscEk&&g5ABCv8v7QVG&0jEy1tz$eO7tN^P75YE-N;TM>vxE`_e&Sfg6`B+?gD
zEKCf`FLsD;5Dz|;!?p<t^?ef}%I;gL%qPUD)u}EPwT$Fz9H>~NvPnBN>+9__%}dsH
zl=UcMxaPL%r1N2_Mx0AXBrIU(6bYb!L9+vgd-^L?eU6$V?>SuaJ9il!OA4^saHWqV
zz4-Kseiu-Z#pfci>>}0vc44wHj}epKc9Jmp;yHsJsRyNErBNW&gwrapUKy%L1vkm8
zw+=$KAu`Xp&s>Z)fkoX06adKsI70m0>mfxWM%fsks1Zzp!8}Ql!3pKn@pnyT%-y4B
zgug6~?MyHa^-s{f5B7H!r}(c~oT8h9BhX6jKLWNtPp)qKPL8HPYezFfeMg&r1`U-7
z+BT^C=s}xc4U)~vBs6N>8n62dH03&}dQ#Alp)jk1G@-`}=pt(M<1s6_!_h3I>`gQM
zL|f4;lV4~W$<Bq@S2zI<lO2btob|7_OU*=I2zNvM!M78YDt|hu=TG<}a&3_u(Jr3b
zV_04zRbU;{uVBR*NmnhpK-C^(5|Bq~26KPwl=YX8ZEl^`_ctrWFMxiIKKlvbce)i2
z&Gbr#p6e|m=I)&tQ#MNB65Fo@2}mKQTNLQgef<8a)d_q>q1-dC>&g4Bm`e~%sn|v^
z7;wHCn3oJANnhonhW}V-F7qTn4Q-L7``TW8%nyW0h8Z&vDzpo%nO<zuJkbboVOC|R
z%H8@ZJB+9*D%IeJVh_1gE0oe~O8Nq#KUXf@Z-x=3vckucI4JE9@Tu?)BC-1o<lAvw
zqAoFaCW&hmI)h5>h2A;Y^K^0#<Tr%Yq=j#a7=<asvTh$b3&NOLm94T=QX?IzjZ3?c
zE<F$rrwq^z;4Z2UO8(u@=T@WHvoz{o1r7?4wUkL6Ou3z}Lgcvlko4~@Nh+|j$j;)0
zdcDDn&r;;|DoT-!!$ie=m@@-PF@vnP00+|PI1tz#Bg^QRH5@ux%=L?^Pf=&DS{K-=
z4(#^LQFe#47lhjz+dlTeX!e1zT8pq)L-u%s6oYh+#r0%Cm;U;%$mGlIKz8Jm?ub{s
zzbtVKPZt*Ek0sjv3BCU_F8}YokLh2s#D97|H7Gs21)Ps8`sc|Vrl<@Kd4W)9nCqCz
zv{>ZyAG`e^{^#H$&Sl_YQ#UKTF-`}Lb-RddIe|g50#LvN1q~6+)i_L}_?p$(Y3aue
zkIT-Z$1EfDCJb1Zna=BOAMel4jj7@fk0<#rRyz>5G~j9YF0AG<DI?6Z->qddj*k*7
zWTe!r9fR2nj1@N!O=vRh$Mwe+w$MsC$1_;-sR2B=zu6p96Yp4+U^47283uMi+1d@;
zC&Qfvc3+#b`KDcRe;#3Sc(=z-x*D(Iu_~&UqpouGfetw#o~^H7tPx#qtSQ4-R$y@W
zz9~4*-dR%qHi^;%?a6Y}-pR5k7UgPD6ZmG@isKDlHrX`S<P!C3FsRTZsfra5_Nj@h
zPvuLZnsp8)EjSGxE>t;j&Fru1lGywhUo<(iEz?L}H1dg1aY`P8Xk%@Q=2QHXjimd*
ziU!qb5!5Ury-G4Ibuuk6L4e0u!$L9vQQf+?16AR;W1O-1w4)U#Bi%~}GZ!iHvD?G;
z>2$3xGxlvq=psz%#*aaJu;maD1OzxxyzEKW#TH)*Rsec_lBmV-Y&s@KV+0spGJ}~Z
z%8}PYTjf+Z-EeK?xWOmqJgZ+x#K0|t0m4+zg-K633epy9M((zwuRBnB^(GI_6h0$V
z8q_ypA47=g0>Xxlm_m@i1ZBO`-^=3xslVO8Yt6mgv0;k-d;>H3@{i_nw=G4kIkD$3
ze?U#fdUL3LebM@pW>g|!9e`R$CJ==<Vcq<4&f_{yC=3D9hKgGZ=m(1QA^NsGb6~lE
zE{EQ-Wl-uRWU)_2!lk$_f^h8ul^)I#3wR*iXG9srlu{W8C`v=Sf(8R`$gi!zu&5b!
zlabb}MJVLffABTMdQV1OG?=uS0mySw`}(R9b8FH9gHZbVR0iwk0@2IW>C6}z7He!K
z{d$?flD8B<x)0&|-6hb+Z61+#7!7)->`um`BGjtbI%rR&jd+ZGfl(INsA|eI<&NxM
z(E3=S8obr}3=W}ci1O`SBAkr9n-hHV+Tf`Xk{OjUc?p9X;(yB4w-u=uCT^EwtuS>j
z5qojzZ^70`EzQMd8V|}aR7pnyQR)*?m85<FVg|@gvC36h(ph*UF*B_4_o!+*a-|lg
z?SAIOE76D1{lwZW#MMzqi-#k_am7iJ2X$aE){X_n9MU9mzu1FS|DrvHGN|OzzQZfG
zfmxRL_Wdo!#}(wbB`sOe;!E{FBW{&`6+U3XJ!3{bd|=y&W4O$+SQOtEV?T_{>&Cr<
zzwe&4ON#@c1BD&gMzQJ~1y!T3Yx2U{?L^u&JcxY?xG9i`(1F1&&oDG@$~VR8eA=S^
z<z~GS(mK95k}uVsB`Lv&7BDk1`+2`lEUeOzihZIy6ju2oaN->UNFa8h&fZ7`;?bfN
zp9$C5wx2pHNTWY&rArwpZ8Bsy8i3{sh#aNcxG(}51K_btU42UL+a=7Se?cLvM+-{j
zLQtKm*r_!`R|AP3^<P9cLUGig2w7v|Qz|KpcHkd4I=_YY;Sy@N@|X2NMs4Y<?^X?`
zm5%4t91@8VM0z-J)7UO#S=Dx3blvuX;Sj=SZ*F#TRVdJPFb(xi7VHO2I4;YWRFGvu
zZ5z$p>rcT<DR(j<1$vMp_w~`$RPiJvl2va1rXCwFQN&4S<IA8Q4X5Scv)&?wEmbT^
zU%X~kF(~!jU1d~(HGSf^HLNYnROb@5{+?CP>edP73Ywh&agr0!Ta4f-!iyO}EV1b*
zqWZm5M^<*r0Wz!i&`rWvG7ZGqO$8~$?-%08PB>&2nPHxXjCVX6iMqnVoh9+sP2&R_
znC=jJ%kUR#+0>hFC7N>P^CZvSaGNt%R-o21Nxqjm9?xmH2Rwnz7N*q6S*<1uNU&R`
zKxBo=%uxuCH)y_@E5qKrGiETpfhlNKoC&`?ypL#$o3hg<2!bE?H!{wJ)ZHvs7H<?t
zYdYcE1^K#iL2F&)>k`lHi(+9ikq4Y|)0ePIs-@bea0X6qzB+aD1>MNl2#=6gCU44p
zx(5thED;EA2tJe~XLkh-oRU3BEN1o9QWW&sv)8f|mp?uylj@DqKGuHuTy1)uaTW7~
zGgLAj&U$5jAA{|+Km2j(d#!XDlSyd(Ti?BiokzcRnHfgi!?EYXbOjvA&25eAIl#7<
zt>>HRJ@*<mTq2J(MtK~=GO{-J<3-$YGpjscn|ck;Bj~%HNw3)uoJk!T8ln>pqJ!1y
zNZU3Xq=zP0p2E>MkNm{Pc`8@h2lG;D9KFB$wDN?L0d2G|5Y&xO-9b#l%QAv#_ZB%N
zf8j>aMc+jw1Pg?8X>xtvIn{bJNr_gXB#h9=-5Pxip;jO%friGYkP=6)b{4r@C`5o_
zpS;e(NS;dpk_sZYCIb4wR5ldt*~nt~L+akRnqvgn0@xWFIrXO98$Q7>pVn}~dk@oQ
zHEI{^RGZaLBa3~YAKb#(c=dJH@8pNmj9dw8W&G}KxHRj)NP~oTTL@D*C$)9c0lPFi
zXA#^3x5YQ3JUo`|AcR!JdtJj3x$lRpf*A~xIo%@oF6(!g`^u@Hww5mPXi29AkN7d*
z{-X_kxdWBJTg}^vrudP^!v&clM>{-v;(8AGjE0-)j~8-jiE<;cOQ-s-cGy&w$ffsB
zOhigRA?@=N5|N6a|D+vTwgZMIY~`RGxdRygO0NTc0s?n;U3&EZ%LgQ9y}07Y<!BMk
zJR2Kd$V<_%zuLfx`G>~_@c`NQ=0eGiO#*1PET)x_6E03hlzRrh(+}JM$Wz-ecl9bI
zgFsyI9*j2+5*76R3#AjVG5=E&yA%0&e10-w<LU3=O>U`dVTZ<P4wxs?ReRXa4iKCe
zH$Kehu85efRY=w<+_JFN@|*7DyW-UOr2P3!NwKvU<+g~N7gVveU0?l|;F@CF;th#R
z))HC64-*Dr@!PC}E|I&j4r(l96&;KqYu!NZV`R^7u?ug_h9T~}ke1w|w;MpxVqI1V
zJLEVkeM)Vw6>qq+XoH2bO&{40V@#{R`@M&fGNC18W%P*Yme4@8|6ZEMznS=z`#aT{
zeh*G2umQhFunWJ+@{w^(?X_m3O4SB&-CxX0PxyY};NXXs9;XhQ&ilcdJYI)6X0^P7
zg+mT`fofIB<aS#OU%{cRp@E{)0D-K}0bzv|yPplI{;&_a`*3z2J-ujd<KERn%=I#}
zGa~g}SCG%)n<Kd(%-I3mV5WDT>lcfoNT)j?QZE!?Kc?kyhuY|?)&QQz!n-|hg|3k9
zGe+hBbf0=HA2tzN1d$c+h;0#rHwvvN&DK}M0z1m3%k390Ex!JHsMZf;e2nN*<sf{9
z!ChNs!r<`hl!5a-Me#KKbzc`28W)z+oBUw0bfV{xN12ZB&0X6smxJ0;*;G!Q>8PwH
z-HG4VCAsgWn;x$;Ba?5HyyvA$y0I=vmta>4l7v2aAv)8QHUP|NX(m^`T}hOoU0cB+
zeo*!)tq|^4vFhBIFy432Sz_SPlUr!g^nfQN#O#S}xQKUdR@pq7oS!sCRO9(&@!%Wi
zw~n~!%SsZ-toy<k+I6i*aT8B0(v@4s-#mr)<pVvj59{THMl@9-{G~ZP*@A5zMEo|V
zwu5`JReAkv_OHge#IBm{KRk#ILr1rWcC{=Y8=)^$53Y)xeTK1a9O_x*SMc9N5kE<K
zvI&RI-aSZqirwmDLT2;5==1RHHc{kLOVB=&aB_J>Ae>0fNQ~tpe%~d&9T3b2-SYPz
zSz4)Xf7P%fXhP<}LP24EDEm_>nP+Dau~Co-jg2e9$h4Q^{P{?xLl3&cVXqxX--|pn
zM_tJwJa4;4I;6Y<E<bh@nX6N&9G6d=6q;jC=+Q1f-Jaxd{O~P_MSf{afa2tZM6@>P
zxLzcPjfM6EXL<D@L+y85^x69a=XJ*`R$^v4j=!eblr?am0|7<Ag}2B`_<l`DZJ;5{
zCMI6F@>>mm1#Lg8q|)BP3&2gHZzzpWZ%&I+Mqm595)JR^xEu}d+3ay4ROI=7Db)D6
zvJ8#>rhFmPw6Y4czwiD!pqex5D){YMNV$Y2Yg#~qJ6CikbhQlgqegDPM0l-(?KEMX
zi~95T{5iu0q)R==y5RdI`OZe4$5AJ_FAlBRfv7@8DX8I=L9MvDN-#*Rx_T32=MG(z
zXTdqDCdW<ulFH1aJO*bL^>?K@m5};ELW6P+QSE$;qaPo#-~t)pzdrxbWe{Wwh_;3Q
z^2HeY@3I-{zs+X;qlEKsX^e1G4`R;`<e<;ogt!>jFHl$v-zGarV#UY;Ud<^RN`D(G
zpRV9@{|rXe3=pRP_<Yz<eD1ongQeu0=Luk&Iv}$o_QVc|A5;kG8>Q8uC~B7ojm1R5
z1y4r;8H7m|_$wZmp>T3hyio*vT0CFF0JYkTZ_!~5DWWj1`2;=b+F&yEV&(PW6uFO|
zj}CN=GgxT0Zo)@zq!E&BGGCSCF;|4x<|~~m?awTiAI^06Pa*zF>H_Q@QEUDPx%+4Q
z&q*EC->E^|+QCuZ((>OM4Vh|gdieWJpFC!T>Xn1Z5tiY7bb~j<r&k~>!-G#T@Fa0`
zbdm;EhJeMWy+#+8Bp$jEt!=5V0i<LQc)ijYV9-VSK+<0g;Il;yX0zc9W~;NToto~O
zc0M)_(^X`YL3|A_#$At{ukRbL2km?w@AO~F_fmXOdq^mG=Zyv`eBYfF`@b8BrU&h+
z&>0V<ujYpqU?8s9ff4qcfh`i3Q(FoLr!}2(=^>FpuvJ=Vvfn$OEw8O^)Ej!d9&8Yt
zueCim+pO9(=9C%wby4CV2?sC27+cyUn6R#x1S&RRVR$CSW5Sci!T7Qt!Hf1qVW7`D
zXUI1$(!~;}Rx#7I`Y4j<i$2J!_tXKhPZ<jKW^V3tO{rS>r{5hAF`&6LC&ymFv*=}}
zA9B%^DU1!OavWD~x?rKpq@UzU%bzKv#*xQQpoPz?l#H?oHuYnD+oo`8dc9P*3#L|*
zv-UoawHuzsHTDEW);z)N)+AOd@5;AEvki594)_cK*tik{l}5v%Rhn6$y2ECxxUg%Z
zRaQp7qK<WXf9f*1kaRs0Fk-@tPj*#(bgr$nHQ!rbUg<L@VVBU4W@pU^%|@lDg#qDv
zVlo@@gTW<}q@`2$6?LEGg5AMr!#LYKC~&8#m;^$b#OOFr+&znZ6X!?BBUeX?HqOr>
zRp##Fk!)lFd*N&Ay8HVJO)2sP(~8z0DUXxHKaZU>1IJiblL4c1sdI-A+SJk#u7RNl
zEpdo)m!hec2qybKE3!^ImdTcx$V*a#gU0*P1`h@kg{yJbRS{kVW(NCmQ_5-wglJdQ
zT*WC#f7njenORx%0(EK{R2x_fz{I(Z7$X|8`QZmLP5YxL-h=BxPan5&9kHJhwt4{v
zy1@WeqakU>vNi79qnzEoZ(0^P>AcTs>J|oE?rJhp)Y7l6rn(Zk0A+hjpyJPsQw+Ls
z<!|S=E;KHD1cn2m@BVg_JF1s=7BN-n=;;889}M5hK4s9_S@BGQQPX?-7EMVgrP!<4
zYem^j4!(KhH(ci+vFl}ngu}Qv|Hy|#f=2XyJK^Q}2-n7@xg)o#XEypNY_~$WuW!I7
zAcP)dW<pi;q=1}@zw=~^i~_c;b#1(v9#XbDdX93AC4mmG%dbo4cmA!Caa`=!7S9wr
zKmV;|4k)~A3k?89GSg<wpQBVN<@FDYg^|muHcR-#ho)<<@N<pBUhSxysH6xaKCxaf
z*>b682?J&rY$;C-)a{HhPvc@en?pUWa2Ba5^9i`{dosi&7&l9OTbKI1PQuH?F{W`z
zYG5wduidzR@akV&6Qqawuw;*u$_A!?7i+9SMWWu|9XF!in28jX@<h=k>64o^Hs?I+
zx=q5UGo9+9Oc%B5|7AFDby5|Y@0!s_)F>JkzfGxWspFZ-Q>@HWU4<C5<9S-6w7@5u
z>Z$=&8Q5*6+Y3`1*L0Ax`c@HoIPZdyS~6p<ybpn<Yv(cGO*<o8s^ggmvw}xXHJH$i
zrCZGVQLw8@$e88|!w7IukYGZo--$>KN%d6)Ka^Rn;lYp&B5~%=_EfH6_vh&GV|q?r
zq)2-4kIK9f%`EWw6-rSlH*X^>dJ7qRCY0Z8MV17jcfyVx2KoLF!WIJ`{h}((Q6$f`
z(k#^x#H#2#9V$xq@^EA3K3-LSX0_Q5#J!ED&>7-Lr_HRis`5%REuGt7y~dP*!6Z8~
zS_|QckuVoMYTAvJBgr-FXBA&B2K653uihbO<3ssw*)HAjJKP1LeQK|!A{*5)csJUU
z#Ri2B5|&tD`i_}7@mRG)!zN>zt-hrRA~9BQX8YWEe8f^yIMX-2M@Aq_c^c&?|H|kI
zy}{G|iNYsYpU~Ar2ItNmtwlP}b3}|z)*KvA(=!dOeU-w4Lx)|Nb1_9rs4HsNin7Re
z-2Y;5j5nN{N6Cub7+1<MqWS^qm}bBJi|9~9G1*j++d7h_5Q$G9(O@7u?Fry1#vJDB
zK0492-(KXLot^RoHxM!^m&cY&nU?Kiwo`qz#JT_rNjc%xdZUlc<8O_H`j#2mt@;fk
zSBS5E3P;BEI@*y!G?K#D-`B?=QmW=CiVMt{B$j}@;|Z&G^4CWQ+TG43mBV>qa+&p~
z{th3;wQ)Ukvzk05ZeBMa<`LyX6L0O43jH#zE7>dH6L1a4ps?7$+OfvLQn6DBcH%{$
zW(#QU=T!VAeQg?x+owX+x)AD7m@#u+8(&eSRrzX&HgG`++W3TUtx%a!%w7x$b>2d-
zZf(KG+CM}Kw65mCl_W2%vl3=mD+@Opg-;#HC|rO5&p3c93id<5l_Rb{Mo1MTVoXm8
z_&^pspqb&6%7n>_P!o1YRZURT)TWazlUOLZkwEa*PA`ePk)I^p8h!S=CxSBxU#U_I
z#7wi#<w{Z<$<aYlUdGI(iyH{i%9s<iT1m2@Et)?;$t?elLu?TeoJ7M@tqw<N)GSI(
zmKBDAO8Gr*9_FNpqttfViYHVTS#0uN!A8QLs}4!ij>QzU;skL`rPmnh_EcH9mSf=b
zsDzL8h{#FdLtp0|BT%uxPG54YS6k~`NbRDiePc(+HKq`#AWfOYCM<`#HdOVUP1-?`
zeLKF>?Sj>9yx!eTXPVjT;5hiF5X(_P19DL$bR;|gGC}W9Jj|<`A==91?)rPRrBM$@
zs0hK1D<Em2$a03uwlJ#7E?7q<N<}PP3pl*E{{GG13AVV2T2+$E>iB%bN0)keA-&df
zGy(CLY^Y#v8@^tc86RzFN#MjxqeHdHjNjykM60&NsPpj*o)fES^pUXZswTY?jSH%F
zl{{48RDyTw<h>e+KiymoGMa}TU*Di_5^;Lc500U-RuK}m9C=nF##ZU&9`Oq5wKUH<
zQ96iD#WvhO$A=w@E5<a;&k_aJ_$FaR6t1-fTA-Lf&>7>7)(^c=kW49BCl)KXHTPCF
zvW&hO0iIPV%XvymyqA1-w9r)hd=LE){CV%vHgfcyqr{@#5OjMrcAglV-tw{M_&FC%
znp8?=BeEsYI_V1ACCWa7XEJhj>gnGV3?pOI1rBTe!<9wr6xjztfUSO!@R%k$cXS>!
z!2Kmb(R!(M%7A+NT<DrQU)x8^T7t*jn%c^b<ryh@r$Y<b>Bad}pP(G(hF}N4$XluR
z_#`tB_hZI$LH52umM|e0!7YS6>bQY@AMOTv1%Ak_HFp@;{;j#$qWLL~+kBW2L%_CS
zYueC00Fui5mTrp9W(m!uyrvx^I8XSC!j=H;CCPNhvDXOe>S0i(l(Q9uotos((r&>H
zn6q=jn9qlW5+?ZcgJ}XbauWygNeTdn-!F_WCjs)YkORN($?~KG%2;+sO1`B05*qi}
zxt<=X{+2mW{Kf2Uy`qhIyj1fVce1qH2jMoVJs7KHi2KcI&jyXACQejU9(-#Gzps@8
z$ySv{WIYj<X8Xlc>(?jT^JHH!oU-0AD2)i)9+Wax=C1*5giC!xLEN$Eof|t=h{0N#
zX<JZ>!J4Kr^2mE-yyy7A17^$f`OdQPmbn-=7tr&eE$vtlRbvaN=99UjG0SVOoRz-K
z-xENm&0g-Rho*$3gkls+W{LF9g{=IN3g%f3TlA&KUA-SmQ7p5<+~tBal-@0cc||0V
zeeYEznqfk*@0|B+7?gH+ow~V0mnV;`9?FX*nlvZoG=o>In7WORRApsjQ3fKBmt=(K
z_&soKFQC;R2h6PVDU>}%o_J82G}^?na$?dzT-k$(%JNeDKES)gbH~=v@nx&yP{QQ!
zw6a$uUzzDPv7oLeX|brzi=Uk*K+b9XmO=uo@ScbAYRnLuOIdZ7mM0XAylfbIL++$m
z9ZD8B(#;dv@$&_P{hif>@YldwXM)*s1gBa#k>X6)m>q`3wD0|LIIW%`*wALAm_ERI
z5OZB5>~$t+cR7q%!5d3;_i-kQXcu?#IWuFvo#VpUL9J6|a>!ZTpU`Z(4WqM;$O~1l
zJ7Vj5D;S6ydix%2i%yhbbVo4Wx~JFA)Uk@OeOlGaZLaZA<&<FEzG{FhSBPG!a%+d|
z^M1o%60|qiCBO%16xlnzoTXsT{SC8g=smp<sXOu#kZ%)D`1Z41=cF68yUzt<{>kR5
z{o;hwGh{QLjn}*j+2@x_;?qxwl!WY+SK{(wq3+|WN2K4YucXb~y89AvZo3@b=-7SH
zT&aUlQF?5j@8UUyZ<Pmiv&K`*8LEmp=jy))dY^7dODb$QLbH={J{h8wJj%whIN#%6
zLYL_rpCL+1CnN}j=!4{<-&+Ds5un?<${Z}b4ZE7y+nj3_08!?mFtQVQPMefd83d`F
zME2D}d{{<X!n`@jG-B5v+xs@rzZ|q^t%Mi&YI438THq5wjBW~P=QNyTdw^z@`JBTf
z)K+|Sn!tZ9?37*?TzAt0*??vT-x;R0vT1>-qaJl%K&yzbNSPQgKng4H<JAon78H0H
z7JQjgHx2Lwog$f4F^y202iM}09A4Ga?fG*CUNh(TfX5--r`QLrsQV-gw16@4Fqw~t
z_5A^R;DDCd-ld&}W@Pbo2A%z9H=SgCODojvGhTkPO@R$+N;nxcqCP^9It1zXi@e{Z
z{@I{(K}%}6rX5`Q7XJrd*xJacOvlgmE0&8v+7_sO)Q%{R<J;F1{>OH^?^089&CeWO
zUul1HOboQwh0!jY6R4jX-{1-vMQZg9H|fbSBpMsvM4HAm+T%PT8HQ?2y0erBCRXg?
zF%k+3JKuxS8gy#))K|BZBWNWa0Xf!$oZIE0CbMZ(vtp#HB`h?mj&s7>W@oi;xJS7e
zle#!c^SOr^u8^~diXNg{7RSe~hBW|S^+v&K!xDGxx+<t_xf{P$F|5njtHdO2Opb#L
z)zl7+Ro)@WQ#HUxjH5w4)sMqn5=SBKZFn4B1hY7}bNflsAks{?n7>~`>z`0<@<bK7
zf{s0R;7+wkXvd)>yIgBDd#=PD*Ze#qYfjDhbQ!U3b47s{=zF!U_XzbJYv!d0#uOwE
z@5r#Zz)$A!#W1uNq?mYM-t|ME3{-qxvuBFGiX}~{hFmxmOrR(nIOYqY4cqLQS#n|{
z^g<&_MjzATkP`w><Qv*^&^OEdI$s4ul?=C2yu6yT2X~1qbn%nx8eDWpHR|@DlB{U#
z$inH6-V~*FGBUHvY$0Yi64VnLN^CH@jGAZ-9i7x$UrdPj-M)4@Mj++eXM09fsfiVI
z>GH}JhanclYYPo|Xaz4#UT+~(CmDDNnz6BY>j?{LbPY#+^dCoK-{s$%xq0@6z?XFL
zC(58$Zy2-6GRJOg$J|)a4YotTE*)T0B~tE<RrNOB6mS>TM8oZyxdp+h{-T{?DI&~b
ztuIG)li44+y#f6^g(AjdubCMB1pBLCFetE_z4izA8bb7U1q1TGD;P-Gn3()~wIJ{h
z=w(h0o5uyuLUr`lwp<Yla=#VLJ^3|UKQ;^n1w;gZd^^0gd`V%p@wSQJy7&pu4<1SM
z2J%6*>(CyA6<jOsVKe2BHFulQ)b0KG1ha*bWlF`wN_wpB`Rg~B{{6FDz+&v4zi&(u
zfm>D#t^_<F*mJn@XK+^I8W*~CZw{xXjn0{KGxjpCf7dpo_Yvh3c35RopWJH11{^_r
zgQSr}J2j-k+RBPY@*_^lAO->etG_*aN9ay^o@q?(L5QT6xX*lyS5&-!$o=%(Zukem
z66?6O(zrQAm0_0cHS<3I+bA3<^*1*<?2}}(OVwYtef{90@N-Q>VVMn^XgBni5c7)l
zq{&c-$z5$zJvSoXx_wD7rRjdC#uGg;_r<+uhb)Dj1QX@?wAj(0FO-G0o65JzOKdNR
zvhvmGpivSRZF#}w_`l*_Fpujfe7pWad$$1z3o8(JGL(gDd=_eS7$Rwa{hKPW%JsM$
zgi_Ra37tR^T`snZBq&HC)S3Kf`pBqc`Zq4DoM@x*{P<-_*4BwCYZtP@FX^_VP^j^3
zl_09jz&V|873It$Pr=*EB=<#wC}^YIZ<QEyhU7NhGM38ag!$JvgUlC>GSj?@rN&K%
z;+4MC0+aJ)MysRqgjr=g6AO3D1f=!93u3XR%#K<i^EV}#i9Y`Us0yH@-F^E5vbOqL
zcnjm-nUnNiz-!fi!#Dp0d;JegfhV3S&S&>>t<iqn-uF-dF8M?aP;=CDmQ_61lD7Z4
z;(Xa@c2R4uzEY`8QKmQo5w`G$I<T4rwovYy8C+e7nW73D@KXL^gY<_lXy9jid?Ov+
z?JIek$7R>!#OGt@<?XI4-xJf%bAxC&IB;Be2ksJz`QZS}h;m9c9@kMNG?)o^=aGe&
z`Xhz>Hn>F4v8Zy&1wE;SA%C8sC<_!xJ)q{(k0aZ|Ut+4JOzS-MEqv?j_BF+{bX(`+
zijSJcN<^EKHBAAQ1<lpP?Cb1I+_NZzm}=|hN8*wTmHcc;v+GyTbdC401#xLODNH-K
z!bvyKE=Z%h)^rrl@H`1sJr}vLJ+``%vOdd^<Ov3sVsRI8Sj|b&Hupg<ufgswtLs-X
z*{5)i5BL|Sj=P|~!t1dSFKZrcztzZVY)$lB^wNK7dLJPm;5!;d{@Mp*oY19Z26`2l
zmalA>^I|T5u?wLYHS?i{pU9uu`-Z&)@%xUd7%DmRh^|R`t;U57im=T^MuIMIQo7Z^
zXlgBMq1Sx?#3jRNm&4pwS*p}Ki+YYUOu(Dwr{Gok#_5sXOzm@PQ!3x3`2nDyRq-sg
zJci_S1Puu$t%PgnmP3fXW$)_c7GtG=qrm}3VJ75FVx)5wTbPHdn1B*qnrUuEyt<FN
z{R`z9q}OAcF<V|(EjeA0A#<h@Sj@bzr;~^i4Hp`3DFD>GA+z+(dPqqv|3buQW9KnH
zghqk<X-N$miZm>%^CZ_o3PqwFFNDfG5&a=Fi0qT2kffTtaX8#LD4Sc^Iu=snh1_%~
z!>kFAKtX!YdUdb_g&R52?3D}{?WdzfUc)V!Iv}Eye}T1#HJ8k}QLXob&?PlUzfoAa
zmAynytj$F{X+Ou9qBI##>TVU}-rarNWbI-M_wsg&s>*2_*Z02Oy?hRvXh{lUNxWZ4
z<epj3?>!Y(3Ez<LP~WP&%Y1b)0V5LPR@bsn6vOnZ(h|86pp^4CmXcEs_d14Ch9Z45
zDEFsLa@yBE7<?CE3HU^`k}dcCkVT<U*ny{=N=D92CMxAw3~W7^5_wTkNely92{2|g
z>9yksGPN+;2y`C{2eQujxxA({++t@+yVXEN&_7H1h8K8cMjuxPZ_ne8chtk&hfgyQ
zkiamlnJ42LFW{^&s+E&}Kx>x`#|~qek=UWVfl!-b+;&9=@>$_%wVIL^rfxMz&0}2R
z?Bv-rUK;;GjbuGo$pXlxt!b3%p-Q%9;Evw6R59x;V?&XkXyk}&wEF~wXdWxjw45U_
zmgY50-dnpOq2}D~iF6J1^e8>=U6~j@?zVBxBROuWV>G1xGiTs&YC}s*V9}<6wB(5=
zlm^)kozg93SGIVydazz-(J^8lXP`YuntxFSq_cFn(z#JNHEAqc0k+w?Si(;`b$gMv
z3aacEx}D-MUs0wBqJj>S*Zkc!^FpaG9@gm98XsPc_KYK+@*k!uJj-a{l9B@DDADCF
zB^~k0oSE|(wi|(%SQ`w;De<a3D>~|*u2<Hf{_R&X5RW_B4FH29!x_7^$xMeYjdbko
zIlm(xsazR1DB(2dj5EGh=vJdG@Jud{*W`OgoycWX8ohu(5cR7+=sIs>LMJ2jW@K17
z=R>?biqBoDUVY*1M-Sn+KsS9Q3YyxRW2(QlBc5=V1BV^zlo<xsIK*VhZb3^KBQ3l@
zU4Hodz8n}`_e?Lv&Q56T&FSUJd(NHGOIjD<CAF2eV&kWUbH9c5lmM4qAW?6wWPZqB
zh8f@dp6?ogy|d4ItDvRZ#YNqcQhbF25xqvP-UL-vdYnX-sLNZtbz3K1I_VYLuB&uK
z-g>%Y-Hcld)z#bnn)b_XVSR6KX_*&`vp3p?>WQLDxI0yYq)4OzOdcS9b(Xq`p;$$q
z)mur(?R(jJrHxs^&2J$kU6=mE>%GMhP*nrXe4v=V?HGwy?2$!An}pLi2`*_i{2}@j
z3dd(`!_Hplm%U>WwYdjBYf~@|jb?ogkMdk?^a1xa8mL?6k`gJ>Q+<tR0v-FiK0$Rl
z`6LZvZ(LZUyN^ig>75n7{uTBkgpc`|e%Ds_HNx;5{3;tl<&bAFdA8D2i`Fz^YPTA-
zMRxR~=GP+_T9Mu8v3kg2_bxTohdf=ob`M|i%&hE_gwb2N>QYK11>Z+LG&FySDW!rr
zojS{ilq|pKdY&JeaCzBj&_3QmN{8J+HY15(`c~kD;ne=vK|nN5yG=xA38TOxfnt1`
z&FR73;+KKYz_1cjhA>huE%FTpdjIBpAS)GA%k8pAexN8ycu_86I$UVK6+=(0n{+Pe
z%hXYl`}addMEP2+ugT~`{tU!Mi%yevp4pnVT^j^vut))EYwbuzV*>NgY7ZG(73sxe
zLcJka`<rM6fg~zn$}%E%X5x58xdn4?u&m>}xOL_Yr<SAjUUixk6wYl3+4R%NSiLa?
zcQZfFZrns=LY%@{<SI;#fWb*a@-SS8l?MJ9VVN_cSsOc;>83QoM(kc~Jkl?5F!ZPd
z;pX{WB^O*2LrU4D!VRXqJ9D*ETPT`BosyQBSx;dD)Oq|e8E~Y`q@}G8LwC}ZB4M6k
z`ri;LDm+&mbyxvJ;D;`s>k#Ekf+=nX@UlxuPJMT}cCcg4Rv>HKh#X^~;TW}&AE9|+
zwexrJ89JGH+jnk_g}e4YZvG%EH!!}G$x}i(buIJ^Q2LHMLOgur`8D?5$NAkWR3&3n
zBs-kbt1a1j@%OYPonk<oCTcBVRH*j#H8-jaWx};O1XdE%7{i_hcjB?MQ27UmgLiVx
zEhi2ZB5l>Zp82a@E%i}uk;WTqnO*u>HXWuwJfnLu+{uz8@TmZ8s+yyz5J5C%j6KLB
zzzW<UH))^ub0!X`&5w2fNj<rfgYa$bPjgF|J=>j$O=+r%J#7-AJ@8RROm!~$zXg0C
zV_65&0U_+aqtS2*9#j^TpNnmGuh6XtA2t+JIYSSnwwt!$v-m=>WOfD=TMS)M8D)1d
z+^oPNplTvtEQ`Ilup`5d_qCV9B&P#-JlDb{Yl-MvBI<AVo0OplysmLO7MqMfGhGSJ
zOGUt|57$8LTM@xL%fD9Z!_QDA?m3fh{Ny^0#9TaL-;rLwAD+p+vuV0_3qOxWmmQ(9
z%IwuvdbG+^Y)PN;Xv0mPb%pxu_9&?x$sT;2Yq>=6e6pNOz%W7xIGV)tD@oikH9YHW
z8s!ZJssP#h0HN^8IwHfK;7D=)qET-v!-V9NI4zJb?y!op{u{v*b`1W}bNegOK0PWM
z*^-w0=jh(h_eWGe`2EjOV9G(X5-}QR;c|r=4(BGjJ9rRd+Thga>Imr7?+(-g>KtjU
zGH0LYK7D##ftRXtPcLL$+M`v~KYx$nx63#JSAO>`OXLvUgt2zT4<gMyx#4!7w_t_i
zgxvN;#y^d5hCQV}>Y8zTQJ(A>N2<v^Bhv)YzP;nfb5gG#;sb^53*;tO>ymnDF-_Ri
ztyF``TiK;N@%6oR1a-9~9V7Sr8qqNfO4SAzG{Ea@*h(<R0+%K)hz(|Ep2Q6#AwNP?
z=R?vOO3ttNg2<yZoT3=e`r-|wO-L~`*3?Kn&1!4QsYM-P3(QtEN2=3LX{MaVOm15d
z5A!$qsM99piHO+v^p>JjUQWJlwx1On#)9KBjlxgYq=e`UWL#}?d;^%IrBbh<6n8<I
z$zFBz%)zMmqV)%hGl)a3)X_iAC7Cyb<}4e(=Bito3_{<Opy3@gLKG++`4c$LTTcm3
z<OI!*t#vL`m=S!4<}RbeTs+d?)H<}}+e&t=M~|It<xo+XJb8faZHk!NqS5}ISoYJj
zk0})(4V3s!>^v5~6ZZ-FS0d;{(GRBm=SJPw-!{;B|1NTu(|0uGcW?k&8T{!UlS$ba
z>RSq#{kgtoX5i##X7kTLK2kwj7EK<Rr=GrDPF1bx9*mD4+6>Eae}amc7&%frpCXO-
zNzZ;wXLZfeCB0qqO*3sd<!K9POBCfm2iL$ixa({@H5FiTF_M+_{tl&wlun4>TQ2oz
zz>J#N6%o86RCJ9*FG5<nJC%1twAYH?gjU*|rY=e*O2gP-9u1dRNH`jx_f<wHBcuV#
z#~jJ1_^Ycn;Y*Q7z<$wr8J%}A>a+3ccZIYqOs_<nPO|y*+hf4mZ`D$o4b+V(=`<ca
zOg4>x8~w#Z$t^`MI)hR_R8S&}3RH=Ekuk?IUhWo(_FY2|2K~ZPg=af%OUZZT8hGM{
zgN6VVNZD}Utx)eNr%k6d6CdZ<$j)cnJwpk56|UwsXVdyuNZq>Hi(xqA$&d~vZof}r
z=|Wy9@FfQ%ynyrPD6$G2E;PI|>Cn#-Q~^U|liXT(Xi&ql^DE_+0p08w7Y-_i3Slm^
z^{5X$^3}|*5m~ZwuLDj{F6W4VIbc^mOO(7Y(ql`Vb)$JpG}|v@k+IrTd3Ft?E88**
z2eK%*8Jhq;#^m-Ujt02*aNlEr-h8}~#`3)#$U6U_hgWb}P8B*Yf~g;ef0+rs&6Ifi
zp9IhGZxcMa|FxO?TXvVJ^6Z25h~i}-nM8*P3Y)U3M>9DZM;}Ph01g()SfeoJ?B#2R
zSC@q8#=oKLtP0s|mQF}!HTx<f>AqP!M-hj|p8JUOp1<0qJ`!go#9PEC_WJwx^JItH
zt?|R_<!8t9x1aG(s$ZmGWz?J*N--M7{j#*?lN<qVbBnMLzh$B<E(Ef7kHT-=ek1-W
z)_Zia5|=z+10>_8cUPHcL0BDkrRL6*&&3O(sRj?t3aU~TQz+zPVFZYt48~VkrL^im
za6!?{*|E)K&fEy|gs4CuS=r_2Ej{%wD++=sDy#CBz=AHAIBxr9I6HbQYs{NzhZ?Gl
zz=`OXL?qP*nYA2Zu!^=Dqd!4bR1gXP2vx3;odH`R`X~7V18%>wW>eCBG_q)Ti_{~u
zR`cGq!Ug4j{a(l8jqNJy2uP?(RiQePt3_+a{#M-XA0$X|5MHI93Txfre<_(rd)#Kc
z7uH0<<=);Dx}TCfHK^A~j4wd;(}niPEhmKraf=C#=)7#t_{7@YokZ9NHmZyxXcyL5
z34pgyKq#7*PTzj9;A`m}9Y)nA7GBAyA^9>*ugXpkorE^y;j%s?t|iRw9`dV+PN0Ss
zx(JWMRj=ss8u^EUZ(HrJ-eYl$%Yl4Y!VQJr-V?-eoindr_zHKtT)X{{n?tE<mr^Za
zp4tjPUA1~XDplTvNwXKMdgjV^EJ?ZZqLC+eN4{h&&ktcB(Y#DgF=)m$;kP#xLMQ6j
zXa&q+Cv+LCU08toP(V+Dl2Zp!W5{lUS;`Twk1K?&l{vC;F{)?`loVh&R*sG#qhe!y
zAu1qjzSAY;=$$DDqqZa2(`AP3?dHysw=?TA)TjHY4pIEMSp>Juasa*-jIOo*fNz!{
z=#^*t0sKaz%zpz?D1CE~YFDW2x1zBLX>@!%tr_c!Tqg#VQ$5zTI+LdhYs}xK+9F{h
zi(oM+fV_n96wNiV8wE{YZGaN6WIs`d#pX>#Xd`#lY84t066V~6x~m>_f45bNjE@eM
zvj&#cnr{-;w9P;{*S2fQ`JgD{qJ<&ZqMj;CeOVu`&p>&}*fyx+PM!(GAnFknPhmZ)
zE59Av3U{8khl`0Wed6HlQ3?;NIA96j`@XcvhW3k+6NGz+OpkcQW>2B0{IEctz*A$u
zq+efh5e~KY)|J2EhJ;91u}+uJOXlt)?oOp_TkM6qoAG`KO?ZwClT#Al&Tmf8kA;Dc
zUlaCh+261}3`!k=ZJc`~f<Gll5|Dfign7k)s1-4+|1dJ|X|f(Iu2ofd#TAu$*QO`w
zQRN<UaVHIh{k|D%823##x6v%hUyL~XRRkCO2w?|Nm$HCjQ}NpC?dSc31tMI=g3ZXD
zIY*F!!6zvO-=Hjd!}oz_rv$4RB~oK`?YUFf!e6=)-?x)#yvcWoe?U~o&TWPaC6^HZ
ztPU-TWACGh-qFjNs!N~1KE(X)Ou{ubRzMxK-&Orw{b^`#T;qpvl_YR{VD+4ChjpB_
zyyOScXMIU7?A8p@+s9boq5NIL`Hf04L&5EmF;V(L(I@bVoaPeTkx=J59^GK2HH5kH
z$Nn^UOy{sA#5lfrkFs+95UU|=TydC+=+l?+HzuS^pF!l)aK+lvM)T`HvTE7vA)4aX
zf_jdCV*a??{+-`J)A3>m4A8xmdc5K5r#)H^CS4v%)L<6Cd$^@R+)#G1^-VIsLxrk+
z!ZWS*SlQ?25@8&g2}8>&ZVGc+h_3)o`pNOrUpf1e+}78N3zIRoK7#aE%>{>2#E|Ej
z#lXbVLTr4rTy)gc5~0|nmAgL70SF(!n837tv8xM13XI6Su3nRww<>O4buYhoDN16~
z%8G1!UDF(GsZ)?F_OJPcCQIus_QMZ`jQOXiZFsPoxK#^iThgkPC$=o0P=!0Ve0{B7
zThcYC+*l*!ZeG9~avCWT{pr|*@=rfQGON7INb3-fs5;m{XjxsLD8eFNzwZ+>%_My{
zzP>AKM0s6pMWIbGhBPWCOxbx!j^GBFYD40RZH5JYOmKlLJJEcdYn_q{ZM&D|jMc53
zZS}WeuY-lF_o66WHqGwCg&0h>ws`gS{>l}WT0Z0Ndv2m4%dWQ2MxBrBLf9#Jx5MWL
z82o{F!mgndqWt+Q@+&7KUAX-#1kbs-3vW-jO^U93t!}?d*SPS-7~TnXl7`OfD;G)E
z`}H2Kt0C2$2`I@Y{mkT=<OyU8M_(O=xYGnIK7|#{@NO)=%7+P=H+a5BgX;|KNZ_2t
zn`2D0Zb7>+XLZ)4(XWfd3z<y-`CA)d?Zg<}#HYMH_u%+YsDXi?@^^E2t}D&ADCRfM
zR}Wbbn#8Zyg*4n1D!ZFSf%DCbgosHsH?V%SOEX=lNS9X^&f)8Q)zx`QgR5Z)!mLCe
zfPF%&-0n_>o9^}BpbkMSo&7P%Fs4Z`Q&vZdUAW`CZwsWwFg~{rp9G&*WW~1Gem(-v
zM1LL3!Jf3)d{AG$Y#{z!A^+Ro9nAmz8ljlJwb6g#0F~7>(NwX$qroA2TXIYIh3E5-
zq2*B;!Oa#73K7DC^5oj#w^QIL0J}yc(-Rlv=gKyBy<<1roq3(mh1{~8m(k|0S!6Nb
z2F<M;CX>yXmmb~wZy!U|-5?y1m#mg(9KiO_nr-as0{G&{*IC%9_Mlxcc6`loR~DX&
zRc_a!aV<c_N`fQX6S(sP&SRwQXbtLiZ7L_uBlroV)Yu&)g!%XHln|b(XX?kI2)K^(
zc`|w?^9_5Z-*`xW!x&PKL!{+7uZv0JR+UZ)=S@kb;rIe(K2KDI^kfCx(_2ABzvsEx
zNOO5ENR5b@Y^U6hE4lXDmMkFy(2}-++8ca#kF#Ji3jc?-cMPtyUAIQNqmFIcnz3!$
zwrzH7+qP}nPCB;TNjgqW)_V8Z->Uu9diUA8PR*LXX4U+2KjXT_b&c_i`v5S*TqR^g
zWlW#1AJcmkf5c3bP}qzoZFXab2W$3=E;nVnkmx6BznRG*1>AmPupp49q=|(7vpqZv
zW;FN(9V>$syLya{7}2FDRW#*A%v{10zcl6hu~Xwd2!ZVCaAmJwyj)sZrxg{4lT$hM
z^01<dh{Xw_8O4w{k)^wd1}x2B(SBNU5kcdX8U}4jgNcPo`vW)>HlBm_x^;%EM1{1r
ztV>1%g7!L&hx=TNO{NM$CW6`3FUW@9l~|_E_q*7Bic9){Xt_4CJdTxy)}^#i27CUI
zyA!n1#|xl@TvsdQJS%wM@w^D2K1$dmdD8f5?i$K;o#lN{7b%khdfP{*dl1eq@s$db
zwgxy!ww4OXfq=`#E!&9(hfZINFJj%COcycF0$(U64@aKDM}34D8Y#2G0YJ*F3~>la
zER1<eDZ(TK+N?_N6loBdn#yG2)=X7fBjDO9R^oRaYTnuxyfwZA@LN$cNY=VxDbSdV
z!bC(v#%ytt(og?h0uy6BgXK8^+#S!fk=mJ(q@tw);aQj~<k)gs9L!q2qk%kkn|#K!
zjkA!hJRcm5F{r){u`<n3z8qXZs!N!+D>HOMb>l>=k9d&Sh^WJ`-97;M-oc?Dc9$tP
zoAVUXP92Y_zn=|OLWq}%!=YuDzEsNyN~=`&Kv$(JsxsmY`ZJk{p<ps17<76%Y71}O
z%+L>~D4SZU2q!5(D7TKhP7G}+cAHD{U1pVhOLdrbsy?)wp@QB91PFySQI_yKKU{i&
zG8c)gBcyYWex8Kn4dH;a(Zc-i#k&U3EQ|JYXW^4op(Kl;c{x92F5`&l7sutto@}^&
z)P@EdEmS_<`$)1H(Xu`A6U@byC|@tjHVdwxHmIwnK9t4JMAO%{<-@Qlvx9OpkXGB{
zt)Do*#LKkZS2xE)-2`m7XLxJ!%q>7Y3;M9r@d}zP-C=%+vvJi2FH>yIvaI2Z?>-^k
z`{4P?fO*L-H3tq9Sc1z`<$0EunSz#-Zf6WU&q5N)W`OzjMHFnZYiSQr0lha#wj!5m
z53zlE=l!G$8N;^uvjTeN;P#HN2JB4SwOIq&h;5RS+eVe^OjX7XS>0dWCtWnP$n)V?
zWtj%R-tUE-fBiOHfOi)tPCy@KQZ0(H0vPtpjB8fhBbLq53h;t&w+pwVd%OcD@W+*@
zTSy(o*dTh~&KxT7a>Cui?k*XGE2LADAn?c_N2H<N!?}8RLbz7Qb`BDC!^1o9wipKX
z64NCt^a+f4W{uK(3S_Y~>w(MJb$lvCIbeJ9fA$DP^$M#=jj4%Xr~38&m6{OpY~}rm
z_K#ZX38Y7J^7UHm%2#O8zjsmpZF0+h2v~x)HYVn#&JOzjX8=x0+*ZU=Mjq)w6F{5~
z3Ir(+ZJM`O9So)sXw(RY5vQ~kL=*=eKcPoc8(6N*Sl#SZ`Xs?~5*dz$dk20iz@FLM
z<g4G{x+n1T$$4G%oIcwA{BVcT1D!%2M*p3>x$KsLmvyp6!Mh-RxpA~vZDZ-#O|5=3
zBhq2&xKcZbP6%D5`W9)4W7FL9vP<<oYMe@;@)*v`1gFs?Qg^?XtFUe?rdsnm{cEhb
z6opn?oVIT}z4|R98)F!+uiw$CS%!0QiHsFBKHVor7A&Qga_-q=(WQpkwJ(QmBR=tB
z4h?yodAA}nQRw;_<afy^^;%u;Y~w=hBgH-vENB$MeQSgK7$&{Bq`^58%EFAkeGrZ7
zz})KD5C6J!^1`3@+<nrnk9h?)(3)P<5t>+O$n9tEmAgZ_CAlN$g*;G|*J0J|qV=xS
zXYD2RV7<9C#Te{)_Fy@w<4R)pBWKVqMZ_Luy|FTSS{gKG54X!IWjz}A3H`_@>XEE3
zmol}#an=DcJ~euuM{vI9N+sdSqoP|IVb>VcTxj2o&+*bWsufohgjY3|U&+i8(!~1`
z3e+)Fp`l#=tZC~s&!*=f1V@`X!g-LhV}m6ShmGheY?t0_$#qR0z&bz?EF$fg3zKT^
z#EKnO`f4Dw@SgrLOibrU$IX=Zdv>^R@#1DWw1t{VOn=yxK9i>a)-=MAF|YW8bgDd_
zK(U@kGC5jdeoc4E4sJUmcjNs7mn@TiAO^&II(M$o<4@ejBK$yl%9Me+oqimxaps33
zDIf+yXe>OAIhbuV?E5R&yV)HVH-=cdxa@qsI|I__D&Mp_gE;p|NB;4v(YuI`NPX-p
z)?J&^8w~1}-Yt-1+kI4b_EZsX2Om$$GHvbNX+^fq(}LwI3HLQT{z)#lesL||_J#Ft
z8i65g>IK%X=OZLB?<r)L%1b(a7hxF~KB_QO`rt$0&*Q|f{7e}vvaA*=@34qmC;zG;
zA!iF;tEw8rjAxF;Z=H|~AC*~tv%RaqzHKr7<bHg(LVVc+d`bOS=5mV2Z)uQx;lC1p
zCVqhXaV7dI-P~h>M^zw$sh6aW5b+J7h6VHtC4&&-fw>ccx(6RK#Co9@N--xP;G18A
z1fwa$Cee>3BNtNsP=^RmDl_o}5hMM!n(SX0%#W!Mn~rV74E;OaLW79U1UR-Gxey-g
zSqE}HHUPOFpI2c@mWb~NDE7KDJ?k&|y8Sz^e(Kj|gZyuSPy2Ty>OX)l>}G7}{GY)K
zNvaT@NGmAZzz)O_`baE#$x8YV^_``K#Kt9C-&luLs0|Ikiww=J;NqCi%mM+8;%kN0
z@yS=3^Q6{h8tp5MdULH1+Ts~kp1#sO*^ef~QG?%h?;g#!JRMgYXS(j*mOphofqPxv
zSVM&&4T_o5W`ApVNXSZAn%-*}4A1{|-;}_1%=R{YaGGPO!Uuv>$y}Z`3#&}dkb;iN
zSzc)NPu}`i9JTX(oQwO&>r)gB`5{9R5)$t{Kx7C>2(0{^XpPY}#toVLC$-JL>hMCI
zMsrcnOsSU35c$cY(+tbxsx(QtwtCpYRkggvfCVJU&yBgg$-i1}>h|NHY;knfPPgmL
z0rZTWD8~S`ok-J?XO-FE7ZGk5W6t758Rnhy?<w57Xe&0`w7_YWdw>5WSa7B!X=18l
z5Ce7Pv)njir3q~D0jbcgpB5qw4no$YX2%gOLy3b85kq6fjrJ67vTKvl=n0UBz^>({
zF^SX~>0(jk6{J!T`e6otFj0M_Emim#RInm?_Ln(5s2W0|fw)aX;0%!Fey79gNBF;5
zCLLA}Y&xsxL+<lz)EHnHNV(U<F<!hwvTSoGr8rg<@DHLeJueYNsx(3+;6S2|XowEr
zhZ=m!fWCUstf2iyosEoN1{RUQqn3#|Uk+tMhS4u>x+pclFu2BrY;L`wQk!sS{Y7GV
zLg3&lHq=p<&~|P*Hsc@p<Obg%eqsSXFqCO6b?$At;Gwg~7T5*3rkycInK}od5oNQk
z@e6e-b>m2ilk(CfxDM|cVvkR{hf}TmM1U1oFL41Aqm9aiaf1x(tOO*?AwdbfW0vaY
zmE!D$p>U!BU@d^HGIzgP3}=|2k+nV=uHx6vC<AAqA&W|c3IY_%IYO0~QniqW{4EL;
zBDV35iF6IpQ}a!0+lX(l=Fw$t$eHdHcgfi+)Lktmg&2bjNBOY}mxFV=AKZk~NR+q(
z;tEB%>pC!?REACS{SyS43b#IH7i(i0?xvN@LtcI=u_|%jL6haCqB5ns7k;?p2t1{6
zfhg!pEZQjV9*GUUE>Pk=Mkq;%-TG(<Ps{ea@zm@A3-C(4?~8O>HRtxDTI>o;-D03H
z;-1#WsiPco&F`@V!qww=Od7BdQP5f7X5F5`PGlx;&QYYk1nQk7K<>4KSQ(8om~MQ)
z?F~#;zf{l1Vh8<6<o6i5Hu0jQ*1h`~!`=<0$`XX1tz5e`k-2C!y*#Z#41$xbdJECF
zRFqt8O#DRJ)2^@8TN3c3<j&XeLdioEYfW5F0meZ?Hg~M#g{zwj%1>U;ZOWNb3pqAH
zLlo&FK9mv^b`&0_q$7)kB$8g<O#kQ~jwZ|p(<~m7Ne9|sR#cHQXfe^aXWVyKbC<Ep
z%Jg>nSs$9OTG?H;r<}JjNy<#~8Y)jNSGs}7@71BjFucvH^qnU3`UY%Ax{`N<jzRlm
z%?Ul_hPyB3TD7A&v-@OC<xOrV=EiVYJ2r~3oALlaWK6eT!v8jiC8W$ZgmRl?A!aH)
zcR@gOoT=(2ZyKXmRQ)I<`6eYS&e!FCZ82Qze_6-rJ9}OO$FHrBc#B?##M5Oj>G{5g
zm^yW~Y;Dvoy<l>$@exWIPohpvtJfZ_3w8?ynsH^NGgNb9*({cx`pbcmiVePFg3Ffh
z!S>b!p4H~j_;-Z%(DjX{N-cgfWb+fD$_QS)NCPQ5jmk4PlJ9_c;_?>k@|#HHD~QW_
zM1d^|8+_rSzGHfm>SiB1XX%)=NX~4y`f>1#*9;r$yD!BFCR2d}S{C4<>}3C?(h-<~
z4VZsMC@S-siFR9=Lw!6E8+N+aygVZ@3y4Stc`NEkSB6Mq_NQknltT+R!PP+aJK|M}
z$DfH--QCri1D_<*?ZD7hF*_WD74YW+5&<6fr5(kh8P8i-3!yfw!Ye|a6&gMa&0cTA
z+tDM$X4+im%E0DkM2_Ra&C53woxx9IxEt4|f*@CMJOh$Wc*l#<Uo7Yev1g$(`+aD2
zF5f$b2|a;o3~zt!xt(GDNt$)keu{c+*ChS!5i5dgaKg!L!@03IIBpMRkLR*M$yqwr
zn-Fn}2s?jIkbcz@{y4l|V}QTqf)a2WT_M&CC`G$5(tKrx9;vx;hA6mWqfLn;*#pEp
zCeic6Kpa~YIhu?%R5~_KvNIm09cD7Kn+m(T{6S>7fE}Hj;Y@1@o74m%@j7`i7U@L6
z8)|SHpK|9-zH@~GIytbQn`nzk`-<~`m8*xccS4H8y)Qr`n;U@|<v+vgzhjG3y{R2E
z3rXPS@h>3}K_k%!*MhL1j;HclH#n>6V{C-qp`Z(Sdq>{}BY(G7?~n8Xwj$t|fq}1=
z?G8f~PoP5295HqOEj(|GtD9z7p+YM_!(Rmk9cL4xhoq2wW^GSoi7($BUNg5scw5&q
z_L!;#oN;Q2kC;9p$y)319ZhUb4q}^pH;KKi-A$^@^__e(8Zb2S%ap9hatUzQ4jXaa
zII`PPIB*9dWM-??TLd6|+a$8SynE^+3H<S#dEQFvLnj$ubD+C=*j4|)lwCZw3N1LB
zb_ycDGPW*$%0t=KS=YZFRgc)OfK+Xeos4`t=ZJOuokzHpAVhrSOq2dtoZ_IkaEF<?
z^#ww;hyP@S3XOXl2IVkk-x&^9R-92CjHVRX+;z{*&^5Q9iiAF9TdUe~UY*b*IyUnW
zo?d}K55#sCZeAC}cQA(-g7As)Ltv90>4}OTfoZ>JOj-|a8@x=fQ(7NuspKXwM7l3L
z1OJ0`8%nU<(kz%$e*VE<koa6O0EcyU7O*nC{iluX$MjJ7t+UdPDdzbdh2|lLy}EEC
zt6|4^{SAP!ee0Gpxr%R!V`H5AdjJ)}dqt8}{1x^F{zxw`)&_tc6<%5?JHVMj=cceV
zZ_hs9T)wZT=*{;7?jKXm(?|h(+*b%JHPXLMIsY{`7U%ECj-l1xC!7A)G$G#q?$7uQ
z{t<U+=p<-sZT+=<k}|h3{u-gaoId{<e3_+uE`!OB&P^0?BGH9{V0~Vss@Aupu}-<T
z_$xhC&XSPev<LPad8Jn%S@>M?Ui|`3YON4%HpJp(idHz0CZE@ZcH7Hw`gt09;F_1$
z=eydl2)H-2B}zx>9VIJlkj~La|Gcb~P8Fmkt3+|PdMP^#Yi5;1+hkQhrFmFYxHGkt
z=r00t=mOEV)N>LWl!urgB7HW3dq!$k&<9|{lbO`yQ!9Fqy)dqTdS!NaN+5JdqQLLL
z2x&c<bZCKD`$6$~=rbzNI^&M(iFYP)_OMf!f*hXb?eoxc6Qd<dz9+V}a2aEV^H_m6
z44vSDT-jZAwjm0{q8xEu78KSB+rG>~O8_brn!pq1l4X$|bF_0~efFw%=zv#~xjmW9
zVh;r$L<Z|R?-7<NLI~N|H~3-<RL`QVeHZCpl*ROg{=59>Uzu7S<)0DiPN%ASo9`EV
zl4QRT?RX+X+y>z*$H@o&_-0-}UJ>Fp$`=+*lIch8Qw(%i7CK-3;bse37jBP6;PrMo
z)_!+-PO&)y-ptmKjn;oSYMM2dWJMjAtsA5_3QNGLII^3-?;x_z(J+2-G~a?0{1^_*
za_e@{*;gc^9caJaJV~lCO&Oy%$IL1d6s5&}=6e1Hwvnl~F`@iO<-88RUhJiL)X{|-
zff%vtNZPUm(J_Z{_ROR0o|EX#G5pP&|0M=oLDrV8DS&CcFng@j1@?gx1_)en{Tgh<
zK4h&n<)?n69Ipojg9vw;e@7#ofMJjcQfi?*o&jwiMHNVC&RbZS>~ZTOza-0-qmq`1
zex-N60rjvp1C_uSNeIii?6|W^+JfC9m`xsfmg{?zSYamlgU+%Vm1SR5gwH)se|&W<
zw?^Enk~P02{!;Jn)ui7g+Az57YxB8?FHjmi^a9q521_B=MH7!vD#&Ms(nKyziA;nf
zQDQm<kC~}?l&0c+nH2(ef0~sB(`82Is5(iLzbg=PL$r=_9UIWd8c54_zA@iZgnNOI
z@0n|r&|O9|OpRvr`~$W(M)EH2U%6dMU(o&c%L(!SuSokpsd4`vb5$yqnpncfJ|R}W
zh^^M){lW=@G%RdlQBR`ekp0#c?dlfsX)IEVAtVzvom~fp*5PhXAAOeSP6K%UoSOOu
z^ayh|K=>II@KL*`re(1oPrhcen@+#ouGG|g(;A5(Tthd3rpk$zR$o<66m}O~QtU{!
zN-s}RfYh+?*mR**w@;=HD8`m<GL1BlUuLaOubxJKft4;#2KU>YE`w%PG&Rdvbec*t
zxDhsF2h$(^B`0`8K;9SQ5)7r~lc%JmS|$41gWovR2u7Ipz({g`dr7=+b>1qt?E-5j
z(d1;ZB1GUdqPPHqLr|3|c{ADdK#70(uFQC3{+=uBkB5+{vgk788JM7M0<&gaWBE|7
z!AXWjw-JJ0-HERtFPM{fvy}kGMA(T5II97q-)?^3U2Css7h=EHJ?$3K+z7oxvo`Vl
zK4Mn9d=M9!_nx!B#o{cLj93VL=%cU}4{&C9aUd1CL2R>;=h}Emc=^?AS&WD#U+;}y
zpv+Y|{~+;ToF1F3%ejmh%L~}A_*bcwH0YISk5N<kGV7JRiVloT7bESw(KD{d_4oo5
zg)bu?VxKWh%|tYodkf|YSyyHkqoO&&zR{c5UAL8OoC~-iI76reNfvstOsG}L=`aBI
z6s%R}DX)!N*m-r0kW{AqXLK45bb30^z}+Xrb>f!A)Cj@GPzYhMj07^ASau5@fQ!xZ
z%|mL5;mB|@JXIgvR#>+m`$~RiE-EzviX>^CMFGuCeadAXr#0pWAwy#L0~I2Va56#e
z+&eWVSdoHkmP;{*EGlX(u|eFVrz(k8aEKDMlk<#u=PcSvi}H~8kDE}xO_)3=b_l8`
ze*yIc*2S(N>EJ7qt4WZX)bBWI1FD4GMr^9C^N8KUij=k{Va=U54_7By=0Fkq>M6ND
z%Oz%MZ#hIV9O;Z0q{k7_wh#8)VcXL{9ur9Qv1UT?wLPJ#B}>7P(CQr4*U5Bvwl;D%
zm@J2qRIi5@qqr0wH@~H>Gtw+IZ(>I>QC0FR;6p_k<dt;qU1x+Se~L(o55-ynj%B%s
zgSjDC?IU8klVbas9Y*Wr>yaO_hY`qR9zig6n=vXExJ}d5Q?16B70vZyb6<Nu{h9Jv
z(VGapi%LuALwG+B{dCP{gW;PluZ-Y=c=44%N_l^P1Nr*5dbh5*{?0ZcbgQsfBsT9}
zT?+hkb*g&VGrp&;fn4nB(i-Nx8)E=FO87F&MV^e$RU?2e{@Ev_&4U9*&nKKlfL5wh
zhHot(4u19wb-5Y=H-~zYEA6>j!*rI9oDU^}dkd~xN@=}y1n!_3`2||ujKOQNcF7V2
z`qHl0l<GqBamoR!CTS;PER_uK{wa%28i<y9h5}1JbAzc3HGr`9{4DL;^2y#mwmW+E
zJ^QKlH&EA@zHUnow0rA19T$yY6}8=0YIDwqPtpOoH|_XDAY>@wD|(Z?K_<SHxYVp!
zm<cYD;j~_+971ur>#`i*oN*Hv4p<%@zBtl$>?Zj;^{>L+#a72M#I^o~LGO^lm{!MW
z`}w^sxFMvm6*VfumbsWo;W@BC(^F(z6+^vJR5jy^&kD$Q-{a<ORh;($-hUKHi(`C|
z>aPv%^j9Rvzb}&iEgkunlF091>TLa$rzz}aXl(a?wz*lc{IdP@$RnS^znt>%Aw>|Q
zHb5dHL<0x_LP!Zi0q|GGOa&(A$u__}$z+IdKHqo~>u^A#5aIsJc0aycU%%^a^XhDW
z)7qOAir%42%$6oPlS##yr9k>4HBW9Z@8WIq*pHuUaADVHQ<wrKMcgt&8-a)miRAA8
zf|RAOUee!yrx<thv+4>W(vsF~o}@IJUANtbu<eFpih#cxEjld-#tKFLC%@c$7Vf;>
z;K9#mFA+I=fs_|P%C_m0Auonq0RPBy%QLJWMlD<Mm(G*I>A#FQvrQQg25q_)g()N}
zH;0r60ZA)uI8<4^gsApTpG4cS?-4z$i%Q4z4F+C#g{p+`LEM5>d0E+ACQGD(d*n#c
z#kOp7yj)a5eWW?u0tzMk*BCjNi@XB#6eXSdV|l=pe)HO~<HdU*PK78L#)T7sX5S=<
zl;|tlD78w%N|WqA4)E2QB~j_iXJq=->Hhrzvi^5n?q3e@zwpSUFCW_1!F6Tzg7n;Q
zegOZ;O@c=<4jjxSC6#3IyU`hTPPW=q7`|_L-hsOj#gGJu70%U#6nB|EW;(9l-9G<;
z{pQTp+(#%EW6Y=C|7Kc<Fd;XKHWm*;@*pU~X^#v5+_(11P%|V_NMJ#NloKTbFc}bL
zL;Aqq6MtULeBjGfxbxn0S?CAAYmdBc?jx3Nbibq)a-kYxje}JGUTaJ4BNm98euYTv
z;DV>l5+k;=sGrp+byge`-f7k@SyALk7nzudjuOl~Mpe{c?8-=gJT8opined1uTg(C
zaK@zB)@`FZR@SPP;_8X7AD=;jyT4=p$WzCkjhuIWp_JNmBlPav&&y{67(ZHBsDm~x
zS<-gc(xpg%fLHe2Q<X2G<$<97I#ZH+a4s#)0>#2yWy06QTxG%M#4N*%)egGo>)ygU
zdAPx1fBC0>kee+hQR?f!I{wxe#`HfpFxh{FnX;xTk}C2CEE-v$c&}2MT7{aBAmLz#
z3SUKT5@IhZ2!9^zm^r$X$^6)$<g4UbNVmGKmstlS?YV}w_wPK*2h)4o#`kHX(X1v5
z)#b@F$LX!@e|*@V_pfz*f$hMy&CC$co3f<(N3qJJ(?&63ijv&+(4RY<5X&mlQX3uF
z2PDX(C8v+I7n+$GA)IV6VxokWYZ=0xqiE6`K$+IpX~CUHx;FDIO^~4Gaga{b=oyoD
zQE@2f)jBw{EBR<zqs@(ntLFt-Go=7zG_JSm*)p#cm81<Kd3*`L50?9Y!_~CpphQED
zF>oQwT~Pm^J(2Rk2vqYlSEF&cKNG=*bAhPENt8Br($a(Fz1{W;44V}|U2~L!=BgaS
zA}Y}^bP$6XmrO+^mFuLJjnMfhT^xibNM=#6bmnYA)k!ZKERY$M^6>8`mp^-daIDqU
z0E^m74gBP51?o1+Fvr0o6gwG8;$%&Fw#UH%ci98U$CQb;F!bRFMnD2jwYXY~=96`5
zEf-w)cv1U`hEf_BrInbfjs}rotR=}&fcW8pP<{_6-nELdk{CJ}bk|z6<HuJjfW%3$
zOJfGiU(EKI5pCR*OPqv910oeYGeq>KBc>>;DM1yg9fvl8olsFEi-0+ejZ&aTlpKBQ
zrZ$<%Ru;xwIlnuvQAPZutn*%dSPU)*evkcBCtB1KX}{|*weXczl_;?&^|6M_l~Flv
z_ss;Eo<GleK2wGVg&EU6b&pFh@oOb0?vQh?wou+FDNu436-6fqConyLig0O~QEHq!
z^fjtT`aU3KQSN|ewlj8K1!rGiX0k93v1fCdSamXsps?`DfvXqgt$d5TCAI+a`0f6e
zPhLR<h{?$>zHmKtbK?zZ*@^`V!E$n4NbG2tt0<Ij-2IQPbW~}$=osL75iJYpkO@n3
zQSaa7JYU|&51Wc_?l`*pvEkY*Q|QwIh@gh3JC=J)`9usCN-Ss<Rqi}kEP2b!_;=*o
z?UO@Ic&I8^0+PJkqq|I)+N{tn@)P1)q@4LYFflpG83qCIR);;yJX^_~!0Zcbmi#~A
z=-PgFCct$ZdxyN&P2i~$L=&uu+~6LQ!~nC6-h$4pv*|>13CLc+yr}BzzFT8Qzef_S
zqeu1($M$YO-A8qbXzjRWrbWH`50vQaYe6NqJ;n99e!e{*5oiGV9ueStVspEsa`Cv?
zqS1rx{PvYI4}hWF602_?0XyDJ`y2}qal<gAYyRTZXId1O(zlX3q&7(jpM#P-yH&uK
zltp-5Q4lpM7J#E5O25X}JP;ehblXF(xMd4E_=rq`1+^jGQ3P}nnS4khx#6cqjA1Fp
zNXJ38ZDd1KM;;O8uxAg%l#KW%=$zN-6|*WJ^SURNBdooc1@r!Z6N<DX$!h&R#lT(z
z_5@yU`e!g#ihx66#`Z^453MLpHSMF;57fCQSX`eNy-rWPAE$?I#07s6=h`0;0N(4O
z+xazHEXQdVz14*tLH?kxczV|zzn*zqUdTPY{k3uR%VrvOkW%v?O`fxf9^ETz!QjO6
z1f*XUfz$#5{6(j%bxJ&8oHb0ct}f-tHft2)mZ<%-|8(Gzj__wE9GlsCuD;Y)JHwT0
zpwYHm*<&2W#~><@$ED$=`*T$SK_u~KGaWZ=^-@XeIKb&>^VD3`r_()QnAbI1b6I?2
zglJYyicy(9Hdh4HtVFC@P#&3PFRlD#*=A9#l|=YTuh0InZU6fo`QJ{0|I#Dn^c@_(
ztlRu1U+WeTa|cH!MQ4Nm`1voR?v#q=Kiu0N#Wd8^6UuFFJ<7B+wL9A3Vl<Bx;z@xc
z1NF&6E-kCHH<E8~JO=svB!KR;n}SHkHJ~9>eFP-DHFndZ$qO$=N0aHTnVRiy&;}y>
zKV$7S5^3xE)fgWle=%8mPoS(;o}P)U%_GT>5?w5@Pq64hvYNK<K4Hx`kx{cAld!6U
z8-Nn@x5^4esLwcDJSE#jWEPTfCCFV?skhyH)7P8M8A3mY)oebDf{(Q68TaMM;ce8&
zM>$s~3`CqRSBDbF3Z_)50MFM6@W&J=;A*UmQwMCS8jwu2Y8+t;7N!JRj(Nvn#OtxU
z@N`wBf)4ANVrO#!ejcWRKSWQN+jR*zfLm@lo*O8hnCq9^7anW4P^wIy-k$sPd5NzX
zQm)yH^Z&@(&Y^)xu@90Xf*zPW><<WRz2104#<zA;(a1qtRl}*?4fa3Bjv)eq`5GeN
zrP6To8km?OsLqRbFR>_%DO&e|6$$7euMkPShwq!-mtC4K>SxDaF6L+bp(y)L;vO&v
zE|euIXB=)b9_GDXm$+eZwgo}EK00Qsge@UoAnF)V90`IcU+D1#C!Je8$~zpJD;j)n
zla++*b$xEW%m2>I*n+_0ZF1m0@1d<3Ka92g&A(f0^hi5_9fMW!i!>u@d+r58cjyUz
z>+`P6nbuK61*b*CKi!E%Yap}sfZUR5;VOlI$ZVn6x;?CM^iV3>8I5Yy=wX~fkN+^l
z-ycN(-u4)_q#8(;s>%^GAuz9Dg;4g8s3Uq`0|O4Nn#CtwUNON-=7uu#r<V+UPqM3G
zXNm(2;yVa4;^n5_AHT=%OgFv(iSj_oOu-zOqC|IVYQx8KfhPDpdw^c9X&{XVmF>EB
z_yxBEqQx1r^LPJ>?_ML9LEU&}tHN&V<MGqrm${yvXmiHyHfY`xb2=uc-mm?h>p!X+
z#R8b3Ow#$OrU<3(++7KS;BZ=zMg+MGSP#wsH9(Viy+~ZbwGhx=r6&exf(hvoxQ-X_
zj!jA?lTq%`Z!pK7Ir@R8@EQ0%s$8ZriKpZX_zQ02KhdN{1nRY046!LmQ)Pk<0<A`v
z7Ipu@V~=_!ENQ+d5y{_Tl>dJ~i~bd(e^DgIzpz=9^v???Mm`;Bs<fa$Q9$qz5X`Bt
zLtg~ENF}5w<G)ECM5(VeWj1?GJ$!qY>5dg5nHz-b4Pltx$}0K=)W(#uaWy^t=3?UF
z^0+fIv;FPJjt(NAcBd6Za#7e^QiHjUD5>c@+(WxvrOZMzLZ*sTsZEcnjqs~~lVx{3
z7QPl=twviABam^0f`g|k%euwKQsPV_nLv@%drde%+55%1nNh8KN~Pw6TV&E8?nTI`
zr-u?Gi6ENyCn(aB4G)a!z`rb<@cYNkX-up)NuO4SO;P@EYu-r|Y9iOtj1kn|Sg*$l
z6qQG_*@T!L<dgQ=O1ua;2Nmd_RoV^sg`lEb8s2o))?7|)#0n1BRcU0jP6*@?#o@Pd
z=5zWf^1$8OQcN2b5m*$O>ii(j-ccT9Vt}0T5UoRi?G%o0Q0AnFBySxPF;=q@h;$`6
zE<X|d(jrNf#nO&dA{}W+7={&?W>zM#PfFSrDb)71mv9`OUurX9NEx?ZCd$*KofU62
zcW{@slw=>QSIx0*Bi`NkK!I(;m^FusG+&b#e`TP|gc)z!nYN%XKde7EC+Qe{)3|;o
zfPR55iGvY^ttx@OPd)gAup`N*tGsdUmzU5VuY*f-JG#S?RN$T3_U3wjc{|G&{Q16?
zxI8O(PG1)KJsIZ58M+bvTlO%b@39?E;MTE<B}N^cbn^0d>qh!W(t%$138sA@5rJXL
z=GkadAN_l4o<|t(wE;=pPvGu5KSMtYq*MsMcGo4{XuGMIAQ4_TLl$P{Pv8~D5GBPK
zxwHt8=2i=qF%!O{GGd#cPVwcrb25i#Z>h`o<K6Tb2%zcbPc9or&S<t7*#Uzi>K50%
z7w7b0FRg9!g;uCLx_=-53rmwM;cJTP`!c8g`z|H%KSzLov5BpN@xN(Pmx@TH@SoNW
zc5dt>^8!V}STvBtfkfeS@I?k7mQj3IMNxl@qxa3(GByAy5%;>MIkUDd#W+@JDm~7_
zbnh`7n`G?7sfz54jPJ1*+^;SjJ)52`Iq!F`Io}+fRD>h#HXkU1+w?Wg`%BZ{f()%Z
zj)sG8pern}KwDH8vzqcRLyZ?IplqMgpQaxM{V$i^6%3hUE9AiM5V&cqpPJ7nt<!aS
zDV~ezz&AhIwehlvrBDmL!n-bw*X!QZ{h2YBo|ayui<(#}-hM&yQ?y#{!GlBKXrC;@
zkLcr2dVqH+nAgc`qHN(fHjTSKplDB2R;Omu%zRgj8$(1T6v5H~1H;$9Ebm6`n=S+o
z(GEG^d9FHxUlxskn+z$IXU+<j|INK#cEHJQD8FypW?SK@Gvpcg=C{%4KTH3UKkVZ*
zu*qB4yEfNVL1&IW5Q#Dxi8P;m{+2)?5O<+osEa3)Xj0f_rA~zdX1f}*Wh%-GsD!?9
zkEnVF*Drd3O)yk7P?l{0c4GbvSpS(bdQF{Dgy>*VK-fQSIj--?#=sQfIG@Z#b_irw
zWN>Z6x!ZL^x}>1yV1>P`0Pfmsbg%Lv#xc-T{~h60Gi;6fate3pkMXKKS~;6+>Q+q;
zd(C_)#7NF(AELA=cdHm1#*-{)i)izBIYmoZEGD})UYZ<0TCDpQ1?KP8{Jr0}@=!83
z4Ns|bM%~30Us{3__}-)LW|UuYFva9pyEf5%h+7=IRt%4iO%PCd-cQiydMu%$7A`>@
z$GnU6R^x}Bs}(!D3`Ry94-|H2&a=^}JupF0*Y%$STJA(z5TaFReG&CqAa+PTFEg&;
zEe)WfV}pi2bCWiLP3yF5FoAK7km^C8|45G@=;T=}pZlxEeaMwq;pr%%2GTiDb`xuP
zFEss(K<i&vhpOD8>Ywb($Ve&XE-|F*u!=KK+wbI5WT05#_6a8<UEw~$+gl*>N_ODR
zdPdRUVC)8cH{}_z3;c``!@xMn7bhkU(K&*tjeLk3l+S%03<!4*be+R<d(U`x1)!{>
zlba5kLye#=^zeB`!VUWljG<>67>QsgeF#(!;l3hxua71(dNIvc=6E(nl{svK9>Qr+
zjx-dFq^|Zak*$*_774q^t<Gio-g9jrWul*Og?RX>W=60Hr?@rC63Mz#FIX|Ym8s~>
z44^^xNyBRLc#q2hi0$B7<PH{N8ZKB+^N9PhQ~VD^)bi<-Gt6kN^OtBg={35fqu;!j
z-#)QPiWx8b-S%4tGJzI4r1qs$6Vbc%G*k{)*aqoV>~c<5!ZSYvpTO4sDS})ezie-Q
zwbgGhe^*qL{^vzSP~Xw`D*@No#?jo#+{IY&>+MAw(=Q5ar~l>Q{Lg!I6u($7Kk|o3
zi&K$RQS;Am6*+m202E!x^i)z(X-r~@(^t7*1|!b(Nt<)qTi*L2G$}87p4Xht%+*c4
zTy(?!fs3|D_U*4v1Fw(wJD46ECoFYv03RGT&rty5Zq$<!`E|k3e%<U=Z;H;>3&E`%
zrxGNvZLmRG7I$(^O5{r9MC>SCVv@{-wSW~a$i@I@!QD*Rwqr-;dmikZ2>t{7iCRQY
zvbg)M3b){kZY2f_z^^2W9D)T{86jAfWG%MVky@*8JSmY80lZs7U3%n>zMrq&)kSrR
zrlcGR1OxhyHqT5LnfzArQI`^r;p&L1nU6}G?1{B!dWUPo@tSCsZliJ%fEfR2IZ%yM
zT67iLKG|8^4mDQyh!polRr+Y7+&`0iNAt8b+w*2J2d5Ok=No#l7sc$?0A>uGR`Q+i
zf;A2+j8%VNJ`e?~(WLJAI#WynEFJkeiWvzv69k6}!qoddwqJT~tN$E}&gbW~;uHni
zymCPcpX5&0zWQ#UvwZZy+J<IGoBDm!LsQ>{k7*E35RHk^E_UNTrXfSodN&M@`4Gys
zXMpVRB#SdN_%S^v<}(sUJPd<|SN$fVPBazqW$F;3Ob7pir4BVZH*=}s5~(4{pr};9
z-M7%HfM7gNebzU`Xw^&GS&*J#K7~VQkTAJ&wk>Zl+tz!x`Y?QYU<h}Ju##eaMis9z
z?tJc2eY950SI{-=LQPc~KRFaop6B=Q&t3FR;j1X+R|Bm1+lzK2|L4!Dq|H}i^<Nb5
zFH-n*L!^`OUu5u7?bH=n8TGTPP>^{F*pO)Mr)1gp`04rFPy>2FkU=wWy;LKAMzf+0
zDM(IbYh`Dk*64L=N*jBEz3I^tHbXtB5On+P=<NL;ysvmqLp^+5E#>VEPL8!mydG>$
zT@S9;@0*8RDK)+x*TCN_Z`=GC{Hl^S(N^X)@^xe2%mUgm@amhKG+Oq<5)rnoV4%%R
z>Nn{hveGY4T&ALmnT@W*I)aT~h_b4W&L9PVG9&^i`4D20S(i`Of>+7xq+c`f-!G?t
zpuE`pn0qisMRU6%5ETPVL2d@gO8VgWg7()N>y(I!0sSn{7G;rF;7ZNc3t&xd!^{e|
zE(7-FHu@!VrWQ8CqyXlIV%C@UM3X;5zyccR)0eE7>C8oPd*=h5teC~S&EN!<lABy~
zqRD5S3f|0kKbD*!0$DW0y$L|3li0B4z{llj>X0WWx+ILt>8Zp5{qI1NWu9A>nwx+x
z4!~7*1W=vh_}s0v(Wva}1`Vipmx~Zl)OxFu5Fz_FG-&GJ5p0&ksr`}JB7$6vz&xBi
zTb48O<-(gaA!wG0R>2+v`rv;=_ckkBQs~f=rxPZxT09zqIW3_4QrASUcD}on45Zeg
zvd5rBQ=2d8Sh1W=WXiXQ@uvb|dDDPs>(YEAbDBw}uSRa=QkzT7Cn?vpT3n*aTC$j*
z$60FBT3WJMQJzw2`j#u+2R434Vd#2)wSaUmYNA!3w;xH7^CJxP%`g6%Wde6r>={P5
zw7t!n1;0+UmeSwZ?9i-DMNb{j-=P*ogQ#hb10i*4lCyqYw}d+Upfsi-t&Atu@#FV$
zsbG3Rv9;x_*qL||lM+&iexW&n4PS>p)))>WRMMb}Q!Fw~T4s^TbUgRPWENtFT>=`*
zpa(~hqqTKemTD|`V3U`e5EKM~b{n{P^LpO3D+L(giAan;F9cJPN&@j8J7N(EL`_8s
zOLDwO*t_4RVLdmE25g#Xx}YuKRupr!m%;n7^W9wjk5Z9(bWASpHN8YV{4|s(d8G=-
zX8N%WE3RseVTIr}f;~X(cuX_<N^$hHF~In7vp6LtRlU{hzZ2+Gg%N2%75jSA`ipkN
z;%j4z@3I^WMD2pu)rj>axzT50sX;A3*4c!tAwntyMgg!2O2+hsdUAT3THi?i?0-`i
z9h*hbvdM39Zm40+v~-o&7z(T7%3)n+q*%$lm^qe3f0V-+g*o0IlMivyq|0O3B)e7J
zko~UT+FsR`Oe4oESk|nUdEy2SN97jUNSm4Tg!LiAl%_-vGF?_hRcSi8#Y=*_%g`Ch
zmB|=nkC(u9pzQB6wVOUb%tdfZoSnZWMr<{=(40N1_Fyx`(xv%Zir{$`Yq$Y2n<7u)
znV;qsJ3D6_YTj6Ltfh+&Zy@}d*m%PxgWXz%UO=^QHC-nIpdh{pyANL1+@Y&V#1^UY
z;jX@i(kbx+A%dYyhY6Jv8&V4HTgHH!_D*MJ4veTY*oHh4lZV2`5YSd?kms7!^zQFz
zU&+ofT8NHhUW`898(mP_<7#t8>69ltPEGMUxpAYCXbEi7z@dZ1X(?Oybc8oNL&z<Z
zR*$QZbRkrGNScX@+DWbFSaUiw$IS=F3XuEq+iW5Mr;iVi)bljAbS%JjH^|oUzzcT!
zk&^}nXP&O<&1OgWx5BW3$j&vB^!6_HB6e8Sx$?bPC64gy0U%Q}&j4An?0&N~Vx{?7
z>|P+DXLJ54a$f3AI&P}3FXh))!0bVNkyg;yn4~ANGt1Zte~P+bt08ch9H#CCpfohd
zHXR{tAUwlHiynY!i9SG5Hw;)DEEhCXL#e1n7reBG1BmpX#ao3U2o2t;k?Q0=E+c$#
z^3bF`lEsJ=d0ETlxa>gLPt5N%%Dbn%G|QbEmUUMIHA8Evu`be~$IeQf4>)zy%aM9R
z#LEvtD<Lww<=MY~b+i`V5m)1m6vLf2{QBC?sIW;}H~9cr8=sKo;uN@3B{Kr=Ig{^^
zn}33-gc+J4*yc-j9;(Y7O3rA``pI07Zi0M-W&q)Ih<oyHClMEsMpO@!nz$pis>?NL
zaD{boOI=kJFbdP@-wkn=A{NLELC9v_`vKYe>&p4XPH^S%vBCd#!8QFJgY>cZVdwK%
zof&UHhcHI`IVyxZd}faMQb`hC-yHr*miMY)Yx~%;Nx&D_p|ig{JC}L*!x6W&qxA==
zT@Bv|KnRQM=4Y>{*_O_B>=1A1YiaN3%vY{jjISSCQ@PCEsW|pkST}t%8U|%VN`8&8
zJ(HSn6?L@nZSuD7F_ci5GS+=P8(@5sqI*SAfv+>BXb&0mMD*Y&=Ct?|B6!f0jhJU-
z;hvkYyO8me%8RUf_;C;G4Zr)rO}R_%9k9~`N=6@@FnB=#xdH(hS}!4I(1rF??&p<X
z%WCid6Sb6g7H%(vn{!x$0M|14>O21W{ta)Q^@yaGK2A}jCPd#0`XgePo(JM~$`d`u
zKc-CI3pM=hp8}VNCk2bl*9<HDbs_ryuXC)lxufG3$^5I4f62`M(#5Ni{z)`PJ{OXc
zX*FpfOUc6_e?isnF@G0E=tHN9)w9@JZ<HEO-&{3u@k@Qmukk^_BbFEQx&eO5i!^mf
z(a5Ef7GKC>PjK|P+jcbne0zVu>cz%2iPdx4Eo&db>TIT=PPv9OzoghQ12<m6Uf1}e
zl`>IPPcsCj+AWu0Yqi~C?A?X%D_cw9Ve01(!T{s}uaH7Bh<%KC9dIKzohx`G3Ufai
z_{%z)OT9RKl5Os4Iejr2PtATlL~l|CdW>urXrAav|GaG>xOr&cHB0M}D#(XqRh;qR
zwtCflnIJ07^;><)U(MdZOEPpengEIU+zDP4P<2YRm;~N<I^Ug+4TsiB%?!W%+Ms^V
zfX3+b)}Q*pI_ta+G7ics3bMlV2VCxv9h<@HN5xl`#(LN*46Wlgm72+65L%}6T;kI(
zq9?T4ldhGwt?k4%>F5K-!923n?!U?Tu`Us}H<kBWjR|AQZcs`uIICm7D|3706pW&@
z2?tG{qkejT6*#a|sh6HacT|y8r7YTdaF&y*SaSmxl%O|o*g_vsQ3PqYv|dB;26R9-
zWSQq3*;WMWpDcPRJZMm#A&nEf7tYh4_!VnoLeON()EjjXQ}J8s#^LmnC;Je#$eI8F
z-(RfcP4dGz>eGkub6`bn0EGAgIirm4*<*ImIq(D*hUUMEbThlJ!AUjQ%}dK*qS;d%
z$UzNft~m9e=1_g`U42uPVEoZ~`wn75Hz+L>Ev-d6e5wt1iP)Gks08hU2sLRzZ=T5m
z@xGW3SPwMGz=R?nE)~tgDG=N5_&jBFVtbW}`b{#J7H1e(5CAO!FiPi2kne{DH24Zc
zB8iaoUt2vj+J!6w!u9V>-Qhg)kL-AhLfl~C6o&svY$5&1uhYMXt@z(=cK#Q{_CKKD
zs_$U@e-Yaz<*)o0eq`>2Wz^&(RFFYBzDfZ}<Gd$vc|lBiQkeKfCcl<b7i!71O%oTW
z7sWTwmz@C8d=W(7pS<I4CDcvg6;m&_^Q)YX*^bwlZLTkuuPHU(l5g>Y;Rk|=D!^>*
z9A(j+eekXJ<$j9@iVak%i)@vxv}seQHUB!AM`3tw+*Ob6@)<4aQM_*@GYF-x1S>r2
zWrR-SeTS9|+IDD)O@bZ97F=9!*f>zowNk}_>@ZnPevIwQgoA|DFe@K~ALB#;fCo2l
z7@*I>i)fADBSOdcqt2EQ#!)TH<Cwx5hgOtUnRHPfFzQstRThAb95f-OB-g)Bg(61p
z+RqMlar!MvEj~}w<4byw0igHqg1mitqcB@4MCKBbwWo?)m?{6{M@yy}q1SFK?9itu
zD_f%Zw-45}V81fib)cPZpOoxURu9on)S_Q#I1}4vT_vbeV$pGpNp>zH_prH$4`3?*
zCLbr}l`Eo|P{k;1()+C+UL<yWq%Vi<5(x0*iXM)$V>6PSx(pgFI+%_0O1p~$w%#85
zAUtZiC`oS(M;Q)20?!N2wW6}8HP04XFfhGk-eY8TO>MexH0I1D6s<HYoXFb0MU-!&
z-;*`d7<CV8tIk@*JRk<-bF79{Jqj%>I;+KDV6M@>`vuY$XJg>U$;F^w1|krsFUrBi
zDd&Qtq=?aB^UF5KqRW^@)Bo-c;uh^07@sN5tur57g}(icbU*|>d<s=Xmqa9#c?>vZ
ztckD6&p!={X}xKlLL=c-s}CSsI||!lsE*Cihg{&9;jynMwR!;-3AG4Td1tig>>mU$
zaE>eBmV4bY?~SN!-A*OBUS_5n=utq|I*D#saoR4=VD)FA9?@RSaY#xSpP;nLa!xc>
zH!Ecb(&jT|3}^_w{xc7?W0pI({0kx_e+v=e|M~3q7exN+Vxmat|CQ$|6CG&qcR*1r
zG-<WNLnY!OloQgyq%6elFXd#$<G&=j&AsiLkefXybaCjJ54?hI^kXYld>Y81kOoFm
z7nA8p*KT%QU+)hf{3ugQpg@!f+S7c>a88AqP;T?HYis!`2~E0W7;Z~t%KnXMtYR-3
zE73J1EajD2sb<w68m)<Cc*6UuaPGX6AoY3HW*6hRrCAyDn@Z*t^7E39z&|7dOdG}m
z^l=-+f%VJH&_tor;7nRX_oWNVmPs_`JqVh{;wLkj!tz_l&3S*i0S8y;u=+HgIWR`x
z8guLR^9FnKr)TaARWD?Y`a*zG{hzTGG%WrET4aHe^Ho@_@7+QSzL1Xm?HDjbfoQ5g
zMLTQ3>Ks9&k@_2QEe;7cXTL|^7)?prFovx+=IBMx-x3H88IVMsQTntu3_X;f6Kc~(
zbB+_oazv}YHf4BHMqH%R@QpgL!LNZ2sGQ@FqDNAq>CwBGp7j{j=!lTj#Cfv}T4=<N
zb`koN{yI`fdtqLNl4&NA3?m24ot|PyCYpz5;x}Ky+O~*Bl)(bQgRdhD^YaO-=HfSa
z+;W~5@R=I13NStJEG~4=3KO(LNkMKnLFqUOWyrh&y+o<q<;B*XSIs_{P7Mo`He(Tz
zct&Y+(}{lj!UFxaAom(HDfEt?$Wj*~Y^`^9Kj0c76=GGfdOiq177ZslV7E@G!;IGt
z2>S8VA@KXRU5pEDPYk#fT=`f%)Z*K@c%OjD6e-Y(VP|~<cUzo7=VV)*BX1v0Nf!)G
zzyVD$Gm(L?^liQl8mwqPUZTn0`7(VxN~TvBUrQ*h!6<6tL1{UL;^ZS84b7vY8fLI9
z^R}3)ul#g3p+9#!Ptr3vM4ZxBz8^i#G>=wHG}vJm)bE50tATkb;bz5zzu*iS%6j?>
z%bL^<IwW2KxP~At2OW|Q=_i;YKfwMW9!LTuqfLF`$M0|PBl5q+&;Qk3iWH=67x>`4
z_glr!gPElBycTfzBs@xol2lOO{rJMyB>36w)?0~OsXVQ#Sc7<b;m#n!fO&u7DFe<$
zC_{B5RMx!jL>g>evyWB|V{*Rf7<2^vylJmBuarp2bjYl5WVuDF7>~EkG~&QTb+4Wr
z6T{+BX*PI$D|Kq8S2emw+(#7<c$CVjU{fTGiYYeDWD{`I#kzzAkNVIP01p|05H-^)
ziXvfxu++J?OO{>rQCNtC=#q~swaTyj<CP7)Syl~hD;n|P7&A)|8Mut|TlI0cI56O2
zr@7siN+bv&Pkma1gXb!y+8Uj+Lb|;r*N4pbkzaYmHZ(2g-1N{Stqv(<>jCZ2gg%T<
z4dKup&;Zf1vh_OUTYdEc25}iPT#I8;Ufyc43($Xb(Z#RarWcz5uld-f?LWh#-bfC{
zyr~H5jmf-8u2qW#Npa~md=~KkCa+B_{t~Plwyp~5@4E99Qq_dnp;l8D5`}sF;<ci>
zl@ZYc4}G+k!5Z=7p<6cx?nbVb3}F``I}jlo(k5um_8-pyWNy-Y;+MOu=x^O+{|g!Q
zuR8kIn)g3sRK>pn>J&AaD=o`FA)mq^=V=?Me0D^aegH^GL6}l8y?)nsQAjp-OkMeZ
zMVLc*B?(F7hw=9I7zrKQsDgxt1&3^9d4AQ<w6+CX&zv5hR6%LMaJjpHVv@CfofH*G
zEAbf*tWXzCu;fdQW&dpph?=?+x8H5x0vJ-XEkq-aD*3&)>6r6@Z^6G1lc_q3n>w2b
zE<<O@{7Lg_pGFp<Y7k!DQ)h;OM;!A-15XufwdfS8k>;U%1kX+a^zkDWv`Un!;eOJa
z;RpB_X905aauAB#%p00W15ym8k|d&Rp;~BxL^qM>ajG~8c6aw6f_tS8(-}PW0<Bd$
zH4$m1IkhMsn`4LA2$aiC*g~K%r|~egS%-UtwFpo2iT%mF4u#GG;|z}!eX4dD^zTde
zZ;SU?jB*WuRF@)2KLu(kLM_3H<@ZwLvOHh}4qIn&$;;#wDWrfI(MgPmdd?^F1@LX+
z^f1UNb@y|&9);*~UkEnjaNugu_177o$&SJ4B*-Q_H^9!RK1}o`N}@G#4P=AM^Wh^+
zv&jNLRRi;&nKy`(K4l?F*h+&!re3E%*O4JDR#z!Ym5*(M0XCWM9NQ|-#d}~=+L;Wd
zF0qWJuCd!PrQyj(cRzAGrC!3YzY9i6IhmsmgTrf<Lk}fWCK_bmF;UzF7bMwky#;FN
zR|Yg(13o~JDuU{?we;z?`;>kh!jTW3ToByvcc-@kJq$rc+6)VQFI$o*SASFPj$Gw`
zAZPddnRyz2w-cr%JGwxv+*FyySZQGMN}ojrKqeYBwMS|}oL}@2M)fWv?EWmixpwiI
z-iP&lNOeMc%=^pFgIb8b;PO@MOujrl|9-;!U-RjIqh%;bfAMK_ACq=tV|DUvLJc{7
zGYS{b$P`4x`O-4;-ojuZTfwwO$>xTsD^y>o%ue@OG`d(b1FqMC$ZIPq@Ss>y6GqPK
zmCie^naQh~?QNfLY6I;M(>L>Q7SU$m7TO#z_QXkd0Qjk5=*;qC4&k0T__N##%4Zdj
zJZMzcjQ^*!s{qO)*}6c0pusJ;ySpZM@Zc8Q34FK{+}$;}Yj6+l1cC=mg1ZKn@PF)X
z-UD_w*?s@5qNcto`kbEIGt)gi_nsTMRV0pDS12-_3njGtm<-NuM9_)^M<ze1veBKQ
zC^8V#ua9FU=+(#id?U;$+gNOKMiQoJUdXI<{1>p$aMKJ{{)9QFb0(}O2K&<6E>Sv7
z+seMR<Y3B|^XW(v^AQVn=Pkf0cL@_yS(5{ahY%Uk1{v&8w5kcMF@b#&V73)(xmNLY
z&T<o(&L67v7x6lz(=3CDVo1@%(HbIMNZu{hFnC|8)jfubm26R)8*Pf1AG=;N18UcR
zAL?yP9(f++Tcv7}PwLDg5Ebg-f9Kj#R@iwJEnp#3)X&hfpKAfk9xEnmW9ZaYyi$4@
z`|j17H@Pm8Ypm#gZ9(etM5Y_TWlkuI)bY-h%Hgzfoph9>-kId>Fa5}H{9N5*Fjp-&
ziHNLu&3TANp`VIfEW=w~n@6(0NEKwx;;gp@-XT~xZ0{f2MkHgB&F-RVgHt9Y^4;t%
z(vK_D&JCsL&Ygjeoxu^8S6{q4ZGVB^k;Eh&vAlB>$QB;SGV_J;TWX39o9M*G$$7Vp
z54<ZP@ti;sf==LU?><uT0V>;>3f#Jr(HI?p`QVZcoHcfM?_$h!s~!zv6ASu=st03(
zRBM{8=d&D1uhoUvIT^{~QI0OTOD3169acV*Nck(fa`Rpe5CgC16Qs!_LQBwqX&A95
z;N5*m{Ha5Fahu<cE>o_5t3kn@z2@W&yzT>kdfh+&_mljer}yYVz}RzC-;YvrTz2wN
zkWc&FGu*|9b<0W72!sg;h0SvmRLhb%vN~gV!@2=Td!2spFK8S=@L;TZo<y)r$EYOL
z+w8bJOJhztKi|4U0HL?kCl+<Y+Q^{pZpRj5M^%=q$FIf=&#`~s>M$#d3B$U6CY}n7
zEAc+w7eIt;(m@nM-x+K9D8p~p<VL_5TIYC5+3heW;@yM`co8mqwl~jYkV+d>hQ1|v
zypGnU%?JWX#%Lf9(vi=J6rYm`De*Hh9Ea~(I>E=ji}G65xzS@*i=shgid$DG^HNps
z{7Nn!3$%q-MuAb$e0Qo``1+)ft;W#I5Lb9kI8fW4NJpobnf_>)BT*2Ajfj<4yXtu>
zm>4^2>VnbEJJC%NId?bLn%?uMOYDMzs9MwKjvDHas(YLS#Yk@fwgtTBL+t)Q(Wr42
zX{fGKap1PG5YE6<H{Zfw#jN2{#BdXqZy9IL!hBkPF>Xz)zth=bVsdN!VB$a|M=8!5
z!39`)U@Qh(8ozMyw}u2X%Q=sF+uE1n{03oI*<Bi(-T(!*mc^5`*9q1^1%{+pWE$p6
zcmbZL2Luq$I*Hw69Iuo$hzFfsDcA7kgfQt(8@n=@%&jFPPtB;BQOAenZCt@M;!rou
zbby-1ae_b2S0DOq*>Gtq@4XFNHkAGJ)0@=4zp@kouYdCKtxNHb*Dz%jbcz?$i|}aG
z8ZfY*>3v>6Q9<(~S0Oax&O}$t?6S?$?r+{4@FUX&B76t=4yuXgdeDV&{ivIB7G41+
zDJT$O9vG?qft~rw2hREPgA-g2tGPg8A;;x9VR;21H`OGAaw2n^3AETC+d<bpro0qu
z)hS=jfjHRq5^;z1#OqOer5$oKV2I?!=S*@QEK#5Rbm1~GRG`pMJc<piE^GQ6xsR_p
z$<fezMCx`L=tg5Y=TZZV^L*l#JqgUqH#qp!!-%1vx+rnxPSHNf8-`a(3t{qxWTF9*
z+z<tXApl(57l?+VB?4@Ao}RO9+ZzE{QYLS>W-=&gbBKd5Gt|#Ne(IMPeM1!|E@!o~
zEKEuMN}|MjFrd~<5xTM@*LFOH@lr#0gBN{*vQ~v!Vs=R>kNKn1Z25Hi@#;zvdyez7
z#33Ai_0VA4aVyX@s3g5gs~nOE?L*yXC+&nNmc?a0Y)I*^>%44nl%caq24lkD-~{q0
zPz@(}l$V7Hx&z4(24cyL*Ph87JWCFhlx8&-ntzmXS+zbs*W_wkz$wYv7E+i5eNk*K
z;m|-*sHhscG?Uf~XeT_vIYj?VGI!}BeinLRFyXGyhq>(4ah2phQnX9@`u*n6MU(~2
z0H#0?Le18)VxlrqoS1jbhyk2MW=}6*(TA}jaG49=$1<vg67tawk@#N5$Ya|v(W4Ra
zqi>0_k6S6>K$>&GqTUrm5NgTy`8b`j41s4<(!?rK96HlWOYRIC;VZvOgRJwZ<iK!D
z@-!NsYCmUx{I-RKL-h15{i57g*LZ_<inVvmHidvPWm!}~H{oo6I|y?h8<kM|ly(i<
zaHa16P1I$8+sY9<?$LX~93fm*P(Zt-N30=aqE;1F$8@B*{wD<e>a9!vt1tOCtc=~(
z9$4_-@K28e{IF>(gvXo0m)NS(ZWrD%Jewmuz-RNsPhY_PO<KqA59L4B+G?<_3KNMp
z?tS{ZAC_SV6M6|=fD;ieXHevefe3<xMtFn@Jo1_&Vef0zCmWLVICD!MrFvO{<~7-0
z!&a?^7VDD$6Q@SKYhT+q573wwE!YK2l)S0iotf~xPUCja>?43XyG*p%<NR{z`sK!T
z?TH1R%Q=BZu>Lzg8h&Ahaaj{v?2;5igZT13I0e8HtoeDv{ECUaqGDKkJ1ox{gJzHV
zb|~M$2uObd3-9v2{3C47u>KWV><^Ox+Gb_ki?ERGurA3&gj(s|%mXxqsR19grnPOA
zVdtcp!#t2SpcB1v$0w2upd)2LCkCV^%2wi5H_yizhW0PLld)aZKh&(7sSp%FER~#Z
zfnh&t8}vLAcT1keWm1PfZt&tFHhl3CvAPqZxGGo4*Y$1g`oUNz!*#6+#(BF)@E0?b
zI#XlGR*XdYUb@73xv%-KHHmm3qMm-0SUx`Lc5X1kvH>>WzUGEg7)-OKdPK=YAre!_
z6*KUj$~~Bl3WyupdNRtvSioS;?2!Sl5<mAGq{9LSmr+$ctc(Sow$6m>0T-fqUL=t*
zmWE6~ovcs6(;=DZw%pH_o!g^~@M8tfrckiZyz>K05y+OnaHAQ#Phx2#@^YP5#Su!<
z3i8FVD#2rMMX7}%rSUc1@5iunBsq<zg~E_>%5?b7Z3%&C82E4}3gIba3JCA%;&NJ=
zCJ3U8Zs$IZ*Urssl=Kg)#0-rzgt2ajm1|p!V$G7bS;a^OOwYzGgRD5ATbQtB1?G89
zTb~zjX<=`!Z!kTI<Y;-UtexREGexF`ln?J4qG_m%i_VB0vd^TIaH;ZE*R@K)#MMhG
zQn3hEJu?eN*_uX7H{Xat!7U}MrM@Ikc~>Bb07fZKJ`NIk)d=9>XF%><BP;pzsi=Ws
zG*(|1jH_4&t5>BQfrKbZsX-Y#)_1(<bDj(m&I&vJmb4M2)@A-jN`*}tvH8i7EQNr$
zOjTK=(jl=HSZdZ+^eQo`(~?@oHID^Xk+mprOg2r*Kk=$~+lkM@d*z8Um2^rv5DT7f
zNafztGYl7I_)>6i@o~+xD%cc&u@UhLIO+6<jn96Ys9*Px5j2t%?=K94pL!7jlc28h
z+^C0y1S7()Q~{*AV%(bmFg{G1-#<LNo-Pe?fe0o~`EFp{oRJeHNC<&iz*_7nrrM4`
zI6+a<+@oh~TT@<|WZ6!7;R^`i+JR^{rts{rh0HAFH7N__AEgig?Il!p02JFa61yQD
zv?x~QN3ZGx(_`b`sj^$_(5xJ5aP2A)jx~fp8Td`i@pA2Uz1e1O=cUzY#HOSuNaN)4
zG97EqTq>#qDm$mN2L?Fg20C_&wi)|pE=Hfc6*23PhUW%Xep^6;tJUG{#aKffDyf@_
z?{!X!HJfOb0jsqJZ7BLiQ@8-;klmKYO9QTne%KJ8`gtfxCtzzrE-mN=PtpB&!@C(b
zeB+D^FK<|zz`hk)DSP06x$+Vk%*%kS#D0NZVYgUSxw$4&p~C@c8rtqa+RTaqRo{Q#
zT!G^2-lqdzMFn6qIZ_7(6g{g8t7{q}@93y6FQ0odmh}Qw&0Ct@y!~RTs5R-A4b*5|
ze7N*qh3&M*GC*eg4y%wjJPS=pbz8zf;YJ5uFibk;c`3;a``b1ZH+*EoHT3aUr`b2%
z@aNK$P3*YVe$jYs*r~wn^rENe3<>@y*)!}#-bC7D(a=T@m-T||$~P3;cSR{5;31!S
z+gp?%p1|XZ#xRwPK^5^RRJj){y^9cat*q)~1C$?LZQGLLg)i+!LRpV?Gn$_o1eQk$
zytE;s>_WsW%sd=pWpN&#!Stfxu`zpTiDz7Cs<L^GTqXQ^#6Os0hj>`{i}B-Nx?{KD
zS=>hAx7L-U2~l+-2UpeH^_J!YRs~7G4FiRuD$c@=l2X=Gz(lAP1{>E0AsN&X!6M|v
z>!Fq|F2}71O=LKv)siRQd9VDb-Z`)~rHxi;U^7XvnLp)2rQs;qFS=qc)@=1g*yqk!
zA-2~@WE0EER%N|Wzv73!TFRGZ2&BTmUqXSui5;~ZCC9x9y^+-(nN-?3b?2w=WB&e;
z(Whees#T<t)=lC<L1(t7F#4heZudskodsttXT3@QNvdpl9}h)`g+#*g*u>8vTavmr
zEm$xf$BOA=fbGFs-1yNaOz9Izb#jLT4Z;Q7k)kZ!FRWK+q-?<qH$%nZ88;<+S4HZ4
zEaMcFI=N$(x0o~?*Bs2CE>tpE$){4~`Oi#Ogfi&XD2$aY-}l1R`nkrD(;dJBG*d6X
z(je>8e>z%1w-cXZaw_e3DUm9dnY%8R4YoRGe8R+pmq<0nnuu;QPh`PBl+u7Y05Lvg
zV77p(nzDBs^j;`FF=)PPi6k4`n2DOS;zQ#`@Pt}vjCegAT4A64NO|n$$ujciHQcU+
zMGv*ql7TMM={^Iz+G4xJtbtecG4ea;U?g72IF-?Jc1vGnccKRBO}aKC;!N?{<cJeu
zN}q+`R?#hlYQSQkQKH21DzD2GJ*jwW?=Dj(?+H)?CuXYcsp@Vi3}Fzldre3scA?8^
zFO(z~o)(xk!j5v8g^4hUx*^*V6Sf;M4FGjDBePg`08KS&BO%-6iuSHi!O#qw)XZx@
z`(nuSDc9L*GY>F&+QdnIBc5;qlFTOOpjNm+%)<w&YRC0hW;zC9Lnl4g_Im-LCz+O^
zTj<b-6MH=G3h}n_rvmk_K9)%51+Y{|lX6;I801Z9QcX{;)m)2rxJ_zgGbfSwZZJyC
zS4(1hiOuVZX}iB6nl7{+-$~6P<*ZJt2#zP8gBEmf#$Od7Pb6y^kdZPC$<OZC55HJn
zjUt%Mq>vv8S=<jH(yHs-_m|8nsm%|KMP-<!nqnLXg(+CSSiu5SfH?}r|41dv+h8WA
ztS+N6ztUdh8Yvx*XkWA$@|*yZa`8YORkETtUD$I<@^wtNF71ruWG2=Mv+=^3ahOAR
z%np;9`k<vF*TLyx$g@X-uTl_OrK{L%K(pM40s@m$9Gg@uS2o1)j?uo1p>9K0CrP*#
z64T*yDQDCLxEy<WU{&x<QI8LnQ)xzDg4^YNJJ;>>r$INpFyTGdd+f=&W5ghZhsa`R
zERur6w)IGd8SzBeHTgrN28#S832M^zho&9%q_b+$4e5@$Jgwp7j1MgUwzGB}wWny^
z71fHU*(slvvGZn|CIM^$hJ_g9YQ5Og=at8jOWUa*o^{a5aE2X^e`-I%WwZd+wQ1?H
z?tf|Czh_8UD$Oy1JhWy`kNx~f#kd8d>)2Tw1jfx8+OYFbb+_v=He3Wd|Mg<mDPuNP
zFpqVJ{4;rLg`3cUc+llN&((E*;!9!4DWkxI-WKWLY?w7Q=C8Ba9G5&C#S`T@9SL(+
zV7YLaj)<hthT&Zm0csfPU`G_3h8Z8w6-|R1QZrF^vPb!2<X;(lBcPiJpLT7^cA6wu
z-R;SNu0PL)EM5L$D&81Wu|<3CD~na*dYrvvZCV%oM8T%S&!&Ibspec2{e7eDBq$AL
z>*AWI<9rOsI4;I!Zo6}7@P(}ZYy{%dd7q-#{q2;wgjW}5(+qKJ2w55RN2DL{+O69N
zO0hfRvHi+(>#HOo%WJGA5hvx<q+6Oc2eAYizbc*;;jC!(fPlR@#C=EnjLAdlO)qx0
z)L_tBT(_H3!dNZB*C9ShlAKSG%pN6=rj%BWxE}9=K(~`P_7dgqa~-b2e_f~_qA&oZ
zw5L`ZEONqyknV8~K9yw}Bp<7#$^AyFMrvP6JGo`qy#b@u>cdMxaI7h}$G^+aJjm;E
zh^YEPVMXD)bBf>@0R7@+zCNdUXq??y4sD}&B?W8p;p(9d&&1oCBLcT{iZuLI3DY^H
zmBR)|%XEZuP2~^DGoHAn&UK7NrHyHFI1syFwTFfdvE*VAJ?P7UuulPVn{i;ZLHlj*
zd%kS<Agft%OutMn#y8M1j?COw;XYQ&nrTXdIl(ES#BWVDph~GIvE>R7|E}Q=T?aZ=
zmKvy+{)E=}Iki%T)OC#);!HUNZr$UQDNua89>^;Y>;tAN4llYZWY8vGg6|#x*C6b!
zz=-8?Z%QGdruE2zDH;sj;PG!KuJC}U>N?fQC3KUXl5HnIwB{Tg!orj3!BcXpT2}=1
z70x+o!8(~II>|WQ*N0E=BC;G`e(n%FB(yn1;URMGrYnL=l{KMF>+1KAQC={Tyo5fa
z`~K9uqce@nVqxt}{o)nr<-Wri!~jvJ+=a``Znlj4KEfGV8lKT$A!n%D#>r-$W7_9y
zFzE}_mErXf!Ykr6mJ3^N*0s!Pz~u&R@(?Ls+}GKd?c8wr{U@9}XL*=2D)!$i6-#ft
z+^a_npOh#<l*V$MEPcueYzPON%qpJmi2{)bexw9&M)DU8bo3%R$wfQBZo)>3<PFB7
z2;g7}IYsTh=4M=|?F>RlQeC*=4EVwx*Tb&|<=)?3sN>rI^ioTp1Cftdm*esPMNto3
z*HtqXW#yTO8w7JpZ9lis^9pmoNYdl3!KR7K?Nm1wM_#K|E0_6V$R3o0MLSZt&$v?O
zga<E$o{>$zj+A{Z9@YPS>7$dzlEF48mT2I(=F61>XHC)4!e(!m)@tatR*v)f5rNbC
zwlg8|h93tHxcruRR^Bna-0G?CSDAfo#2;2T=>2%v71@;SlWZ3gabOO0H&G5uwO{rJ
z-P$S{VEjOAm~zDY+Y+TI6?XVu(xa^krj<#@`Vcp?;myJWCi+bcX&Af8jyU6kuFxq}
zHUij_F4*sMs0VweiN!J<1EYz3a;c$4P5>VN3CC1}=5T{6u$l#7o`Col^=YV&98+wb
z8TGY<>fm%C93W}7^{{;BNJV3R5*&s<AlXD_!$H@&WzAcCdEhtaOKgqsIVPU-^r;(}
zMHz|W;m+5Q0q|gq9VGM(f!s88%~&qgPKD$CZxt$W!@JWJ5~cd$T*fOPpQDNr+KUdd
z$88j|s<~H8Rr^nLuvZ6|&=ZrD&?UT&ZBf_6vZ#2}&Vo=YF>Q?V0BBj!N~O^&6<!sJ
zs+t1zvL&B7tNP>fSqqCOOSjbG>|?%hSv!xfJ)3!*QeH7y*rs(b-)FT^R;+8t&d#y=
z@q&_tY^q|E@R&Z@F<ZCrO|}vz*`8;k*`!CYhN4JQ-0>!*iyK^3c*`Iy3vz-+hH13%
zDp8bE0E=D#>v?BBY=Bsf?X>`xys&=3!W?pYdwtDo7E!hA2~)H<aqLH}v*??hB*;dx
zawWFU=fBfG&#*;q#DOlZ;9$3GieC7FDGZGz6CWG>rZTC>`pJ-;{zqlSWM(IOZ!mwR
z%c-L$!D-Xj0lD_7W1t&&G5Z-6S9y;~khMPZ=sLZwk)*TS=Ka3Nz-OT(HJpCL7NhEs
zVH!C9RR}#^!!1-?%PCQ#@(H(T3neg*jYWTNY#YH6k58Y&t*3OI_(XQEvh9)>q2}30
zb$EHo5}j)lYDKf7!vs0I>ih%;P1O@08fy)G13h%7EUeg+wW#D3bnL)jT1z9KlC<0P
zhX8bdX0a9NK#8^b)3|Bk#^z0uxY;pNP9C`dFOoR!<slZD_^@#~?7jR-mG_%_^A)jr
zP<q*@)XR8z>bt(ZY@>6X2h=Zb3Wb)7vYXPD>?LDxaay`hA9K2;pdB*wh~lV*H22bN
z&J0=Ab`S&izesNw!@{ljdJmG{y1!jQ*}wWN?um8k@~Q$61f+`MXWwalxhL}5Mu`3&
z>D9MNcfaq6lqi|pY6ZK!Lm%k%ZVO|ifELkit%#tliO|Nbt?~9Qzz8bPKpEAKfOHBd
zM#_rxuB?`t-F_WUW2?3Cn2+S6e0oeCu=cggC4Q2{IhM&67b6mhNe*ZhEfxpP)49{8
zHD1wEt+eke79dZ)h9iN4U(j;LPX;?1j=Z4X7!V=6jw!(i_DdOB9z3F)r^A|Nd~G5|
zuTMVcg~b0t`<w6^RhhM80Xklr@0pQS;B2bGJykF{BeAMIY_OcAl2k<%daGmd&Q>qA
zJBkyj*QKY~z|l7y{K=Fx8lFIs@4-!lG`L$PoK~TmXX&HjI20%#7))9kk7~3m+Pt^c
ze`Rm>rgJDZemyLV?GsKii^S;IE~~^=o#|61*j#3sGFDkVh6T(TH$DrvlObryvmLlM
zZ18U2FSIfksb32r3Hkd;O%WkV9t{bXDW;pF?Lxn=da;|eF4O}FHCIF!k_)wKQAQ*z
zJGZ8`Gh7Bb0%Z>~S82+sJ9`ln@+_$Cb*;L$UnuQVun;&e*iLAh$-1yy`gDv<PXz=Q
z%6nE<X~!*Z+7}tmyqbgJ8#LfewvBor3?<UD7BfUry^(OPcyibou-bGyI~<7HDV}5y
z_rtin>=5LjLL9^@(lslBmF+Kw@Q%tN^bEDbMuPh^kwl$`?uwR$6f&;L9Qw3-p8-XK
zCfe5@Ih2H@^o)Tt5%1GJlr)qO`tfKLQS2rs^*{ijbbR~}_6b%ZpP}Ap|N1%SJlo2g
zIvi&(+0vZ5Kg0*3KoztouB#v)#pS22rQf<M5Ql>{yRklYL^f{GZ|l-Qk_mQydAU7q
z$xBJy1;e<cCH<yS8>eX0U~6Sp#~8A*x`Wt;pgAul=#v9eJ-R_?>exPJvoL@zmbM3z
zQeQ@mtX}NwG`~AIlf#dkWu4>W+^e!}(iC0JBx4rWqslJj6+myx<BKYVv?Zj7<&xL&
zq63C}ucu`7M@B+~J)cw2kz=s(1oBu()WE8G^5M^g);jL?G6o{^j-p6d;C;z<mFUkT
zu~V~G!0n#om9eR00nCu9LFX0~EE^obGC!xRcuwv7dC~uSvE(81Q^Wn@R<SQ<yM-|N
zJ<ggPwFkICjCyD|^D&BzU3pu*-5E%0FLZLiSmW|dJoJ?KWVkmJlTOa}&LzH@!MYJ}
zuLT!BYLREUh-ZD(4U??=xnJt(fJpO90Qa>l6iEvQ_;kpZ;eE2ty3zXa7*kt4o?o7g
za)ULRG7Y}Ac5ar-=%F`)^R2{shCH>Z8+N))dE5ybhw||$MnZ_0JF3MJ`62%Ic{}jd
zyyw_DxLV)BOx|509BMMTV55JEoEPCuR>WI7a-BAA`?wzr<u<e?cWnaS5_17Hsz%U6
zV@|0$M8)Me^Y|d8rsGDiwPkGIrHKIhIU9GB5qZFnngO?7NOFa$0~^jxymonX63pQ>
zj!>g3trhwLjfdgTIbGq9I>*{&9+$-mT|&ViP9wE>l}AK43#U7u6Ur%xMV8G1S&fEh
zNXI3|oExqNPB-VA9q#-k09erENb&7@qwgEAn^w<)S&q*6$B+UA*c{fdkH8*DDVOt3
zF00~TLy_P3sL<fR&bKRjCB$?0K$KpcF7a7dUK68@fV*D?;)F1Do_;1X>v=!r$vfqn
zwcbr(zl39iac)<4f`iN<w$-8Uh4l4x0{FNw%vi`3g=%UWWj9xl_ZgS;*cK-fV=yz%
z0lb=NmG#aV2XaODVSLlDMf6N?Expf8&{qM5K7t0o;>fgb1djc{LfXNZe~?7rT(u0P
zQ0bRCe+q(|mBJ>Yn425R@y@-C+1{vTSosW{_&LvgMVtWNqGjJ2Eq<1X)J9MnzKP~+
zzVerYG#oS~XyG@8FvSR;EbG%|IG!8ekQDj%e%8_DX&>>%{QAw(hbGj@BIs3#wNpd?
zipeXvS8O()L;~}(IQUNnn)JwR$|UIoSzn1?=Ap)$x!}d4@SuIIrLEtCOihg!Vwzk7
zt5YJSFN6z=j<SNt8smNGJJKzbDhp@{#wb*9lc{(2%|dK>Z+r13XQ%|t4lh|eDk`4u
zIfrctQH_k(r$RWpLSvZ>@6EcjsYZ@n9TsxM6aAE9CBmb_Ol9bFZ*9_q=ThU=d#n)Q
z?sl5vq+SYm*%#0|#~`4%N#fTivw)=?-xGYln9>t5wE52Pn^d(}xyGP1EAeCKFgt<%
z;zxZ3Ik8<tE4W|Jc$>6V)*eBSlz4zvz%_o_WL3`kWI1tw*0d#jP!`WEg=dKR3|{+t
z7ORO%6xYC~Y^kD)k$q|i#4}d6B_|rkjm^R(1GU2T9fFn>v^PZ@>WahYEyAnoQ4Qo9
z&iS9ma!l3oBh?Q|wr!)L2$XNqT{W)pZ$B^u5UxGnf&>9^22QAdAN0WWt50-)noNHW
z?D>64O}P!}xs4f)15iqMf+;p<LkXx?Q3oAop$T{TWFti<J$1yM5o^?MG_O%dy$R$?
zK3nuAqvA(Cp2jz5s%)(C^~2Dzx8I#}*{uf(SDs%kk$a#OQ|~htPnHCAV>c<FsfFT0
z$-9^zhzP2v^$k~J%$Wuqio91^GUR-htlOxwWhc+?q2ri_Z#nqYP<Zz9ECy*Zp<`=k
zobjmYXHK)}hK!Zt+!TX#`gOGESy~AOnz!6TE8Hp&v!jFJ_Mzflob%&5tdQ<Rs`^l7
z;{!x+&ma|#h>NuYbgCXz0aUMEX8IzvX+Oivq`E-V$Bg=rR%`0g?%a0@M}#=|Nn(z|
zS|Z+s9<!{7%j)CujVN*^b|F+F1%x)H1c{3%3`&j|ntVd;9F>K0J<D9F7d0@JJ&3jg
z5e<N91_&NxCtaw5B9s;bG&<JPC0SJhdWt$3h6X$8vfgloV7-dH_`n=O?kq+U{HV^4
z6e1Wdva&Xv$djaRc>GI4RgHj(VZtF7@{(hT!IX0cBB0VxO?Uofq@M@`OY?U91aHGu
zNU>Kev!7L81f?`7@qAWZl3k-=Ik}^!GNfaD6F^aoRc9t@LIds8GEGJH>Mb%}-ZGuW
zqf_y0QfEujAwjg)hwZ5E>s4P*`NJ&;yf=vLWY%ytya40QCdFJ`@4h~og3{oMRPwdw
z^D*wp_TS)s9!Vb4WsED0%P*BeP+{Y<V1aqQs2@JczW6nS*aOqg7&j|rb8?t&^{CEg
z08g`{V<5X(Z;=;LhM^KAg|~g~-MDfHj-Dsr+#5qW#qYYOZnwi??rLuLDRF8mczJ3k
zRIZiphuBs#<x|PVOWL_yDu-r8e_s*V#4+*_?sR@~jxP|SpCIc6tsH#vVs@gjDjd%-
zvG6tRmZ7+fBw`XREp-8<{=_$U1Y1>kpH>N1dAMYiy>U9YDZYn8f%By-)y#F#&a9sF
z_Bmf6+}=K4c?ktS0l&{Z|7q;Ri(lS8))uA)dba;W3^pfHN`{CZ(eDc~xX_h=hTW1*
zlP9z!&t)Wqp^QFho1=xFwJ|d@ugO!m8*v#jyerV}6nY;$y33+9qIU$}PsE-UNZY+{
z=4}DtX#Yrr4uv6pSsLKWuFa0B7dGcYyO>bD1u?o~Y}b=ou1hU)SeDcNQs}xSq%J43
zoVJ3FNXGcO`lFMDan+eJvA}|m$mm-n>*@=5!Y^`f=!pGuV9;d=ib=nJ$tvr)P&)!6
zQ<&{XX$u`@s{a_|#2g{mZg6?y&rN1_cBPZ_s!OCWpiHr-cCS;V&NINZ_H|Xr)e<rr
z)HvbxHUFy$B&M%!(CR+oJa6iCSjo1H>ikpVOw`)LH00t#nZ1#vN`^{C!?4Q6u=~>Y
zB%$-VrCK&vxE4qbQv9OJp+sI;Aopvqj^f=!^&#N8y*@K!B6^~I>bbmZZg{G#H}d&a
zk-pu*K6H*~GEKUf9w9A2ce=ZOT-%PcOSzoQ8=IL!S;IX+(4jfKUZyI^6EKu@nYeBb
zd7+2L+xr~4vEcO{?(OLB37Go_0OK22e;O7k`m51@SorPEJIMpp#GJ?hX>3MRzZ*dT
zWH8zY>%8C%x`LRH2HiGcfk2gX%SbtcJxOWuQp0ZIaFm!@DrypRp6B>53s_(R8&HH3
z!8YG+a4)Ca@%QjSu39y*V149s-Y9prW0zwGL5uE&qFa5KIR@J}$qiiCSEE*Eh>EU(
z5k!J-WLm5VBCF|b2qDV21|*O1>sIZ5xD18LA;uE35ug~yej`v`;`d4zRDxPXD6lMP
zlfGxc<5-3fD&gf8l??cs41=VPLBh;Yf$!x{Ta36#iZ8FM_cj#GvV)+ok3~*v6QI};
zBlk{1;v(Hu+PFNqeCFK)o?sI`!c!{aSCOvpPA-o{Y+emOkr|*V)=st@)?4CXmgbS?
z+Kkr|*?xOU|CX!vDsF7sXUz7L<E^w1!>UN|%bkMqlQYTO@X@p0rV?8!SMO`k>>^|0
z%frby^HnvONqV;y!Ieo!*nBnh{vcKw^~OV*vhVVK?%kVkfT6Df<~tv88jc}pn=-3$
zjs|!d(t-i2>FVF|qrH*snI?8oZb$!}{bofVaP-N38+}kPR1j1UC@7#TGzcN^4+I4G
zSoqC=#cUp!l&}Int(de3P@v_0vtU7+)qLPTQv+d9?=|8C{`yZdDSl}&5nv1oos`H!
zgxf|xh!O4~5Cbv)gJ7;>Zvglc{oTe`_ZsW|xv_}_ovqGm9cz=H!jRvCDf$`AZ+)V5
zu-37(G_d{?=r?v;;oD`%ts_|Pfr0_g_rZz%w{Q1BEiKIHEUhho__ihnHb3(nFk<PB
zr2#1{td0KEsoQ_~;ccM8)Eyi9qlJ#8j-Ii>Pa7iLX$AuF1b8*wQvK2J-wu?_Up2qy
z(?`EwrMI;KMyIa21%NY`HVg>JZ8^0cb_RM|h3QYd_yHqeVPSh)C%{rl#{>XOm;7&a
zfZsfNhk$ikFcTT*i4`Cm(+_mu@eGt3cvt)_fslcrj-8pU5Kv#i%tA*WD2d1T`%3a5
z{s6WX3^Wkm5;$D)_wY-A!|^ZhA3lPCGqIx+zn!fyP;%Hr@4wO`4?7^p>Jx4W6gf5o
zmThOa*8z55A<%!`fxkXIAFEU3G9c;_@Q?ByIt2F5(EsDNzlQA=SW24(J{$t@fu*+Y
z!NTGE1Qw{vVyk2JpNgapUExDcy>tb<zs-STO?nTN7g&${Z(Sj2VPs@r{ns6}BkO#m
z0UXEypm*u-L52W}fc-6`)a}FVk3wL#m*`)E-z}xicMn_y_?-D$@RvHa#{4!m2Ijgz
zPmoAj=;@dVnE>ww6J5Li%2Ge{&E4v-Kxh2N&Opt1{wddApT*r;iMQ2df7lr)q|i^0
zA71bGYRx|E{oS%`_a75-Ky}N%_0%6D09?X6tikw@;BG0D+v;vV><m-_7##X5g8Q}J
ze#8EonfSJt%72YR=_lB?rBxnw^KR*fTkY~6b_VMEE2v)=R(VKvS3(`=<^R|j=$`5?
z`u&6KpS(^yq`fQreg7O$wSGZ+XW9BUYV8ln?uu65YKi}_Gtdd`e@^ybjr@@0u1xFg
zM}Z%92I{B#&q?m?XFO!MD>8Y1sLqZ4Im7RPnLiPKeMoy(*^mFnSpkn{pee8aH`?D%
z@((@Bhje!}zi#CMf7lsl8sJ~k{X{(QA@5!NCWRlQz~dR{k@dgk{YUy@4|{M|dP3q}
z57O=abq{`~8ugI)ZifGTmm9tL*Tg^3xp>HXH*Na<2|IcGYu?{4D*nGz6L?5`H{VqF
zo~Pe>|Bu8EbF?2)-c4=1O=SIHXP|R_|0Ct^ck&$_k%ydjGtKVbxyu3nBj?=|%7=7!
z6MXIuXJ7FDi|$vxy_^5>{D)(K$1~8juzyYbORwIImA}m?`C(_E*pdI5?dKUL4?TSM
zll1*LMkD6mQvdZj@9sYReFm$XUoiY>Z~m_t?rvq?zG(ljGtlPZf6MT*+4AnD*^3_}
zz~dR{^}Ap3{PS(nha+@%v*va~?uVU$UY7rY_2F9i&N}B$OAiR(r<B`w6?zazWDt<^
I%G+Q62O#6pg#Z8m

literal 0
HcmV?d00001

diff --git a/quarkus/.mvn/wrapper/maven-wrapper.properties b/quarkus/.mvn/wrapper/maven-wrapper.properties
new file mode 100755
index 0000000000..1703626ce7
--- /dev/null
+++ b/quarkus/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar
diff --git a/quarkus/mvnw b/quarkus/mvnw
new file mode 100755
index 0000000000..34d9dae8d0
--- /dev/null
+++ b/quarkus/mvnw
@@ -0,0 +1,305 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+        
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/quarkus/mvnw.cmd b/quarkus/mvnw.cmd
new file mode 100755
index 0000000000..77b451d837
--- /dev/null
+++ b/quarkus/mvnw.cmd
@@ -0,0 +1,172 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    echo Found %WRAPPER_JAR%
+) else (
+	if not "%MVNW_REPOURL%" == "" (
+	  SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar"
+	)
+    echo Couldn't find %WRAPPER_JAR%, downloading it ...
+	echo Downloading from: %DOWNLOAD_URL%
+	
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/quarkus/pom.xml b/quarkus/pom.xml
new file mode 100644
index 0000000000..d8f274df6d
--- /dev/null
+++ b/quarkus/pom.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<project 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"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.baeldung.quarkus</groupId>
+  <artifactId>quarkus</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <properties>
+    <surefire-plugin.version>2.22.0</surefire-plugin.version>
+    <quarkus.version>0.13.1</quarkus.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-bom</artifactId>
+        <version>${quarkus.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire-plugin.version}</version>
+        <configuration>
+          <systemProperties>
+            <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+          </systemProperties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <activation>
+        <property>
+          <name>native</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-maven-plugin</artifactId>
+            <version>${quarkus.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>native-image</goal>
+                </goals>
+                <configuration>
+                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>${surefire-plugin.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <systemProperties>
+                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                  </systemProperties>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/quarkus/src/main/docker/Dockerfile.jvm b/quarkus/src/main/docker/Dockerfile.jvm
new file mode 100644
index 0000000000..c91417af87
--- /dev/null
+++ b/quarkus/src/main/docker/Dockerfile.jvm
@@ -0,0 +1,21 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
+#
+# Before building the docker image run:
+#
+# mvn package
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/quarkus-project-jvm .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/quarkus-project-jvm
+#
+###
+FROM fabric8/java-jboss-openjdk8-jdk
+ENV JAVA_OPTIONS=-Dquarkus.http.host=0.0.0.0
+COPY target/lib/* /deployments/lib/
+COPY target/*-runner.jar /deployments/app.jar
+ENTRYPOINT [ "/deployments/run-java.sh" ]
\ No newline at end of file
diff --git a/quarkus/src/main/docker/Dockerfile.native b/quarkus/src/main/docker/Dockerfile.native
new file mode 100644
index 0000000000..f076fe3f60
--- /dev/null
+++ b/quarkus/src/main/docker/Dockerfile.native
@@ -0,0 +1,22 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode
+#
+# Before building the docker image run:
+#
+# mvn package -Pnative -Dnative-image.docker-build=true
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.native -t quarkus/quarkus-project .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/quarkus-project
+#
+###
+FROM registry.fedoraproject.org/fedora-minimal
+WORKDIR /work/
+COPY target/*-runner /work/application
+RUN chmod 775 /work
+EXPOSE 8080
+CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
\ No newline at end of file
diff --git a/quarkus/src/main/java/com/baeldung/quarkus/HelloResource.java b/quarkus/src/main/java/com/baeldung/quarkus/HelloResource.java
new file mode 100644
index 0000000000..884275f313
--- /dev/null
+++ b/quarkus/src/main/java/com/baeldung/quarkus/HelloResource.java
@@ -0,0 +1,28 @@
+package com.baeldung.quarkus;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloResource {
+
+    @Inject
+    HelloService helloService;
+
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    @Path("/polite/{name}")
+    public String greeting(@PathParam("name") String name) {
+        return helloService.politeHello(name);
+    }
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+}
\ No newline at end of file
diff --git a/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java b/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java
new file mode 100644
index 0000000000..4b19de1b63
--- /dev/null
+++ b/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java
@@ -0,0 +1,16 @@
+package com.baeldung.quarkus;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class HelloService {
+
+    @ConfigProperty(name = "greeting")
+    private String greeting;
+
+    public String politeHello(String name){
+        return greeting + " " + name;
+    }
+}
diff --git a/quarkus/src/main/resources/META-INF/resources/index.html b/quarkus/src/main/resources/META-INF/resources/index.html
new file mode 100644
index 0000000000..070a1f672b
--- /dev/null
+++ b/quarkus/src/main/resources/META-INF/resources/index.html
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>quarkus-project - 1.0-SNAPSHOT</title>
+    <style>
+        h1, h2, h3, h4, h5, h6 {
+            margin-bottom: 0.5rem;
+            font-weight: 400;
+            line-height: 1.5;
+        }
+
+        h1 {
+            font-size: 2.5rem;
+        }
+
+        h2 {
+            font-size: 2rem
+        }
+
+        h3 {
+            font-size: 1.75rem
+        }
+
+        h4 {
+            font-size: 1.5rem
+        }
+
+        h5 {
+            font-size: 1.25rem
+        }
+
+        h6 {
+            font-size: 1rem
+        }
+
+        .lead {
+            font-weight: 300;
+            font-size: 2rem;
+        }
+
+        .banner {
+            font-size: 2.7rem;
+            margin: 0;
+            padding: 2rem 1rem;
+            background-color: #00A1E2;
+            color: white;
+        }
+
+        body {
+            margin: 0;
+            font-family: -apple-system, system-ui, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        }
+
+        code {
+            font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+            font-size: 87.5%;
+            color: #e83e8c;
+            word-break: break-word;
+        }
+
+        .left-column {
+            padding: .75rem;
+            max-width: 75%;
+            min-width: 55%;
+        }
+
+        .right-column {
+            padding: .75rem;
+            max-width: 25%;
+        }
+
+        .container {
+            display: flex;
+            width: 100%;
+        }
+
+        li {
+            margin: 0.75rem;
+        }
+
+        .right-section {
+            margin-left: 1rem;
+            padding-left: 0.5rem;
+        }
+
+        .right-section h3 {
+            padding-top: 0;
+            font-weight: 200;
+        }
+
+        .right-section ul {
+            border-left: 0.3rem solid #00A1E2;
+            list-style-type: none;
+            padding-left: 0;
+        }
+
+    </style>
+</head>
+<body>
+
+<div class="banner lead">
+    Your new Cloud-Native application is ready!
+</div>
+
+<div class="container">
+    <div class="left-column">
+        <p class="lead"> Congratulations, you have created a new Quarkus application.</p>
+
+        <h2>Why do you see this?</h2>
+
+        <p>This page is served by Quarkus. The source is in
+            <code>src/main/resources/META-INF/resources/index.html</code>.</p>
+
+        <h2>What can I do from here?</h2>
+
+        <p>If not already done, run the application in <em>dev mode</em> using: <code>mvn compile quarkus:dev</code>.
+        </p>
+        <ul>
+            <li>Add REST resources, Servlets, functions and other services in <code>src/main/java</code>.</li>
+            <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
+            <li>Configure your application in <code>src/main/resources/application.properties</code>.
+            </li>
+        </ul>
+
+        <h2>How do I get rid of this page?</h2>
+        <p>Just delete the <code>src/main/resources/META-INF/resources/index.html</code> file.</p>
+    </div>
+    <div class="right-column">
+        <div class="right-section">
+            <h3>Application</h3>
+            <ul>
+                <li>GroupId: com.baeldung.quarkus</li>
+                <li>ArtifactId: quarkus-project</li>
+                <li>Version: 1.0-SNAPSHOT</li>
+                <li>Quarkus Version: 0.13.1</li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>Next steps</h3>
+            <ul>
+                <li><a href="https://quarkus.io/guides/maven-tooling.html">Setup your IDE</a></li>
+                <li><a href="https://quarkus.io/guides/getting-started-guide.html">Getting started</a></li>
+                <li><a href="https://quarkus.io">Quarkus Web Site</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/quarkus/src/main/resources/application.properties b/quarkus/src/main/resources/application.properties
new file mode 100644
index 0000000000..3f05d2198f
--- /dev/null
+++ b/quarkus/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+# Configuration file
+# key = value
+greeting=Good morning
\ No newline at end of file
diff --git a/quarkus/src/test/java/com/baeldung/quarkus/HelloResourceTest.java b/quarkus/src/test/java/com/baeldung/quarkus/HelloResourceTest.java
new file mode 100644
index 0000000000..3d0fff7562
--- /dev/null
+++ b/quarkus/src/test/java/com/baeldung/quarkus/HelloResourceTest.java
@@ -0,0 +1,21 @@
+package com.baeldung.quarkus;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class HelloResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/hello")
+          .then()
+             .statusCode(200)
+             .body(is("hello"));
+    }
+
+}
\ No newline at end of file
diff --git a/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java b/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java
new file mode 100644
index 0000000000..4b0606f588
--- /dev/null
+++ b/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java
@@ -0,0 +1,9 @@
+package com.baeldung.quarkus;
+
+import io.quarkus.test.junit.SubstrateTest;
+
+@SubstrateTest
+public class NativeHelloResourceIT extends HelloResourceTest {
+
+    // Execute the same tests but in native mode.
+}
\ No newline at end of file

From 8470644bdc4b261cc6c2890b831e9d7f708781ac Mon Sep 17 00:00:00 2001
From: Rodrigo Graciano <rodrigolgraciano@gmail.com>
Date: Sun, 28 Apr 2019 23:52:54 -0400
Subject: [PATCH 110/295] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 32c35f28fa..b4118cf5c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <modules>
         <module>lombok-custom</module>
         <module>picocli</module>
-				<module>quarkus</module>
+        <module>quarkus</module>
     </modules>
 
 	<dependencies>
@@ -531,7 +531,7 @@
                 <module>protobuffer</module>
 
                 <module>persistence-modules</module>
-								<module>quarkus</module>
+		<module>quarkus</module>
 
                 <module>rabbitmq</module>
                 <!-- <module>raml</module> --> <!-- Not a maven project -->

From 179cfe5089712ab072559e418ae9b30dc68a8d4e Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Mon, 29 Apr 2019 14:04:52 +0300
Subject: [PATCH 111/295] enable jvmdefault

---
 parent-kotlin/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/parent-kotlin/pom.xml b/parent-kotlin/pom.xml
index 86ab45ecb1..6f7fe6c102 100644
--- a/parent-kotlin/pom.xml
+++ b/parent-kotlin/pom.xml
@@ -108,6 +108,9 @@
 								<sourceDir>${project.basedir}/src/main/java</sourceDir>
 							</sourceDirs>
 							<jvmTarget>${java.version}</jvmTarget>
+                                                        <args>
+                                                            <arg>-Xjvm-default=enable</arg> 
+                                                        </args>
 						</configuration>
 					</execution>
 					<execution>

From cf48fe424376eef4984dd91cf028c806540ce9c0 Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Mon, 29 Apr 2019 15:06:17 +0300
Subject: [PATCH 112/295] rename package, fix file upload tests

---
 httpclient-simple/README.md                          |  6 ++----
 .../basic/MyBasicAuthenticationEntryPoint.java       |  2 +-
 ...pComponentsClientHttpRequestFactoryBasicAuth.java |  2 +-
 .../baeldung/client/RestTemplateFactory.java         |  2 +-
 .../baeldung/client/spring/ClientConfig.java         |  4 ++--
 .../{org => com}/baeldung/filter/CustomFilter.java   |  2 +-
 .../filter/CustomWebSecurityConfigurerAdapter.java   |  4 ++--
 ...avedRequestAwareAuthenticationSuccessHandler.java |  2 +-
 .../security/RestAuthenticationEntryPoint.java       |  2 +-
 .../baeldung/spring/SecSecurityConfig.java           |  4 ++--
 .../java/{org => com}/baeldung/spring/WebConfig.java |  4 ++--
 .../baeldung/web/controller/BarController.java       |  4 ++--
 .../baeldung/web/controller/FooController.java       |  4 ++--
 .../main/java/{org => com}/baeldung/web/dto/Bar.java |  2 +-
 .../main/java/{org => com}/baeldung/web/dto/Foo.java |  2 +-
 .../src/main/resources/webSecurityConfig.xml         |  2 +-
 httpclient-simple/src/main/webapp/WEB-INF/web.xml    |  2 +-
 .../{org => com}/baeldung/client/ClientLiveTest.java |  6 +++---
 .../baeldung/client/RestClientLiveManualTest.java    | 10 +++-------
 .../httpclient/HttpClientHeadersLiveTest.java        |  2 +-
 .../httpclient/HttpClientPostingLiveTest.java        | 12 ++++++------
 .../httpclient/HttpClientTimeoutLiveTest.java        |  4 +++-
 .../baeldung/httpclient/HttpsClientSslLiveTest.java  |  2 +-
 .../baeldung/httpclient/ProgressEntityWrapper.java   |  2 +-
 .../baeldung/httpclient/ResponseUtil.java            |  2 +-
 .../httpclient/base/HttpClientBasicLiveTest.java     |  4 ++--
 .../httpclient/sec/HttpClientAuthLiveTest.java       |  4 ++--
 .../httpclient/sec/HttpClientCookieLiveTest.java     |  4 ++--
 .../{org => com}/baeldung/test/LiveTestSuite.java    |  6 +++---
 httpclient-simple/src/test/resources/test.in         |  1 +
 30 files changed, 53 insertions(+), 56 deletions(-)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/basic/MyBasicAuthenticationEntryPoint.java (97%)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java (97%)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/client/RestTemplateFactory.java (97%)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/client/spring/ClientConfig.java (75%)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/filter/CustomFilter.java (94%)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/filter/CustomWebSecurityConfigurerAdapter.java (95%)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java (98%)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/security/RestAuthenticationEntryPoint.java (95%)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/spring/SecSecurityConfig.java (83%)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/spring/WebConfig.java (92%)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/web/controller/BarController.java (92%)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/web/controller/FooController.java (92%)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/web/dto/Bar.java (86%)
 rename httpclient-simple/src/main/java/{org => com}/baeldung/web/dto/Foo.java (86%)
 rename httpclient-simple/src/test/java/{org => com}/baeldung/client/ClientLiveTest.java (94%)
 rename httpclient-simple/src/test/java/{org => com}/baeldung/client/RestClientLiveManualTest.java (94%)
 rename httpclient-simple/src/test/java/{org => com}/baeldung/httpclient/HttpClientHeadersLiveTest.java (99%)
 rename httpclient-simple/src/test/java/{org => com}/baeldung/httpclient/HttpClientPostingLiveTest.java (93%)
 rename httpclient-simple/src/test/java/{org => com}/baeldung/httpclient/HttpClientTimeoutLiveTest.java (98%)
 rename httpclient-simple/src/test/java/{org => com}/baeldung/httpclient/HttpsClientSslLiveTest.java (99%)
 rename httpclient-simple/src/test/java/{org => com}/baeldung/httpclient/ProgressEntityWrapper.java (98%)
 rename httpclient-simple/src/test/java/{org => com}/baeldung/httpclient/ResponseUtil.java (94%)
 rename httpclient-simple/src/test/java/{org => com}/baeldung/httpclient/base/HttpClientBasicLiveTest.java (96%)
 rename httpclient-simple/src/test/java/{org => com}/baeldung/httpclient/sec/HttpClientAuthLiveTest.java (98%)
 rename httpclient-simple/src/test/java/{org => com}/baeldung/httpclient/sec/HttpClientCookieLiveTest.java (97%)
 rename httpclient-simple/src/test/java/{org => com}/baeldung/test/LiveTestSuite.java (64%)
 create mode 100644 httpclient-simple/src/test/resources/test.in

diff --git a/httpclient-simple/README.md b/httpclient-simple/README.md
index 492f3bc5b4..18fd94c3a8 100644
--- a/httpclient-simple/README.md
+++ b/httpclient-simple/README.md
@@ -1,9 +1,7 @@
 =========
-## HttpClient 4.x Cookbooks and Examples
-
-###The Course
-The "REST With Spring" Classes: http://bit.ly/restwithspring
+## Articles that are part of the HTTPClient Ebook
 
+# To run the live tests, use the command: mvn clean install -Plive
 
 ### Relevant Articles: 
 
diff --git a/httpclient-simple/src/main/java/org/baeldung/basic/MyBasicAuthenticationEntryPoint.java b/httpclient-simple/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
similarity index 97%
rename from httpclient-simple/src/main/java/org/baeldung/basic/MyBasicAuthenticationEntryPoint.java
rename to httpclient-simple/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
index 6e580e7a22..380ff9df6b 100644
--- a/httpclient-simple/src/main/java/org/baeldung/basic/MyBasicAuthenticationEntryPoint.java
+++ b/httpclient-simple/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
@@ -1,4 +1,4 @@
-package org.baeldung.basic;
+package com.baeldung.basic;
 
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint;
diff --git a/httpclient-simple/src/main/java/org/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java b/httpclient-simple/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java
similarity index 97%
rename from httpclient-simple/src/main/java/org/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java
rename to httpclient-simple/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java
index a2f51d343b..81f82a2c1c 100644
--- a/httpclient-simple/src/main/java/org/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java
+++ b/httpclient-simple/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java
@@ -1,4 +1,4 @@
-package org.baeldung.client;
+package com.baeldung.client;
 
 import java.net.URI;
 
diff --git a/httpclient-simple/src/main/java/org/baeldung/client/RestTemplateFactory.java b/httpclient-simple/src/main/java/com/baeldung/client/RestTemplateFactory.java
similarity index 97%
rename from httpclient-simple/src/main/java/org/baeldung/client/RestTemplateFactory.java
rename to httpclient-simple/src/main/java/com/baeldung/client/RestTemplateFactory.java
index 3ed0bc82b7..aac4f8cebd 100644
--- a/httpclient-simple/src/main/java/org/baeldung/client/RestTemplateFactory.java
+++ b/httpclient-simple/src/main/java/com/baeldung/client/RestTemplateFactory.java
@@ -1,4 +1,4 @@
-package org.baeldung.client;
+package com.baeldung.client;
 
 import org.apache.http.HttpHost;
 import org.springframework.beans.factory.FactoryBean;
diff --git a/httpclient-simple/src/main/java/org/baeldung/client/spring/ClientConfig.java b/httpclient-simple/src/main/java/com/baeldung/client/spring/ClientConfig.java
similarity index 75%
rename from httpclient-simple/src/main/java/org/baeldung/client/spring/ClientConfig.java
rename to httpclient-simple/src/main/java/com/baeldung/client/spring/ClientConfig.java
index 73e602855c..03994b55a5 100644
--- a/httpclient-simple/src/main/java/org/baeldung/client/spring/ClientConfig.java
+++ b/httpclient-simple/src/main/java/com/baeldung/client/spring/ClientConfig.java
@@ -1,10 +1,10 @@
-package org.baeldung.client.spring;
+package com.baeldung.client.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.client")
+@ComponentScan("com.baeldung.client")
 public class ClientConfig {
 
     public ClientConfig() {
diff --git a/httpclient-simple/src/main/java/org/baeldung/filter/CustomFilter.java b/httpclient-simple/src/main/java/com/baeldung/filter/CustomFilter.java
similarity index 94%
rename from httpclient-simple/src/main/java/org/baeldung/filter/CustomFilter.java
rename to httpclient-simple/src/main/java/com/baeldung/filter/CustomFilter.java
index 01e5b0b59d..6bb12610fa 100644
--- a/httpclient-simple/src/main/java/org/baeldung/filter/CustomFilter.java
+++ b/httpclient-simple/src/main/java/com/baeldung/filter/CustomFilter.java
@@ -1,4 +1,4 @@
-package org.baeldung.filter;
+package com.baeldung.filter;
 
 import org.springframework.web.filter.GenericFilterBean;
 
diff --git a/httpclient-simple/src/main/java/org/baeldung/filter/CustomWebSecurityConfigurerAdapter.java b/httpclient-simple/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
similarity index 95%
rename from httpclient-simple/src/main/java/org/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
rename to httpclient-simple/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
index 7ca2a80c52..fb597e46c8 100644
--- a/httpclient-simple/src/main/java/org/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
+++ b/httpclient-simple/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
@@ -1,6 +1,6 @@
-package org.baeldung.filter;
+package com.baeldung.filter;
 
-import org.baeldung.security.RestAuthenticationEntryPoint;
+import com.baeldung.security.RestAuthenticationEntryPoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/httpclient-simple/src/main/java/org/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java b/httpclient-simple/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
similarity index 98%
rename from httpclient-simple/src/main/java/org/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
rename to httpclient-simple/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
index 698052fa2b..7dc53e3e1e 100644
--- a/httpclient-simple/src/main/java/org/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
+++ b/httpclient-simple/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
@@ -1,4 +1,4 @@
-package org.baeldung.security;
+package com.baeldung.security;
 
 import java.io.IOException;
 
diff --git a/httpclient-simple/src/main/java/org/baeldung/security/RestAuthenticationEntryPoint.java b/httpclient-simple/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java
similarity index 95%
rename from httpclient-simple/src/main/java/org/baeldung/security/RestAuthenticationEntryPoint.java
rename to httpclient-simple/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java
index 77aa32ff97..1ae89adb89 100644
--- a/httpclient-simple/src/main/java/org/baeldung/security/RestAuthenticationEntryPoint.java
+++ b/httpclient-simple/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java
@@ -1,4 +1,4 @@
-package org.baeldung.security;
+package com.baeldung.security;
 
 import java.io.IOException;
 
diff --git a/httpclient-simple/src/main/java/org/baeldung/spring/SecSecurityConfig.java b/httpclient-simple/src/main/java/com/baeldung/spring/SecSecurityConfig.java
similarity index 83%
rename from httpclient-simple/src/main/java/org/baeldung/spring/SecSecurityConfig.java
rename to httpclient-simple/src/main/java/com/baeldung/spring/SecSecurityConfig.java
index 4ce80dab9f..4ba9d47f8d 100644
--- a/httpclient-simple/src/main/java/org/baeldung/spring/SecSecurityConfig.java
+++ b/httpclient-simple/src/main/java/com/baeldung/spring/SecSecurityConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.ImportResource;
 
 @Configuration
 @ImportResource({ "classpath:webSecurityConfig.xml" })
-@ComponentScan("org.baeldung.security")
+@ComponentScan("com.baeldung.security")
 public class SecSecurityConfig {
 
     public SecSecurityConfig() {
diff --git a/httpclient-simple/src/main/java/org/baeldung/spring/WebConfig.java b/httpclient-simple/src/main/java/com/baeldung/spring/WebConfig.java
similarity index 92%
rename from httpclient-simple/src/main/java/org/baeldung/spring/WebConfig.java
rename to httpclient-simple/src/main/java/com/baeldung/spring/WebConfig.java
index 5876e1307b..8d5c1dc7f1 100644
--- a/httpclient-simple/src/main/java/org/baeldung/spring/WebConfig.java
+++ b/httpclient-simple/src/main/java/com/baeldung/spring/WebConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import java.util.List;
 
@@ -11,7 +11,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 @EnableWebMvc
-@ComponentScan("org.baeldung.web")
+@ComponentScan("com.baeldung.web")
 public class WebConfig implements WebMvcConfigurer {
 
     public WebConfig() {
diff --git a/httpclient-simple/src/main/java/org/baeldung/web/controller/BarController.java b/httpclient-simple/src/main/java/com/baeldung/web/controller/BarController.java
similarity index 92%
rename from httpclient-simple/src/main/java/org/baeldung/web/controller/BarController.java
rename to httpclient-simple/src/main/java/com/baeldung/web/controller/BarController.java
index 2bc314baa2..02e6af03af 100644
--- a/httpclient-simple/src/main/java/org/baeldung/web/controller/BarController.java
+++ b/httpclient-simple/src/main/java/com/baeldung/web/controller/BarController.java
@@ -1,6 +1,6 @@
-package org.baeldung.web.controller;
+package com.baeldung.web.controller;
 
-import org.baeldung.web.dto.Bar;
+import com.baeldung.web.dto.Bar;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Controller;
diff --git a/httpclient-simple/src/main/java/org/baeldung/web/controller/FooController.java b/httpclient-simple/src/main/java/com/baeldung/web/controller/FooController.java
similarity index 92%
rename from httpclient-simple/src/main/java/org/baeldung/web/controller/FooController.java
rename to httpclient-simple/src/main/java/com/baeldung/web/controller/FooController.java
index b50edb2dcf..461a5e351a 100644
--- a/httpclient-simple/src/main/java/org/baeldung/web/controller/FooController.java
+++ b/httpclient-simple/src/main/java/com/baeldung/web/controller/FooController.java
@@ -1,6 +1,6 @@
-package org.baeldung.web.controller;
+package com.baeldung.web.controller;
 
-import org.baeldung.web.dto.Foo;
+import com.baeldung.web.dto.Foo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/httpclient-simple/src/main/java/org/baeldung/web/dto/Bar.java b/httpclient-simple/src/main/java/com/baeldung/web/dto/Bar.java
similarity index 86%
rename from httpclient-simple/src/main/java/org/baeldung/web/dto/Bar.java
rename to httpclient-simple/src/main/java/com/baeldung/web/dto/Bar.java
index d33e39a823..eb139b0ec1 100644
--- a/httpclient-simple/src/main/java/org/baeldung/web/dto/Bar.java
+++ b/httpclient-simple/src/main/java/com/baeldung/web/dto/Bar.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.dto;
+package com.baeldung.web.dto;
 
 import java.io.Serializable;
 
diff --git a/httpclient-simple/src/main/java/org/baeldung/web/dto/Foo.java b/httpclient-simple/src/main/java/com/baeldung/web/dto/Foo.java
similarity index 86%
rename from httpclient-simple/src/main/java/org/baeldung/web/dto/Foo.java
rename to httpclient-simple/src/main/java/com/baeldung/web/dto/Foo.java
index 09c1dac933..23cfab132d 100644
--- a/httpclient-simple/src/main/java/org/baeldung/web/dto/Foo.java
+++ b/httpclient-simple/src/main/java/com/baeldung/web/dto/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.dto;
+package com.baeldung.web.dto;
 
 import java.io.Serializable;
 
diff --git a/httpclient-simple/src/main/resources/webSecurityConfig.xml b/httpclient-simple/src/main/resources/webSecurityConfig.xml
index a93dc841b6..2ff9a1de15 100644
--- a/httpclient-simple/src/main/resources/webSecurityConfig.xml
+++ b/httpclient-simple/src/main/resources/webSecurityConfig.xml
@@ -23,6 +23,6 @@
 
     <global-method-security pre-post-annotations="enabled"/>
         
-    <beans:bean id="myBasicAuthenticationEntryPoint" class="org.baeldung.basic.MyBasicAuthenticationEntryPoint" />
+    <beans:bean id="myBasicAuthenticationEntryPoint" class="com.baeldung.basic.MyBasicAuthenticationEntryPoint" />
 
 </beans:beans>
\ No newline at end of file
diff --git a/httpclient-simple/src/main/webapp/WEB-INF/web.xml b/httpclient-simple/src/main/webapp/WEB-INF/web.xml
index 83b4aeb0a7..4b2dd54266 100644
--- a/httpclient-simple/src/main/webapp/WEB-INF/web.xml
+++ b/httpclient-simple/src/main/webapp/WEB-INF/web.xml
@@ -12,7 +12,7 @@
     </context-param>
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>org.baeldung.spring</param-value>
+        <param-value>com.baeldung.spring</param-value>
     </context-param>
 
     <listener>
diff --git a/httpclient-simple/src/test/java/org/baeldung/client/ClientLiveTest.java b/httpclient-simple/src/test/java/com/baeldung/client/ClientLiveTest.java
similarity index 94%
rename from httpclient-simple/src/test/java/org/baeldung/client/ClientLiveTest.java
rename to httpclient-simple/src/test/java/com/baeldung/client/ClientLiveTest.java
index 286ee3c900..78e9813f06 100644
--- a/httpclient-simple/src/test/java/org/baeldung/client/ClientLiveTest.java
+++ b/httpclient-simple/src/test/java/com/baeldung/client/ClientLiveTest.java
@@ -1,11 +1,11 @@
-package org.baeldung.client;
+package com.baeldung.client;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.baeldung.client.spring.ClientConfig;
-import org.baeldung.web.dto.Foo;
+import com.baeldung.client.spring.ClientConfig;
+import com.baeldung.web.dto.Foo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/httpclient-simple/src/test/java/org/baeldung/client/RestClientLiveManualTest.java b/httpclient-simple/src/test/java/com/baeldung/client/RestClientLiveManualTest.java
similarity index 94%
rename from httpclient-simple/src/test/java/org/baeldung/client/RestClientLiveManualTest.java
rename to httpclient-simple/src/test/java/com/baeldung/client/RestClientLiveManualTest.java
index 53f259c21d..102f2cdca0 100644
--- a/httpclient-simple/src/test/java/org/baeldung/client/RestClientLiveManualTest.java
+++ b/httpclient-simple/src/test/java/com/baeldung/client/RestClientLiveManualTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.client;
+package com.baeldung.client;
 
 import static org.apache.http.conn.ssl.SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER;
 import static org.hamcrest.Matchers.equalTo;
@@ -50,12 +50,8 @@ public class RestClientLiveManualTest {
         final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
         final CloseableHttpClient httpClient = (CloseableHttpClient) requestFactory.getHttpClient();
 
-        final TrustStrategy acceptingTrustStrategy = new TrustStrategy() {
-            @Override
-            public final boolean isTrusted(final X509Certificate[] certificate, final String authType) {
-                return true;
-            }
-        };
+        TrustStrategy acceptingTrustStrategy = (cert, authType) -> true;
+        
         final SSLSocketFactory sf = new SSLSocketFactory(acceptingTrustStrategy, ALLOW_ALL_HOSTNAME_VERIFIER);
         httpClient.getConnectionManager().getSchemeRegistry().register(new Scheme("https", 8443, sf));
 
diff --git a/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientHeadersLiveTest.java b/httpclient-simple/src/test/java/com/baeldung/httpclient/HttpClientHeadersLiveTest.java
similarity index 99%
rename from httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientHeadersLiveTest.java
rename to httpclient-simple/src/test/java/com/baeldung/httpclient/HttpClientHeadersLiveTest.java
index 51c3817da5..44262851fd 100644
--- a/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientHeadersLiveTest.java
+++ b/httpclient-simple/src/test/java/com/baeldung/httpclient/HttpClientHeadersLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package com.baeldung.httpclient;
 
 import com.google.common.collect.Lists;
 import org.apache.http.Header;
diff --git a/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientPostingLiveTest.java b/httpclient-simple/src/test/java/com/baeldung/httpclient/HttpClientPostingLiveTest.java
similarity index 93%
rename from httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientPostingLiveTest.java
rename to httpclient-simple/src/test/java/com/baeldung/httpclient/HttpClientPostingLiveTest.java
index 39ed8f09ef..f5dff8d757 100644
--- a/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientPostingLiveTest.java
+++ b/httpclient-simple/src/test/java/com/baeldung/httpclient/HttpClientPostingLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package com.baeldung.httpclient;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertThat;
  * NOTE : Need module spring-rest to be running
  */
 public class HttpClientPostingLiveTest {
-    private static final String SAMPLE_URL = "http://localhost:8082/spring-rest/users";
+    private static final String SAMPLE_URL = "http://www.example.com";
     private static final String URL_SECURED_BY_BASIC_AUTHENTICATION = "http://browserspy.dk/password-ok.php";
     private static final String DEFAULT_USER = "test";
     private static final String DEFAULT_PASS = "test";
@@ -69,7 +69,7 @@ public class HttpClientPostingLiveTest {
     @Test
     public void whenPostJsonUsingHttpClient_thenCorrect() throws IOException {
         final CloseableHttpClient client = HttpClients.createDefault();
-        final HttpPost httpPost = new HttpPost(SAMPLE_URL + "/detail");
+        final HttpPost httpPost = new HttpPost(SAMPLE_URL);
 
         final String json = "{\"id\":1,\"name\":\"John\"}";
         final StringEntity entity = new StringEntity(json);
@@ -92,7 +92,7 @@ public class HttpClientPostingLiveTest {
     @Test
     public void whenSendMultipartRequestUsingHttpClient_thenCorrect() throws IOException {
         final CloseableHttpClient client = HttpClients.createDefault();
-        final HttpPost httpPost = new HttpPost(SAMPLE_URL + "/multipart");
+        final HttpPost httpPost = new HttpPost(SAMPLE_URL);
 
         final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
         builder.addTextBody("username", DEFAULT_USER);
@@ -110,7 +110,7 @@ public class HttpClientPostingLiveTest {
     @Test
     public void whenUploadFileUsingHttpClient_thenCorrect() throws IOException {
         final CloseableHttpClient client = HttpClients.createDefault();
-        final HttpPost httpPost = new HttpPost(SAMPLE_URL + "/upload");
+        final HttpPost httpPost = new HttpPost(SAMPLE_URL);
 
         final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
         builder.addBinaryBody("file", new File("src/test/resources/test.in"), ContentType.APPLICATION_OCTET_STREAM, "file.ext");
@@ -126,7 +126,7 @@ public class HttpClientPostingLiveTest {
     @Test
     public void whenGetUploadFileProgressUsingHttpClient_thenCorrect() throws IOException {
         final CloseableHttpClient client = HttpClients.createDefault();
-        final HttpPost httpPost = new HttpPost(SAMPLE_URL + "/upload");
+        final HttpPost httpPost = new HttpPost(SAMPLE_URL);
 
         final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
         builder.addBinaryBody("file", new File("src/test/resources/test.in"), ContentType.APPLICATION_OCTET_STREAM, "file.ext");
diff --git a/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java b/httpclient-simple/src/test/java/com/baeldung/httpclient/HttpClientTimeoutLiveTest.java
similarity index 98%
rename from httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
rename to httpclient-simple/src/test/java/com/baeldung/httpclient/HttpClientTimeoutLiveTest.java
index 8041080b3d..8bd7042dc6 100644
--- a/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
+++ b/httpclient-simple/src/test/java/com/baeldung/httpclient/HttpClientTimeoutLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package com.baeldung.httpclient;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
@@ -20,6 +20,7 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.params.CoreConnectionPNames;
 import org.apache.http.params.HttpParams;
 import org.junit.After;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class HttpClientTimeoutLiveTest {
@@ -91,6 +92,7 @@ public class HttpClientTimeoutLiveTest {
      * This simulates a timeout against a domain with multiple routes/IPs to it (not a single raw IP)
      */
     @Test(expected = ConnectTimeoutException.class)
+    @Ignore
     public final void givenTimeoutIsConfigured_whenTimingOut_thenTimeoutException() throws IOException {
         final int timeout = 3;
 
diff --git a/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpsClientSslLiveTest.java b/httpclient-simple/src/test/java/com/baeldung/httpclient/HttpsClientSslLiveTest.java
similarity index 99%
rename from httpclient-simple/src/test/java/org/baeldung/httpclient/HttpsClientSslLiveTest.java
rename to httpclient-simple/src/test/java/com/baeldung/httpclient/HttpsClientSslLiveTest.java
index 9e95905c70..24ceab0069 100644
--- a/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpsClientSslLiveTest.java
+++ b/httpclient-simple/src/test/java/com/baeldung/httpclient/HttpsClientSslLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package com.baeldung.httpclient;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
diff --git a/httpclient-simple/src/test/java/org/baeldung/httpclient/ProgressEntityWrapper.java b/httpclient-simple/src/test/java/com/baeldung/httpclient/ProgressEntityWrapper.java
similarity index 98%
rename from httpclient-simple/src/test/java/org/baeldung/httpclient/ProgressEntityWrapper.java
rename to httpclient-simple/src/test/java/com/baeldung/httpclient/ProgressEntityWrapper.java
index cd00d8711a..c7adf51b3e 100644
--- a/httpclient-simple/src/test/java/org/baeldung/httpclient/ProgressEntityWrapper.java
+++ b/httpclient-simple/src/test/java/com/baeldung/httpclient/ProgressEntityWrapper.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package com.baeldung.httpclient;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;
diff --git a/httpclient-simple/src/test/java/org/baeldung/httpclient/ResponseUtil.java b/httpclient-simple/src/test/java/com/baeldung/httpclient/ResponseUtil.java
similarity index 94%
rename from httpclient-simple/src/test/java/org/baeldung/httpclient/ResponseUtil.java
rename to httpclient-simple/src/test/java/com/baeldung/httpclient/ResponseUtil.java
index fd38b95cbe..e9ea08a723 100644
--- a/httpclient-simple/src/test/java/org/baeldung/httpclient/ResponseUtil.java
+++ b/httpclient-simple/src/test/java/com/baeldung/httpclient/ResponseUtil.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package com.baeldung.httpclient;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
diff --git a/httpclient-simple/src/test/java/org/baeldung/httpclient/base/HttpClientBasicLiveTest.java b/httpclient-simple/src/test/java/com/baeldung/httpclient/base/HttpClientBasicLiveTest.java
similarity index 96%
rename from httpclient-simple/src/test/java/org/baeldung/httpclient/base/HttpClientBasicLiveTest.java
rename to httpclient-simple/src/test/java/com/baeldung/httpclient/base/HttpClientBasicLiveTest.java
index fee9dc4343..d1b093394e 100644
--- a/httpclient-simple/src/test/java/org/baeldung/httpclient/base/HttpClientBasicLiveTest.java
+++ b/httpclient-simple/src/test/java/com/baeldung/httpclient/base/HttpClientBasicLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient.base;
+package com.baeldung.httpclient.base;
 
 import org.apache.http.HttpStatus;
 import org.apache.http.client.ClientProtocolException;
@@ -8,7 +8,7 @@ import org.apache.http.entity.ContentType;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
-import org.baeldung.httpclient.ResponseUtil;
+import com.baeldung.httpclient.ResponseUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/httpclient-simple/src/test/java/org/baeldung/httpclient/sec/HttpClientAuthLiveTest.java b/httpclient-simple/src/test/java/com/baeldung/httpclient/sec/HttpClientAuthLiveTest.java
similarity index 98%
rename from httpclient-simple/src/test/java/org/baeldung/httpclient/sec/HttpClientAuthLiveTest.java
rename to httpclient-simple/src/test/java/com/baeldung/httpclient/sec/HttpClientAuthLiveTest.java
index 96278b481a..0f7018a9ac 100644
--- a/httpclient-simple/src/test/java/org/baeldung/httpclient/sec/HttpClientAuthLiveTest.java
+++ b/httpclient-simple/src/test/java/com/baeldung/httpclient/sec/HttpClientAuthLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient.sec;
+package com.baeldung.httpclient.sec;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.http.HttpHeaders;
@@ -17,7 +17,7 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.protocol.HttpContext;
-import org.baeldung.httpclient.ResponseUtil;
+import com.baeldung.httpclient.ResponseUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/httpclient-simple/src/test/java/org/baeldung/httpclient/sec/HttpClientCookieLiveTest.java b/httpclient-simple/src/test/java/com/baeldung/httpclient/sec/HttpClientCookieLiveTest.java
similarity index 97%
rename from httpclient-simple/src/test/java/org/baeldung/httpclient/sec/HttpClientCookieLiveTest.java
rename to httpclient-simple/src/test/java/com/baeldung/httpclient/sec/HttpClientCookieLiveTest.java
index ba27aca08d..287b6e996c 100644
--- a/httpclient-simple/src/test/java/org/baeldung/httpclient/sec/HttpClientCookieLiveTest.java
+++ b/httpclient-simple/src/test/java/com/baeldung/httpclient/sec/HttpClientCookieLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient.sec;
+package com.baeldung.httpclient.sec;
 
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -10,7 +10,7 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.cookie.BasicClientCookie;
 import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.HttpContext;
-import org.baeldung.httpclient.ResponseUtil;
+import com.baeldung.httpclient.ResponseUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/httpclient-simple/src/test/java/org/baeldung/test/LiveTestSuite.java b/httpclient-simple/src/test/java/com/baeldung/test/LiveTestSuite.java
similarity index 64%
rename from httpclient-simple/src/test/java/org/baeldung/test/LiveTestSuite.java
rename to httpclient-simple/src/test/java/com/baeldung/test/LiveTestSuite.java
index 8c9b48d056..c864349e02 100644
--- a/httpclient-simple/src/test/java/org/baeldung/test/LiveTestSuite.java
+++ b/httpclient-simple/src/test/java/com/baeldung/test/LiveTestSuite.java
@@ -1,7 +1,7 @@
-package org.baeldung.test;
+package com.baeldung.test;
 
-import org.baeldung.client.ClientLiveTest;
-import org.baeldung.client.RestClientLiveManualTest;
+import com.baeldung.client.ClientLiveTest;
+import com.baeldung.client.RestClientLiveManualTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/httpclient-simple/src/test/resources/test.in b/httpclient-simple/src/test/resources/test.in
new file mode 100644
index 0000000000..95d09f2b10
--- /dev/null
+++ b/httpclient-simple/src/test/resources/test.in
@@ -0,0 +1 @@
+hello world
\ No newline at end of file

From a752486b794b38df466b3b63329d710adf9805c2 Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date: Mon, 29 Apr 2019 19:58:51 +0200
Subject: [PATCH 113/295] changed example for finder of root cause exception

---
 .../baeldung/exceptions/RootCauseFinder.java  | 68 ++++++++++++++-----
 .../exceptions/RootCauseFinderTest.java       | 57 ++++++++++++----
 2 files changed, 94 insertions(+), 31 deletions(-)

diff --git a/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java b/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
index a7963c35a8..11f29a2cf0 100644
--- a/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
+++ b/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
@@ -1,5 +1,8 @@
 package com.baeldung.exceptions;
 
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.format.DateTimeParseException;
 import java.util.Objects;
 
 /**
@@ -16,44 +19,75 @@ public class RootCauseFinder {
         return rootCause;
     }
 
-    static class IntParser {
+    /**
+     *  Calculates the age of a person from a given date.
+     */
+    static class AgeCalculator {
 
-        private IntParser() {
+        private AgeCalculator() {
         }
 
-        public static int parse(String input) throws InvalidNumber {
-            if (input == null || input.isEmpty()) {
+        public static int calculateAge(String birthDate) throws CalculationException {
+            if (birthDate == null || birthDate.isEmpty()) {
                 throw new IllegalArgumentException();
             }
 
             try {
-                return new IntParser().stringToInt(input.trim());
-            } catch (NaNException ex) {
-                throw new InvalidNumber(input, ex);
+                return calculateDifference(birthDate).getYears();
+            } catch (DateParseException ex) {
+                throw new CalculationException(ex);
             }
         }
 
-        private int stringToInt(String numberAsString) throws NaNException {
+        private static Period calculateDifference(String birthDateAsString) throws DateParseException {
+
+            LocalDate birthDate = null;
             try {
-                return Integer.valueOf(numberAsString);
-            } catch (NumberFormatException ex) {
-                throw new NaNException(numberAsString, ex);
+                birthDate = LocalDate.parse(birthDateAsString);
+            } catch (DateTimeParseException ex) {
+                throw new InvalidFormatException(birthDateAsString, ex);
             }
+
+            LocalDate today = LocalDate.now();
+
+            if (birthDate.isAfter(today)) {
+                throw new DateOutOfRangeException(birthDateAsString);
+            }
+
+            return Period.between(birthDate, today);
         }
 
     }
 
-    static class InvalidNumber extends Exception {
+    static class CalculationException extends Exception {
 
-        InvalidNumber(String input, Throwable thr) {
-            super("Invalid input for a number: " + input, thr);
+        CalculationException(DateParseException ex) {
+            super(ex);
         }
     }
 
-    static class NaNException extends Exception {
+    static class DateParseException extends Exception {
 
-        NaNException(String number, Throwable thr) {
-            super(number + "is not a number", thr);
+        DateParseException(String input) {
+            super(input);
+        }
+
+        DateParseException(String input, Throwable thr) {
+            super(input, thr);
+        }
+    }
+
+    static class InvalidFormatException extends DateParseException {
+
+        InvalidFormatException(String input, Throwable thr) {
+            super("Invalid date format: " + input, thr);
+        }
+    }
+
+    static class DateOutOfRangeException extends DateParseException {
+
+        DateOutOfRangeException(String date) {
+            super("Date out of range: " + date);
         }
 
     }
diff --git a/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java b/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
index 1e58e3f602..c333a7ac26 100644
--- a/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
+++ b/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
@@ -4,6 +4,8 @@ import com.google.common.base.Throwables;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.junit.jupiter.api.Test;
 
+import java.time.format.DateTimeParseException;
+
 import static com.baeldung.exceptions.RootCauseFinder.*;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -13,38 +15,65 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class RootCauseFinderTest {
 
     @Test
-    public void givenNestedException_whenFindingRootCauseUsingJava_thenRootCauseFound() {
+    public void givenWrongFormatDate_whenFindingRootCauseUsingJava_thenRootCauseFound() {
         try {
-            IntParser.parse("text");
-        } catch (InvalidNumber ex) {
-            assertTrue(findCauseUsingPlainJava(ex) instanceof NumberFormatException);
+            AgeCalculator.calculateAge("010102");
+        } catch (CalculationException ex) {
+            assertTrue(findCauseUsingPlainJava(ex) instanceof DateTimeParseException);
         }
     }
 
     @Test
-    public void givenNonNestedException_whenFindingRootCauseUsingJava_thenRootCauseFound() {
+    public void givenOutOfRangeDate_whenFindingRootCauseUsingJava_thenRootCauseFound() {
         try {
-            IntParser.parse(null);
+            AgeCalculator.calculateAge("2020-04-04");
+        } catch (CalculationException ex) {
+            assertTrue(findCauseUsingPlainJava(ex) instanceof DateOutOfRangeException);
+        }
+    }
+
+    @Test
+    public void givenNullDate_whenFindingRootCauseUsingJava_thenRootCauseFound() {
+        try {
+            AgeCalculator.calculateAge(null);
         } catch (Exception ex) {
             assertTrue(findCauseUsingPlainJava(ex) instanceof IllegalArgumentException);
         }
     }
 
     @Test
-    public void givenNestedException_whenFindingRootCauseUsingApacheCommons_thenRootCauseFound() {
+    public void givenWrongFormatDate_whenFindingRootCauseUsingApacheCommons_thenRootCauseFound() {
         try {
-            IntParser.parse("text");
-        } catch (InvalidNumber ex) {
-            assertTrue(ExceptionUtils.getRootCause(ex) instanceof NumberFormatException);
+            AgeCalculator.calculateAge("010102");
+        } catch (CalculationException ex) {
+            assertTrue(ExceptionUtils.getRootCause(ex) instanceof DateTimeParseException);
         }
     }
 
     @Test
-    public void givenNestedException_whenFindingRootCauseUsingGuava_thenRootCauseFound() {
+    public void givenOutOfRangeDate_whenFindingRootCauseUsingApacheCommons_thenRootCauseFound() {
         try {
-            IntParser.parse("text");
-        } catch (InvalidNumber ex) {
-            assertTrue(Throwables.getRootCause(ex) instanceof NumberFormatException);
+            AgeCalculator.calculateAge("2020-04-04");
+        } catch (CalculationException ex) {
+            assertTrue(ExceptionUtils.getRootCause(ex) instanceof DateOutOfRangeException);
+        }
+    }
+
+    @Test
+    public void givenWrongFormatDate_whenFindingRootCauseUsingGuava_thenRootCauseFound() {
+        try {
+            AgeCalculator.calculateAge("010102");
+        } catch (CalculationException ex) {
+            assertTrue(Throwables.getRootCause(ex) instanceof DateTimeParseException);
+        }
+    }
+
+    @Test
+    public void givenOutOfRangeDate_whenFindingRootCauseUsingGuava_thenRootCauseFound() {
+        try {
+            AgeCalculator.calculateAge("2020-04-04");
+        } catch (CalculationException ex) {
+            assertTrue(Throwables.getRootCause(ex) instanceof DateOutOfRangeException);
         }
     }
 

From 88ff2a56ac958d9041b52f8960c9afbe58782286 Mon Sep 17 00:00:00 2001
From: PranayVJain <pranayjain000@gmail.com>
Date: Tue, 30 Apr 2019 11:09:34 +0530
Subject: [PATCH 114/295] BAEL-2805: Added unit test cases (#6728)

* BAEL-2805: Added unit test cases

* BAEL-2805: Added a property annotated with @Column and @Size

* BAEL-2805: Moved the examples from hibernate5 to hibernate-mapping
---
 persistence-modules/hibernate-mapping/pom.xml | 19 +++++
 .../java/com/baeldung/hibernate/Strategy.java |  2 +-
 .../hibernate/persistmaps/mapkey/User.java    | 66 +++++++++++++++
 .../validation/UserValidationUnitTest.java    | 81 +++++++++++++++++++
 4 files changed, 167 insertions(+), 1 deletion(-)
 create mode 100644 persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/User.java
 create mode 100644 persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/validation/UserValidationUnitTest.java

diff --git a/persistence-modules/hibernate-mapping/pom.xml b/persistence-modules/hibernate-mapping/pom.xml
index 11caf67bf1..fdc82a5275 100644
--- a/persistence-modules/hibernate-mapping/pom.xml
+++ b/persistence-modules/hibernate-mapping/pom.xml
@@ -31,6 +31,22 @@
             <artifactId>h2</artifactId>
             <version>${h2database.version}</version>
         </dependency>
+	    <!-- validation -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.el</groupId>
+            <artifactId>javax.el-api</artifactId>
+            <version>${javax.el-api.version}</version>
+	    </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
+            <version>${org.glassfish.javax.el.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -47,6 +63,9 @@
         <hibernate.version>5.3.7.Final</hibernate.version>
         <h2database.version>1.4.196</h2database.version>
         <assertj-core.version>3.8.0</assertj-core.version>
+        <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
+        <javax.el-api.version>2.2.5</javax.el-api.version>
+        <org.glassfish.javax.el.version>3.0.1-b08</org.glassfish.javax.el.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/Strategy.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/Strategy.java
index 75f10ed583..78434fd2a2 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/Strategy.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/Strategy.java
@@ -9,7 +9,7 @@ public enum Strategy {
     //See that the classes belongs to different packages
     MAP_KEY_COLUMN_BASED(Collections.singletonList(com.baeldung.hibernate.persistmaps.mapkeycolumn.Order.class)),
     MAP_KEY_BASED(Arrays.asList(com.baeldung.hibernate.persistmaps.mapkey.Item.class,
-            com.baeldung.hibernate.persistmaps.mapkey.Order.class)),
+            com.baeldung.hibernate.persistmaps.mapkey.Order.class,com.baeldung.hibernate.persistmaps.mapkey.User.class)),
     MAP_KEY_JOIN_COLUMN_BASED(Arrays.asList(com.baeldung.hibernate.persistmaps.mapkeyjoincolumn.Seller.class,
             com.baeldung.hibernate.persistmaps.mapkeyjoincolumn.Item.class,
             com.baeldung.hibernate.persistmaps.mapkeyjoincolumn.Order.class)),
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/User.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/User.java
new file mode 100644
index 0000000000..f6e8f1cdd6
--- /dev/null
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/User.java
@@ -0,0 +1,66 @@
+package com.baeldung.hibernate.persistmaps.mapkey;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.validation.constraints.Size;
+
+import org.hibernate.validator.constraints.Length;
+
+@Entity
+public class User {
+    @Id
+    @Column(length = 3)
+    private String firstName;
+
+    @Size(min = 3, max = 15)
+    private String middleName;
+
+    @Length(min = 3, max = 15)
+    private String lastName;
+
+    @Column(length = 5)
+    @Size(min = 3, max = 5)
+    private String city;
+
+    public User(String firstName, String middleName, String lastName, String city) {
+        super();
+        this.firstName = firstName;
+        this.middleName = middleName;
+        this.lastName = lastName;
+        this.city = city;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getMiddleName() {
+        return middleName;
+    }
+
+    public void setMiddleName(String middletName) {
+        this.middleName = middletName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+}
diff --git a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/validation/UserValidationUnitTest.java b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/validation/UserValidationUnitTest.java
new file mode 100644
index 0000000000..e39f324856
--- /dev/null
+++ b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/validation/UserValidationUnitTest.java
@@ -0,0 +1,81 @@
+package com.baeldung.hibernate.validation;
+
+import static org.junit.Assert.assertEquals;
+import java.util.Set;
+import javax.persistence.PersistenceException;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validation;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import com.baeldung.hibernate.HibernateUtil;
+import com.baeldung.hibernate.Strategy;
+import com.baeldung.hibernate.persistmaps.mapkey.User;
+
+public class UserValidationUnitTest {
+
+    private static Validator validator;
+    private static SessionFactory sessionFactory;
+    private Session session;
+    private Set<ConstraintViolation<User>> constraintViolations;
+
+    @BeforeClass
+    public static void before() {
+        ValidatorFactory config = Validation.buildDefaultValidatorFactory();
+        validator = config.getValidator();
+        sessionFactory = HibernateUtil.getSessionFactory(Strategy.MAP_KEY_BASED);
+    }
+
+    @Before
+    public void setUp() {
+        session = sessionFactory.openSession();
+        session.beginTransaction();
+    }
+
+    @Test
+    public void whenValidationWithSizeAndInvalidMiddleName_thenConstraintViolation() {
+        User user = new User("john", "m", "butler", "japan");
+        constraintViolations = validator.validateProperty(user, "middleName");
+        assertEquals(constraintViolations.size(), 1);
+    }
+
+    @Test
+    public void whenValidationWithSizeAndValidMiddleName_thenNoConstraintViolation() {
+        User user = new User("john", "mathis", "butler", "japan");
+        constraintViolations = validator.validateProperty(user, "middleName");
+        assertEquals(constraintViolations.size(), 0);
+    }
+
+    @Test
+    public void whenValidationWithLengthAndInvalidLastName_thenConstraintViolation() {
+        User user = new User("john", "m", "b", "japan");
+        constraintViolations = validator.validateProperty(user, "lastName");
+        assertEquals(constraintViolations.size(), 1);
+    }
+
+    @Test
+    public void whenValidationWithLengthAndValidLastName_thenNoConstraintViolation() {
+        User user = new User("john", "mathis", "butler", "japan");
+        constraintViolations = validator.validateProperty(user, "lastName");
+        assertEquals(constraintViolations.size(), 0);
+    }
+
+    @Test(expected = PersistenceException.class)
+    public void whenSavingFirstNameWithInvalidFirstName_thenPersistenceException() {
+        User user = new User("john", "mathis", "butler", "japan");
+        session.save(user);
+        session.getTransaction()
+            .commit();
+    }
+
+    @Test
+    public void whenValidationWithSizeAndColumnWithValidCity_thenNoConstraintViolation() {
+        User user = new User("john", "mathis", "butler", "japan");
+        constraintViolations = validator.validateProperty(user, "city");
+        assertEquals(constraintViolations.size(), 0);
+    }
+}

From 4e4d50fae212c7e6013dced01d2b0398a9b0ca1b Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Tue, 30 Apr 2019 13:17:30 +0300
Subject: [PATCH 115/295] Update README.md

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

diff --git a/httpclient-simple/README.md b/httpclient-simple/README.md
index 18fd94c3a8..fc4a53c91a 100644
--- a/httpclient-simple/README.md
+++ b/httpclient-simple/README.md
@@ -2,6 +2,7 @@
 ## Articles that are part of the HTTPClient Ebook
 
 # To run the live tests, use the command: mvn clean install -Plive
+# This will start an embedded Jetty server on port 8082 using the Cargo plugin configured in the pom.xml file, for the live Maven profile
 
 ### Relevant Articles: 
 

From 8f647bbf5e98fca58cef34095f0f0553ea3b2f06 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Tue, 30 Apr 2019 13:18:06 +0300
Subject: [PATCH 116/295] Update README.md

---
 httpclient-simple/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httpclient-simple/README.md b/httpclient-simple/README.md
index fc4a53c91a..5dfa6a8a75 100644
--- a/httpclient-simple/README.md
+++ b/httpclient-simple/README.md
@@ -2,7 +2,8 @@
 ## Articles that are part of the HTTPClient Ebook
 
 # To run the live tests, use the command: mvn clean install -Plive
-# This will start an embedded Jetty server on port 8082 using the Cargo plugin configured in the pom.xml file, for the live Maven profile
+# This will start an embedded Jetty server on port 8082 using the Cargo plugin configured in the pom.xml file, for the live 
+# Maven profile
 
 ### Relevant Articles: 
 

From 639a4572e496a76e3c6f32121a13320e1e1c57f7 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Tue, 30 Apr 2019 13:18:34 +0300
Subject: [PATCH 117/295] Update README.md

---
 httpclient-simple/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httpclient-simple/README.md b/httpclient-simple/README.md
index 5dfa6a8a75..c170dcfbe5 100644
--- a/httpclient-simple/README.md
+++ b/httpclient-simple/README.md
@@ -2,8 +2,8 @@
 ## Articles that are part of the HTTPClient Ebook
 
 # To run the live tests, use the command: mvn clean install -Plive
-# This will start an embedded Jetty server on port 8082 using the Cargo plugin configured in the pom.xml file, for the live 
-# Maven profile
+# This will start an embedded Jetty server on port 8082 using the Cargo plugin configured in the pom.xml file,
+# for the live Maven profile
 
 ### Relevant Articles: 
 

From 480d6683baa78d3101b8b1cbcc40e4abd549b32c Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Tue, 30 Apr 2019 13:19:51 +0300
Subject: [PATCH 118/295] Update README.md

---
 httpclient-simple/README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/httpclient-simple/README.md b/httpclient-simple/README.md
index c170dcfbe5..b9d8c5d877 100644
--- a/httpclient-simple/README.md
+++ b/httpclient-simple/README.md
@@ -1,9 +1,10 @@
 =========
-## Articles that are part of the HTTPClient Ebook
+## This module contains articles that are part of the HTTPClient Ebook
 
-# To run the live tests, use the command: mvn clean install -Plive
-# This will start an embedded Jetty server on port 8082 using the Cargo plugin configured in the pom.xml file,
-# for the live Maven profile
+# Running the Tests
+To run the live tests, use the command: mvn clean install -Plive
+This will start an embedded Jetty server on port 8082 using the Cargo plugin configured in the pom.xml file,
+for the live Maven profile
 
 ### Relevant Articles: 
 

From 185d062bdb78e722cfbc3370bc3dac6457cc3a0c Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Tue, 30 Apr 2019 13:20:55 +0300
Subject: [PATCH 119/295] Update README.md

---
 httpclient-simple/README.md | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/httpclient-simple/README.md b/httpclient-simple/README.md
index b9d8c5d877..e3535a133e 100644
--- a/httpclient-simple/README.md
+++ b/httpclient-simple/README.md
@@ -1,13 +1,6 @@
 =========
 ## This module contains articles that are part of the HTTPClient Ebook
 
-# Running the Tests
-To run the live tests, use the command: mvn clean install -Plive
-This will start an embedded Jetty server on port 8082 using the Cargo plugin configured in the pom.xml file,
-for the live Maven profile
-
-### Relevant Articles: 
-
 - [HttpClient 4 – Get the Status Code](http://www.baeldung.com/httpclient-status-code)
 - [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
 - [HttpClient Timeout](http://www.baeldung.com/httpclient-timeout)
@@ -15,3 +8,9 @@ for the live Maven profile
 - [Custom HTTP Header with the HttpClient](http://www.baeldung.com/httpclient-custom-http-header)
 - [HttpClient Basic Authentication](http://www.baeldung.com/httpclient-4-basic-authentication)
 - [Posting with HttpClient](https://www.baeldung.com/httpclient-post-http-request)
+
+
+### Running the Tests
+To run the live tests, use the command: mvn clean install -Plive
+This will start an embedded Jetty server on port 8082 using the Cargo plugin configured in the pom.xml file,
+for the live Maven profile

From c2f42299720cdf36b0b5cf48b74db863bbb9956a Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Tue, 30 Apr 2019 19:43:10 +0300
Subject: [PATCH 120/295] refactor spring-data-jpa

---
 .../boot/config/PersistenceConfiguration.java |  16 +-
 .../daos}/CustomerRepository.java             |   4 +-
 .../{ => daos}/user/PossessionRepository.java |   2 +-
 .../daos}/user/UserRepository.java            |  24 +-
 .../daos}/user/UserRepositoryCustom.java      |   6 +-
 .../daos}/user/UserRepositoryCustomImpl.java  |   6 +-
 .../model => boot/domain}/Customer.java       |   2 +-
 .../com/baeldung/boot/domain/Possession.java  |   1 +
 .../java/com/baeldung/boot/domain/User.java   |  48 +-
 .../baeldung/boot/user/UserRepository.java    |  81 ---
 .../boot/user/UserRepositoryCustom.java       |  10 -
 .../boot/user/UserRepositoryCustomImpl.java   |  43 --
 .../web/controllers}/CustomerController.java  |   6 +-
 .../java/com/baeldung/domain/user/User.java   | 130 -----
 .../PersistenceProductConfiguration.java      |   6 +-
 .../PersistenceUserConfiguration.java         |   7 +-
 .../multipledb/ProductRepository.java         |  11 -
 .../dao/product/ProductRepository.java        |  13 +
 .../{ => dao/user}/PossessionRepository.java  |   6 +-
 .../multipledb/dao/user/UserRepository.java   |   8 +
 .../product/ProductMultipleDB.java}           |  12 +-
 .../user/PossessionMultipleDB.java}           |  10 +-
 .../user/UserMultipleDB.java}                 |  20 +-
 .../src/main/resources/application.properties |   4 -
 .../BatchInsertIntegrationTest.java           |  12 +-
 .../boot/daos/UserRepositoryCommon.java       | 204 +++++--
 .../daos/UserRepositoryIntegrationTest.java   |  12 +-
 .../UserRepositoryTCAutoIntegrationTest.java  |  13 +-
 .../daos/UserRepositoryTCIntegrationTest.java |  14 +-
 .../repositories/UserRepositoryCommon.java    | 544 ------------------
 .../UserRepositoryIntegrationTest.java        |  37 --
 .../UserRepositoryTCAutoIntegrationTest.java  |  42 --
 .../UserRepositoryTCIntegrationTest.java      |  57 --
 .../JpaMultipleDBIntegrationTest.java         |  28 +-
 .../ProductRepositoryIntegrationTest.java     |  42 +-
 35 files changed, 364 insertions(+), 1117 deletions(-)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{batchinserts/repository => boot/daos}/CustomerRepository.java (68%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/{ => daos}/user/PossessionRepository.java (83%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/user/UserRepository.java (92%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/user/UserRepositoryCustom.java (77%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{dao/repositories => boot/daos}/user/UserRepositoryCustomImpl.java (95%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{batchinserts/model => boot/domain}/Customer.java (96%)
 delete mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepository.java
 delete mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustom.java
 delete mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustomImpl.java
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/{batchinserts => boot/web/controllers}/CustomerController.java (88%)
 delete mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/user/User.java
 delete mode 100755 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/ProductRepository.java
 create mode 100755 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/dao/product/ProductRepository.java
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/{ => dao/user}/PossessionRepository.java (50%)
 create mode 100644 persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/dao/user/UserRepository.java
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/{Product.java => model/product/ProductMultipleDB.java} (76%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/{Possession.java => model/user/PossessionMultipleDB.java} (86%)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/{User.java => model/user/UserMultipleDB.java} (73%)
 delete mode 100644 persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryCommon.java
 delete mode 100644 persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryIntegrationTest.java
 delete mode 100644 persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryTCAutoIntegrationTest.java
 delete mode 100644 persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryTCIntegrationTest.java

diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/config/PersistenceConfiguration.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/config/PersistenceConfiguration.java
index 64e3cd8c9a..35a603d9f4 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/config/PersistenceConfiguration.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/config/PersistenceConfiguration.java
@@ -1,28 +1,16 @@
 package com.baeldung.boot.config;
 
-import com.baeldung.boot.daos.impl.ExtendedRepositoryImpl;
 import com.baeldung.boot.services.IBarService;
 import com.baeldung.boot.services.impl.BarSpringDataJpaService;
-import com.google.common.base.Preconditions;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.*;
-import org.springframework.core.env.Environment;
-import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.JpaVendorAdapter;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
-import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import javax.sql.DataSource;
-import java.util.Properties;
-
 @Configuration
 @Profile("!tc")
+@EnableTransactionManagement
+@EnableJpaAuditing
 public class PersistenceConfiguration {
 
     @Bean
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/batchinserts/repository/CustomerRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/CustomerRepository.java
similarity index 68%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/batchinserts/repository/CustomerRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/CustomerRepository.java
index ab0214bade..2f1af6ac55 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/batchinserts/repository/CustomerRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/CustomerRepository.java
@@ -1,8 +1,8 @@
-package com.baeldung.batchinserts.repository;
+package com.baeldung.boot.daos;
 
 import org.springframework.data.repository.CrudRepository;
 
-import com.baeldung.batchinserts.model.Customer;
+import com.baeldung.boot.domain.Customer;
 
 /**
  * JPA CrudRepository interface
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/PossessionRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/user/PossessionRepository.java
similarity index 83%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/PossessionRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/user/PossessionRepository.java
index 63af5ca05d..e102754c18 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/PossessionRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/user/PossessionRepository.java
@@ -1,4 +1,4 @@
-package com.baeldung.boot.user;
+package com.baeldung.boot.daos.user;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/UserRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/user/UserRepository.java
similarity index 92%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/UserRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/user/UserRepository.java
index 1d05a17414..d6a060740d 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/UserRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/user/UserRepository.java
@@ -1,6 +1,5 @@
-package com.baeldung.dao.repositories.user;
+package com.baeldung.boot.daos.user;
 
-import com.baeldung.domain.user.User;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -9,6 +8,8 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import com.baeldung.boot.domain.User;
+
 import java.time.LocalDate;
 import java.util.Collection;
 import java.util.List;
@@ -18,11 +19,11 @@ public interface UserRepository extends JpaRepository<User, Integer> , UserRepos
 
     Stream<User> findAllByName(String name);
 
-    @Query("select u from User u where u.email like '%@gmail.com'")
-    List<User> findUsersWithGmailAddress();
-
     @Query("SELECT u FROM User u WHERE u.status = 1")
     Collection<User> findAllActiveUsers();
+    
+    @Query("select u from User u where u.email like '%@gmail.com'")
+    List<User> findUsersWithGmailAddress();
 
     @Query(value = "SELECT * FROM Users u WHERE u.status = 1", nativeQuery = true)
     Collection<User> findAllActiveUsersNative();
@@ -74,14 +75,14 @@ public interface UserRepository extends JpaRepository<User, Integer> , UserRepos
     @Query(value = "INSERT INTO Users (name, age, email, status, active) VALUES (:name, :age, :email, :status, :active)", nativeQuery = true)
     @Modifying
     void insertUser(@Param("name") String name, @Param("age") Integer age, @Param("email") String email, @Param("status") Integer status, @Param("active") boolean active);
-
+    
     @Modifying
     @Query(value = "UPDATE Users u SET status = ? WHERE u.name = ?", nativeQuery = true)
     int updateUserSetStatusForNameNativePostgres(Integer status, String name);
-
+    
     @Query(value = "SELECT u FROM User u WHERE u.name IN :names")
-	List<User> findUserByNameList(@Param("names") Collection<String> names);
-
+	  List<User> findUserByNameList(@Param("names") Collection<String> names);
+    
     void deleteAllByCreationDateAfter(LocalDate date);
 
     @Modifying(clearAutomatically = true, flushAutomatically = true)
@@ -89,11 +90,10 @@ public interface UserRepository extends JpaRepository<User, Integer> , UserRepos
     void deactivateUsersNotLoggedInSince(@Param("date") LocalDate date);
 
     @Modifying(clearAutomatically = true, flushAutomatically = true)
-    @Query("delete from User u where u.active = false")
+    @Query("delete User u where u.active = false")
     int deleteDeactivatedUsers();
 
     @Modifying(clearAutomatically = true, flushAutomatically = true)
-    @Query(value = "alter table Users add column deleted int(1) not null default 0", nativeQuery = true)
+    @Query(value = "alter table USERS.USERS add column deleted int(1) not null default 0", nativeQuery = true)
     void addDeletedColumn();
-
 }
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/UserRepositoryCustom.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/user/UserRepositoryCustom.java
similarity index 77%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/UserRepositoryCustom.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/user/UserRepositoryCustom.java
index 0f29cd656e..c586b54027 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/UserRepositoryCustom.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/user/UserRepositoryCustom.java
@@ -1,14 +1,14 @@
-package com.baeldung.dao.repositories.user;
+package com.baeldung.boot.daos.user;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Predicate;
 
-import com.baeldung.domain.user.User;
+import com.baeldung.boot.domain.User;
 
 public interface UserRepositoryCustom {
     List<User> findUserByEmails(Set<String> emails);
-
+    
     List<User> findAllUsersByPredicates(Collection<Predicate<User>> predicates);
 }
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/UserRepositoryCustomImpl.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/user/UserRepositoryCustomImpl.java
similarity index 95%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/UserRepositoryCustomImpl.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/user/UserRepositoryCustomImpl.java
index 7b2a7ab123..63a743b6b5 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/UserRepositoryCustomImpl.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/user/UserRepositoryCustomImpl.java
@@ -1,4 +1,4 @@
-package com.baeldung.dao.repositories.user;
+package com.baeldung.boot.daos.user;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -15,7 +15,7 @@ import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import com.baeldung.domain.user.User;
+import com.baeldung.boot.domain.User;
 
 public class UserRepositoryCustomImpl implements UserRepositoryCustom {
 
@@ -42,7 +42,7 @@ public class UserRepositoryCustomImpl implements UserRepositoryCustom {
         return entityManager.createQuery(query)
             .getResultList();
     }
-
+    
     @Override
     public List<User> findAllUsersByPredicates(Collection<java.util.function.Predicate<User>> predicates) {
         List<User> allUsers = entityManager.createQuery("select u from User u", User.class).getResultList();
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/batchinserts/model/Customer.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Customer.java
similarity index 96%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/batchinserts/model/Customer.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Customer.java
index 4d82cf12a2..af88be0be6 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/batchinserts/model/Customer.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Customer.java
@@ -1,4 +1,4 @@
-package com.baeldung.batchinserts.model;
+package com.baeldung.boot.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Possession.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Possession.java
index 44cdce86c0..f13491ad82 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Possession.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/Possession.java
@@ -1,6 +1,7 @@
 package com.baeldung.boot.domain;
 
 import javax.persistence.*;
+import com.baeldung.boot.domain.Possession;
 
 @Entity
 @Table
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/User.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/User.java
index 5c709307ac..cca00e52a2 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/User.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/domain/User.java
@@ -1,7 +1,10 @@
 package com.baeldung.boot.domain;
 
 import javax.persistence.*;
+
+import java.time.LocalDate;
 import java.util.List;
+import java.util.Objects;
 
 @Entity
 @Table(name = "users")
@@ -11,6 +14,9 @@ public class User {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
     private String name;
+    private LocalDate creationDate;
+    private LocalDate lastLoginDate;
+    private boolean active;
     private int age;
     @Column(unique = true, nullable = false)
     private String email;
@@ -22,10 +28,12 @@ public class User {
         super();
     }
 
-    public User(String name, String email, Integer status) {
+    public User(String name,  LocalDate creationDate,String email, Integer status) {
         this.name = name;
+        this.creationDate = creationDate;
         this.email = email;
         this.status = status;
+        this.active = true;
     }
 
     public int getId() {
@@ -67,6 +75,10 @@ public class User {
     public void setAge(final int age) {
         this.age = age;
     }
+    
+    public LocalDate getCreationDate() {
+        return creationDate;
+    }
 
     public List<Possession> getPossessionList() {
         return possessionList;
@@ -82,5 +94,39 @@ public class User {
         builder.append("User [name=").append(name).append(", id=").append(id).append("]");
         return builder.toString();
     }
+    
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        User user = (User) o;
+        return id == user.id &&
+          age == user.age &&
+          Objects.equals(name, user.name) &&
+          Objects.equals(creationDate, user.creationDate) &&
+          Objects.equals(email, user.email) &&
+          Objects.equals(status, user.status);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name, creationDate, age, email, status);
+    }
+
+    public LocalDate getLastLoginDate() {
+        return lastLoginDate;
+    }
+
+    public void setLastLoginDate(LocalDate lastLoginDate) {
+        this.lastLoginDate = lastLoginDate;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
 
 }
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepository.java
deleted file mode 100644
index 1097387e7b..0000000000
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepository.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.baeldung.boot.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import com.baeldung.boot.domain.User;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Stream;
-
-public interface UserRepository extends JpaRepository<User, Integer> , UserRepositoryCustom{
-
-    Stream<User> findAllByName(String name);
-
-    @Query("SELECT u FROM User u WHERE u.status = 1")
-    Collection<User> findAllActiveUsers();
-
-    @Query(value = "SELECT * FROM Users u WHERE u.status = 1", nativeQuery = true)
-    Collection<User> findAllActiveUsersNative();
-
-    @Query("SELECT u FROM User u WHERE u.status = ?1")
-    User findUserByStatus(Integer status);
-
-    @Query(value = "SELECT * FROM Users u WHERE u.status = ?1", nativeQuery = true)
-    User findUserByStatusNative(Integer status);
-
-    @Query("SELECT u FROM User u WHERE u.status = ?1 and u.name = ?2")
-    User findUserByStatusAndName(Integer status, String name);
-
-    @Query("SELECT u FROM User u WHERE u.status = :status and u.name = :name")
-    User findUserByStatusAndNameNamedParams(@Param("status") Integer status, @Param("name") String name);
-
-    @Query(value = "SELECT * FROM Users u WHERE u.status = :status AND u.name = :name", nativeQuery = true)
-    User findUserByStatusAndNameNamedParamsNative(@Param("status") Integer status, @Param("name") String name);
-
-    @Query("SELECT u FROM User u WHERE u.status = :status and u.name = :name")
-    User findUserByUserStatusAndUserName(@Param("status") Integer userStatus, @Param("name") String userName);
-
-    @Query("SELECT u FROM User u WHERE u.name like ?1%")
-    User findUserByNameLike(String name);
-
-    @Query("SELECT u FROM User u WHERE u.name like :name%")
-    User findUserByNameLikeNamedParam(@Param("name") String name);
-
-    @Query(value = "SELECT * FROM users u WHERE u.name LIKE ?1%", nativeQuery = true)
-    User findUserByNameLikeNative(String name);
-
-    @Query(value = "SELECT u FROM User u")
-    List<User> findAllUsers(Sort sort);
-
-    @Query(value = "SELECT u FROM User u ORDER BY id")
-    Page<User> findAllUsersWithPagination(Pageable pageable);
-
-    @Query(value = "SELECT * FROM Users ORDER BY id", countQuery = "SELECT count(*) FROM Users", nativeQuery = true)
-    Page<User> findAllUsersWithPaginationNative(Pageable pageable);
-
-    @Modifying
-    @Query("update User u set u.status = :status where u.name = :name")
-    int updateUserSetStatusForName(@Param("status") Integer status, @Param("name") String name);
-
-    @Modifying
-    @Query(value = "UPDATE Users u SET u.status = ? WHERE u.name = ?", nativeQuery = true)
-    int updateUserSetStatusForNameNative(Integer status, String name);
-
-    @Query(value = "INSERT INTO Users (name, age, email, status) VALUES (:name, :age, :email, :status)", nativeQuery = true)
-    @Modifying
-    void insertUser(@Param("name") String name, @Param("age") Integer age, @Param("status") Integer status, @Param("email") String email);
-
-    @Modifying
-    @Query(value = "UPDATE Users u SET status = ? WHERE u.name = ?", nativeQuery = true)
-    int updateUserSetStatusForNameNativePostgres(Integer status, String name);
-    
-    @Query(value = "SELECT u FROM User u WHERE u.name IN :names")
-	  List<User> findUserByNameList(@Param("names") Collection<String> names);
-}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustom.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustom.java
deleted file mode 100644
index 7690463093..0000000000
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustom.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.baeldung.boot.user;
-
-import java.util.List;
-import java.util.Set;
-
-import com.baeldung.boot.domain.User;
-
-public interface UserRepositoryCustom {
-    List<User> findUserByEmails(Set<String> emails);
-}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustomImpl.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustomImpl.java
deleted file mode 100644
index 8739a1a868..0000000000
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/user/UserRepositoryCustomImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.baeldung.boot.user;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import com.baeldung.boot.domain.User;
-
-public class UserRepositoryCustomImpl implements UserRepositoryCustom {
-
-    @PersistenceContext
-    private EntityManager entityManager;
-
-    @Override
-    public List<User> findUserByEmails(Set<String> emails) {
-        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-        CriteriaQuery<User> query = cb.createQuery(User.class);
-        Root<User> user = query.from(User.class);
-
-        Path<String> emailPath = user.get("email");
-
-        List<Predicate> predicates = new ArrayList<>();
-        for (String email : emails) {
-
-            predicates.add(cb.like(emailPath, email));
-
-        }
-        query.select(user)
-            .where(cb.or(predicates.toArray(new Predicate[predicates.size()])));
-
-        return entityManager.createQuery(query)
-            .getResultList();
-    }
-
-}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/batchinserts/CustomerController.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/web/controllers/CustomerController.java
similarity index 88%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/batchinserts/CustomerController.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/web/controllers/CustomerController.java
index 7623d4d166..69a1e5507e 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/batchinserts/CustomerController.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/web/controllers/CustomerController.java
@@ -1,4 +1,4 @@
-package com.baeldung.batchinserts;
+package com.baeldung.boot.web.controllers;
 
 import java.net.URISyntaxException;
 import java.util.Arrays;
@@ -9,8 +9,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.baeldung.batchinserts.model.Customer;
-import com.baeldung.batchinserts.repository.CustomerRepository;
+import com.baeldung.boot.daos.CustomerRepository;
+import com.baeldung.boot.domain.Customer;
 
 /**
  * A simple controller to test the JPA CrudRepository operations
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/user/User.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/user/User.java
deleted file mode 100644
index 7109271eeb..0000000000
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/user/User.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.baeldung.domain.user;
-
-import javax.persistence.*;
-import java.time.LocalDate;
-import java.util.List;
-import java.util.Objects;
-
-@Entity
-@Table(name = "users")
-public class User {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private int id;
-    private String name;
-    private LocalDate creationDate;
-    private LocalDate lastLoginDate;
-    private boolean active;
-    private int age;
-    @Column(unique = true, nullable = false)
-    private String email;
-    private Integer status;
-    @OneToMany
-    List<Possession> possessionList;
-
-    public User() {
-        super();
-    }
-
-    public User(String name, LocalDate creationDate, String email, Integer status) {
-        this.name = name;
-        this.creationDate = creationDate;
-        this.email = email;
-        this.status = status;
-        this.active = true;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(final int id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    public LocalDate getCreationDate() {
-        return creationDate;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(final String email) {
-        this.email = email;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public void setAge(final int age) {
-        this.age = age;
-    }
-
-    public List<Possession> getPossessionList() {
-        return possessionList;
-    }
-
-    public void setPossessionList(List<Possession> possessionList) {
-        this.possessionList = possessionList;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder builder = new StringBuilder();
-        builder.append("User [name=").append(name).append(", id=").append(id).append("]");
-        return builder.toString();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        User user = (User) o;
-        return id == user.id &&
-          age == user.age &&
-          Objects.equals(name, user.name) &&
-          Objects.equals(creationDate, user.creationDate) &&
-          Objects.equals(email, user.email) &&
-          Objects.equals(status, user.status);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, name, creationDate, age, email, status);
-    }
-
-    public LocalDate getLastLoginDate() {
-        return lastLoginDate;
-    }
-
-    public void setLastLoginDate(LocalDate lastLoginDate) {
-        this.lastLoginDate = lastLoginDate;
-    }
-
-    public boolean isActive() {
-        return active;
-    }
-
-    public void setActive(boolean active) {
-        this.active = active;
-    }
-}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceProductConfiguration.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceProductConfiguration.java
index d79e721e31..bcf2cd84eb 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceProductConfiguration.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceProductConfiguration.java
@@ -17,9 +17,9 @@ import org.springframework.transaction.PlatformTransactionManager;
 import javax.sql.DataSource;
 import java.util.HashMap;
 
-//@Configuration
+@Configuration
 @PropertySource({"classpath:persistence-multiple-db.properties"})
-@EnableJpaRepositories(basePackages = "com.baeldung.multipledb", entityManagerFactoryRef = "productEntityManager", transactionManagerRef = "productTransactionManager")
+@EnableJpaRepositories(basePackages = "com.baeldung.multipledb.dao.product", entityManagerFactoryRef = "productEntityManager", transactionManagerRef = "productTransactionManager")
 @Profile("!tc")
 public class PersistenceProductConfiguration {
     @Autowired
@@ -35,7 +35,7 @@ public class PersistenceProductConfiguration {
     public LocalContainerEntityManagerFactoryBean productEntityManager() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(productDataSource());
-        em.setPackagesToScan("com.baeldung.multipledb");
+        em.setPackagesToScan("com.baeldung.multipledb.model.product");
 
         final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         em.setJpaVendorAdapter(vendorAdapter);
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceUserConfiguration.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceUserConfiguration.java
index 572065314d..6b48455c0c 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceUserConfiguration.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceUserConfiguration.java
@@ -14,9 +14,9 @@ import org.springframework.transaction.PlatformTransactionManager;
 import javax.sql.DataSource;
 import java.util.HashMap;
 
-//@Configuration
+@Configuration
 @PropertySource({"classpath:persistence-multiple-db.properties"})
-@EnableJpaRepositories(basePackages = "com.baeldung.multipledb", entityManagerFactoryRef = "userEntityManager", transactionManagerRef = "userTransactionManager")
+@EnableJpaRepositories(basePackages = "com.baeldung.multipledb.dao.user", entityManagerFactoryRef = "userEntityManager", transactionManagerRef = "userTransactionManager")
 @Profile("!tc")
 public class PersistenceUserConfiguration {
     @Autowired
@@ -31,9 +31,10 @@ public class PersistenceUserConfiguration {
     @Primary
     @Bean
     public LocalContainerEntityManagerFactoryBean userEntityManager() {
+        System.out.println("loading config");
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(userDataSource());
-        em.setPackagesToScan("com.baeldung.multipledb");
+        em.setPackagesToScan("com.baeldung.multipledb.model.user");
 
         final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         em.setJpaVendorAdapter(vendorAdapter);
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/ProductRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/ProductRepository.java
deleted file mode 100755
index b82b0989de..0000000000
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/ProductRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.baeldung.multipledb;
-
-import java.util.List;
-
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-public interface ProductRepository extends PagingAndSortingRepository<Product, Integer> {
-
-    List<Product> findAllByPrice(double price, Pageable pageable);
-}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/dao/product/ProductRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/dao/product/ProductRepository.java
new file mode 100755
index 0000000000..022099eed0
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/dao/product/ProductRepository.java
@@ -0,0 +1,13 @@
+package com.baeldung.multipledb.dao.product;
+
+import java.util.List;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import com.baeldung.multipledb.model.product.ProductMultipleDB;
+
+public interface ProductRepository extends PagingAndSortingRepository<ProductMultipleDB, Integer> {
+
+    List<ProductMultipleDB> findAllByPrice(double price, Pageable pageable);
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PossessionRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/dao/user/PossessionRepository.java
similarity index 50%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PossessionRepository.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/dao/user/PossessionRepository.java
index 104a0ca6b5..ae37fde20d 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PossessionRepository.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/dao/user/PossessionRepository.java
@@ -1,9 +1,9 @@
-package com.baeldung.multipledb;
+package com.baeldung.multipledb.dao.user;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.baeldung.boot.domain.Possession;
+import com.baeldung.multipledb.model.user.PossessionMultipleDB;
 
-public interface PossessionRepository extends JpaRepository<Possession, Long> {
+public interface PossessionRepository extends JpaRepository<PossessionMultipleDB, Long> {
 
 }
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/dao/user/UserRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/dao/user/UserRepository.java
new file mode 100644
index 0000000000..267a61a93f
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/dao/user/UserRepository.java
@@ -0,0 +1,8 @@
+package com.baeldung.multipledb.dao.user;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.baeldung.multipledb.model.user.UserMultipleDB;
+
+public interface UserRepository extends JpaRepository<UserMultipleDB, Integer> {
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/Product.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/product/ProductMultipleDB.java
similarity index 76%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/Product.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/product/ProductMultipleDB.java
index 1edbd924a3..8bdff340ac 100755
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/Product.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/product/ProductMultipleDB.java
@@ -1,4 +1,4 @@
-package com.baeldung.multipledb;
+package com.baeldung.multipledb.model.product;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -6,7 +6,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(schema = "products")
-public class Product {
+public class ProductMultipleDB {
 
     @Id
     private int id;
@@ -15,19 +15,19 @@ public class Product {
 
     private double price;
 
-    public Product() {
+    public ProductMultipleDB() {
         super();
     }
 
-    private Product(int id, String name, double price) {
+    private ProductMultipleDB(int id, String name, double price) {
         super();
         this.id = id;
         this.name = name;
         this.price = price;
     }
 
-    public static Product from(int id, String name, double price) {
-        return new Product(id, name, price);
+    public static ProductMultipleDB from(int id, String name, double price) {
+        return new ProductMultipleDB(id, name, price);
     }
 
     public int getId() {
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/Possession.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/user/PossessionMultipleDB.java
similarity index 86%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/Possession.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/user/PossessionMultipleDB.java
index 0281184dec..a6a3c88bd0 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/Possession.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/user/PossessionMultipleDB.java
@@ -1,10 +1,10 @@
-package com.baeldung.multipledb;
+package com.baeldung.multipledb.model.user;
 
 import javax.persistence.*;
 
 @Entity
 @Table
-public class Possession {
+public class PossessionMultipleDB {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -12,11 +12,11 @@ public class Possession {
 
     private String name;
 
-    public Possession() {
+    public PossessionMultipleDB() {
         super();
     }
 
-    public Possession(final String name) {
+    public PossessionMultipleDB(final String name) {
         super();
 
         this.name = name;
@@ -58,7 +58,7 @@ public class Possession {
         if (getClass() != obj.getClass()) {
             return false;
         }
-        final Possession other = (Possession) obj;
+        final PossessionMultipleDB other = (PossessionMultipleDB) obj;
         if (id != other.id) {
             return false;
         }
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/User.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/user/UserMultipleDB.java
similarity index 73%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/User.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/user/UserMultipleDB.java
index e173794d74..c7cd07f7a1 100644
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/User.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/user/UserMultipleDB.java
@@ -1,11 +1,12 @@
-package com.baeldung.multipledb;
+package com.baeldung.multipledb.model.user;
 
 import javax.persistence.*;
+
 import java.util.List;
 
 @Entity
 @Table(name = "users")
-public class User {
+public class UserMultipleDB {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -15,12 +16,15 @@ public class User {
     @Column(unique = true, nullable = false)
     private String email;
     private Integer status;
+    
+    @OneToMany
+    List<PossessionMultipleDB> possessionList;
   
-    public User() {
+    public UserMultipleDB() {
         super();
     }
 
-    public User(String name, String email, Integer status) {
+    public UserMultipleDB(String name, String email, Integer status) {
         this.name = name;
         this.email = email;
         this.status = status;
@@ -66,6 +70,14 @@ public class User {
         this.age = age;
     }
 
+    public List<PossessionMultipleDB> getPossessionList() {
+        return possessionList;
+    }
+
+    public void setPossessionList(List<PossessionMultipleDB> possessionList) {
+        this.possessionList = possessionList;
+    }
+
     @Override
     public String toString() {
         final StringBuilder builder = new StringBuilder();
diff --git a/persistence-modules/spring-data-jpa/src/main/resources/application.properties b/persistence-modules/spring-data-jpa/src/main/resources/application.properties
index 4afa7155d6..f127dd5e50 100644
--- a/persistence-modules/spring-data-jpa/src/main/resources/application.properties
+++ b/persistence-modules/spring-data-jpa/src/main/resources/application.properties
@@ -1,9 +1,5 @@
 spring.main.allow-bean-definition-overriding=true
 
-# envers.X
-#spring.jpa.properties.hibernate.hbm2ddl.import_files=import_entities.sql
-spring.datasource.data=classpath:import_entities.sql
-
 spring.jpa.properties.hibernate.jdbc.batch_size=4
 spring.jpa.properties.hibernate.order_inserts=true
 spring.jpa.properties.hibernate.order_updates=true
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/batchinserts/BatchInsertIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/batchinserts/BatchInsertIntegrationTest.java
index f60e0d21bf..7ddf36d3f0 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/batchinserts/BatchInsertIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/batchinserts/BatchInsertIntegrationTest.java
@@ -9,21 +9,17 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import com.baeldung.batchinserts.CustomerController;
-import com.baeldung.batchinserts.repository.CustomerRepository;
-import com.baeldung.config.PersistenceConfiguration;
-import com.baeldung.config.PersistenceProductConfiguration;
-import com.baeldung.config.PersistenceUserConfiguration;
+import com.baeldung.boot.Application;
+import com.baeldung.boot.daos.CustomerRepository;
+import com.baeldung.boot.web.controllers.CustomerController;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes=Application.class)
 @AutoConfigureMockMvc
-@ContextConfiguration(classes = { PersistenceConfiguration.class, PersistenceProductConfiguration.class, PersistenceUserConfiguration.class })
 public class BatchInsertIntegrationTest {
 
     @Autowired
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryCommon.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryCommon.java
index e101d35de1..4aeeaf5209 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryCommon.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryCommon.java
@@ -1,8 +1,5 @@
 package com.baeldung.boot.daos;
 
-import com.baeldung.boot.domain.User;
-import com.baeldung.boot.user.UserRepository;
-
 import org.junit.After;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,10 +10,18 @@ import org.springframework.data.jpa.domain.JpaSort;
 import org.springframework.data.mapping.PropertyReferenceException;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.baeldung.boot.daos.user.UserRepository;
+import com.baeldung.boot.domain.User;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.time.LocalDate;
 import java.util.*;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.*;
 
 class UserRepositoryCommon {
 
@@ -33,6 +38,8 @@ class UserRepositoryCommon {
 
     @Autowired
     protected UserRepository userRepository;
+    @Autowired
+    private EntityManager entityManager;
 
     @Test
     @Transactional
@@ -255,9 +262,9 @@ class UserRepositoryCommon {
 
     @Test
     public void givenUsersInDB_WhenFindAllWithSortByName_ThenReturnUsersSorted() {
-        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
 
         List<User> usersSortByName = userRepository.findAll(new Sort(Sort.Direction.ASC, "name"));
 
@@ -267,9 +274,9 @@ class UserRepositoryCommon {
 
     @Test(expected = PropertyReferenceException.class)
     public void givenUsersInDB_WhenFindAllSortWithFunction_ThenThrowException() {
-        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
 
         userRepository.findAll(new Sort(Sort.Direction.ASC, "name"));
 
@@ -281,9 +288,9 @@ class UserRepositoryCommon {
 
     @Test
     public void givenUsersInDB_WhenFindAllSortWithFunctionQueryAnnotationJPQL_ThenReturnUsersSorted() {
-        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
 
         userRepository.findAllUsers(new Sort("name"));
 
@@ -295,12 +302,12 @@ class UserRepositoryCommon {
 
     @Test
     public void givenUsersInDB_WhenFindAllWithPageRequestQueryAnnotationJPQL_ThenReturnPageOfUsers() {
-        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", USER_EMAIL4, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE2", USER_EMAIL5, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", USER_EMAIL6, INACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL4, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE2", LocalDate.now(), USER_EMAIL5, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL6, INACTIVE_STATUS));
 
         Page<User> usersPage = userRepository.findAllUsersWithPagination(new PageRequest(1, 3));
 
@@ -311,27 +318,27 @@ class UserRepositoryCommon {
 
     @Test
     public void givenUsersInDB_WhenFindAllWithPageRequestQueryAnnotationNative_ThenReturnPageOfUsers() {
-        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", USER_EMAIL4, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE2", USER_EMAIL5, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", USER_EMAIL6, INACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL4, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE2", LocalDate.now(), USER_EMAIL5, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL6, INACTIVE_STATUS));
 
         Page<User> usersSortByNameLength = userRepository.findAllUsersWithPaginationNative(new PageRequest(1, 3));
 
         assertThat(usersSortByNameLength.getContent()
           .get(0)
-          .getName()).isEqualTo("SAMPLE1");
+          .getName()).isEqualTo(USER_NAME_PETER);
     }
 
     @Test
     @Transactional
     public void givenUsersInDB_WhenUpdateStatusForNameModifyingQueryAnnotationJPQL_ThenModifyMatchingUsers() {
-        userRepository.save(new User("SAMPLE", USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", USER_EMAIL3, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", USER_EMAIL4, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL4, ACTIVE_STATUS));
 
         int updatedUsersSize = userRepository.updateUserSetStatusForName(INACTIVE_STATUS, "SAMPLE");
 
@@ -386,8 +393,8 @@ class UserRepositoryCommon {
     @Test
     @Transactional
     public void whenInsertedWithQuery_ThenUserIsPersisted() {
-        userRepository.insertUser(USER_NAME_ADAM, 1, ACTIVE_STATUS, USER_EMAIL);
-        userRepository.insertUser(USER_NAME_PETER, 1, ACTIVE_STATUS, USER_EMAIL2);
+        userRepository.insertUser(USER_NAME_ADAM, 1, USER_EMAIL, ACTIVE_STATUS, true);
+        userRepository.insertUser(USER_NAME_PETER, 1, USER_EMAIL2, ACTIVE_STATUS, true);
 
         User userAdam = userRepository.findUserByNameLike(USER_NAME_ADAM);
         User userPeter = userRepository.findUserByNameLike(USER_NAME_PETER);
@@ -397,7 +404,140 @@ class UserRepositoryCommon {
         assertThat(userPeter).isNotNull();
         assertThat(userPeter.getEmail()).isEqualTo(USER_EMAIL2);
     }
-    
+
+
+    @Test
+    @Transactional
+    public void givenTwoUsers_whenFindByNameUsr01_ThenUserUsr01() {
+        User usr01 = new User("usr01", LocalDate.now(), "usr01@baeldung.com", 1);
+        User usr02 = new User("usr02", LocalDate.now(), "usr02@baeldung.com", 1);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        try (Stream<User> users = userRepository.findAllByName("usr01")) {
+            assertTrue(users.allMatch(usr -> usr.equals(usr01)));
+        }
+    }
+
+    @Test
+    @Transactional
+    public void givenTwoUsers_whenFindByNameUsr00_ThenNoUsers() {
+        User usr01 = new User("usr01", LocalDate.now(), "usr01@baeldung.com", 1);
+        User usr02 = new User("usr02", LocalDate.now(), "usr02@baeldung.com", 1);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        try (Stream<User> users = userRepository.findAllByName("usr00")) {
+            assertEquals(0, users.count());
+        }
+    }
+
+    @Test
+    public void givenTwoUsers_whenFindUsersWithGmailAddress_ThenUserUsr02() {
+        User usr01 = new User("usr01", LocalDate.now(), "usr01@baeldung.com", 1);
+        User usr02 = new User("usr02", LocalDate.now(), "usr02@gmail.com", 1);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        List<User> users = userRepository.findUsersWithGmailAddress();
+        assertEquals(1, users.size());
+        assertEquals(usr02, users.get(0));
+    }
+
+    @Test
+    @Transactional
+    public void givenTwoUsers_whenDeleteAllByCreationDateAfter_ThenOneUserRemains() {
+        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
+        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.com", 1);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        userRepository.deleteAllByCreationDateAfter(LocalDate.of(2018, 5, 1));
+
+        List<User> users = userRepository.findAll();
+
+        assertEquals(1, users.size());
+        assertEquals(usr01, users.get(0));
+    }
+
+    @Test
+    public void givenTwoUsers_whenFindAllUsersByPredicates_ThenUserUsr01() {
+        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
+        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.org", 1);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        List<Predicate<User>> predicates = new ArrayList<>();
+        predicates.add(usr -> usr.getCreationDate().isAfter(LocalDate.of(2017, 12, 31)));
+        predicates.add(usr -> usr.getEmail().endsWith(".com"));
+
+        List<User> users = userRepository.findAllUsersByPredicates(predicates);
+
+        assertEquals(1, users.size());
+        assertEquals(usr01, users.get(0));
+    }
+
+    @Test
+    @Transactional
+    public void givenTwoUsers_whenDeactivateUsersNotLoggedInSince_ThenUserUsr02Deactivated() {
+        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
+        usr01.setLastLoginDate(LocalDate.now());
+        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.org", 1);
+        usr02.setLastLoginDate(LocalDate.of(2018, 7, 20));
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        userRepository.deactivateUsersNotLoggedInSince(LocalDate.of(2018, 8, 1));
+
+        List<User> users = userRepository.findAllUsers(Sort.by(Sort.Order.asc("name")));
+        assertTrue(users.get(0).isActive());
+        assertFalse(users.get(1).isActive());
+    }
+
+    @Test
+    @Transactional
+    public void givenTwoUsers_whenDeleteDeactivatedUsers_ThenUserUsr02Deleted() {
+        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
+        usr01.setLastLoginDate(LocalDate.now());
+        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.com", 0);
+        usr02.setLastLoginDate(LocalDate.of(2018, 7, 20));
+        usr02.setActive(false);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        int deletedUsersCount = userRepository.deleteDeactivatedUsers();
+
+        List<User> users = userRepository.findAll();
+        assertEquals(1, users.size());
+        assertEquals(usr01, users.get(0));
+        assertEquals(1, deletedUsersCount);
+    }
+
+    @Test
+    @Transactional
+    public void givenTwoUsers_whenAddDeletedColumn_ThenUsersHaveDeletedColumn() {
+        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
+        usr01.setLastLoginDate(LocalDate.now());
+        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.org", 1);
+        usr02.setLastLoginDate(LocalDate.of(2018, 7, 20));
+        usr02.setActive(false);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        userRepository.addDeletedColumn();
+
+        Query nativeQuery = entityManager.createNativeQuery("select deleted from USERS where NAME = 'usr01'");
+        assertEquals(0, nativeQuery.getResultList().get(0));
+    }
+
     @After
     public void cleanUp() {
         userRepository.deleteAll();
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryIntegrationTest.java
index ac8fdf8ea2..1b1d264574 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryIntegrationTest.java
@@ -1,9 +1,7 @@
 package com.baeldung.boot.daos;
 
 import com.baeldung.boot.Application;
-import com.baeldung.boot.config.PersistenceConfiguration;
 import com.baeldung.boot.domain.User;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -11,6 +9,8 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -24,10 +24,10 @@ public class UserRepositoryIntegrationTest extends UserRepositoryCommon {
     @Test
     @Transactional
     public void givenUsersInDBWhenUpdateStatusForNameModifyingQueryAnnotationNativeThenModifyMatchingUsers() {
-        userRepository.save(new User("SAMPLE", USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", USER_EMAIL3, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", USER_EMAIL4, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL4, ACTIVE_STATUS));
         userRepository.flush();
 
         int updatedUsersSize = userRepository.updateUserSetStatusForNameNative(INACTIVE_STATUS, "SAMPLE");
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCAutoIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCAutoIntegrationTest.java
index 599546fdbf..2f3e9c9032 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCAutoIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCAutoIntegrationTest.java
@@ -1,5 +1,6 @@
 package com.baeldung.boot.daos;
 
+import com.baeldung.boot.Application;
 import com.baeldung.boot.domain.User;
 import com.baeldung.util.BaeldungPostgresqlContainer;
 import org.junit.ClassRule;
@@ -11,13 +12,15 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 import org.testcontainers.containers.PostgreSQLContainer;
 
+import java.time.LocalDate;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Created by adam.
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes = Application.class)
 @ActiveProfiles({"tc", "tc-auto"})
 public class UserRepositoryTCAutoIntegrationTest extends UserRepositoryCommon {
 
@@ -27,10 +30,10 @@ public class UserRepositoryTCAutoIntegrationTest extends UserRepositoryCommon {
     @Test
     @Transactional
     public void givenUsersInDB_WhenUpdateStatusForNameModifyingQueryAnnotationNativePostgres_ThenModifyMatchingUsers() {
-        userRepository.save(new User("SAMPLE", USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", USER_EMAIL3, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", USER_EMAIL4, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL4, ACTIVE_STATUS));
         userRepository.flush();
 
         int updatedUsersSize = userRepository.updateUserSetStatusForNameNativePostgres(INACTIVE_STATUS, "SAMPLE");
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCIntegrationTest.java
index 2c5f7bcfa6..afdf60cc81 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/daos/UserRepositoryTCIntegrationTest.java
@@ -1,5 +1,7 @@
 package com.baeldung.boot.daos;
 
+import com.baeldung.boot.Application;
+import com.baeldung.boot.domain.User;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -13,12 +15,12 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 import org.testcontainers.containers.PostgreSQLContainer;
 
-import com.baeldung.boot.domain.User;
+import java.time.LocalDate;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes = Application.class)
 @ActiveProfiles("tc")
 @ContextConfiguration(initializers = {UserRepositoryTCIntegrationTest.Initializer.class})
 public class UserRepositoryTCIntegrationTest extends UserRepositoryCommon {
@@ -32,10 +34,10 @@ public class UserRepositoryTCIntegrationTest extends UserRepositoryCommon {
     @Test
     @Transactional
     public void givenUsersInDB_WhenUpdateStatusForNameModifyingQueryAnnotationNative_ThenModifyMatchingUsers() {
-        userRepository.save(new User("SAMPLE", USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", USER_EMAIL3, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", USER_EMAIL4, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL4, ACTIVE_STATUS));
         userRepository.flush();
 
         int updatedUsersSize = userRepository.updateUserSetStatusForNameNativePostgres(INACTIVE_STATUS, "SAMPLE");
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryCommon.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryCommon.java
deleted file mode 100644
index abd758cec2..0000000000
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryCommon.java
+++ /dev/null
@@ -1,544 +0,0 @@
-package com.baeldung.dao.repositories;
-
-import com.baeldung.dao.repositories.user.UserRepository;
-import com.baeldung.domain.user.User;
-import org.junit.After;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.JpaSort;
-import org.springframework.data.mapping.PropertyReferenceException;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import java.time.LocalDate;
-import java.util.*;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
-
-class UserRepositoryCommon {
-
-    final String USER_EMAIL = "email@example.com";
-    final String USER_EMAIL2 = "email2@example.com";
-    final String USER_EMAIL3 = "email3@example.com";
-    final String USER_EMAIL4 = "email4@example.com";
-    final Integer INACTIVE_STATUS = 0;
-    final Integer ACTIVE_STATUS = 1;
-    final String USER_EMAIL5 = "email5@example.com";
-    final String USER_EMAIL6 = "email6@example.com";
-    final String USER_NAME_ADAM = "Adam";
-    final String USER_NAME_PETER = "Peter";
-
-    @Autowired
-    protected UserRepository userRepository;
-    @Autowired
-    private EntityManager entityManager;
-
-    @Test
-    @Transactional
-    public void givenUsersWithSameNameInDB_WhenFindAllByName_ThenReturnStreamOfUsers() {
-        User user1 = new User();
-        user1.setName(USER_NAME_ADAM);
-        user1.setEmail(USER_EMAIL);
-        userRepository.save(user1);
-
-        User user2 = new User();
-        user2.setName(USER_NAME_ADAM);
-        user2.setEmail(USER_EMAIL2);
-        userRepository.save(user2);
-
-        User user3 = new User();
-        user3.setName(USER_NAME_ADAM);
-        user3.setEmail(USER_EMAIL3);
-        userRepository.save(user3);
-
-        User user4 = new User();
-        user4.setName("SAMPLE");
-        user4.setEmail(USER_EMAIL4);
-        userRepository.save(user4);
-
-        try (Stream<User> foundUsersStream = userRepository.findAllByName(USER_NAME_ADAM)) {
-            assertThat(foundUsersStream.count()).isEqualTo(3l);
-        }
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindAllWithQueryAnnotation_ThenReturnCollectionWithActiveUsers() {
-        User user1 = new User();
-        user1.setName(USER_NAME_ADAM);
-        user1.setEmail(USER_EMAIL);
-        user1.setStatus(ACTIVE_STATUS);
-        userRepository.save(user1);
-
-        User user2 = new User();
-        user2.setName(USER_NAME_ADAM);
-        user2.setEmail(USER_EMAIL2);
-        user2.setStatus(ACTIVE_STATUS);
-        userRepository.save(user2);
-
-        User user3 = new User();
-        user3.setName(USER_NAME_ADAM);
-        user3.setEmail(USER_EMAIL3);
-        user3.setStatus(INACTIVE_STATUS);
-        userRepository.save(user3);
-
-        Collection<User> allActiveUsers = userRepository.findAllActiveUsers();
-
-        assertThat(allActiveUsers.size()).isEqualTo(2);
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindAllWithQueryAnnotationNative_ThenReturnCollectionWithActiveUsers() {
-        User user1 = new User();
-        user1.setName(USER_NAME_ADAM);
-        user1.setEmail(USER_EMAIL);
-        user1.setStatus(ACTIVE_STATUS);
-        userRepository.save(user1);
-
-        User user2 = new User();
-        user2.setName(USER_NAME_ADAM);
-        user2.setEmail(USER_EMAIL2);
-        user2.setStatus(ACTIVE_STATUS);
-        userRepository.save(user2);
-
-        User user3 = new User();
-        user3.setName(USER_NAME_ADAM);
-        user3.setEmail(USER_EMAIL3);
-        user3.setStatus(INACTIVE_STATUS);
-        userRepository.save(user3);
-
-        Collection<User> allActiveUsers = userRepository.findAllActiveUsersNative();
-
-        assertThat(allActiveUsers.size()).isEqualTo(2);
-    }
-
-    @Test
-    public void givenUserInDB_WhenFindUserByStatusWithQueryAnnotation_ThenReturnActiveUser() {
-        User user = new User();
-        user.setName(USER_NAME_ADAM);
-        user.setEmail(USER_EMAIL);
-        user.setStatus(ACTIVE_STATUS);
-        userRepository.save(user);
-
-        User userByStatus = userRepository.findUserByStatus(ACTIVE_STATUS);
-
-        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
-    }
-
-    @Test
-    public void givenUserInDB_WhenFindUserByStatusWithQueryAnnotationNative_ThenReturnActiveUser() {
-        User user = new User();
-        user.setName(USER_NAME_ADAM);
-        user.setEmail(USER_EMAIL);
-        user.setStatus(ACTIVE_STATUS);
-        userRepository.save(user);
-
-        User userByStatus = userRepository.findUserByStatusNative(ACTIVE_STATUS);
-
-        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindUserByStatusAndNameWithQueryAnnotationIndexedParams_ThenReturnOneUser() {
-        User user = new User();
-        user.setName(USER_NAME_ADAM);
-        user.setEmail(USER_EMAIL);
-        user.setStatus(ACTIVE_STATUS);
-        userRepository.save(user);
-
-        User user2 = new User();
-        user2.setName(USER_NAME_PETER);
-        user2.setEmail(USER_EMAIL2);
-        user2.setStatus(ACTIVE_STATUS);
-        userRepository.save(user2);
-
-        User userByStatus = userRepository.findUserByStatusAndName(ACTIVE_STATUS, USER_NAME_ADAM);
-
-        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindUserByStatusAndNameWithQueryAnnotationNamedParams_ThenReturnOneUser() {
-        User user = new User();
-        user.setName(USER_NAME_ADAM);
-        user.setEmail(USER_EMAIL);
-        user.setStatus(ACTIVE_STATUS);
-        userRepository.save(user);
-
-        User user2 = new User();
-        user2.setName(USER_NAME_PETER);
-        user2.setEmail(USER_EMAIL2);
-        user2.setStatus(ACTIVE_STATUS);
-        userRepository.save(user2);
-
-        User userByStatus = userRepository.findUserByStatusAndNameNamedParams(ACTIVE_STATUS, USER_NAME_ADAM);
-
-        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindUserByStatusAndNameWithQueryAnnotationNativeNamedParams_ThenReturnOneUser() {
-        User user = new User();
-        user.setName(USER_NAME_ADAM);
-        user.setEmail(USER_EMAIL);
-        user.setStatus(ACTIVE_STATUS);
-        userRepository.save(user);
-
-        User user2 = new User();
-        user2.setName(USER_NAME_PETER);
-        user2.setEmail(USER_EMAIL2);
-        user2.setStatus(ACTIVE_STATUS);
-        userRepository.save(user2);
-
-        User userByStatus = userRepository.findUserByStatusAndNameNamedParamsNative(ACTIVE_STATUS, USER_NAME_ADAM);
-
-        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindUserByStatusAndNameWithQueryAnnotationNamedParamsCustomNames_ThenReturnOneUser() {
-        User user = new User();
-        user.setName(USER_NAME_ADAM);
-        user.setEmail(USER_EMAIL);
-        user.setStatus(ACTIVE_STATUS);
-        userRepository.save(user);
-
-        User user2 = new User();
-        user2.setName(USER_NAME_PETER);
-        user2.setEmail(USER_EMAIL2);
-        user2.setStatus(ACTIVE_STATUS);
-        userRepository.save(user2);
-
-        User userByStatus = userRepository.findUserByUserStatusAndUserName(ACTIVE_STATUS, USER_NAME_ADAM);
-
-        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindUserByNameLikeWithQueryAnnotationIndexedParams_ThenReturnUser() {
-        User user = new User();
-        user.setName(USER_NAME_ADAM);
-        user.setEmail(USER_EMAIL);
-        user.setStatus(ACTIVE_STATUS);
-        userRepository.save(user);
-
-        User userByStatus = userRepository.findUserByNameLike("Ad");
-
-        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindUserByNameLikeWithQueryAnnotationNamedParams_ThenReturnUser() {
-        User user = new User();
-        user.setName(USER_NAME_ADAM);
-        user.setEmail(USER_EMAIL);
-        user.setStatus(ACTIVE_STATUS);
-        userRepository.save(user);
-
-        User userByStatus = userRepository.findUserByNameLikeNamedParam("Ad");
-
-        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindUserByNameLikeWithQueryAnnotationNative_ThenReturnUser() {
-        User user = new User();
-        user.setName(USER_NAME_ADAM);
-        user.setEmail(USER_EMAIL);
-        user.setStatus(ACTIVE_STATUS);
-        userRepository.save(user);
-
-        User userByStatus = userRepository.findUserByNameLikeNative("Ad");
-
-        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindAllWithSortByName_ThenReturnUsersSorted() {
-        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
-
-        List<User> usersSortByName = userRepository.findAll(new Sort(Sort.Direction.ASC, "name"));
-
-        assertThat(usersSortByName.get(0)
-          .getName()).isEqualTo(USER_NAME_ADAM);
-    }
-
-    @Test(expected = PropertyReferenceException.class)
-    public void givenUsersInDB_WhenFindAllSortWithFunction_ThenThrowException() {
-        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
-
-        userRepository.findAll(new Sort(Sort.Direction.ASC, "name"));
-
-        List<User> usersSortByNameLength = userRepository.findAll(new Sort("LENGTH(name)"));
-
-        assertThat(usersSortByNameLength.get(0)
-          .getName()).isEqualTo(USER_NAME_ADAM);
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindAllSortWithFunctionQueryAnnotationJPQL_ThenReturnUsersSorted() {
-        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
-
-        userRepository.findAllUsers(new Sort("name"));
-
-        List<User> usersSortByNameLength = userRepository.findAllUsers(JpaSort.unsafe("LENGTH(name)"));
-
-        assertThat(usersSortByNameLength.get(0)
-          .getName()).isEqualTo(USER_NAME_ADAM);
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindAllWithPageRequestQueryAnnotationJPQL_ThenReturnPageOfUsers() {
-        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL4, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE2", LocalDate.now(), USER_EMAIL5, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL6, INACTIVE_STATUS));
-
-        Page<User> usersPage = userRepository.findAllUsersWithPagination(new PageRequest(1, 3));
-
-        assertThat(usersPage.getContent()
-          .get(0)
-          .getName()).isEqualTo("SAMPLE1");
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindAllWithPageRequestQueryAnnotationNative_ThenReturnPageOfUsers() {
-        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL4, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE2", LocalDate.now(), USER_EMAIL5, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL6, INACTIVE_STATUS));
-
-        Page<User> usersSortByNameLength = userRepository.findAllUsersWithPaginationNative(new PageRequest(1, 3));
-
-        assertThat(usersSortByNameLength.getContent()
-          .get(0)
-          .getName()).isEqualTo(USER_NAME_PETER);
-    }
-
-    @Test
-    @Transactional
-    public void givenUsersInDB_WhenUpdateStatusForNameModifyingQueryAnnotationJPQL_ThenModifyMatchingUsers() {
-        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL4, ACTIVE_STATUS));
-
-        int updatedUsersSize = userRepository.updateUserSetStatusForName(INACTIVE_STATUS, "SAMPLE");
-
-        assertThat(updatedUsersSize).isEqualTo(2);
-    }
-
-    @Test
-    public void givenUsersInDB_WhenFindByEmailsWithDynamicQuery_ThenReturnCollection() {
-
-        User user1 = new User();
-        user1.setEmail(USER_EMAIL);
-        userRepository.save(user1);
-
-        User user2 = new User();
-        user2.setEmail(USER_EMAIL2);
-        userRepository.save(user2);
-
-        User user3 = new User();
-        user3.setEmail(USER_EMAIL3);
-        userRepository.save(user3);
-
-        Set<String> emails = new HashSet<>();
-        emails.add(USER_EMAIL2);
-        emails.add(USER_EMAIL3);
-
-        Collection<User> usersWithEmails = userRepository.findUserByEmails(emails);
-
-        assertThat(usersWithEmails.size()).isEqualTo(2);
-    }
-
-    @Test
-    public void givenUsersInDBWhenFindByNameListReturnCollection() {
-
-        User user1 = new User();
-        user1.setName(USER_NAME_ADAM);
-        user1.setEmail(USER_EMAIL);
-        userRepository.save(user1);
-
-        User user2 = new User();
-        user2.setName(USER_NAME_PETER);
-        user2.setEmail(USER_EMAIL2);
-        userRepository.save(user2);
-
-        List<String> names = Arrays.asList(USER_NAME_ADAM, USER_NAME_PETER);
-
-        List<User> usersWithNames = userRepository.findUserByNameList(names);
-
-        assertThat(usersWithNames.size()).isEqualTo(2);
-    }
-
-
-    @Test
-    @Transactional
-    public void whenInsertedWithQuery_ThenUserIsPersisted() {
-        userRepository.insertUser(USER_NAME_ADAM, 1, USER_EMAIL, ACTIVE_STATUS, true);
-        userRepository.insertUser(USER_NAME_PETER, 1, USER_EMAIL2, ACTIVE_STATUS, true);
-
-        User userAdam = userRepository.findUserByNameLike(USER_NAME_ADAM);
-        User userPeter = userRepository.findUserByNameLike(USER_NAME_PETER);
-
-        assertThat(userAdam).isNotNull();
-        assertThat(userAdam.getEmail()).isEqualTo(USER_EMAIL);
-        assertThat(userPeter).isNotNull();
-        assertThat(userPeter.getEmail()).isEqualTo(USER_EMAIL2);
-    }
-
-
-    @Test
-    @Transactional
-    public void givenTwoUsers_whenFindByNameUsr01_ThenUserUsr01() {
-        User usr01 = new User("usr01", LocalDate.now(), "usr01@baeldung.com", 1);
-        User usr02 = new User("usr02", LocalDate.now(), "usr02@baeldung.com", 1);
-
-        userRepository.save(usr01);
-        userRepository.save(usr02);
-
-        try (Stream<User> users = userRepository.findAllByName("usr01")) {
-            assertTrue(users.allMatch(usr -> usr.equals(usr01)));
-        }
-    }
-
-    @Test
-    @Transactional
-    public void givenTwoUsers_whenFindByNameUsr00_ThenNoUsers() {
-        User usr01 = new User("usr01", LocalDate.now(), "usr01@baeldung.com", 1);
-        User usr02 = new User("usr02", LocalDate.now(), "usr02@baeldung.com", 1);
-
-        userRepository.save(usr01);
-        userRepository.save(usr02);
-
-        try (Stream<User> users = userRepository.findAllByName("usr00")) {
-            assertEquals(0, users.count());
-        }
-    }
-
-    @Test
-    public void givenTwoUsers_whenFindUsersWithGmailAddress_ThenUserUsr02() {
-        User usr01 = new User("usr01", LocalDate.now(), "usr01@baeldung.com", 1);
-        User usr02 = new User("usr02", LocalDate.now(), "usr02@gmail.com", 1);
-
-        userRepository.save(usr01);
-        userRepository.save(usr02);
-
-        List<User> users = userRepository.findUsersWithGmailAddress();
-        assertEquals(1, users.size());
-        assertEquals(usr02, users.get(0));
-    }
-
-    @Test
-    @Transactional
-    public void givenTwoUsers_whenDeleteAllByCreationDateAfter_ThenOneUserRemains() {
-        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
-        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.com", 1);
-
-        userRepository.save(usr01);
-        userRepository.save(usr02);
-
-        userRepository.deleteAllByCreationDateAfter(LocalDate.of(2018, 5, 1));
-
-        List<User> users = userRepository.findAll();
-
-        assertEquals(1, users.size());
-        assertEquals(usr01, users.get(0));
-    }
-
-    @Test
-    public void givenTwoUsers_whenFindAllUsersByPredicates_ThenUserUsr01() {
-        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
-        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.org", 1);
-
-        userRepository.save(usr01);
-        userRepository.save(usr02);
-
-        List<Predicate<User>> predicates = new ArrayList<>();
-        predicates.add(usr -> usr.getCreationDate().isAfter(LocalDate.of(2017, 12, 31)));
-        predicates.add(usr -> usr.getEmail().endsWith(".com"));
-
-        List<User> users = userRepository.findAllUsersByPredicates(predicates);
-
-        assertEquals(1, users.size());
-        assertEquals(usr01, users.get(0));
-    }
-
-    @Test
-    @Transactional
-    public void givenTwoUsers_whenDeactivateUsersNotLoggedInSince_ThenUserUsr02Deactivated() {
-        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
-        usr01.setLastLoginDate(LocalDate.now());
-        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.org", 1);
-        usr02.setLastLoginDate(LocalDate.of(2018, 7, 20));
-
-        userRepository.save(usr01);
-        userRepository.save(usr02);
-
-        userRepository.deactivateUsersNotLoggedInSince(LocalDate.of(2018, 8, 1));
-
-        List<User> users = userRepository.findAllUsers(Sort.by(Sort.Order.asc("name")));
-        assertTrue(users.get(0).isActive());
-        assertFalse(users.get(1).isActive());
-    }
-
-    @Test
-    @Transactional
-    public void givenTwoUsers_whenDeleteDeactivatedUsers_ThenUserUsr02Deleted() {
-        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
-        usr01.setLastLoginDate(LocalDate.now());
-        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.com", 0);
-        usr02.setLastLoginDate(LocalDate.of(2018, 7, 20));
-        usr02.setActive(false);
-
-        userRepository.save(usr01);
-        userRepository.save(usr02);
-
-        int deletedUsersCount = userRepository.deleteDeactivatedUsers();
-
-        List<User> users = userRepository.findAll();
-        assertEquals(1, users.size());
-        assertEquals(usr01, users.get(0));
-        assertEquals(1, deletedUsersCount);
-    }
-
-    @Test
-    @Transactional
-    public void givenTwoUsers_whenAddDeletedColumn_ThenUsersHaveDeletedColumn() {
-        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
-        usr01.setLastLoginDate(LocalDate.now());
-        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.org", 1);
-        usr02.setLastLoginDate(LocalDate.of(2018, 7, 20));
-        usr02.setActive(false);
-
-        userRepository.save(usr01);
-        userRepository.save(usr02);
-
-        userRepository.addDeletedColumn();
-
-        Query nativeQuery = entityManager.createNativeQuery("select deleted from USERS where NAME = 'usr01'");
-        assertEquals(0, nativeQuery.getResultList().get(0));
-    }
-
-    @After
-    public void cleanUp() {
-        userRepository.deleteAll();
-    }
-}
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryIntegrationTest.java
deleted file mode 100644
index 09f937c8f2..0000000000
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryIntegrationTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.baeldung.dao.repositories;
-
-import com.baeldung.config.PersistenceConfiguration;
-import com.baeldung.domain.user.User;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Created by adam.
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = PersistenceConfiguration.class)
-@DirtiesContext
-public class UserRepositoryIntegrationTest extends UserRepositoryCommon {
-
-    @Test
-    @Transactional
-    public void givenUsersInDBWhenUpdateStatusForNameModifyingQueryAnnotationNativeThenModifyMatchingUsers() {
-        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL4, ACTIVE_STATUS));
-        userRepository.flush();
-
-        int updatedUsersSize = userRepository.updateUserSetStatusForNameNative(INACTIVE_STATUS, "SAMPLE");
-
-        assertThat(updatedUsersSize).isEqualTo(2);
-    }
-}
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryTCAutoIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryTCAutoIntegrationTest.java
deleted file mode 100644
index 6a851823e3..0000000000
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryTCAutoIntegrationTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.baeldung.dao.repositories;
-
-import com.baeldung.domain.user.User;
-import com.baeldung.util.BaeldungPostgresqlContainer;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.transaction.annotation.Transactional;
-import org.testcontainers.containers.PostgreSQLContainer;
-
-import java.time.LocalDate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Created by adam.
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest
-@ActiveProfiles({"tc", "tc-auto"})
-public class UserRepositoryTCAutoIntegrationTest extends UserRepositoryCommon {
-
-    @ClassRule
-    public static PostgreSQLContainer postgreSQLContainer = BaeldungPostgresqlContainer.getInstance();
-
-    @Test
-    @Transactional
-    public void givenUsersInDB_WhenUpdateStatusForNameModifyingQueryAnnotationNativePostgres_ThenModifyMatchingUsers() {
-        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL4, ACTIVE_STATUS));
-        userRepository.flush();
-
-        int updatedUsersSize = userRepository.updateUserSetStatusForNameNativePostgres(INACTIVE_STATUS, "SAMPLE");
-
-        assertThat(updatedUsersSize).isEqualTo(2);
-    }
-}
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryTCIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryTCIntegrationTest.java
deleted file mode 100644
index c300a07ab9..0000000000
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryTCIntegrationTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.baeldung.dao.repositories;
-
-import com.baeldung.domain.user.User;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.util.TestPropertyValues;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.transaction.annotation.Transactional;
-import org.testcontainers.containers.PostgreSQLContainer;
-
-import java.time.LocalDate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-@ActiveProfiles("tc")
-@ContextConfiguration(initializers = {UserRepositoryTCIntegrationTest.Initializer.class})
-public class UserRepositoryTCIntegrationTest extends UserRepositoryCommon {
-
-    @ClassRule
-    public static PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer("postgres:11.1")
-      .withDatabaseName("integration-tests-db")
-      .withUsername("sa")
-      .withPassword("sa");
-
-    @Test
-    @Transactional
-    public void givenUsersInDB_WhenUpdateStatusForNameModifyingQueryAnnotationNative_ThenModifyMatchingUsers() {
-        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL4, ACTIVE_STATUS));
-        userRepository.flush();
-
-        int updatedUsersSize = userRepository.updateUserSetStatusForNameNativePostgres(INACTIVE_STATUS, "SAMPLE");
-
-        assertThat(updatedUsersSize).isEqualTo(2);
-    }
-
-    static class Initializer
-      implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-        public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
-            TestPropertyValues.of(
-              "spring.datasource.url=" + postgreSQLContainer.getJdbcUrl(),
-              "spring.datasource.username=" + postgreSQLContainer.getUsername(),
-              "spring.datasource.password=" + postgreSQLContainer.getPassword()
-            ).applyTo(configurableApplicationContext.getEnvironment());
-        }
-    }
-}
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/JpaMultipleDBIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/JpaMultipleDBIntegrationTest.java
index 74f347caae..bcc4103d08 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/JpaMultipleDBIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/JpaMultipleDBIntegrationTest.java
@@ -13,24 +13,20 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.baeldung.boot.domain.Possession;
-import com.baeldung.boot.domain.User;
-import com.baeldung.boot.user.PossessionRepository;
-import com.baeldung.boot.user.UserRepository;
-import com.baeldung.multipledb.PersistenceProductConfiguration;
-import com.baeldung.multipledb.PersistenceUserConfiguration;
-import com.baeldung.multipledb.Product;
-import com.baeldung.multipledb.ProductRepository;
+import com.baeldung.multipledb.dao.product.ProductRepository;
+import com.baeldung.multipledb.dao.user.PossessionRepository;
+import com.baeldung.multipledb.dao.user.UserRepository;
+import com.baeldung.multipledb.model.product.ProductMultipleDB;
+import com.baeldung.multipledb.model.user.PossessionMultipleDB;
+import com.baeldung.multipledb.model.user.UserMultipleDB;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes=MultipleDbApplication.class)
 @EnableTransactionManagement
-@DirtiesContext
 public class JpaMultipleDBIntegrationTest {
 
     @Autowired
@@ -47,15 +43,15 @@ public class JpaMultipleDBIntegrationTest {
     @Test
     @Transactional("userTransactionManager")
     public void whenCreatingUser_thenCreated() {
-        User user = new User();
+        UserMultipleDB user = new UserMultipleDB();
         user.setName("John");
         user.setEmail("john@test.com");
         user.setAge(20);
-        Possession p = new Possession("sample");
+        PossessionMultipleDB p = new PossessionMultipleDB("sample");
         p = possessionRepository.save(p);
         user.setPossessionList(Collections.singletonList(p));
         user = userRepository.save(user);
-        final Optional<User> result = userRepository.findById(user.getId());
+        final Optional<UserMultipleDB> result = userRepository.findById(user.getId());
         assertTrue(result.isPresent());
         System.out.println(result.get().getPossessionList());
         assertEquals(1, result.get().getPossessionList().size());
@@ -64,14 +60,14 @@ public class JpaMultipleDBIntegrationTest {
     @Test
     @Transactional("userTransactionManager")
     public void whenCreatingUsersWithSameEmail_thenRollback() {
-        User user1 = new User();
+        UserMultipleDB user1 = new UserMultipleDB();
         user1.setName("John");
         user1.setEmail("john@test.com");
         user1.setAge(20);
         user1 = userRepository.save(user1);
         assertTrue(userRepository.findById(user1.getId()).isPresent());
 
-        User user2 = new User();
+        UserMultipleDB user2 = new UserMultipleDB();
         user2.setName("Tom");
         user2.setEmail("john@test.com");
         user2.setAge(10);
@@ -89,7 +85,7 @@ public class JpaMultipleDBIntegrationTest {
     @Test
     @Transactional("productTransactionManager")
     public void whenCreatingProduct_thenCreated() {
-        Product product = new Product();
+        ProductMultipleDB product = new ProductMultipleDB();
         product.setName("Book");
         product.setId(2);
         product.setPrice(20);
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/ProductRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/ProductRepositoryIntegrationTest.java
index 7b85cb479a..2c965f72f3 100644
--- a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/ProductRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/ProductRepositoryIntegrationTest.java
@@ -24,8 +24,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.baeldung.multipledb.PersistenceProductConfiguration;
-import com.baeldung.multipledb.Product;
-import com.baeldung.multipledb.ProductRepository;
+import com.baeldung.multipledb.dao.product.ProductRepository;
+import com.baeldung.multipledb.model.product.ProductMultipleDB;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes=MultipleDbApplication.class)
@@ -38,22 +38,22 @@ public class ProductRepositoryIntegrationTest {
     @Before
     @Transactional("productTransactionManager")
     public void setUp() {
-        productRepository.save(Product.from(1001, "Book", 21));
-        productRepository.save(Product.from(1002, "Coffee", 10));
-        productRepository.save(Product.from(1003, "Jeans", 30));
-        productRepository.save(Product.from(1004, "Shirt", 32));
-        productRepository.save(Product.from(1005, "Bacon", 10));
+        productRepository.save(ProductMultipleDB.from(1001, "Book", 21));
+        productRepository.save(ProductMultipleDB.from(1002, "Coffee", 10));
+        productRepository.save(ProductMultipleDB.from(1003, "Jeans", 30));
+        productRepository.save(ProductMultipleDB.from(1004, "Shirt", 32));
+        productRepository.save(ProductMultipleDB.from(1005, "Bacon", 10));
     }
 
     @Test
     public void whenRequestingFirstPageOfSizeTwo_ThenReturnFirstPage() {
         Pageable pageRequest = PageRequest.of(0, 2);
 
-        Page<Product> result = productRepository.findAll(pageRequest);
+        Page<ProductMultipleDB> result = productRepository.findAll(pageRequest);
 
         assertThat(result.getContent(), hasSize(2));
         assertTrue(result.stream()
-            .map(Product::getId)
+            .map(ProductMultipleDB::getId)
             .allMatch(id -> Arrays.asList(1001, 1002)
                 .contains(id)));
     }
@@ -62,11 +62,11 @@ public class ProductRepositoryIntegrationTest {
     public void whenRequestingSecondPageOfSizeTwo_ThenReturnSecondPage() {
         Pageable pageRequest = PageRequest.of(1, 2);
 
-        Page<Product> result = productRepository.findAll(pageRequest);
+        Page<ProductMultipleDB> result = productRepository.findAll(pageRequest);
 
         assertThat(result.getContent(), hasSize(2));
         assertTrue(result.stream()
-            .map(Product::getId)
+            .map(ProductMultipleDB::getId)
             .allMatch(id -> Arrays.asList(1003, 1004)
                 .contains(id)));
     }
@@ -75,11 +75,11 @@ public class ProductRepositoryIntegrationTest {
     public void whenRequestingLastPage_ThenReturnLastPageWithRemData() {
         Pageable pageRequest = PageRequest.of(2, 2);
 
-        Page<Product> result = productRepository.findAll(pageRequest);
+        Page<ProductMultipleDB> result = productRepository.findAll(pageRequest);
 
         assertThat(result.getContent(), hasSize(1));
         assertTrue(result.stream()
-            .map(Product::getId)
+            .map(ProductMultipleDB::getId)
             .allMatch(id -> Arrays.asList(1005)
                 .contains(id)));
     }
@@ -88,12 +88,12 @@ public class ProductRepositoryIntegrationTest {
     public void whenSortingByNameAscAndPaging_ThenReturnSortedPagedResult() {
         Pageable pageRequest = PageRequest.of(0, 3, Sort.by("name"));
 
-        Page<Product> result = productRepository.findAll(pageRequest);
+        Page<ProductMultipleDB> result = productRepository.findAll(pageRequest);
 
         assertThat(result.getContent(), hasSize(3));
         assertThat(result.getContent()
             .stream()
-            .map(Product::getId)
+            .map(ProductMultipleDB::getId)
             .collect(Collectors.toList()), equalTo(Arrays.asList(1005, 1001, 1002)));
 
     }
@@ -103,12 +103,12 @@ public class ProductRepositoryIntegrationTest {
         Pageable pageRequest = PageRequest.of(0, 3, Sort.by("price")
             .descending());
 
-        Page<Product> result = productRepository.findAll(pageRequest);
+        Page<ProductMultipleDB> result = productRepository.findAll(pageRequest);
 
         assertThat(result.getContent(), hasSize(3));
         assertThat(result.getContent()
             .stream()
-            .map(Product::getId)
+            .map(ProductMultipleDB::getId)
             .collect(Collectors.toList()), equalTo(Arrays.asList(1004, 1003, 1001)));
 
     }
@@ -119,12 +119,12 @@ public class ProductRepositoryIntegrationTest {
             .descending()
             .and(Sort.by("name")));
 
-        Page<Product> result = productRepository.findAll(pageRequest);
+        Page<ProductMultipleDB> result = productRepository.findAll(pageRequest);
 
         assertThat(result.getContent(), hasSize(5));
         assertThat(result.getContent()
             .stream()
-            .map(Product::getId)
+            .map(ProductMultipleDB::getId)
             .collect(Collectors.toList()), equalTo(Arrays.asList(1004, 1003, 1001, 1005, 1002)));
 
     }
@@ -133,11 +133,11 @@ public class ProductRepositoryIntegrationTest {
     public void whenRequestingFirstPageOfSizeTwoUsingCustomMethod_ThenReturnFirstPage() {
         Pageable pageRequest = PageRequest.of(0, 2);
 
-        List<Product> result = productRepository.findAllByPrice(10, pageRequest);
+        List<ProductMultipleDB> result = productRepository.findAllByPrice(10, pageRequest);
 
         assertThat(result, hasSize(2));
         assertTrue(result.stream()
-            .map(Product::getId)
+            .map(ProductMultipleDB::getId)
             .allMatch(id -> Arrays.asList(1002, 1005)
                 .contains(id)));
     }

From af2359f9b1e98c181cfeb885291bfb98c482793a Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Tue, 30 Apr 2019 22:04:03 -0600
Subject: [PATCH 121/295] Move fastUtil to libraries-primitive (#6868)

---
 fastUtil/pom.xml                              | 44 -------------------
 libraries-primitive/pom.xml                   | 39 ++++++++++++++++
 .../java/com/baeldung/BigArraysUnitTest.java  |  0
 ...FastUtilTypeSpecificBenchmarkUnitTest.java |  0
 .../FastUtilTypeSpecificUnitTest.java         |  0
 pom.xml                                       |  1 +
 6 files changed, 40 insertions(+), 44 deletions(-)
 delete mode 100644 fastUtil/pom.xml
 create mode 100644 libraries-primitive/pom.xml
 rename {fastUtil => libraries-primitive}/src/test/java/com/baeldung/BigArraysUnitTest.java (100%)
 rename {fastUtil => libraries-primitive}/src/test/java/com/baeldung/FastUtilTypeSpecificBenchmarkUnitTest.java (100%)
 rename {fastUtil => libraries-primitive}/src/test/java/com/baeldung/FastUtilTypeSpecificUnitTest.java (100%)

diff --git a/fastUtil/pom.xml b/fastUtil/pom.xml
deleted file mode 100644
index fcd9020747..0000000000
--- a/fastUtil/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.baeldung</groupId>
-    <artifactId>fastUtil</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <dependencies>
-<!-- https://mvnrepository.com/artifact/it.unimi.dsi/fastutil -->
-<dependency>
-    <groupId>it.unimi.dsi</groupId>
-    <artifactId>fastutil</artifactId>
-    <version>8.2.2</version>
-</dependency>
-<!-- https://mvnrepository.com/artifact/junit/junit -->
-<dependency>
-    <groupId>junit</groupId>
-    <artifactId>junit</artifactId>
-    <version>4.12</version>
-    <scope>test</scope>
-</dependency>
-<!-- https://mvnrepository.com/artifact/org.openjdk.jmh/jmh-core -->
-<dependency>
-    <groupId>org.openjdk.jmh</groupId>
-    <artifactId>jmh-core</artifactId>
-    <version>1.19</version>
-    <scope>test</scope>
-</dependency>
-<dependency>
-    <groupId>org.openjdk.jmh</groupId>
-    <artifactId>jmh-generator-annprocess</artifactId>
-    <version>1.19</version>
-    <scope>test</scope>
-</dependency>
-
-
-
-    </dependencies>
-
-
-</project>
\ No newline at end of file
diff --git a/libraries-primitive/pom.xml b/libraries-primitive/pom.xml
new file mode 100644
index 0000000000..9bb58470b2
--- /dev/null
+++ b/libraries-primitive/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.baeldung</groupId>
+    <artifactId>libraries-primitive</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+       <!-- https://mvnrepository.com/artifact/it.unimi.dsi/fastutil -->
+       <dependency>
+            <groupId>it.unimi.dsi</groupId>
+            <artifactId>fastutil</artifactId>
+            <version>8.2.2</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/junit/junit -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.openjdk.jmh/jmh-core -->
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>1.19</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>1.19</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/fastUtil/src/test/java/com/baeldung/BigArraysUnitTest.java b/libraries-primitive/src/test/java/com/baeldung/BigArraysUnitTest.java
similarity index 100%
rename from fastUtil/src/test/java/com/baeldung/BigArraysUnitTest.java
rename to libraries-primitive/src/test/java/com/baeldung/BigArraysUnitTest.java
diff --git a/fastUtil/src/test/java/com/baeldung/FastUtilTypeSpecificBenchmarkUnitTest.java b/libraries-primitive/src/test/java/com/baeldung/FastUtilTypeSpecificBenchmarkUnitTest.java
similarity index 100%
rename from fastUtil/src/test/java/com/baeldung/FastUtilTypeSpecificBenchmarkUnitTest.java
rename to libraries-primitive/src/test/java/com/baeldung/FastUtilTypeSpecificBenchmarkUnitTest.java
diff --git a/fastUtil/src/test/java/com/baeldung/FastUtilTypeSpecificUnitTest.java b/libraries-primitive/src/test/java/com/baeldung/FastUtilTypeSpecificUnitTest.java
similarity index 100%
rename from fastUtil/src/test/java/com/baeldung/FastUtilTypeSpecificUnitTest.java
rename to libraries-primitive/src/test/java/com/baeldung/FastUtilTypeSpecificUnitTest.java
diff --git a/pom.xml b/pom.xml
index ced3c9e506..b896514b3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -499,6 +499,7 @@
                 <module>libraries-2</module>
                 <module>libraries-data</module>
                 <module>libraries-apache-commons</module>
+                <module>libraries-primitive</module>
                 <module>libraries-security</module>
                 <module>libraries-server</module>
                 <module>linkrest</module>

From 833c06f48f6412d889b7f1bd172254ff8cb90931 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Wed, 1 May 2019 09:09:44 +0300
Subject: [PATCH 122/295] Update README.md

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

diff --git a/kotlin-libraries-2/README.md b/kotlin-libraries-2/README.md
index ff12555376..fdb7c2830d 100644
--- a/kotlin-libraries-2/README.md
+++ b/kotlin-libraries-2/README.md
@@ -1 +1,3 @@
 ## Relevant articles:
+
+- [Jackson Support for Kotlin](https://www.baeldung.com/jackson-kotlin)

From 6da90b24b01f89a7c2ee0eb74795e2864171a9ae Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date: Wed, 1 May 2019 13:10:42 +0200
Subject: [PATCH 123/295] AgeCalculator changes

---
 .../com/baeldung/exceptions/RootCauseFinder.java | 14 +++++++-------
 .../baeldung/exceptions/RootCauseFinderTest.java | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java b/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
index 11f29a2cf0..e05dc7a6cd 100644
--- a/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
+++ b/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
@@ -33,28 +33,28 @@ public class RootCauseFinder {
             }
 
             try {
-                return calculateDifference(birthDate).getYears();
+                return Period
+                  .between(parseDate(birthDate), LocalDate.now())
+                  .getYears();
             } catch (DateParseException ex) {
                 throw new CalculationException(ex);
             }
         }
 
-        private static Period calculateDifference(String birthDateAsString) throws DateParseException {
+        private static LocalDate parseDate(String birthDateAsString) throws DateParseException {
 
-            LocalDate birthDate = null;
+            LocalDate birthDate;
             try {
                 birthDate = LocalDate.parse(birthDateAsString);
             } catch (DateTimeParseException ex) {
                 throw new InvalidFormatException(birthDateAsString, ex);
             }
 
-            LocalDate today = LocalDate.now();
-
-            if (birthDate.isAfter(today)) {
+            if (birthDate.isAfter(LocalDate.now())) {
                 throw new DateOutOfRangeException(birthDateAsString);
             }
 
-            return Period.between(birthDate, today);
+            return birthDate;
         }
 
     }
diff --git a/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java b/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
index c333a7ac26..cfac81b812 100644
--- a/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
+++ b/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
@@ -2,9 +2,12 @@ package com.baeldung.exceptions;
 
 import com.google.common.base.Throwables;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
 import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoUnit;
 
 import static com.baeldung.exceptions.RootCauseFinder.*;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -14,6 +17,19 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  */
 public class RootCauseFinderTest {
 
+    @Test
+    public void givenBirthDate_whenCalculatingAge_thenAgeReturned() {
+        try {
+            int age = AgeCalculator.calculateAge("1990-01-01");
+            Assertions.assertEquals(1990, LocalDate
+              .now()
+              .minus(age, ChronoUnit.YEARS)
+              .getYear());
+        } catch (CalculationException e) {
+            Assertions.fail(e.getMessage());
+        }
+    }
+
     @Test
     public void givenWrongFormatDate_whenFindingRootCauseUsingJava_thenRootCauseFound() {
         try {

From 84a9cad62dedfda8b84c4f7a80f8e82e10fe05e3 Mon Sep 17 00:00:00 2001
From: KevinGilmore <kpg102@gmail.com>
Date: Wed, 1 May 2019 23:03:06 -0500
Subject: [PATCH 124/295] BAEL-2655 update README (#6880)

* BAEL-2246: add link back to article

* BAEL-2174: rename core-java-net module to core-java-networking

* BAEL-2174: add link back to article

* BAEL-2363 BAEL-2337 BAEL-1996 BAEL-2277 add links back to articles

* BAEL-2367: add link back to article

* BAEL-2335: add link back to article

* BAEL-2413: add link back to article

* Update README.MD

* BAEL-2577: add link back to article

* BAEL-2490: add link back to article

* BAEL-2471: add link back to article

* BAEL-2583: add link back to article

* BAEL-2738: add link back to article

* BAEL-2711: Add spring-boot-angular module to root pom

* BAEL-2544 BAEL-2711 BAEL-2575 BAEL-2657 Add links back to articles

* BAEL-2736: Add link back to article

* BAEL-2789: Add link back to article

* BAEL-2489: add link back to article

* BAEL-2840: add link back to article

* BAEL-2655: add link back to article
---
 core-kotlin-io/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core-kotlin-io/README.md b/core-kotlin-io/README.md
index c085c0653f..cb4dac7e4d 100644
--- a/core-kotlin-io/README.md
+++ b/core-kotlin-io/README.md
@@ -1,3 +1,5 @@
 ## Relevant articles:
 
 - [InputStream to String in Kotlin](https://www.baeldung.com/kotlin-inputstream-to-string)
+- [Console I/O in Kotlin](https://www.baeldung.com/kotlin-console-io)
+

From 48f4709d6145c68bb6a6a3e7b04cff9715b5e1f9 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Thu, 2 May 2019 08:55:50 +0200
Subject: [PATCH 125/295] [BAEL-2506] Moved Java Void Type examples into a new
 core-java-reflection module

---
 core-java-reflection/pom.xml                  | 29 +++++++
 .../baeldung/reflection/voidtype/Action.java  |  5 ++
 .../reflection/voidtype/Calculator.java       | 21 +++++
 .../baeldung/reflection/voidtype/Defer.java   | 27 +++++++
 .../reflection/voidtype/MyOwnDefer.java       | 15 ++++
 .../voidtype/CalculatorUnitTest.java          | 23 ++++++
 .../reflection/voidtype/DeferUnitTest.java    | 81 +++++++++++++++++++
 .../voidtype/MyOwnDeferUnitTest.java          | 22 +++++
 pom.xml                                       |  1 +
 9 files changed, 224 insertions(+)
 create mode 100644 core-java-reflection/pom.xml
 create mode 100644 core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Action.java
 create mode 100644 core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Calculator.java
 create mode 100644 core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Defer.java
 create mode 100644 core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/MyOwnDefer.java
 create mode 100644 core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/CalculatorUnitTest.java
 create mode 100644 core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/DeferUnitTest.java
 create mode 100644 core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/MyOwnDeferUnitTest.java

diff --git a/core-java-reflection/pom.xml b/core-java-reflection/pom.xml
new file mode 100644
index 0000000000..fc2e908fe8
--- /dev/null
+++ b/core-java-reflection/pom.xml
@@ -0,0 +1,29 @@
+<?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>core-java-reflection</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-reflection</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <assertj-core.version>3.10.0</assertj-core.version>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Action.java b/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Action.java
new file mode 100644
index 0000000000..1459bf25c5
--- /dev/null
+++ b/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Action.java
@@ -0,0 +1,5 @@
+package com.baeldung.reflection.voidtype;
+
+public interface Action {
+    void execute();
+}
diff --git a/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Calculator.java b/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Calculator.java
new file mode 100644
index 0000000000..dcfbe72008
--- /dev/null
+++ b/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Calculator.java
@@ -0,0 +1,21 @@
+package com.baeldung.reflection.voidtype;
+
+public class Calculator {
+    private int result = 0;
+
+    public int add(int number) {
+        return result += number;
+    }
+
+    public int sub(int number) {
+        return result -= number;
+    }
+
+    public void clear() {
+        result = 0;
+    }
+
+    public void print() {
+        System.out.println(result);
+    }
+}
diff --git a/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Defer.java b/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Defer.java
new file mode 100644
index 0000000000..09817199fa
--- /dev/null
+++ b/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Defer.java
@@ -0,0 +1,27 @@
+package com.baeldung.reflection.voidtype;
+
+import java.util.concurrent.Callable;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public class Defer {
+    public static <V> V defer(Callable<V> callable) throws Exception {
+        return callable.call();
+    }
+
+    public static void defer(Runnable runnable) {
+        runnable.run();
+    }
+
+    public static <T, R> R defer(Function<T, R> function, T arg) {
+        return function.apply(arg);
+    }
+
+    public static <T> void defer(Consumer<T> consumer, T arg) {
+        consumer.accept(arg);
+    }
+
+    public static void defer(Action action) {
+        action.execute();
+    }
+}
diff --git a/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/MyOwnDefer.java b/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/MyOwnDefer.java
new file mode 100644
index 0000000000..47468ee641
--- /dev/null
+++ b/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/MyOwnDefer.java
@@ -0,0 +1,15 @@
+package com.baeldung.reflection.voidtype;
+
+import java.util.concurrent.Callable;
+
+public class MyOwnDefer {
+    public static void defer(Runnable runnable) throws Exception {
+        Defer.defer(new Callable<Void>() {
+            @Override
+            public Void call() {
+                runnable.run();
+                return null;
+            }
+        });
+    }
+}
diff --git a/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/CalculatorUnitTest.java b/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/CalculatorUnitTest.java
new file mode 100644
index 0000000000..0ba22bf6e3
--- /dev/null
+++ b/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/CalculatorUnitTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.reflection.voidtype;
+
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class CalculatorUnitTest {
+    @Test
+    void givenCalculator_whenGettingVoidMethodsByReflection_thenOnlyClearAndPrint() {
+        Method[] calculatorMethods = Calculator.class.getDeclaredMethods();
+        List<Method> calculatorVoidMethods = Arrays.stream(calculatorMethods)
+          .filter(method -> method.getReturnType().equals(Void.TYPE))
+          .collect(Collectors.toList());
+
+        assertThat(calculatorVoidMethods)
+          .allMatch(method -> Arrays.asList("clear", "print").contains(method.getName()));
+    }
+}
\ No newline at end of file
diff --git a/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/DeferUnitTest.java b/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/DeferUnitTest.java
new file mode 100644
index 0000000000..e2dc68effc
--- /dev/null
+++ b/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/DeferUnitTest.java
@@ -0,0 +1,81 @@
+package com.baeldung.reflection.voidtype;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+class DeferUnitTest {
+    @Test
+    void givenVoidCallable_whenDiffer_thenReturnNull() throws Exception {
+        Callable<Void> callable = new Callable<Void>() {
+            @Override
+            public Void call() {
+                System.out.println("Hello!");
+                return null;
+            }
+        };
+
+        assertThat(Defer.defer(callable)).isNull();
+    }
+
+    @Test
+    void givenVoidRunnable_whenDiffer_thenNoReturn() {
+        AtomicBoolean run = new AtomicBoolean(false);
+
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                System.out.println("Hello!");
+                run.set(true);
+            }
+        };
+
+        Defer.defer(runnable);
+
+        assertTrue(run.get());
+    }
+
+    @Test
+    void givenVoidFunction_whenDiffer_thenReturnNull() {
+        Function<String, Void> function = s -> {
+            System.out.println("Hello " + s + "!");
+            return null;
+        };
+
+        assertThat(Defer.defer(function, "World")).isNull();
+    }
+
+    @Test
+    void givenVoidConsumer_whenDiffer_thenReturnNull() {
+        AtomicBoolean run = new AtomicBoolean(false);
+
+        Consumer<String> function = s -> {
+            System.out.println("Hello " + s + "!");
+            run.set(true);
+        };
+
+        Defer.defer(function, "World");
+
+        assertTrue(run.get());
+    }
+
+    @Test
+    void givenAction_whenDiffer_thenNoReturn() {
+        AtomicBoolean run = new AtomicBoolean(false);
+
+        Action action = () -> {
+            System.out.println("Hello!");
+            run.set(true);
+        };
+
+        Defer.defer(action);
+
+        assertTrue(run.get());
+    }
+}
\ No newline at end of file
diff --git a/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/MyOwnDeferUnitTest.java b/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/MyOwnDeferUnitTest.java
new file mode 100644
index 0000000000..e3c3612a22
--- /dev/null
+++ b/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/MyOwnDeferUnitTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.reflection.voidtype;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class MyOwnDeferUnitTest {
+    @Test
+    void defer() throws Exception {
+        AtomicBoolean run = new AtomicBoolean(false);
+        Runnable runnable = () -> {
+            System.out.println("Hello!");
+            run.set(true);
+        };
+
+        MyOwnDefer.defer(runnable);
+
+        assertTrue(run.get());
+    }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b896514b3a..6cb0c6d570 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,7 @@
     <modules>
         <module>lombok-custom</module>
         <module>picocli</module>
+        <module>core-java-reflection</module>
     </modules>
 
 	<dependencies>

From 98a70c0db86efdd5b34facf456b189bce872d313 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Thu, 2 May 2019 09:09:06 +0200
Subject: [PATCH 126/295] [BAEL-2882] Moved Picocli examples to libraries-2
 module

---
 .../com/baeldung/picocli/git/Application.java |  0
 .../git/commands/declarative/GitCommand.java  |  0
 .../git/commands/methods/GitCommand.java      |  0
 .../commands/programmative/GitCommand.java    |  0
 .../commands/subcommands/GitAddCommand.java   |  0
 .../subcommands/GitCommitCommand.java         |  0
 .../subcommands/GitConfigCommand.java         |  0
 .../picocli/git/model/ConfigElement.java      |  0
 .../picocli/helloworld/HelloWorldCommand.java |  0
 picocli/pom.xml                               | 28 -------------------
 10 files changed, 28 deletions(-)
 rename {picocli => libraries-2}/src/main/java/com/baeldung/picocli/git/Application.java (100%)
 rename {picocli => libraries-2}/src/main/java/com/baeldung/picocli/git/commands/declarative/GitCommand.java (100%)
 rename {picocli => libraries-2}/src/main/java/com/baeldung/picocli/git/commands/methods/GitCommand.java (100%)
 rename {picocli => libraries-2}/src/main/java/com/baeldung/picocli/git/commands/programmative/GitCommand.java (100%)
 rename {picocli => libraries-2}/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitAddCommand.java (100%)
 rename {picocli => libraries-2}/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitCommitCommand.java (100%)
 rename {picocli => libraries-2}/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitConfigCommand.java (100%)
 rename {picocli => libraries-2}/src/main/java/com/baeldung/picocli/git/model/ConfigElement.java (100%)
 rename {picocli => libraries-2}/src/main/java/com/baeldung/picocli/helloworld/HelloWorldCommand.java (100%)
 delete mode 100644 picocli/pom.xml

diff --git a/picocli/src/main/java/com/baeldung/picocli/git/Application.java b/libraries-2/src/main/java/com/baeldung/picocli/git/Application.java
similarity index 100%
rename from picocli/src/main/java/com/baeldung/picocli/git/Application.java
rename to libraries-2/src/main/java/com/baeldung/picocli/git/Application.java
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/commands/declarative/GitCommand.java b/libraries-2/src/main/java/com/baeldung/picocli/git/commands/declarative/GitCommand.java
similarity index 100%
rename from picocli/src/main/java/com/baeldung/picocli/git/commands/declarative/GitCommand.java
rename to libraries-2/src/main/java/com/baeldung/picocli/git/commands/declarative/GitCommand.java
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/commands/methods/GitCommand.java b/libraries-2/src/main/java/com/baeldung/picocli/git/commands/methods/GitCommand.java
similarity index 100%
rename from picocli/src/main/java/com/baeldung/picocli/git/commands/methods/GitCommand.java
rename to libraries-2/src/main/java/com/baeldung/picocli/git/commands/methods/GitCommand.java
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/commands/programmative/GitCommand.java b/libraries-2/src/main/java/com/baeldung/picocli/git/commands/programmative/GitCommand.java
similarity index 100%
rename from picocli/src/main/java/com/baeldung/picocli/git/commands/programmative/GitCommand.java
rename to libraries-2/src/main/java/com/baeldung/picocli/git/commands/programmative/GitCommand.java
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitAddCommand.java b/libraries-2/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitAddCommand.java
similarity index 100%
rename from picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitAddCommand.java
rename to libraries-2/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitAddCommand.java
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitCommitCommand.java b/libraries-2/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitCommitCommand.java
similarity index 100%
rename from picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitCommitCommand.java
rename to libraries-2/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitCommitCommand.java
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitConfigCommand.java b/libraries-2/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitConfigCommand.java
similarity index 100%
rename from picocli/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitConfigCommand.java
rename to libraries-2/src/main/java/com/baeldung/picocli/git/commands/subcommands/GitConfigCommand.java
diff --git a/picocli/src/main/java/com/baeldung/picocli/git/model/ConfigElement.java b/libraries-2/src/main/java/com/baeldung/picocli/git/model/ConfigElement.java
similarity index 100%
rename from picocli/src/main/java/com/baeldung/picocli/git/model/ConfigElement.java
rename to libraries-2/src/main/java/com/baeldung/picocli/git/model/ConfigElement.java
diff --git a/picocli/src/main/java/com/baeldung/picocli/helloworld/HelloWorldCommand.java b/libraries-2/src/main/java/com/baeldung/picocli/helloworld/HelloWorldCommand.java
similarity index 100%
rename from picocli/src/main/java/com/baeldung/picocli/helloworld/HelloWorldCommand.java
rename to libraries-2/src/main/java/com/baeldung/picocli/helloworld/HelloWorldCommand.java
diff --git a/picocli/pom.xml b/picocli/pom.xml
deleted file mode 100644
index 0334f5463d..0000000000
--- a/picocli/pom.xml
+++ /dev/null
@@ -1,28 +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>
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
-    </parent>
-
-    <artifactId>picocli</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>info.picocli</groupId>
-            <artifactId>picocli</artifactId>
-            <version>3.9.6</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <version>2.1.4.RELEASE</version>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file

From 83b180c9525bc67249cf266c423bb37e0643f98f Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Thu, 2 May 2019 09:11:10 +0200
Subject: [PATCH 127/295] [BAEL-2882] Removed picocli module from parent pom as
 well

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

diff --git a/pom.xml b/pom.xml
index b896514b3a..5d8f9693c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,6 @@
 
     <modules>
         <module>lombok-custom</module>
-        <module>picocli</module>
     </modules>
 
 	<dependencies>

From c885910bfd5108fd36a8e92a8dd67c2847df26a3 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 16:43:39 +0800
Subject: [PATCH 128/295] Update README.md

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

diff --git a/core-java-9/README.md b/core-java-9/README.md
index 8fdc3f6ee2..a95fe37acb 100644
--- a/core-java-9/README.md
+++ b/core-java-9/README.md
@@ -21,5 +21,6 @@
 - [Ahead of Time Compilation (AoT)](https://www.baeldung.com/ahead-of-time-compilation)
 - [Java 9 Process API Improvements](https://www.baeldung.com/java-9-process-api)
 - [Guide to java.lang.Process API](https://www.baeldung.com/java-process-api)
+- [Java 9 java.util.Objects Additions](https://www.baeldung.com/java-9-objects-new)
 
 

From 5eb05a77095cfb7cfc9e109d727219e3ad26af39 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 16:45:51 +0800
Subject: [PATCH 129/295] Update README.md

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

diff --git a/core-java-9/README.md b/core-java-9/README.md
index a95fe37acb..90cd8a8347 100644
--- a/core-java-9/README.md
+++ b/core-java-9/README.md
@@ -22,5 +22,5 @@
 - [Java 9 Process API Improvements](https://www.baeldung.com/java-9-process-api)
 - [Guide to java.lang.Process API](https://www.baeldung.com/java-process-api)
 - [Java 9 java.util.Objects Additions](https://www.baeldung.com/java-9-objects-new)
-
+- [Java 9 Reactive Streams](https://www.baeldung.com/java-9-reactive-streams)
 

From dd1fdfc6ee865c0743eea19bdd3ad2a57658c8f9 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 16:48:02 +0800
Subject: [PATCH 130/295] Update README.md

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

diff --git a/core-java-9/README.md b/core-java-9/README.md
index 90cd8a8347..2a00f8fe98 100644
--- a/core-java-9/README.md
+++ b/core-java-9/README.md
@@ -23,4 +23,5 @@
 - [Guide to java.lang.Process API](https://www.baeldung.com/java-process-api)
 - [Java 9 java.util.Objects Additions](https://www.baeldung.com/java-9-objects-new)
 - [Java 9 Reactive Streams](https://www.baeldung.com/java-9-reactive-streams)
+- [Java 9 Optional API Additions](https://www.baeldung.com/java-9-optional)
 

From 9baace711b51260052a167e566389298a2b6e387 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 16:51:08 +0800
Subject: [PATCH 131/295] Update README.md

---
 core-java-9/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core-java-9/README.md b/core-java-9/README.md
index 2a00f8fe98..7618805fe6 100644
--- a/core-java-9/README.md
+++ b/core-java-9/README.md
@@ -24,4 +24,7 @@
 - [Java 9 java.util.Objects Additions](https://www.baeldung.com/java-9-objects-new)
 - [Java 9 Reactive Streams](https://www.baeldung.com/java-9-reactive-streams)
 - [Java 9 Optional API Additions](https://www.baeldung.com/java-9-optional)
-
+- [Java 9 CompletableFuture API Improvements](https://www.baeldung.com/java-9-completablefuture)
+- [Introduction to Java 9 StackWalking API](https://www.baeldung.com/java-9-stackwalking-api)
+- [Java 9 Convenience Factory Methods for Collections](https://www.baeldung.com/java-9-collections-factory-methods)
+- [Java 9 Stream API Improvements](https://www.baeldung.com/java-9-stream-api)

From 34494c4ef7847bb8b403955ce478774f9bd52feb Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 16:58:24 +0800
Subject: [PATCH 132/295] Update README.MD

---
 spring-boot/README.MD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-boot/README.MD b/spring-boot/README.MD
index c0392d38de..d7af3f4614 100644
--- a/spring-boot/README.MD
+++ b/spring-boot/README.MD
@@ -36,3 +36,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Injecting Git Information Into Spring](https://www.baeldung.com/spring-git-information)
 - [Validation in Spring Boot](https://www.baeldung.com/spring-boot-bean-validation)
 - [Guide to Creating and Running a Jar File in Java](https://www.baeldung.com/java-create-jar)
+- [Entity To DTO Conversion for a Spring REST API](https://www.baeldung.com/entity-to-and-from-dto-for-a-java-spring-application)

From 7293f852ea617fc78d9b8de8ff6b48e12bf58462 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:01:59 +0800
Subject: [PATCH 133/295] Update README.md

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

diff --git a/core-java-9/README.md b/core-java-9/README.md
index 7618805fe6..22cbd5f3ee 100644
--- a/core-java-9/README.md
+++ b/core-java-9/README.md
@@ -28,3 +28,4 @@
 - [Introduction to Java 9 StackWalking API](https://www.baeldung.com/java-9-stackwalking-api)
 - [Java 9 Convenience Factory Methods for Collections](https://www.baeldung.com/java-9-collections-factory-methods)
 - [Java 9 Stream API Improvements](https://www.baeldung.com/java-9-stream-api)
+- [A Guide to Java 9 Modularity](https://www.baeldung.com/java-9-modularity)

From cf75dcb3b77ebcb6c3af0cddf7b17af483b1f671 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:03:27 +0800
Subject: [PATCH 134/295] Update README.md

---
 core-java-9/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core-java-9/README.md b/core-java-9/README.md
index 22cbd5f3ee..c2dbef1586 100644
--- a/core-java-9/README.md
+++ b/core-java-9/README.md
@@ -29,3 +29,5 @@
 - [Java 9 Convenience Factory Methods for Collections](https://www.baeldung.com/java-9-collections-factory-methods)
 - [Java 9 Stream API Improvements](https://www.baeldung.com/java-9-stream-api)
 - [A Guide to Java 9 Modularity](https://www.baeldung.com/java-9-modularity)
+- [Java 9 Platform Module API](https://www.baeldung.com/java-9-module-api)
+- [Java 9 Platform Logging API](https://www.baeldung.com/java-9-logging-api)

From b7856034e0b4c439b996eabfb78bd323c11e1e14 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:04:50 +0800
Subject: [PATCH 135/295] Update README.md

---
 spring-boot-rest/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-boot-rest/README.md b/spring-boot-rest/README.md
index b28192cf62..6f365bd465 100644
--- a/spring-boot-rest/README.md
+++ b/spring-boot-rest/README.md
@@ -16,3 +16,4 @@ Module for the articles that are part of the Spring REST E-book:
 - [ETags for REST with Spring](http://www.baeldung.com/etags-for-rest-with-spring)
 - [Testing REST with multiple MIME types](http://www.baeldung.com/testing-rest-api-with-multiple-media-types)
 - [Testing Web APIs with Postman Collections](https://www.baeldung.com/postman-testing-collections)
+- [Spring Boot Consuming and Producing JSON](https://www.baeldung.com/spring-boot-json)

From 487c695fb81a9c15452f85fd779ff7630d26ed1c Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:08:55 +0800
Subject: [PATCH 136/295] Update README.md

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index 41381ab82a..080b2cf482 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -4,3 +4,4 @@
 
 ### Relevant Articles: 
 - [Spring Data JPA – Derived Delete Methods](https://www.baeldung.com/spring-data-jpa-deleteby)
+- [JPA Join Types](https://www.baeldung.com/jpa-join-types)

From 832f4d2619423eb60500327888104d8dd9a89c3a Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:11:11 +0800
Subject: [PATCH 137/295] Update README.md

---
 java-collections-maps-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java-collections-maps-2/README.md b/java-collections-maps-2/README.md
index 8bcafccfe8..ff84e93ce4 100644
--- a/java-collections-maps-2/README.md
+++ b/java-collections-maps-2/README.md
@@ -1,2 +1,3 @@
 ## Relevant Articles:
 - [Map of Primitives in Java](https://www.baeldung.com/java-map-primitives)
+- [Copying a HashMap in Java](https://www.baeldung.com/java-copy-hashmap)

From 1014da588a6e5f72e94414cc51ce2e22d221d837 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:12:38 +0800
Subject: [PATCH 138/295] Update README.md

---
 spring-cloud/spring-cloud-kubernetes/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-cloud/spring-cloud-kubernetes/README.md b/spring-cloud/spring-cloud-kubernetes/README.md
index 2387758626..32bcbc59b8 100644
--- a/spring-cloud/spring-cloud-kubernetes/README.md
+++ b/spring-cloud/spring-cloud-kubernetes/README.md
@@ -2,3 +2,4 @@
 
 - [Running Spring Boot Applications With Minikube](https://www.baeldung.com/spring-boot-minikube)
 - [Self-Healing Applications with Kubernetes and Spring Boot](https://www.baeldung.com/spring-boot-kubernetes-self-healing-apps)
+- [Guide to Spring Cloud Kubernetes](https://www.baeldung.com/spring-cloud-kubernetes)

From d21c9b302eb589f542a5f32ebb50ee6f09f209f6 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:13:35 +0800
Subject: [PATCH 139/295] Update README.md

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

diff --git a/spring-security-mvc-socket/README.md b/spring-security-mvc-socket/README.md
index 6c2ad7b985..d3f28af387 100644
--- a/spring-security-mvc-socket/README.md
+++ b/spring-security-mvc-socket/README.md
@@ -8,3 +8,4 @@ To login, use credentials from the data.sql file in src/main/resource, eg: user/
 ### Relevant Articles: 
 - [Intro to Security and WebSockets](http://www.baeldung.com/spring-security-websockets)
 - [Spring WebSockets: Build an User Chat](https://www.baeldung.com/spring-websockets-send-message-to-user)
+- [REST vs WebSockets](https://www.baeldung.com/rest-vs-websockets)

From 328d2731771571109b35db3469f1fa65ec1358d5 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:15:34 +0800
Subject: [PATCH 140/295] Update README.md

---
 algorithms-miscellaneous-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/algorithms-miscellaneous-2/README.md b/algorithms-miscellaneous-2/README.md
index de054566ed..18d6fece68 100644
--- a/algorithms-miscellaneous-2/README.md
+++ b/algorithms-miscellaneous-2/README.md
@@ -15,3 +15,4 @@
 - [Calculate Percentage in Java](https://www.baeldung.com/java-calculate-percentage)
 - [Converting Between Byte Arrays and Hexadecimal Strings in Java](https://www.baeldung.com/java-byte-arrays-hex-strings)
 - [Convert Latitude and Longitude to a 2D Point in Java](https://www.baeldung.com/java-convert-latitude-longitude)
+- [Reversing a Binary Tree in Java](https://www.baeldung.com/java-reversing-a-binary-tree)

From adcf4ba2cf17ef9a0c1edd3d1a6ce4ff6493d4a3 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:17:08 +0800
Subject: [PATCH 141/295] Update README.md

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

diff --git a/core-java-lang-oop-2/README.md b/core-java-lang-oop-2/README.md
index af0aed5af3..cb424b08d2 100644
--- a/core-java-lang-oop-2/README.md
+++ b/core-java-lang-oop-2/README.md
@@ -4,3 +4,4 @@
 
 ### Relevant Articles: 
 - [Generic Constructors in Java](https://www.baeldung.com/java-generic-constructors)
+- [Cannot Reference “X” Before Supertype Constructor Has Been Called](https://www.baeldung.com/java-cannot-reference-x-before-supertype-constructor-error)

From dcb9c4b5bd4b1511fed5dcc7d0c691ec5ffe87a4 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:19:10 +0800
Subject: [PATCH 142/295] Update README.md

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

diff --git a/spring-boot-ops/README.md b/spring-boot-ops/README.md
index d5063f14e5..356eca40bf 100644
--- a/spring-boot-ops/README.md
+++ b/spring-boot-ops/README.md
@@ -11,4 +11,4 @@
  - [Comparing Embedded Servlet Containers in Spring Boot](http://www.baeldung.com/spring-boot-servlet-containers)
  - [Programmatically Restarting a Spring Boot Application](https://www.baeldung.com/java-restart-spring-boot-app)
  - [Spring Properties File Outside jar](https://www.baeldung.com/spring-properties-file-outside-jar)
- 
+ - [EnvironmentPostProcessor in Spring Boot](https://www.baeldung.com/spring-boot-environmentpostprocessorr)

From e9d9c48127bfc50ddd5ea953e7d6fad0a17c108d Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:20:55 +0800
Subject: [PATCH 143/295] Update README.md

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index 080b2cf482..ac027362dc 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -5,3 +5,4 @@
 ### Relevant Articles: 
 - [Spring Data JPA – Derived Delete Methods](https://www.baeldung.com/spring-data-jpa-deleteby)
 - [JPA Join Types](https://www.baeldung.com/jpa-join-types)
+- [Case Insensitive Queries with Spring Data Repository](https://www.baeldung.com/spring-data-case-insensitive-queries)

From b7f7105e31bd537481872130194adb926d5712ff Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:22:00 +0800
Subject: [PATCH 144/295] Update README.md

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

diff --git a/core-java-11/README.md b/core-java-11/README.md
index a4b0e0e59c..d68a1c87eb 100644
--- a/core-java-11/README.md
+++ b/core-java-11/README.md
@@ -7,3 +7,4 @@
 - [Exploring the New HTTP Client in Java 9 and 11](https://www.baeldung.com/java-9-http-client)
 - [An Introduction to Epsilon GC: A No-Op Experimental Garbage Collector](https://www.baeldung.com/jvm-epsilon-gc-garbage-collector)
 - [Guide to jlink](https://www.baeldung.com/jlink)
+- [Transforming an Empty String into an Empty Optional](https://www.baeldung.com/java-empty-string-to-empty-optional)

From 7f6104e0de4e09302f6e67b2281092aa34092ed4 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:23:07 +0800
Subject: [PATCH 145/295] Update README.md

---
 persistence-modules/java-jpa/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/java-jpa/README.md b/persistence-modules/java-jpa/README.md
index 5be1015942..ba4d9f0410 100644
--- a/persistence-modules/java-jpa/README.md
+++ b/persistence-modules/java-jpa/README.md
@@ -7,3 +7,4 @@
 - [JPA 2.2 Support for Java 8 Date/Time Types](https://www.baeldung.com/jpa-java-time)
 - [Converting Between LocalDate and SQL Date](https://www.baeldung.com/java-convert-localdate-sql-date)
 - [Combining JPA And/Or Criteria Predicates](https://www.baeldung.com/jpa-and-or-criteria-predicates)
+- [Types of JPA Queries](https://www.baeldung.com/jpa-queries)

From 5aa162c29bec21ab048b80ba17e3b3e2efd20380 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:24:04 +0800
Subject: [PATCH 146/295] Update README.md

---
 logging-modules/logback/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/logging-modules/logback/README.md b/logging-modules/logback/README.md
index df55492b69..58dc8ce541 100644
--- a/logging-modules/logback/README.md
+++ b/logging-modules/logback/README.md
@@ -1,3 +1,4 @@
 ### Relevant Articles:
 
 - [Get Log Output in JSON](https://www.baeldung.com/java-log-json-output)
+- [SLF4J Warning: Class Path Contains Multiple SLF4J Bindings](https://www.baeldung.com/slf4j-classpath-multiple-bindings)

From bfdfd7e424603c8afcaf07ed0b0d8eb24ea4f1af Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:25:03 +0800
Subject: [PATCH 147/295] Update README.md

---
 algorithms-miscellaneous-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/algorithms-miscellaneous-2/README.md b/algorithms-miscellaneous-2/README.md
index 18d6fece68..462644dddb 100644
--- a/algorithms-miscellaneous-2/README.md
+++ b/algorithms-miscellaneous-2/README.md
@@ -16,3 +16,4 @@
 - [Converting Between Byte Arrays and Hexadecimal Strings in Java](https://www.baeldung.com/java-byte-arrays-hex-strings)
 - [Convert Latitude and Longitude to a 2D Point in Java](https://www.baeldung.com/java-convert-latitude-longitude)
 - [Reversing a Binary Tree in Java](https://www.baeldung.com/java-reversing-a-binary-tree)
+- [Find If Two Numbers Are Relatively Prime in Java](https://www.baeldung.com/java-two-relatively-prime-numbers)

From 4cb9f99b04c860aefa29b73a9c025a9473e92731 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:26:18 +0800
Subject: [PATCH 148/295] Update README.md

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index ac027362dc..c1b0736aaf 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -6,3 +6,4 @@
 - [Spring Data JPA – Derived Delete Methods](https://www.baeldung.com/spring-data-jpa-deleteby)
 - [JPA Join Types](https://www.baeldung.com/jpa-join-types)
 - [Case Insensitive Queries with Spring Data Repository](https://www.baeldung.com/spring-data-case-insensitive-queries)
+- [The Exists Query in Spring Data](https://www.baeldung.com/spring-data-exists-query)

From 2415cb32af798b33fb0afe349244b1829300b59c Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:28:11 +0800
Subject: [PATCH 149/295] Update README.md

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

diff --git a/core-groovy-2/README.md b/core-groovy-2/README.md
index f60bdb3cbe..cc9e69a4b6 100644
--- a/core-groovy-2/README.md
+++ b/core-groovy-2/README.md
@@ -3,5 +3,5 @@
 ## Relevant articles:
 
 - [String Matching in Groovy](http://www.baeldung.com/)
-- [Groovy def Keyword]
+- [Groovy def Keyword](https://www.baeldung.com/groovy-def-keyword)
 

From 09160c837e4e2504e21624c4382b1d0d59df07ca Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:29:21 +0800
Subject: [PATCH 150/295] Update README.md

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index c1b0736aaf..8c283c6426 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -7,3 +7,4 @@
 - [JPA Join Types](https://www.baeldung.com/jpa-join-types)
 - [Case Insensitive Queries with Spring Data Repository](https://www.baeldung.com/spring-data-case-insensitive-queries)
 - [The Exists Query in Spring Data](https://www.baeldung.com/spring-data-exists-query)
+- [Spring Data JPA Repository Populators](https://www.baeldung.com/spring-data-jpa-repository-populators)

From ed897011bc61f091c1fc9d31a6885adc01f62d07 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:30:18 +0800
Subject: [PATCH 151/295] Update README.md

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

diff --git a/persistence-modules/core-java-persistence/README.md b/persistence-modules/core-java-persistence/README.md
index 26bd4bf00f..1187cc15c4 100644
--- a/persistence-modules/core-java-persistence/README.md
+++ b/persistence-modules/core-java-persistence/README.md
@@ -8,3 +8,4 @@
 - [Introduction to the JDBC RowSet Interface in Java](http://www.baeldung.com/java-jdbc-rowset)
 - [A Simple Guide to Connection Pooling in Java](https://www.baeldung.com/java-connection-pooling)
 - [Guide to the JDBC ResultSet Interface](https://www.baeldung.com/jdbc-resultset)
+- [Types of SQL Joins](https://www.baeldung.com/sql-joins)

From 35a01bf9ae5bb94d122ab9efda369289e77f8bdb Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:31:43 +0800
Subject: [PATCH 152/295] Update README.md

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

diff --git a/core-java-lang-oop-2/README.md b/core-java-lang-oop-2/README.md
index cb424b08d2..2e36d251ca 100644
--- a/core-java-lang-oop-2/README.md
+++ b/core-java-lang-oop-2/README.md
@@ -5,3 +5,4 @@
 ### Relevant Articles: 
 - [Generic Constructors in Java](https://www.baeldung.com/java-generic-constructors)
 - [Cannot Reference “X” Before Supertype Constructor Has Been Called](https://www.baeldung.com/java-cannot-reference-x-before-supertype-constructor-error)
+- [Anonymous Classes in Java](https://www.baeldung.com/java-anonymous-classes)

From 98b8ac5bc745bbad4f86223f6d40656947146067 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:32:53 +0800
Subject: [PATCH 153/295] Update README.MD

---
 spring-boot-testing/README.MD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-boot-testing/README.MD b/spring-boot-testing/README.MD
index 144c3581f7..99d7db5743 100644
--- a/spring-boot-testing/README.MD
+++ b/spring-boot-testing/README.MD
@@ -5,3 +5,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 - [Testing with Spring and Spock](https://www.baeldung.com/spring-spock-testing)
 - [Exclude Auto-Configuration Classes in Spring Boot Tests](https://www.baeldung.com/spring-boot-exclude-auto-configuration-test)
+- [Setting the Log Level in Spring Boot when Testing](https://www.baeldung.com/spring-boot-testing-log-level)

From 52ffde721a91aaceeb3291c69ac463b8eee2f8a7 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:34:06 +0800
Subject: [PATCH 154/295] Update README.md

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index 8c283c6426..54ed6c02fd 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -8,3 +8,4 @@
 - [Case Insensitive Queries with Spring Data Repository](https://www.baeldung.com/spring-data-case-insensitive-queries)
 - [The Exists Query in Spring Data](https://www.baeldung.com/spring-data-exists-query)
 - [Spring Data JPA Repository Populators](https://www.baeldung.com/spring-data-jpa-repository-populators)
+- [Spring Data JPA and Null Parameters](https://www.baeldung.com/spring-data-jpa-null-parameters)

From 3c7984b39f01e392dbe6a2a374749d3c8c68b00b Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:35:38 +0800
Subject: [PATCH 155/295] Update README.md

---
 persistence-modules/spring-data-jpa-2/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index 54ed6c02fd..cbfca88ff5 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -9,3 +9,6 @@
 - [The Exists Query in Spring Data](https://www.baeldung.com/spring-data-exists-query)
 - [Spring Data JPA Repository Populators](https://www.baeldung.com/spring-data-jpa-repository-populators)
 - [Spring Data JPA and Null Parameters](https://www.baeldung.com/spring-data-jpa-null-parameters)
+- [Spring Data JPA Projections](https://www.baeldung.com/spring-data-jpa-projections)
+- [JPA @Embedded And @Embeddable](https://www.baeldung.com/jpa-embedded-embeddable)
+

From 8ddc79d0ef027d5e5fd3b3d2e6d0270e1da996d0 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:36:28 +0800
Subject: [PATCH 156/295] Update README.md

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

diff --git a/core-groovy-collections/README.md b/core-groovy-collections/README.md
index 482e33bce1..73f09f4a03 100644
--- a/core-groovy-collections/README.md
+++ b/core-groovy-collections/README.md
@@ -3,4 +3,5 @@
 ## Relevant articles:
 
 - [Maps in Groovy](http://www.baeldung.com/)
+- [Console I/O in Kotlin](https://www.baeldung.com/kotlin-console-io)
 

From ade4c8bc9ac53295dab539595c25d4a795aded5a Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:37:19 +0800
Subject: [PATCH 157/295] Update README.md

---
 core-groovy-collections/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core-groovy-collections/README.md b/core-groovy-collections/README.md
index 73f09f4a03..aeba8933be 100644
--- a/core-groovy-collections/README.md
+++ b/core-groovy-collections/README.md
@@ -2,6 +2,5 @@
 
 ## Relevant articles:
 
-- [Maps in Groovy](http://www.baeldung.com/)
-- [Console I/O in Kotlin](https://www.baeldung.com/kotlin-console-io)
+- [Maps in Groovy](https://www.baeldung.com/groovy-maps)
 

From 8589828641f5ad3660b2f477b0603e2201ec49b8 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:38:57 +0800
Subject: [PATCH 158/295] Update README.md

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

diff --git a/core-groovy-2/README.md b/core-groovy-2/README.md
index cc9e69a4b6..c8df242e1a 100644
--- a/core-groovy-2/README.md
+++ b/core-groovy-2/README.md
@@ -4,4 +4,4 @@
 
 - [String Matching in Groovy](http://www.baeldung.com/)
 - [Groovy def Keyword](https://www.baeldung.com/groovy-def-keyword)
-
+- [Pattern Matching in Strings in Groovy](https://www.baeldung.com/groovy-pattern-matching)

From ce94aa461af4b5d08e5a124af817573c6b09c2c5 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:39:40 +0800
Subject: [PATCH 159/295] Update README.md

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

diff --git a/jackson-2/README.md b/jackson-2/README.md
index ec147f5fd9..92fc11f61c 100644
--- a/jackson-2/README.md
+++ b/jackson-2/README.md
@@ -7,3 +7,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
 - [Mapping Multiple JSON Fields to a Single Java Field](https://www.baeldung.com/json-multiple-fields-single-java-field)
+- [How to Process YAML with Jackson](https://www.baeldung.com/jackson-yaml)

From 2ea85096cca9cbd0916da7729c01fa49e2b7b378 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:40:57 +0800
Subject: [PATCH 160/295] Update README.md

---
 spring-security-kerberos/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-security-kerberos/README.md b/spring-security-kerberos/README.md
index 0338c2058c..f9594ca529 100644
--- a/spring-security-kerberos/README.md
+++ b/spring-security-kerberos/README.md
@@ -8,3 +8,4 @@ mvn clean install
 
 ### Relevant Articles:
 - [Spring Security – Kerberos](http://www.baeldung.com/xxxxxx)
+- [Introduction to SPNEGO/Kerberos Authentication in Spring](https://www.baeldung.com/spring-security-kerberos)

From e5e8d98fd217aee76c09aadc71492966239a7ed0 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:42:03 +0800
Subject: [PATCH 161/295] Update README.md

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

diff --git a/testing-modules/rest-assured/README.md b/testing-modules/rest-assured/README.md
index d44fd08335..ec108353a0 100644
--- a/testing-modules/rest-assured/README.md
+++ b/testing-modules/rest-assured/README.md
@@ -2,3 +2,4 @@
 - [A Guide to REST-assured](http://www.baeldung.com/rest-assured-tutorial)
 - [REST-assured Support for Spring MockMvc](https://www.baeldung.com/spring-mock-mvc-rest-assured)
 - [Getting and Verifying Response Data with REST-assured](https://www.baeldung.com/rest-assured-response)
+- [REST Assured Authentication](https://www.baeldung.com/rest-assured-authentication)

From c4d32c8a71c845381bf4858c5f01884c22484e19 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:42:46 +0800
Subject: [PATCH 162/295] Update README.md

---
 core-java-collections-set/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core-java-collections-set/README.md b/core-java-collections-set/README.md
index 217e9ee6a5..2e09e920dc 100644
--- a/core-java-collections-set/README.md
+++ b/core-java-collections-set/README.md
@@ -8,4 +8,5 @@
 - [A Guide to HashSet in Java](http://www.baeldung.com/java-hashset)
 - [A Guide to TreeSet in Java](http://www.baeldung.com/java-tree-set)
 - [Initializing HashSet at the Time of Construction](http://www.baeldung.com/java-initialize-hashset)
-- [Guide to EnumSet](https://www.baeldung.com/java-enumset)
\ No newline at end of file
+- [Guide to EnumSet](https://www.baeldung.com/java-enumset)
+- [Set Operations in Java](https://www.baeldung.com/java-set-operations)

From 7d87864c3797819e47cc3541ba07d1d706d230d5 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:44:20 +0800
Subject: [PATCH 163/295] Update README.md

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index cbfca88ff5..f76d994f9f 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -11,4 +11,5 @@
 - [Spring Data JPA and Null Parameters](https://www.baeldung.com/spring-data-jpa-null-parameters)
 - [Spring Data JPA Projections](https://www.baeldung.com/spring-data-jpa-projections)
 - [JPA @Embedded And @Embeddable](https://www.baeldung.com/jpa-embedded-embeddable)
+- [Spring Data JPA Delete and Relationships](https://www.baeldung.com/spring-data-jpa-delete)
 

From 142e156b8845dce05aafef22714cee9b3c294fb6 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:52:22 +0800
Subject: [PATCH 164/295] Update README.md

---
 testing-modules/junit-5/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testing-modules/junit-5/README.md b/testing-modules/junit-5/README.md
index aafdd75e81..9d68ac8923 100644
--- a/testing-modules/junit-5/README.md
+++ b/testing-modules/junit-5/README.md
@@ -1,12 +1,12 @@
 ### Relevant Articles:
 - [The Basics of JUnit 5 – A Preview](http://www.baeldung.com/junit-5-preview)
 - [A Guide to JUnit 5](http://www.baeldung.com/junit-5)
-- [A Guide to @RepeatedTest in Junit 5](http://www.baeldung.com/junit-5-repeated-test)
-- [Guide to Dynamic Tests in Junit 5](http://www.baeldung.com/junit5-dynamic-tests)
+- [A Guide to @RepeatedTest in JUnit 5](http://www.baeldung.com/junit-5-repeated-test)
+- [Guide to Dynamic Tests in JUnit 5](http://www.baeldung.com/junit5-dynamic-tests)
 - [A Guide 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)
+- [JUnit5 @RunWith](http://www.baeldung.com/junit-5-runwith)
 - [JUnit 5 @Test Annotation](http://www.baeldung.com/junit-5-test-annotation)
 - [Assert an Exception is Thrown in JUnit 4 and 5](http://www.baeldung.com/junit-assert-exception)
 - [@Before vs @BeforeClass vs @BeforeEach vs @BeforeAll](http://www.baeldung.com/junit-before-beforeclass-beforeeach-beforeall)

From 2a6797edfd71045bf0961ffc1135773c70b14ae4 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 2 May 2019 17:54:35 +0800
Subject: [PATCH 165/295] Update README.md

---
 persistence-modules/java-jpa/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/persistence-modules/java-jpa/README.md b/persistence-modules/java-jpa/README.md
index ba4d9f0410..784bb4f286 100644
--- a/persistence-modules/java-jpa/README.md
+++ b/persistence-modules/java-jpa/README.md
@@ -2,7 +2,7 @@
 
 - [A Guide to SqlResultSetMapping](http://www.baeldung.com/jpa-sql-resultset-mapping)
 - [A Guide to Stored Procedures with JPA](http://www.baeldung.com/jpa-stored-procedures)
-- [Fixing the JPA error “java.lang.String cannot be cast to [Ljava.lang.String;”]](https://www.baeldung.com/jpa-error-java-lang-string-cannot-be-cast) 
+- [Fixing the JPA error “java.lang.String cannot be cast to [Ljava.lang.String;”]](https://www.baeldung.com/jpa-error-java-lang-string-cannot-be-cast)
 - [JPA Entity Graph](https://www.baeldung.com/jpa-entity-graph)
 - [JPA 2.2 Support for Java 8 Date/Time Types](https://www.baeldung.com/jpa-java-time)
 - [Converting Between LocalDate and SQL Date](https://www.baeldung.com/java-convert-localdate-sql-date)

From 3297adc9928e7968fe0079532eaed2b60c9b21e7 Mon Sep 17 00:00:00 2001
From: Jon Cook <jonathan.cook@erars.plus.com>
Date: Thu, 2 May 2019 14:47:14 +0200
Subject: [PATCH 166/295] BAEL-2125 - Mockito UnnecessaryStubbingException

---
 .../misusing/ExpectedTestFailureRule.java     | 51 ++++++++++++++++++
 .../MockitoUnecessaryStubUnitTest.java        | 52 +++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 testing-modules/mockito-2/src/test/java/com/baeldung/mockito/misusing/ExpectedTestFailureRule.java
 create mode 100644 testing-modules/mockito-2/src/test/java/com/baeldung/mockito/misusing/MockitoUnecessaryStubUnitTest.java

diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/misusing/ExpectedTestFailureRule.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/misusing/ExpectedTestFailureRule.java
new file mode 100644
index 0000000000..53ad60a2fa
--- /dev/null
+++ b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/misusing/ExpectedTestFailureRule.java
@@ -0,0 +1,51 @@
+package com.baeldung.mockito.misusing;
+
+import org.hamcrest.Matchers;
+import org.junit.Assert;
+import org.junit.rules.MethodRule;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+
+public class ExpectedTestFailureRule implements MethodRule {
+
+    private final MethodRule testedRule;
+    private FailureAssert failureAssert = null;
+
+    public ExpectedTestFailureRule(MethodRule testedRule) {
+        this.testedRule = testedRule;
+    }
+
+    @Override
+    public Statement apply(final Statement base, final FrameworkMethod method, final Object target) {
+        return new Statement() {
+            public void evaluate() throws Throwable {
+                try {
+                    testedRule.apply(base, method, target)
+                        .evaluate();
+                } catch (Throwable t) {
+                    if (failureAssert == null) {
+                        throw t;
+                    }
+                    failureAssert.doAssert(t);
+                    return;
+                }
+            }
+        };
+    }
+
+    @SuppressWarnings("unchecked")
+    public void expectedFailure(final Class<? extends Throwable> expected) {
+        FailureAssert assertion = t -> Assert.assertThat(t, Matchers.isA((Class<Throwable>) expected));
+        this.expectedFailure(assertion);
+    }
+
+    private void expectedFailure(FailureAssert failureAssert) {
+        this.failureAssert = failureAssert;
+    }
+
+    @FunctionalInterface
+    private interface FailureAssert {
+        abstract void doAssert(Throwable t);
+    }
+
+}
diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/misusing/MockitoUnecessaryStubUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/misusing/MockitoUnecessaryStubUnitTest.java
new file mode 100644
index 0000000000..00edb699de
--- /dev/null
+++ b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/misusing/MockitoUnecessaryStubUnitTest.java
@@ -0,0 +1,52 @@
+package com.baeldung.mockito.misusing;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.exceptions.misusing.UnnecessaryStubbingException;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.quality.Strictness;
+
+public class MockitoUnecessaryStubUnitTest {
+
+    @Rule
+    public ExpectedTestFailureRule rule = new ExpectedTestFailureRule(MockitoJUnit.rule()
+        .strictness(Strictness.STRICT_STUBS));
+
+    @Mock
+    private ArrayList<String> mockList;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void givenUnusedStub_whenInvokingGetThenThrowUnnecessaryStubbingException() {
+        rule.expectedFailure(UnnecessaryStubbingException.class);
+
+        when(mockList.add("one")).thenReturn(true);
+        when(mockList.get(anyInt())).thenReturn("hello");
+
+        assertEquals("List should contain hello", "hello", mockList.get(1));
+    }
+
+    @Test
+    public void givenLenientdStub_whenInvokingGetThenDontThrowUnnecessaryStubbingException() {
+        lenient().when(mockList.add("one"))
+            .thenReturn(true);
+        when(mockList.get(anyInt())).thenReturn("hello");
+
+        assertEquals("List should contain hello", "hello", mockList.get(1));
+    }
+
+}

From 4cc3f3413c8c1d88d13ed7df0a27108cd14a1638 Mon Sep 17 00:00:00 2001
From: Alejandro Gervasio <alejandro.gervasio@gmail.com>
Date: Fri, 3 May 2019 00:45:12 -0300
Subject: [PATCH 167/295] Multimodule Maven Project using Java Modules (#6875)

* Initial Commit

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Update module-info.java

* Update module-info.java

* Update pom.xml

* Update pom.xml
---
 .../multimodulemavenproject/daomodule/pom.xml | 27 ++++++++
 .../main/java/com/baeldung/daomodule/Dao.java | 11 ++++
 .../daomodule/src/main/java/module-info.java  |  3 +
 .../entitymodule/pom.xml                      | 28 +++++++++
 .../java/com/baeldung/entitymodule/User.java  | 19 ++++++
 .../src/main/java/module-info.java            |  3 +
 .../mainappmodule/pom.xml                     | 45 ++++++++++++++
 .../baeldung/mainappmodule/Application.java   | 19 ++++++
 .../src/main/java/module-info.java            |  8 +++
 .../multimodulemavenproject/pom.xml           | 62 +++++++++++++++++++
 .../userdaomodule/pom.xml                     | 41 ++++++++++++
 .../com/baeldung/userdaomodule/UserDao.java   | 32 ++++++++++
 .../src/main/java/module-info.java            |  6 ++
 core-java-modules/pom.xml                     |  5 +-
 14 files changed, 307 insertions(+), 2 deletions(-)
 create mode 100644 core-java-modules/multimodulemavenproject/daomodule/pom.xml
 create mode 100644 core-java-modules/multimodulemavenproject/daomodule/src/main/java/com/baeldung/daomodule/Dao.java
 create mode 100644 core-java-modules/multimodulemavenproject/daomodule/src/main/java/module-info.java
 create mode 100644 core-java-modules/multimodulemavenproject/entitymodule/pom.xml
 create mode 100644 core-java-modules/multimodulemavenproject/entitymodule/src/main/java/com/baeldung/entitymodule/User.java
 create mode 100644 core-java-modules/multimodulemavenproject/entitymodule/src/main/java/module-info.java
 create mode 100644 core-java-modules/multimodulemavenproject/mainappmodule/pom.xml
 create mode 100644 core-java-modules/multimodulemavenproject/mainappmodule/src/main/java/com/baeldung/mainappmodule/Application.java
 create mode 100644 core-java-modules/multimodulemavenproject/mainappmodule/src/main/java/module-info.java
 create mode 100644 core-java-modules/multimodulemavenproject/pom.xml
 create mode 100644 core-java-modules/multimodulemavenproject/userdaomodule/pom.xml
 create mode 100644 core-java-modules/multimodulemavenproject/userdaomodule/src/main/java/com/baeldung/userdaomodule/UserDao.java
 create mode 100644 core-java-modules/multimodulemavenproject/userdaomodule/src/main/java/module-info.java

diff --git a/core-java-modules/multimodulemavenproject/daomodule/pom.xml b/core-java-modules/multimodulemavenproject/daomodule/pom.xml
new file mode 100644
index 0000000000..a260e15e6d
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/daomodule/pom.xml
@@ -0,0 +1,27 @@
+<?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>
+    <parent>
+        <groupId>com.baeldung.multimodulemavenproject</groupId>
+        <artifactId>multimodulemavenproject</artifactId>
+        <version>1.0</version>
+    </parent>
+    <groupId>com.baeldung.daomodule</groupId>
+    <artifactId>daomodule</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <properties>
+        <maven.compiler.source>9</maven.compiler.source>
+        <maven.compiler.target>9</maven.compiler.target>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/core-java-modules/multimodulemavenproject/daomodule/src/main/java/com/baeldung/daomodule/Dao.java b/core-java-modules/multimodulemavenproject/daomodule/src/main/java/com/baeldung/daomodule/Dao.java
new file mode 100644
index 0000000000..9568bae9d9
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/daomodule/src/main/java/com/baeldung/daomodule/Dao.java
@@ -0,0 +1,11 @@
+package com.baeldung.daomodule;
+import java.util.List;
+import java.util.Optional;
+
+public interface Dao<T> {
+
+    Optional<T> findById(int id);
+
+    List<T> findAll();
+
+}
diff --git a/core-java-modules/multimodulemavenproject/daomodule/src/main/java/module-info.java b/core-java-modules/multimodulemavenproject/daomodule/src/main/java/module-info.java
new file mode 100644
index 0000000000..20c51d316a
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/daomodule/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+module com.baeldung.daomodule {
+    exports com.baeldung.daomodule;
+}
diff --git a/core-java-modules/multimodulemavenproject/entitymodule/pom.xml b/core-java-modules/multimodulemavenproject/entitymodule/pom.xml
new file mode 100644
index 0000000000..1fd672d03e
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/entitymodule/pom.xml
@@ -0,0 +1,28 @@
+<?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>
+    <parent>
+        <groupId>com.baeldung.multimodulemavenproject</groupId>
+        <artifactId>multimodulemavenproject</artifactId>
+        <version>1.0</version>
+    </parent>
+    <groupId>com.baeldung.entitymodule</groupId>
+    <artifactId>entitymodule</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    
+     <properties>
+        <maven.compiler.source>9</maven.compiler.source>
+        <maven.compiler.target>9</maven.compiler.target>
+    </properties>
+    
+</project>
\ No newline at end of file
diff --git a/core-java-modules/multimodulemavenproject/entitymodule/src/main/java/com/baeldung/entitymodule/User.java b/core-java-modules/multimodulemavenproject/entitymodule/src/main/java/com/baeldung/entitymodule/User.java
new file mode 100644
index 0000000000..c025bffd87
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/entitymodule/src/main/java/com/baeldung/entitymodule/User.java
@@ -0,0 +1,19 @@
+package com.baeldung.entitymodule;
+
+public class User {
+
+    private final String name;
+
+    public User(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" + "name=" + name + '}';
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/multimodulemavenproject/entitymodule/src/main/java/module-info.java b/core-java-modules/multimodulemavenproject/entitymodule/src/main/java/module-info.java
new file mode 100644
index 0000000000..b2c4553357
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/entitymodule/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+module com.baeldung.entitymodule {
+    exports com.baeldung.entitymodule;
+}
diff --git a/core-java-modules/multimodulemavenproject/mainappmodule/pom.xml b/core-java-modules/multimodulemavenproject/mainappmodule/pom.xml
new file mode 100644
index 0000000000..26e6a15b1e
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/mainappmodule/pom.xml
@@ -0,0 +1,45 @@
+<?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>
+    <parent>
+        <groupId>com.baeldung.multimodulemavenproject</groupId>
+        <artifactId>multimodulemavenproject</artifactId>
+        <version>1.0</version>
+    </parent>
+    <groupId>com.baeldung.mainappmodule</groupId>
+    <artifactId>mainappmodule</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    
+    <dependencies>
+        <dependency>
+            <groupId>com.baeldung.entitymodule</groupId>
+            <artifactId>entitymodule</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baeldung.daomodule</groupId>
+            <artifactId>daomodule</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baeldung.userdaomodule</groupId>
+            <artifactId>userdaomodule</artifactId>
+            <version>1.0</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <properties>
+        <maven.compiler.source>9</maven.compiler.source>
+        <maven.compiler.target>9</maven.compiler.target>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/core-java-modules/multimodulemavenproject/mainappmodule/src/main/java/com/baeldung/mainappmodule/Application.java b/core-java-modules/multimodulemavenproject/mainappmodule/src/main/java/com/baeldung/mainappmodule/Application.java
new file mode 100644
index 0000000000..cf0ba1d9bc
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/mainappmodule/src/main/java/com/baeldung/mainappmodule/Application.java
@@ -0,0 +1,19 @@
+package com.baeldung.mainappmodule;
+
+import com.baeldung.daomodule.Dao;
+import com.baeldung.entitymodule.User;
+import com.baeldung.userdaomodule.UserDao;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Application {
+    
+    public static void main(String args[]) {
+        Map<Integer, User> users = new HashMap<>();
+        users.put(1, new User("Julie"));
+        users.put(2, new User("David"));
+        Dao userDao = new UserDao(users);
+        userDao.findAll().forEach(System.out::println);
+    }
+    
+}
diff --git a/core-java-modules/multimodulemavenproject/mainappmodule/src/main/java/module-info.java b/core-java-modules/multimodulemavenproject/mainappmodule/src/main/java/module-info.java
new file mode 100644
index 0000000000..dd7620c7bf
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/mainappmodule/src/main/java/module-info.java
@@ -0,0 +1,8 @@
+module com.baeldung.mainppmodule {
+    
+    requires com.baeldung.entitymodule;
+    requires com.baeldung.daomodule;
+    requires com.baeldung.userdaomodule;
+    uses com.baeldung.userdaomodule.UserDao;
+    
+}
diff --git a/core-java-modules/multimodulemavenproject/pom.xml b/core-java-modules/multimodulemavenproject/pom.xml
new file mode 100644
index 0000000000..3d56f1356b
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/pom.xml
@@ -0,0 +1,62 @@
+<?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.multimodulemavenproject</groupId>
+    <artifactId>multimodulemavenproject</artifactId>
+    <version>1.0</version>
+    <packaging>pom</packaging>
+    <name>multimodulemavenproject</name>
+    
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+    
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.12</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>3.12.2</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.0</version>
+                    <configuration>
+                        <configuration>
+                            <source>1.9</source>
+                            <target>1.9</target>
+                        </configuration>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    
+    <modules>
+        <module>entitymodule</module>
+        <module>daomodule</module>
+        <module>userdaomodule</module>
+        <module>mainappmodule</module>
+    </modules>
+    
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+</project>
diff --git a/core-java-modules/multimodulemavenproject/userdaomodule/pom.xml b/core-java-modules/multimodulemavenproject/userdaomodule/pom.xml
new file mode 100644
index 0000000000..63968452db
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/userdaomodule/pom.xml
@@ -0,0 +1,41 @@
+<?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>
+    <parent>
+        <groupId>com.baeldung.multimodulemavenproject</groupId>
+        <artifactId>multimodulemavenproject</artifactId>
+        <version>1.0</version>
+    </parent>
+    <groupId>com.baeldung.userdaomodule</groupId>
+    <artifactId>userdaomodule</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <dependencies>
+        <dependency>
+            <groupId>com.baeldung.entitymodule</groupId>
+            <artifactId>entitymodule</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baeldung.daomodule</groupId>
+            <artifactId>daomodule</artifactId>
+            <version>1.0</version>
+        </dependency>
+    </dependencies>
+    
+    <properties>
+        <maven.compiler.source>9</maven.compiler.source>
+        <maven.compiler.target>9</maven.compiler.target>
+    </properties>
+    
+</project>
\ No newline at end of file
diff --git a/core-java-modules/multimodulemavenproject/userdaomodule/src/main/java/com/baeldung/userdaomodule/UserDao.java b/core-java-modules/multimodulemavenproject/userdaomodule/src/main/java/com/baeldung/userdaomodule/UserDao.java
new file mode 100644
index 0000000000..aba157b431
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/userdaomodule/src/main/java/com/baeldung/userdaomodule/UserDao.java
@@ -0,0 +1,32 @@
+package com.baeldung.userdaomodule;
+
+import com.baeldung.daomodule.Dao;
+import com.baeldung.entitymodule.User;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public class UserDao implements Dao<User> {
+
+    private final Map<Integer, User> users;
+
+    public UserDao() {
+        users = new HashMap<>();
+    }
+
+    public UserDao(Map<Integer, User> users) {
+        this.users = users;
+    }
+
+    @Override
+    public List<User> findAll() {
+        return new ArrayList<>(users.values());
+    }
+
+    @Override
+    public Optional<User> findById(int id) {
+        return Optional.ofNullable(users.get(id));
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/multimodulemavenproject/userdaomodule/src/main/java/module-info.java b/core-java-modules/multimodulemavenproject/userdaomodule/src/main/java/module-info.java
new file mode 100644
index 0000000000..6dd81dabe5
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/userdaomodule/src/main/java/module-info.java
@@ -0,0 +1,6 @@
+module com.baeldung.userdaomodule {
+    requires com.baeldung.entitymodule;
+    requires com.baeldung.daomodule;
+    provides com.baeldung.daomodule.Dao with com.baeldung.userdaomodule.UserDao;
+    exports com.baeldung.userdaomodule;
+}
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index ad49cceb9d..ed6a056448 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -2,6 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.core-java-modules</groupId>
     <artifactId>core-java-modules</artifactId>
     <name>core-java-modules</name>
     <packaging>pom</packaging>
@@ -15,5 +16,5 @@
     <modules>
         <module>pre-jpms</module>
     </modules>
-
-</project>
\ No newline at end of file
+    
+</project>

From 5adaadbfc51d1dc3bbb0e821731c39c2fa70e6aa Mon Sep 17 00:00:00 2001
From: eric-martin <emart.tigers@gmail.com>
Date: Thu, 2 May 2019 23:03:00 -0500
Subject: [PATCH 168/295] issues/6879: Generate hashCode and equals

---
 .../main/java/com/baeldung/graph/Graph.java   | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/core-java/src/main/java/com/baeldung/graph/Graph.java b/core-java/src/main/java/com/baeldung/graph/Graph.java
index 43b5c0aa08..3f2e17c43c 100644
--- a/core-java/src/main/java/com/baeldung/graph/Graph.java
+++ b/core-java/src/main/java/com/baeldung/graph/Graph.java
@@ -59,18 +59,43 @@ public class Graph {
         Vertex(String label) {
             this.label = label;
         }
-        @Override
-        public boolean equals(Object obj) {
-            Vertex vertex = (Vertex) obj;
-            return vertex.label == label;
-        }
+        
         @Override
         public int hashCode() {
-            return label.hashCode();
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + getOuterType().hashCode();
+            result = prime * result + ((label == null) ? 0 : label.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;
+            Vertex other = (Vertex) obj;
+            if (!getOuterType().equals(other.getOuterType()))
+                return false;
+            if (label == null) {
+                if (other.label != null)
+                    return false;
+            } else if (!label.equals(other.label))
+                return false;
+            return true;
+        }
+
         @Override
         public String toString() {
             return label;
         }
+
+
+        private Graph getOuterType() {
+            return Graph.this;
+        }
     }
 }
\ No newline at end of file

From edabb131fab3eb05a06ea912ab8b95448d988ef6 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 3 May 2019 14:27:41 +0800
Subject: [PATCH 169/295] Update README.md

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

diff --git a/persistence-modules/README.md b/persistence-modules/README.md
index 2fbaf25f2f..d5b1d2e7f4 100644
--- a/persistence-modules/README.md
+++ b/persistence-modules/README.md
@@ -13,3 +13,4 @@
 - [Spring Data with Reactive Cassandra](https://www.baeldung.com/spring-data-cassandra-reactive)
 - [Spring Data JPA – Derived Delete Methods](https://www.baeldung.com/spring-data-jpa-deleteby)
 - [Difference Between save() and saveAndFlush() in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-save-saveandflush)
+- [Spring Boot with Hibernate](https://www.baeldung.com/spring-boot-hibernate)

From 0285a60048367def17e7580edb51d6a52c1bbce4 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 3 May 2019 14:29:59 +0800
Subject: [PATCH 170/295] Update README.md

---
 spring-security-sso/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-security-sso/README.md b/spring-security-sso/README.md
index d0c1b2f7cf..5f49ee9919 100644
--- a/spring-security-sso/README.md
+++ b/spring-security-sso/README.md
@@ -1,2 +1,3 @@
 ### Relevant Articles:
 - [Simple Single Sign-On with Spring Security OAuth2](http://www.baeldung.com/sso-spring-security-oauth2)
+- [Spring Security Kerberos Integration](http://www.baeldung.com/sso-spring-security-oauth2)

From aa6d1e535001ca59284a66c6b1ecd7f0eda552bc Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 3 May 2019 14:33:33 +0800
Subject: [PATCH 171/295] Create README.md

---
 core-java-lambdas/README.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 core-java-lambdas/README.md

diff --git a/core-java-lambdas/README.md b/core-java-lambdas/README.md
new file mode 100644
index 0000000000..5b94953e68
--- /dev/null
+++ b/core-java-lambdas/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Java 9 java.lang.Module API](https://www.baeldung.com/java-lambda-effectively-final-local-variables)

From d67449b57a1386d41797251cb2b0d8e7d0888d63 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 3 May 2019 14:34:54 +0800
Subject: [PATCH 172/295] Update README.MD

---
 spring-cloud-data-flow/README.MD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-cloud-data-flow/README.MD b/spring-cloud-data-flow/README.MD
index 17d0ec6286..9e5cef19af 100644
--- a/spring-cloud-data-flow/README.MD
+++ b/spring-cloud-data-flow/README.MD
@@ -1,3 +1,4 @@
 ### Relevant Articles:
 - [Batch Processing with Spring Cloud Data Flow](http://www.baeldung.com/spring-cloud-data-flow-batch-processing)
 - [Getting Started with Stream Processing with Spring Cloud Data Flow](http://www.baeldung.com/spring-cloud-data-flow-stream-processing)
+- [Spring Cloud Data Flow With Apache Spark](https://www.baeldung.com/spring-cloud-data-flow-spark)

From 0ca02c16341c27b45f15c38ade7aa188d5516009 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 3 May 2019 14:36:36 +0800
Subject: [PATCH 173/295] Create README.md

---
 spring-mvc-simple-2/README.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 spring-mvc-simple-2/README.md

diff --git a/spring-mvc-simple-2/README.md b/spring-mvc-simple-2/README.md
new file mode 100644
index 0000000000..6dfe789be4
--- /dev/null
+++ b/spring-mvc-simple-2/README.md
@@ -0,0 +1,2 @@
+## Relevant articles:
+- [How to Read HTTP Headers in Spring REST Controllers](https://www.baeldung.com/spring-rest-http-headers)

From 3084690e62e74cc25781d3338e3056f63e635270 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 3 May 2019 14:38:05 +0800
Subject: [PATCH 174/295] Create README.md

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

diff --git a/libraries-2/README.md b/libraries-2/README.md
new file mode 100644
index 0000000000..4883e13b64
--- /dev/null
+++ b/libraries-2/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles: 
+
+- [A Guide to jBPM with Java](https://www.baeldung.com/jbpm-java)

From 8887d71f00a9dd628c31debb0555a46f0bd94d93 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 3 May 2019 14:39:43 +0800
Subject: [PATCH 175/295] Create README.md

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

diff --git a/jhipster-5/README.md b/jhipster-5/README.md
new file mode 100644
index 0000000000..a0437a3de6
--- /dev/null
+++ b/jhipster-5/README.md
@@ -0,0 +1,5 @@
+# Groovy
+
+## Relevant articles:
+
+- [Creating New APIs and Views in JHipster](https://www.baeldung.com/jhipster-new-apis-and-views)

From db62b3d971e0e2d8d674bb790d89b80e8f0f92e6 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 3 May 2019 14:41:07 +0800
Subject: [PATCH 176/295] Create README.md

---
 persistence-modules/hibernate-mapping/README.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 persistence-modules/hibernate-mapping/README.md

diff --git a/persistence-modules/hibernate-mapping/README.md b/persistence-modules/hibernate-mapping/README.md
new file mode 100644
index 0000000000..223d93e1ed
--- /dev/null
+++ b/persistence-modules/hibernate-mapping/README.md
@@ -0,0 +1,4 @@
+
+### Relevant Articles: 
+
+- [Persisting Maps with Hibernate](https://www.baeldung.com/hibernate-persisting-maps)

From 66337a9d548c83f10b9b0ad0100bdb771c62b371 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 3 May 2019 14:43:22 +0800
Subject: [PATCH 177/295] Create README.md

---
 guava-collections-set/README.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 guava-collections-set/README.md

diff --git a/guava-collections-set/README.md b/guava-collections-set/README.md
new file mode 100644
index 0000000000..cfbe67c13e
--- /dev/null
+++ b/guava-collections-set/README.md
@@ -0,0 +1,4 @@
+
+### Relevant Articles: 
+
+- [Guide to Guava Multiset](https://www.baeldung.com/guava-multiset)

From d0398a9732a0e1c6b8ba80e6f07cb5795c6223e2 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 3 May 2019 14:44:06 +0800
Subject: [PATCH 178/295] Create README.md

---
 spring-boot-exceptions/README.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 spring-boot-exceptions/README.md

diff --git a/spring-boot-exceptions/README.md b/spring-boot-exceptions/README.md
new file mode 100644
index 0000000000..bbc272aec4
--- /dev/null
+++ b/spring-boot-exceptions/README.md
@@ -0,0 +1,4 @@
+
+### Relevant Articles: 
+
+- [Rendering Exceptions in JSON with Spring](https://www.baeldung.com/spring-exceptions-json)

From 21d830074eaf1bed903f6fd2841bc1b9576526da Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 3 May 2019 14:46:22 +0800
Subject: [PATCH 179/295] Update README.md

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

diff --git a/testing-modules/junit-5/README.md b/testing-modules/junit-5/README.md
index 9d68ac8923..85fe460396 100644
--- a/testing-modules/junit-5/README.md
+++ b/testing-modules/junit-5/README.md
@@ -2,7 +2,7 @@
 - [The Basics of JUnit 5 – A Preview](http://www.baeldung.com/junit-5-preview)
 - [A Guide to JUnit 5](http://www.baeldung.com/junit-5)
 - [A Guide to @RepeatedTest in JUnit 5](http://www.baeldung.com/junit-5-repeated-test)
-- [Guide to Dynamic Tests in JUnit 5](http://www.baeldung.com/junit5-dynamic-tests)
+- [Guide to Dynamic Tests in Junit 5](http://www.baeldung.com/junit5-dynamic-tests)
 - [A Guide 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)

From b029e0f3d398850fb9f7ca842725f4f3471e1702 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 3 May 2019 14:47:44 +0800
Subject: [PATCH 180/295] Update README.md

---
 persistence-modules/java-jpa/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/persistence-modules/java-jpa/README.md b/persistence-modules/java-jpa/README.md
index 784bb4f286..17aa758f5f 100644
--- a/persistence-modules/java-jpa/README.md
+++ b/persistence-modules/java-jpa/README.md
@@ -2,7 +2,7 @@
 
 - [A Guide to SqlResultSetMapping](http://www.baeldung.com/jpa-sql-resultset-mapping)
 - [A Guide to Stored Procedures with JPA](http://www.baeldung.com/jpa-stored-procedures)
-- [Fixing the JPA error “java.lang.String cannot be cast to [Ljava.lang.String;”]](https://www.baeldung.com/jpa-error-java-lang-string-cannot-be-cast)
+- [Fixing the JPA error “java.lang.String cannot be cast to [Ljava.lang.String;”](https://www.baeldung.com/jpa-error-java-lang-string-cannot-be-cast)
 - [JPA Entity Graph](https://www.baeldung.com/jpa-entity-graph)
 - [JPA 2.2 Support for Java 8 Date/Time Types](https://www.baeldung.com/jpa-java-time)
 - [Converting Between LocalDate and SQL Date](https://www.baeldung.com/java-convert-localdate-sql-date)

From 111b5b5d10748b126e80d4befdb6ef95ce16fa48 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 3 May 2019 14:48:18 +0800
Subject: [PATCH 181/295] Update README.md

---
 persistence-modules/java-jpa/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/persistence-modules/java-jpa/README.md b/persistence-modules/java-jpa/README.md
index 17aa758f5f..34d03b3259 100644
--- a/persistence-modules/java-jpa/README.md
+++ b/persistence-modules/java-jpa/README.md
@@ -2,7 +2,7 @@
 
 - [A Guide to SqlResultSetMapping](http://www.baeldung.com/jpa-sql-resultset-mapping)
 - [A Guide to Stored Procedures with JPA](http://www.baeldung.com/jpa-stored-procedures)
-- [Fixing the JPA error “java.lang.String cannot be cast to [Ljava.lang.String;”](https://www.baeldung.com/jpa-error-java-lang-string-cannot-be-cast)
+- [Fixing the JPA error “java.lang.String cannot be cast to Ljava.lang.String;”](https://www.baeldung.com/jpa-error-java-lang-string-cannot-be-cast)
 - [JPA Entity Graph](https://www.baeldung.com/jpa-entity-graph)
 - [JPA 2.2 Support for Java 8 Date/Time Types](https://www.baeldung.com/jpa-java-time)
 - [Converting Between LocalDate and SQL Date](https://www.baeldung.com/java-convert-localdate-sql-date)

From c2d94513d8df1b583958f9218a6cafb2c2c9f8f0 Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date: Fri, 3 May 2019 20:13:38 +0200
Subject: [PATCH 182/295] RootCauseFinder improvements

---
 core-java/pom.xml                              |  2 +-
 .../baeldung/exceptions/RootCauseFinder.java   |  5 ++++-
 .../exceptions/RootCauseFinderTest.java        | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/core-java/pom.xml b/core-java/pom.xml
index 463b65a4ce..661e787149 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -454,7 +454,7 @@
         <gson.version>2.8.2</gson.version>
 
         <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
+        <commons-lang3.version>3.9</commons-lang3.version>
         <commons-io.version>2.5</commons-io.version>
         <commons-math3.version>3.6.1</commons-math3.version>
         <decimal4j.version>1.0.3</decimal4j.version>
diff --git a/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java b/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
index e05dc7a6cd..064ae27ac1 100644
--- a/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
+++ b/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
@@ -10,10 +10,13 @@ import java.util.Objects;
  */
 public class RootCauseFinder {
 
+    private RootCauseFinder() {
+    }
+
     public static Throwable findCauseUsingPlainJava(Throwable throwable) {
         Objects.requireNonNull(throwable);
         Throwable rootCause = throwable;
-        while (rootCause.getCause() != null) {
+        while (rootCause.getCause() != null && rootCause.getCause() != rootCause) {
             rootCause = rootCause.getCause();
         }
         return rootCause;
diff --git a/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java b/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
index cfac81b812..5f61a39ad1 100644
--- a/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
+++ b/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
@@ -75,6 +75,15 @@ public class RootCauseFinderTest {
         }
     }
 
+    @Test
+    public void givenNullDate_whenFindingRootCauseUsingApacheCommons_thenRootCauseNotFound() {
+        try {
+            AgeCalculator.calculateAge(null);
+        } catch (Exception ex) {
+            assertTrue(ExceptionUtils.getRootCause(ex) instanceof IllegalArgumentException);
+        }
+    }
+
     @Test
     public void givenWrongFormatDate_whenFindingRootCauseUsingGuava_thenRootCauseFound() {
         try {
@@ -93,4 +102,13 @@ public class RootCauseFinderTest {
         }
     }
 
+    @Test
+    public void givenNullDate_whenFindingRootCauseUsingGuava_thenRootCauseFound() {
+        try {
+            AgeCalculator.calculateAge(null);
+        } catch (Exception ex) {
+            assertTrue(Throwables.getRootCause(ex) instanceof IllegalArgumentException);
+        }
+    }
+
 }

From ccd28428f32545e7c24d2fa0ec777382a454bb4a Mon Sep 17 00:00:00 2001
From: Krzysztof Majewski <majewski.kielce@gmail.com>
Date: Sat, 4 May 2019 06:33:45 +0200
Subject: [PATCH 183/295] Bael 2799 (#6849)

* BAEL-2799

* fix import lombok

* move to proper module

* filename fix

* filename fix

* fix tests

* fix test methods

* fix test methods
---
 .../application/Application.java              | 14 +++++
 .../jpadefaultvalues/application/User.java    | 55 ++++++++++++++++++
 .../application/UserRepository.java           |  8 +++
 .../UserDefaultValuesUnitTest.java            | 56 +++++++++++++++++++
 4 files changed, 133 insertions(+)
 create mode 100644 persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/Application.java
 create mode 100644 persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/User.java
 create mode 100644 persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/UserRepository.java
 create mode 100644 persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/jpadefaultvalues/application/UserDefaultValuesUnitTest.java

diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/Application.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/Application.java
new file mode 100644
index 0000000000..3b96f68583
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/Application.java
@@ -0,0 +1,14 @@
+package com.baeldung.jpadefaultvalues.application;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+
+@SpringBootApplication
+public class Application {
+    private static ApplicationContext applicationContext;
+
+    public static void main(String[] args) {
+        applicationContext = SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/User.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/User.java
new file mode 100644
index 0000000000..e271c01815
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/User.java
@@ -0,0 +1,55 @@
+package com.baeldung.jpadefaultvalues.application;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class User {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @Column(columnDefinition = "varchar(255) default 'John Snow'")
+    private String name = "John Snow";
+
+    @Column(columnDefinition = "integer default 25")
+    private Integer age = 25;
+
+    @Column(columnDefinition = "boolean default false")
+    private Boolean locked = false;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    public Boolean getLocked() {
+        return locked;
+    }
+
+    public void setLocked(Boolean locked) {
+        this.locked = locked;
+    }
+}
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/UserRepository.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/UserRepository.java
new file mode 100644
index 0000000000..ca0e4c4d71
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/UserRepository.java
@@ -0,0 +1,8 @@
+package com.baeldung.jpadefaultvalues.application;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserRepository extends JpaRepository<User, Long> {
+}
diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/jpadefaultvalues/application/UserDefaultValuesUnitTest.java b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/jpadefaultvalues/application/UserDefaultValuesUnitTest.java
new file mode 100644
index 0000000000..52a5c4dcd6
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/jpadefaultvalues/application/UserDefaultValuesUnitTest.java
@@ -0,0 +1,56 @@
+package com.baeldung.jpadefaultvalues.application;
+
+import com.baeldung.jpadefaultvalues.application.User;
+import com.baeldung.jpadefaultvalues.application.UserRepository;
+
+import org.junit.Test;
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.junit.Assert.*;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class UserDefaultValuesUnitTest {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Test
+    @Ignore // SQL default values are also defined
+    public void saveUser_shouldSaveWithDefaultFieldValues() {
+        User user = new User();
+        user = userRepository.save(user);
+
+        assertEquals(user.getName(), "John Snow");
+        assertEquals(25, (int) user.getAge());
+        assertFalse(user.getLocked());
+    }
+
+    @Test
+    @Ignore // SQL default values are also defined
+    public void saveUser_shouldSaveWithNullName() {
+        User user = new User();
+        user.setName(null);
+        user = userRepository.save(user);
+
+        assertNull(user.getName());
+        assertEquals(25, (int) user.getAge());
+        assertFalse(user.getLocked());
+    }
+
+    @Test
+    public void saveUser_shouldSaveWithDefaultSqlValues() {
+        User user = new User();
+        user = userRepository.save(user);
+
+        assertEquals(user.getName(), "John Snow");
+        assertEquals(25, (int) user.getAge());
+        assertFalse(user.getLocked());
+    }
+
+}

From f2de02990d93dcc836cb9f3efb5ca29bcb01f425 Mon Sep 17 00:00:00 2001
From: Andrey Shcherbakov <veontomo@users.noreply.github.com>
Date: Sat, 4 May 2019 06:45:35 +0200
Subject: [PATCH 184/295] Add the code for article BAEL-2876 (#6887)

---
 core-java-8-2/pom.xml                         |  7 ++
 .../java/com/baeldung/localization/App.java   | 21 ++++++
 .../com/baeldung/localization/ICUFormat.java  | 29 ++++++++
 .../baeldung/localization/JavaSEFormat.java   | 24 ++++++
 .../baeldung/localization/Localization.java   | 18 +++++
 .../src/main/resources/formats_en.properties  |  2 +
 .../src/main/resources/formats_fr.properties  |  2 +
 .../src/main/resources/formats_it.properties  |  2 +
 .../src/main/resources/formats_pl.properties  |  2 +
 .../src/main/resources/messages_en.properties |  1 +
 .../src/main/resources/messages_fr.properties |  1 +
 .../src/main/resources/messages_it.properties |  1 +
 .../src/main/resources/messages_pl.properties |  1 +
 .../localization/ICUFormatUnitTest.java       | 74 +++++++++++++++++++
 14 files changed, 185 insertions(+)
 create mode 100644 core-java-8-2/src/main/java/com/baeldung/localization/App.java
 create mode 100644 core-java-8-2/src/main/java/com/baeldung/localization/ICUFormat.java
 create mode 100644 core-java-8-2/src/main/java/com/baeldung/localization/JavaSEFormat.java
 create mode 100644 core-java-8-2/src/main/java/com/baeldung/localization/Localization.java
 create mode 100644 core-java-8-2/src/main/resources/formats_en.properties
 create mode 100644 core-java-8-2/src/main/resources/formats_fr.properties
 create mode 100644 core-java-8-2/src/main/resources/formats_it.properties
 create mode 100644 core-java-8-2/src/main/resources/formats_pl.properties
 create mode 100644 core-java-8-2/src/main/resources/messages_en.properties
 create mode 100644 core-java-8-2/src/main/resources/messages_fr.properties
 create mode 100644 core-java-8-2/src/main/resources/messages_it.properties
 create mode 100644 core-java-8-2/src/main/resources/messages_pl.properties
 create mode 100644 core-java-8-2/src/test/java/com/baeldung/localization/ICUFormatUnitTest.java

diff --git a/core-java-8-2/pom.xml b/core-java-8-2/pom.xml
index 7035f12fb7..4692a0fca6 100644
--- a/core-java-8-2/pom.xml
+++ b/core-java-8-2/pom.xml
@@ -21,9 +21,16 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <icu.version>64.2</icu.version>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.ibm.icu</groupId>
+            <artifactId>icu4j</artifactId>
+            <version>${icu.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/core-java-8-2/src/main/java/com/baeldung/localization/App.java b/core-java-8-2/src/main/java/com/baeldung/localization/App.java
new file mode 100644
index 0000000000..c2b687933d
--- /dev/null
+++ b/core-java-8-2/src/main/java/com/baeldung/localization/App.java
@@ -0,0 +1,21 @@
+package com.baeldung.localization;
+
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
+public class App {
+
+    /**
+     * Runs all available formatter
+     * @throws ParseException 
+     */
+    public static void main(String[] args) {
+        List<Locale> locales = Arrays.asList(new Locale[] { Locale.UK, Locale.ITALY, Locale.FRANCE, Locale.forLanguageTag("pl-PL") });
+        Localization.run(locales);
+        JavaSEFormat.run(locales);
+        ICUFormat.run(locales);
+    }
+
+}
diff --git a/core-java-8-2/src/main/java/com/baeldung/localization/ICUFormat.java b/core-java-8-2/src/main/java/com/baeldung/localization/ICUFormat.java
new file mode 100644
index 0000000000..f7bc357933
--- /dev/null
+++ b/core-java-8-2/src/main/java/com/baeldung/localization/ICUFormat.java
@@ -0,0 +1,29 @@
+package com.baeldung.localization;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import com.ibm.icu.text.MessageFormat;
+
+public class ICUFormat {
+
+    public static String getLabel(Locale locale, Object[] data) {
+        ResourceBundle bundle = ResourceBundle.getBundle("formats", locale);
+        String format = bundle.getString("label-icu");
+        MessageFormat formatter = new MessageFormat(format, locale);
+        return formatter.format(data);
+    }
+
+    public static void run(List<Locale> locales) {
+        System.out.println("ICU formatter");
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Alice", "female", 0 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Alice", "female", 1 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Alice", "female", 2 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Alice", "female", 3 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Bob", "male", 0 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Bob", "male", 1 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Bob", "male", 2 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Bob", "male", 3 })));
+    }
+}
diff --git a/core-java-8-2/src/main/java/com/baeldung/localization/JavaSEFormat.java b/core-java-8-2/src/main/java/com/baeldung/localization/JavaSEFormat.java
new file mode 100644
index 0000000000..c95dfffa13
--- /dev/null
+++ b/core-java-8-2/src/main/java/com/baeldung/localization/JavaSEFormat.java
@@ -0,0 +1,24 @@
+package com.baeldung.localization;
+
+import java.text.MessageFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+public class JavaSEFormat {
+
+    public static String getLabel(Locale locale, Object[] data) {
+        ResourceBundle bundle = ResourceBundle.getBundle("formats", locale);
+        final String pattern = bundle.getString("label");
+        final MessageFormat formatter = new MessageFormat(pattern, locale);
+        return formatter.format(data);
+    }
+
+    public static void run(List<Locale> locales) {
+        System.out.println("Java formatter");
+        final Date date = new Date(System.currentTimeMillis());
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { date, "Alice", 0 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { date, "Alice", 2 })));
+    }
+}
diff --git a/core-java-8-2/src/main/java/com/baeldung/localization/Localization.java b/core-java-8-2/src/main/java/com/baeldung/localization/Localization.java
new file mode 100644
index 0000000000..17a6598ce0
--- /dev/null
+++ b/core-java-8-2/src/main/java/com/baeldung/localization/Localization.java
@@ -0,0 +1,18 @@
+package com.baeldung.localization;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+public class Localization {
+
+    public static String getLabel(Locale locale) {
+        final ResourceBundle bundle = ResourceBundle.getBundle("messages", locale);
+        return bundle.getString("label");
+    }
+
+    public static void run(List<Locale> locales) {
+        locales.forEach(locale -> System.out.println(getLabel(locale)));
+    }
+
+}
diff --git a/core-java-8-2/src/main/resources/formats_en.properties b/core-java-8-2/src/main/resources/formats_en.properties
new file mode 100644
index 0000000000..41e0e00119
--- /dev/null
+++ b/core-java-8-2/src/main/resources/formats_en.properties
@@ -0,0 +1,2 @@
+label=On {0, date, short} {1} has sent you {2, choice, 0#no messages|1#a message|2#two messages|2<{2,number,integer} messages}.
+label-icu={0} has sent you {2, plural, =0 {no messages} =1 {a message} other {{2, number, integer} messages}}.
\ No newline at end of file
diff --git a/core-java-8-2/src/main/resources/formats_fr.properties b/core-java-8-2/src/main/resources/formats_fr.properties
new file mode 100644
index 0000000000..c2d5159b32
--- /dev/null
+++ b/core-java-8-2/src/main/resources/formats_fr.properties
@@ -0,0 +1,2 @@
+label={0, date, short}, {1}{2, choice, 0# ne|0<} vous a envoy� {2, choice, 0#aucun message|1#un message|2#deux messages|2<{2,number,integer} messages}.
+label-icu={0} {2, plural, =0 {ne } other {}}vous a envoy� {2, plural, =0 {aucun message} =1 {un message} other {{2, number, integer} messages}}.
\ No newline at end of file
diff --git a/core-java-8-2/src/main/resources/formats_it.properties b/core-java-8-2/src/main/resources/formats_it.properties
new file mode 100644
index 0000000000..43fd1eee1c
--- /dev/null
+++ b/core-java-8-2/src/main/resources/formats_it.properties
@@ -0,0 +1,2 @@
+label={0, date, short} {1} ti ha inviato {2, choice, 0#nessun messagio|1#un messaggio|2#due messaggi|2<{2, number, integer} messaggi}.
+label-icu={0} {2, plural, =0 {non } other {}}ti ha inviato {2, plural, =0 {nessun messaggio} =1 {un messaggio} other {{2, number, integer} messaggi}}.
\ No newline at end of file
diff --git a/core-java-8-2/src/main/resources/formats_pl.properties b/core-java-8-2/src/main/resources/formats_pl.properties
new file mode 100644
index 0000000000..9333ec3396
--- /dev/null
+++ b/core-java-8-2/src/main/resources/formats_pl.properties
@@ -0,0 +1,2 @@
+label=W {0, date, short} {1}{2, choice, 0# nie|0<} wys\u0142a\u0142a ci {2, choice, 0#\u017Cadnych wiadomo\u015Bci|1#wiadomo\u015B\u0107|2#dwie wiadomo\u015Bci|2<{2, number, integer} wiadomo\u015Bci}.
+label-icu={0} {2, plural, =0 {nie } other {}}{1, select, male {wys\u0142a\u0142} female {wys\u0142a\u0142a} other {wys\u0142a\u0142o}} ci {2, plural, =0 {\u017Cadnej wiadomo\u015Bci} =1 {wiadomo\u015B\u0107} other {{2, number, integer} wiadomo\u015Bci}}.
diff --git a/core-java-8-2/src/main/resources/messages_en.properties b/core-java-8-2/src/main/resources/messages_en.properties
new file mode 100644
index 0000000000..bcbca9483c
--- /dev/null
+++ b/core-java-8-2/src/main/resources/messages_en.properties
@@ -0,0 +1 @@
+label=Alice has sent you a message.
diff --git a/core-java-8-2/src/main/resources/messages_fr.properties b/core-java-8-2/src/main/resources/messages_fr.properties
new file mode 100644
index 0000000000..6716102568
--- /dev/null
+++ b/core-java-8-2/src/main/resources/messages_fr.properties
@@ -0,0 +1 @@
+label=Alice vous a envoy� un message.
\ No newline at end of file
diff --git a/core-java-8-2/src/main/resources/messages_it.properties b/core-java-8-2/src/main/resources/messages_it.properties
new file mode 100644
index 0000000000..6929a8c091
--- /dev/null
+++ b/core-java-8-2/src/main/resources/messages_it.properties
@@ -0,0 +1 @@
+label=Alice ti ha inviato un messaggio.
\ No newline at end of file
diff --git a/core-java-8-2/src/main/resources/messages_pl.properties b/core-java-8-2/src/main/resources/messages_pl.properties
new file mode 100644
index 0000000000..5515a9920e
--- /dev/null
+++ b/core-java-8-2/src/main/resources/messages_pl.properties
@@ -0,0 +1 @@
+label=Alice wys\u0142a\u0142a ci wiadomo\u015B\u0107.
\ No newline at end of file
diff --git a/core-java-8-2/src/test/java/com/baeldung/localization/ICUFormatUnitTest.java b/core-java-8-2/src/test/java/com/baeldung/localization/ICUFormatUnitTest.java
new file mode 100644
index 0000000000..2c8f9b47f3
--- /dev/null
+++ b/core-java-8-2/src/test/java/com/baeldung/localization/ICUFormatUnitTest.java
@@ -0,0 +1,74 @@
+package com.baeldung.localization;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Locale;
+
+import org.junit.Test;
+
+import com.baeldung.localization.ICUFormat;
+
+public class ICUFormatUnitTest {
+
+    @Test
+    public void givenInUK_whenAliceSendsNothing_thenCorrectMessage() {
+        assertEquals("Alice has sent you no messages.", ICUFormat.getLabel(Locale.UK, new Object[] { "Alice", "female", 0 }));
+    }
+
+    @Test
+    public void givenInUK_whenAliceSendsOneMessage_thenCorrectMessage() {
+        assertEquals("Alice has sent you a message.", ICUFormat.getLabel(Locale.UK, new Object[] { "Alice", "female", 1 }));
+    }
+
+    @Test
+    public void givenInUK_whenBobSendsSixMessages_thenCorrectMessage() {
+        assertEquals("Bob has sent you 6 messages.", ICUFormat.getLabel(Locale.UK, new Object[] { "Bob", "male", 6 }));
+    }
+
+    @Test
+    public void givenInItaly_whenAliceSendsNothing_thenCorrectMessage() {
+        assertEquals("Alice non ti ha inviato nessun messaggio.", ICUFormat.getLabel(Locale.ITALY, new Object[] { "Alice", "female", 0 }));
+    }
+
+    @Test
+    public void givenInItaly_whenAliceSendsOneMessage_thenCorrectMessage() {
+        assertEquals("Alice ti ha inviato un messaggio.", ICUFormat.getLabel(Locale.ITALY, new Object[] { "Alice", "female", 1 }));
+    }
+
+    @Test
+    public void givenInItaly_whenBobSendsSixMessages_thenCorrectMessage() {
+        assertEquals("Bob ti ha inviato 6 messaggi.", ICUFormat.getLabel(Locale.ITALY, new Object[] { "Bob", "male", 6 }));
+    }
+
+    @Test
+    public void givenInFrance_whenAliceSendsNothing_thenCorrectMessage() {
+        assertEquals("Alice ne vous a envoyé aucun message.", ICUFormat.getLabel(Locale.FRANCE, new Object[] { "Alice", "female", 0 }));
+    }
+    
+    @Test
+    public void givenInFrance_whenAliceSendsOneMessage_thenCorrectMessage() {
+        assertEquals("Alice vous a envoyé un message.", ICUFormat.getLabel(Locale.FRANCE, new Object[] { "Alice", "female", 1 }));
+    }
+
+    @Test
+    public void givenInFrance_whenBobSendsSixMessages_thenCorrectMessage() {
+        assertEquals("Bob vous a envoyé 6 messages.", ICUFormat.getLabel(Locale.FRANCE, new Object[] { "Bob", "male", 6 }));
+    }
+
+
+    @Test
+    public void givenInPoland_whenAliceSendsNothing_thenCorrectMessage() {
+        assertEquals("Alice nie wysłała ci żadnej wiadomości.", ICUFormat.getLabel(Locale.forLanguageTag("pl-PL"), new Object[] { "Alice", "female", 0 }));
+    }
+    
+    @Test
+    public void givenInPoland_whenAliceSendsOneMessage_thenCorrectMessage() {
+        assertEquals("Alice wysłała ci wiadomość.", ICUFormat.getLabel(Locale.forLanguageTag("pl-PL"), new Object[] { "Alice", "female", 1 }));
+    }
+    
+    @Test
+    public void givenInPoland_whenBobSendsSixMessages_thenCorrectMessage() {
+        assertEquals("Bob wysłał ci 6 wiadomości.", ICUFormat.getLabel(Locale.forLanguageTag("pl-PL"), new Object[] { "Bob", "male", 6 }));
+    }
+
+}

From 4bf210ff59c1ea8149e82a175141dc087beec2c2 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Sat, 4 May 2019 10:41:16 +0200
Subject: [PATCH 185/295] [BAEL-2882] Updated pom.xml

---
 libraries-2/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml
index 965cb195bf..23275d58af 100644
--- a/libraries-2/pom.xml
+++ b/libraries-2/pom.xml
@@ -45,11 +45,23 @@
 			<artifactId>jbpm-test</artifactId>
 			<version>${jbpm.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>info.picocli</groupId>
+			<artifactId>picocli</artifactId>
+			<version>${picocli.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+			<version>${spring-boot-starter.version}</version>
+		</dependency>
 	</dependencies>
 
 	<properties>
 		<assertj.version>3.6.2</assertj.version>
 		<classgraph.version>4.8.22</classgraph.version>
 		<jbpm.version>6.0.0.Final</jbpm.version>
+		<picocli.version>3.9.6</picocli.version>
+		<spring-boot-starter.version>2.1.4.RELEASE</spring-boot-starter.version>
 	</properties>
 </project>

From aaab99952702f36f4bf07fb7a18b5d190bf3a941 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Sat, 4 May 2019 10:54:09 +0200
Subject: [PATCH 186/295] [BAEL-2506] Moved module

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

diff --git a/pom.xml b/pom.xml
index 6cb0c6d570..17a453b14f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,6 @@
     <modules>
         <module>lombok-custom</module>
         <module>picocli</module>
-        <module>core-java-reflection</module>
     </modules>
 
 	<dependencies>
@@ -404,6 +403,7 @@
                 <module>core-java-modules</module>
                 <module>core-java-networking</module>
                 <module>core-java-perf</module>
+                <module>core-java-reflection</module>
                 <module>core-java-sun</module>
                 <module>core-java</module>
                 <module>core-java-jvm</module>

From 7dae64dd749ea9b67072d4a83975b4f6735221aa Mon Sep 17 00:00:00 2001
From: Sushant <sushant57@gmail.com>
Date: Sat, 4 May 2019 12:56:10 +0300
Subject: [PATCH 187/295] Moved guava set related code to guava-collections-set
 module

---
 .../org/baeldung/guava/GuavaMapFromSet.java   |  15 +-
 .../guava/GuavaMapFromSetUnitTest.java        |   7 +-
 .../baeldung/guava/GuavaRangeSetUnitTest.java | 126 ++++++++++++++++
 .../guava/GuavaSetOperationsUnitTest.java     | 138 ++++++++++++++++++
 .../guava/GuavaCollectionTypesUnitTest.java   | 114 ---------------
 5 files changed, 272 insertions(+), 128 deletions(-)
 rename {guava-collections => guava-collections-set}/src/test/java/org/baeldung/guava/GuavaMapFromSet.java (87%)
 rename {guava-collections => guava-collections-set}/src/test/java/org/baeldung/guava/GuavaMapFromSetUnitTest.java (99%)
 create mode 100644 guava-collections-set/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java
 create mode 100644 guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java

diff --git a/guava-collections/src/test/java/org/baeldung/guava/GuavaMapFromSet.java b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
similarity index 87%
rename from guava-collections/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
rename to guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
index 1d19423f7e..94224c08ab 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
+++ b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
@@ -1,14 +1,9 @@
 package org.baeldung.guava;
 
-import java.util.AbstractMap;
-import java.util.AbstractSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-
 import com.google.common.base.Function;
 
+import java.util.*;
+
 public class GuavaMapFromSet<K, V> extends AbstractMap<K, V> {
 
     private class SingleEntry implements Entry<K, V> {
@@ -54,7 +49,7 @@ public class GuavaMapFromSet<K, V> extends AbstractMap<K, V> {
             }
 
             @Override
-            public Map.Entry<K, V> next() {
+            public Entry<K, V> next() {
                 K key = this.inner.next();
                 return new SingleEntry(key);
             }
@@ -72,7 +67,7 @@ public class GuavaMapFromSet<K, V> extends AbstractMap<K, V> {
         }
 
         @Override
-        public Iterator<Map.Entry<K, V>> iterator() {
+        public Iterator<Entry<K, V>> iterator() {
             return new EntryIterator();
         }
 
@@ -94,7 +89,7 @@ public class GuavaMapFromSet<K, V> extends AbstractMap<K, V> {
     }
 
     @Override
-    public Set<Map.Entry<K, V>> entrySet() {
+    public Set<Entry<K, V>> entrySet() {
         return this.entries;
     }
 
diff --git a/guava-collections/src/test/java/org/baeldung/guava/GuavaMapFromSetUnitTest.java b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSetUnitTest.java
similarity index 99%
rename from guava-collections/src/test/java/org/baeldung/guava/GuavaMapFromSetUnitTest.java
rename to guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSetUnitTest.java
index d80f047f5c..03f2d8f891 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/GuavaMapFromSetUnitTest.java
+++ b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSetUnitTest.java
@@ -1,15 +1,14 @@
 package org.baeldung.guava;
 
-import static org.junit.Assert.assertTrue;
+import com.google.common.base.Function;
+import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.junit.Test;
-
-import com.google.common.base.Function;
+import static org.junit.Assert.assertTrue;
 
 public class GuavaMapFromSetUnitTest {
 
diff --git a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java
new file mode 100644
index 0000000000..b72cfdeea6
--- /dev/null
+++ b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java
@@ -0,0 +1,126 @@
+package org.baeldung.guava;
+
+import com.google.common.collect.ImmutableRangeSet;
+import com.google.common.collect.Range;
+import com.google.common.collect.RangeSet;
+import com.google.common.collect.TreeRangeSet;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class GuavaRangeSetUnitTest {
+
+    @Test
+    public void givenRangeSet_whenQueryWithinRange_returnsSucessfully() {
+        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
+
+        numberRangeSet.add(Range.closed(0, 2));
+        numberRangeSet.add(Range.closed(3, 5));
+        numberRangeSet.add(Range.closed(6, 8));
+
+        assertTrue(numberRangeSet.contains(1));
+        assertFalse(numberRangeSet.contains(9));
+    }
+
+    @Test
+    public void givenRangeSet_whenEnclosesWithinRange_returnsSucessfully() {
+        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
+
+        numberRangeSet.add(Range.closed(0, 2));
+        numberRangeSet.add(Range.closed(3, 10));
+        numberRangeSet.add(Range.closed(15, 18));
+
+        assertTrue(numberRangeSet.encloses(Range.closed(4, 5)));
+        assertFalse(numberRangeSet.encloses(Range.closed(4, 11)));
+    }
+
+    @Test
+    public void givenRangeSet_whenComplementIsCalled_returnsSucessfully() {
+        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
+
+        numberRangeSet.add(Range.closed(0, 2));
+        numberRangeSet.add(Range.closed(3, 5));
+        numberRangeSet.add(Range.closed(6, 8));
+        final RangeSet<Integer> numberRangeComplementSet = numberRangeSet.complement();
+
+        assertTrue(numberRangeComplementSet.contains(-1000));
+        assertFalse(numberRangeComplementSet.contains(2));
+        assertFalse(numberRangeComplementSet.contains(3));
+        assertTrue(numberRangeComplementSet.contains(1000));
+    }
+
+    @Test
+    public void givenRangeSet_whenIntersectsWithinRange_returnsSucessfully() {
+        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
+
+        numberRangeSet.add(Range.closed(0, 2));
+        numberRangeSet.add(Range.closed(3, 10));
+        numberRangeSet.add(Range.closed(15, 18));
+
+        assertTrue(numberRangeSet.intersects(Range.closed(4, 17)));
+        assertFalse(numberRangeSet.intersects(Range.closed(19, 200)));
+    }
+
+    @Test
+    public void givenRangeSet_whenRemoveRangeIsCalled_removesSucessfully() {
+        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
+
+        numberRangeSet.add(Range.closed(0, 2));
+        numberRangeSet.add(Range.closed(3, 5));
+        numberRangeSet.add(Range.closed(6, 8));
+        numberRangeSet.add(Range.closed(9, 15));
+        numberRangeSet.remove(Range.closed(3, 5));
+        numberRangeSet.remove(Range.closed(7, 10));
+
+        assertTrue(numberRangeSet.contains(1));
+        assertFalse(numberRangeSet.contains(9));
+        assertTrue(numberRangeSet.contains(12));
+    }
+
+    @Test
+    public void givenRangeSet_whenSpanIsCalled_returnsSucessfully() {
+        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
+
+        numberRangeSet.add(Range.closed(0, 2));
+        numberRangeSet.add(Range.closed(3, 5));
+        numberRangeSet.add(Range.closed(6, 8));
+        final Range<Integer> experienceSpan = numberRangeSet.span();
+
+        assertEquals(0, experienceSpan.lowerEndpoint().intValue());
+        assertEquals(8, experienceSpan.upperEndpoint().intValue());
+    }
+
+    @Test
+    public void givenRangeSet_whenSubRangeSetIsCalled_returnsSubRangeSucessfully() {
+        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
+
+        numberRangeSet.add(Range.closed(0, 2));
+        numberRangeSet.add(Range.closed(3, 5));
+        numberRangeSet.add(Range.closed(6, 8));
+        final RangeSet<Integer> numberSubRangeSet = numberRangeSet.subRangeSet(Range.closed(4, 14));
+
+        assertFalse(numberSubRangeSet.contains(3));
+        assertFalse(numberSubRangeSet.contains(14));
+        assertTrue(numberSubRangeSet.contains(7));
+    }
+
+    @Test
+    public void givenImmutableRangeSet_whenQueryWithinRange_returnsSucessfully() {
+        final RangeSet<Integer> numberRangeSet = ImmutableRangeSet.<Integer> builder()
+	    .add(Range.closed(0, 2))
+	    .add(Range.closed(3, 5))
+	    .add(Range.closed(6, 8)).build();
+
+        assertTrue(numberRangeSet.contains(6));
+        assertFalse(numberRangeSet.contains(15));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void givenImmutableRangeMap_whenRangeOverlaps_ThrowsException() {
+        ImmutableRangeSet.<Integer> builder()
+	    .add(Range.closed(0, 2))
+	    .add(Range.closed(3, 5))
+	    .add(Range.closed(5, 8)).build();
+
+    }
+}
diff --git a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java
new file mode 100644
index 0000000000..4733a15392
--- /dev/null
+++ b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java
@@ -0,0 +1,138 @@
+package org.baeldung.guava;
+
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.collect.*;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Set;
+
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public class GuavaSetOperationsUnitTest {
+
+    @Test
+    public void whenCalculateUnionOfSets_thenCorrect() {
+        final Set<Character> first = ImmutableSet.of('a', 'b', 'c');
+        final Set<Character> second = ImmutableSet.of('b', 'c', 'd');
+
+        final Set<Character> union = Sets.union(first, second);
+        assertThat(union, containsInAnyOrder('a', 'b', 'c', 'd'));
+    }
+
+    @Test
+    public void whenCalculateSetsProduct_thenCorrect() {
+        final Set<Character> first = ImmutableSet.of('a', 'b');
+        final Set<Character> second = ImmutableSet.of('c', 'd');
+        final Set<List<Character>> result = Sets.cartesianProduct(ImmutableList.of(first, second));
+
+        final Function<List<Character>, String> func = new Function<List<Character>, String>() {
+            @Override
+            public final String apply(final List<Character> input) {
+                return Joiner
+                  .on(" ").join(input);
+            }
+        };
+
+        final Iterable<String> joined = Iterables.transform(result, func);
+        assertThat(joined, containsInAnyOrder("a c", "a d", "b c", "b d"));
+    }
+
+    @Test
+    public void whenCalculatingSetIntersection_thenCorrect() {
+        final Set<Character> first = ImmutableSet.of('a', 'b', 'c');
+        final Set<Character> second = ImmutableSet.of('b', 'c', 'd');
+
+        final Set<Character> intersection = Sets.intersection(first, second);
+        assertThat(intersection, containsInAnyOrder('b', 'c'));
+    }
+
+    @Test
+    public void whenCalculatingSetSymmetricDifference_thenCorrect() {
+        final Set<Character> first = ImmutableSet.of('a', 'b', 'c');
+        final Set<Character> second = ImmutableSet.of('b', 'c', 'd');
+
+        final Set<Character> intersection = Sets.symmetricDifference(first, second);
+        assertThat(intersection, containsInAnyOrder('a', 'd'));
+    }
+
+    @Test
+    public void whenCalculatingPowerSet_thenCorrect() {
+        final Set<Character> chars = ImmutableSet.of('a', 'b');
+        final Set<Set<Character>> result = Sets.powerSet(chars);
+
+        final Set<Character> empty = ImmutableSet.<Character> builder().build();
+        final Set<Character> a = ImmutableSet.of('a');
+        final Set<Character> b = ImmutableSet.of('b');
+        final Set<Character> aB = ImmutableSet.of('a', 'b');
+
+        assertThat(result, contains(empty, a, b, aB));
+    }
+
+    @Test
+    public void whenCreateRangeOfIntegersSet_thenCreated() {
+        final int start = 10;
+        final int end = 30;
+        final ContiguousSet<Integer> set = ContiguousSet.create(Range.closed(start, end), DiscreteDomain.integers());
+
+        assertEquals(21, set.size());
+        assertEquals(10, set.first().intValue());
+        assertEquals(30, set.last().intValue());
+    }
+
+    @Test
+    public void whenCreateRangeSet_thenCreated() {
+        final RangeSet<Integer> rangeSet = TreeRangeSet.create();
+        rangeSet.add(Range.closed(1, 10));
+        rangeSet.add(Range.closed(12, 15));
+
+        assertEquals(2, rangeSet.asRanges().size());
+
+        rangeSet.add(Range.closed(10, 12));
+        assertTrue(rangeSet.encloses(Range.closed(1, 15)));
+        assertEquals(1, rangeSet.asRanges().size());
+    }
+
+    @Test
+    public void whenInsertDuplicatesInMultiSet_thenInserted() {
+        final Multiset<String> names = HashMultiset.create();
+        names.add("John");
+        names.add("Adam", 3);
+        names.add("John");
+
+        assertEquals(2, names.count("John"));
+        names.remove("John");
+        assertEquals(1, names.count("John"));
+
+        assertEquals(3, names.count("Adam"));
+        names.remove("Adam", 2);
+        assertEquals(1, names.count("Adam"));
+    }
+
+    @Test
+    public void whenGetTopUsingMultiSet_thenCorrect() {
+        final Multiset<String> names = HashMultiset.create();
+        names.add("John");
+        names.add("Adam", 5);
+        names.add("Jane");
+        names.add("Tom", 2);
+
+        final Set<String> sorted = Multisets.copyHighestCountFirst(names).elementSet();
+        final List<String> topTwo = Lists.newArrayList(sorted).subList(0, 2);
+        assertEquals(2, topTwo.size());
+        assertEquals("Adam", topTwo.get(0));
+        assertEquals("Tom", topTwo.get(1));
+    }
+
+
+
+
+
+
+
+}
diff --git a/guava-collections/src/test/java/org/baeldung/guava/GuavaCollectionTypesUnitTest.java b/guava-collections/src/test/java/org/baeldung/guava/GuavaCollectionTypesUnitTest.java
index cb6ec7ef96..ab38afa5c4 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/GuavaCollectionTypesUnitTest.java
+++ b/guava-collections/src/test/java/org/baeldung/guava/GuavaCollectionTypesUnitTest.java
@@ -111,120 +111,6 @@ public class GuavaCollectionTypesUnitTest {
         assertThat(immutable, contains("John", "Adam", "Jane", "Tom"));
     }
 
-    // sets
-
-    @Test
-    public void whenCalculateUnionOfSets_thenCorrect() {
-        final Set<Character> first = ImmutableSet.of('a', 'b', 'c');
-        final Set<Character> second = ImmutableSet.of('b', 'c', 'd');
-
-        final Set<Character> union = Sets.union(first, second);
-        assertThat(union, containsInAnyOrder('a', 'b', 'c', 'd'));
-    }
-
-    @Test
-    public void whenCalculateSetsProduct_thenCorrect() {
-        final Set<Character> first = ImmutableSet.of('a', 'b');
-        final Set<Character> second = ImmutableSet.of('c', 'd');
-        final Set<List<Character>> result = Sets.cartesianProduct(ImmutableList.of(first, second));
-
-        final Function<List<Character>, String> func = new Function<List<Character>, String>() {
-            @Override
-            public final String apply(final List<Character> input) {
-                return Joiner.on(" ").join(input);
-            }
-        };
-
-        final Iterable<String> joined = Iterables.transform(result, func);
-        assertThat(joined, containsInAnyOrder("a c", "a d", "b c", "b d"));
-    }
-
-    @Test
-    public void whenCalculatingSetIntersection_thenCorrect() {
-        final Set<Character> first = ImmutableSet.of('a', 'b', 'c');
-        final Set<Character> second = ImmutableSet.of('b', 'c', 'd');
-
-        final Set<Character> intersection = Sets.intersection(first, second);
-        assertThat(intersection, containsInAnyOrder('b', 'c'));
-    }
-
-    @Test
-    public void whenCalculatingSetSymmetricDifference_thenCorrect() {
-        final Set<Character> first = ImmutableSet.of('a', 'b', 'c');
-        final Set<Character> second = ImmutableSet.of('b', 'c', 'd');
-
-        final Set<Character> intersection = Sets.symmetricDifference(first, second);
-        assertThat(intersection, containsInAnyOrder('a', 'd'));
-    }
-
-    @Test
-    public void whenCalculatingPowerSet_thenCorrect() {
-        final Set<Character> chars = ImmutableSet.of('a', 'b');
-        final Set<Set<Character>> result = Sets.powerSet(chars);
-
-        final Set<Character> empty = ImmutableSet.<Character> builder().build();
-        final Set<Character> a = ImmutableSet.of('a');
-        final Set<Character> b = ImmutableSet.of('b');
-        final Set<Character> aB = ImmutableSet.of('a', 'b');
-
-        assertThat(result, contains(empty, a, b, aB));
-    }
-
-    @Test
-    public void whenCreateRangeOfIntegersSet_thenCreated() {
-        final int start = 10;
-        final int end = 30;
-        final ContiguousSet<Integer> set = ContiguousSet.create(Range.closed(start, end), DiscreteDomain.integers());
-
-        assertEquals(21, set.size());
-        assertEquals(10, set.first().intValue());
-        assertEquals(30, set.last().intValue());
-    }
-
-    @Test
-    public void whenCreateRangeSet_thenCreated() {
-        final RangeSet<Integer> rangeSet = TreeRangeSet.create();
-        rangeSet.add(Range.closed(1, 10));
-        rangeSet.add(Range.closed(12, 15));
-
-        assertEquals(2, rangeSet.asRanges().size());
-
-        rangeSet.add(Range.closed(10, 12));
-        assertTrue(rangeSet.encloses(Range.closed(1, 15)));
-        assertEquals(1, rangeSet.asRanges().size());
-    }
-
-    @Test
-    public void whenInsertDuplicatesInMultiSet_thenInserted() {
-        final Multiset<String> names = HashMultiset.create();
-        names.add("John");
-        names.add("Adam", 3);
-        names.add("John");
-
-        assertEquals(2, names.count("John"));
-        names.remove("John");
-        assertEquals(1, names.count("John"));
-
-        assertEquals(3, names.count("Adam"));
-        names.remove("Adam", 2);
-        assertEquals(1, names.count("Adam"));
-    }
-
-    @Test
-    public void whenGetTopUsingMultiSet_thenCorrect() {
-        final Multiset<String> names = HashMultiset.create();
-        names.add("John");
-        names.add("Adam", 5);
-        names.add("Jane");
-        names.add("Tom", 2);
-
-        final Set<String> sorted = Multisets.copyHighestCountFirst(names).elementSet();
-        final List<String> topTwo = Lists.newArrayList(sorted).subList(0, 2);
-        assertEquals(2, topTwo.size());
-        assertEquals("Adam", topTwo.get(0));
-        assertEquals("Tom", topTwo.get(1));
-    }
-
     @Test
     public void whenCreateImmutableMap_thenCreated() {
         final Map<String, Integer> salary = ImmutableMap.<String, Integer> builder().put("John", 1000).put("Jane", 1500).put("Adam", 2000).put("Tom", 2000).build();

From dd877c6b2cf797546465cf379cf48dd09282177c Mon Sep 17 00:00:00 2001
From: Vivek <vivekrmd@gmail.com>
Date: Sat, 4 May 2019 15:31:50 +0530
Subject: [PATCH 188/295] BAEL-2857 Defining a JPA Entity - changed the table
 name

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

diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java
index 17007fa126..531bae40c5 100644
--- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java
@@ -17,13 +17,13 @@ import javax.persistence.Transient;
 import com.baeldung.util.Gender;
 
 @Entity
-@Table(name="STUD")
+@Table(name="STUDENT")
 public class Student {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	private Long id;
-	@Column(name = "STUD_NAME", length = 50, nullable = false, unique = false)
+	@Column(name = "STUDENT_NAME", length = 50, nullable = false, unique = false)
 	private String name;
 	@Transient
 	private Integer age;

From 15dfc6fa36ae876b445b0ba9d07239d358ef1aea Mon Sep 17 00:00:00 2001
From: Sushant <sushant57@gmail.com>
Date: Sat, 4 May 2019 13:10:12 +0300
Subject: [PATCH 189/295] Cleanup

---
 .../src/test/java/org/baeldung/guava/GuavaMapFromSet.java | 8 ++++----
 .../java/org/baeldung/guava/GuavaRangeSetUnitTest.java    | 1 -
 .../org/baeldung/guava/GuavaSetOperationsUnitTest.java    | 7 -------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
index 94224c08ab..ba0c8f01a3 100644
--- a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
+++ b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
@@ -49,7 +49,7 @@ public class GuavaMapFromSet<K, V> extends AbstractMap<K, V> {
             }
 
             @Override
-            public Entry<K, V> next() {
+            public Map.Entry<K, V> next() {
                 K key = this.inner.next();
                 return new SingleEntry(key);
             }
@@ -67,7 +67,7 @@ public class GuavaMapFromSet<K, V> extends AbstractMap<K, V> {
         }
 
         @Override
-        public Iterator<Entry<K, V>> iterator() {
+        public Iterator<Map.Entry<K, V>> iterator() {
             return new EntryIterator();
         }
 
@@ -79,7 +79,7 @@ public class GuavaMapFromSet<K, V> extends AbstractMap<K, V> {
     }
 
     private WeakHashMap<K, V> cache;
-    private Set<Entry<K, V>> entries;
+    private Set<Map.Entry<K, V>> entries;
     private Function<? super K, ? extends V> function;
 
     public GuavaMapFromSet(Set<K> keys, Function<? super K, ? extends V> function) {
@@ -89,7 +89,7 @@ public class GuavaMapFromSet<K, V> extends AbstractMap<K, V> {
     }
 
     @Override
-    public Set<Entry<K, V>> entrySet() {
+    public Set<Map.Entry<K, V>> entrySet() {
         return this.entries;
     }
 
diff --git a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java
index b72cfdeea6..edefc61fc4 100644
--- a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java
+++ b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java
@@ -121,6 +121,5 @@ public class GuavaRangeSetUnitTest {
 	    .add(Range.closed(0, 2))
 	    .add(Range.closed(3, 5))
 	    .add(Range.closed(5, 8)).build();
-
     }
 }
diff --git a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java
index 4733a15392..07c99ba184 100644
--- a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java
+++ b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java
@@ -128,11 +128,4 @@ public class GuavaSetOperationsUnitTest {
         assertEquals("Adam", topTwo.get(0));
         assertEquals("Tom", topTwo.get(1));
     }
-
-
-
-
-
-
-
 }

From 4b1840d7447564bb7f4058e18bbcff33bcb2de92 Mon Sep 17 00:00:00 2001
From: Sushant <sushant57@gmail.com>
Date: Sat, 4 May 2019 13:12:18 +0300
Subject: [PATCH 190/295] Remove GuavaRangeSetUnitTest

---
 .../org/baeldung/guava/GuavaMapFromSet.java   |   2 +-
 .../baeldung/guava/GuavaRangeSetUnitTest.java | 127 ------------------
 2 files changed, 1 insertion(+), 128 deletions(-)
 delete mode 100644 guava-collections/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java

diff --git a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
index ba0c8f01a3..f474fcb17b 100644
--- a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
+++ b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
@@ -79,7 +79,7 @@ public class GuavaMapFromSet<K, V> extends AbstractMap<K, V> {
     }
 
     private WeakHashMap<K, V> cache;
-    private Set<Map.Entry<K, V>> entries;
+    private Set<Entry<K, V>> entries;
     private Function<? super K, ? extends V> function;
 
     public GuavaMapFromSet(Set<K> keys, Function<? super K, ? extends V> function) {
diff --git a/guava-collections/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java b/guava-collections/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java
deleted file mode 100644
index 6f3092d845..0000000000
--- a/guava-collections/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.baeldung.guava;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import org.junit.Test;
-import com.google.common.collect.ImmutableRangeSet;
-import com.google.common.collect.Range;
-import com.google.common.collect.RangeSet;
-import com.google.common.collect.TreeRangeSet;
-
-public class GuavaRangeSetUnitTest {
-
-    @Test
-    public void givenRangeSet_whenQueryWithinRange_returnsSucessfully() {
-        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
-
-        numberRangeSet.add(Range.closed(0, 2));
-        numberRangeSet.add(Range.closed(3, 5));
-        numberRangeSet.add(Range.closed(6, 8));
-
-        assertTrue(numberRangeSet.contains(1));
-        assertFalse(numberRangeSet.contains(9));
-    }
-
-    @Test
-    public void givenRangeSet_whenEnclosesWithinRange_returnsSucessfully() {
-        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
-
-        numberRangeSet.add(Range.closed(0, 2));
-        numberRangeSet.add(Range.closed(3, 10));
-        numberRangeSet.add(Range.closed(15, 18));
-
-        assertTrue(numberRangeSet.encloses(Range.closed(4, 5)));
-        assertFalse(numberRangeSet.encloses(Range.closed(4, 11)));
-    }
-
-    @Test
-    public void givenRangeSet_whenComplementIsCalled_returnsSucessfully() {
-        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
-
-        numberRangeSet.add(Range.closed(0, 2));
-        numberRangeSet.add(Range.closed(3, 5));
-        numberRangeSet.add(Range.closed(6, 8));
-        final RangeSet<Integer> numberRangeComplementSet = numberRangeSet.complement();
-
-        assertTrue(numberRangeComplementSet.contains(-1000));
-        assertFalse(numberRangeComplementSet.contains(2));
-        assertFalse(numberRangeComplementSet.contains(3));
-        assertTrue(numberRangeComplementSet.contains(1000));
-    }
-
-    @Test
-    public void givenRangeSet_whenIntersectsWithinRange_returnsSucessfully() {
-        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
-
-        numberRangeSet.add(Range.closed(0, 2));
-        numberRangeSet.add(Range.closed(3, 10));
-        numberRangeSet.add(Range.closed(15, 18));
-
-        assertTrue(numberRangeSet.intersects(Range.closed(4, 17)));
-        assertFalse(numberRangeSet.intersects(Range.closed(19, 200)));
-    }
-
-    @Test
-    public void givenRangeSet_whenRemoveRangeIsCalled_removesSucessfully() {
-        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
-
-        numberRangeSet.add(Range.closed(0, 2));
-        numberRangeSet.add(Range.closed(3, 5));
-        numberRangeSet.add(Range.closed(6, 8));
-        numberRangeSet.add(Range.closed(9, 15));
-        numberRangeSet.remove(Range.closed(3, 5));
-        numberRangeSet.remove(Range.closed(7, 10));
-
-        assertTrue(numberRangeSet.contains(1));
-        assertFalse(numberRangeSet.contains(9));
-        assertTrue(numberRangeSet.contains(12));
-    }
-
-    @Test
-    public void givenRangeSet_whenSpanIsCalled_returnsSucessfully() {
-        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
-
-        numberRangeSet.add(Range.closed(0, 2));
-        numberRangeSet.add(Range.closed(3, 5));
-        numberRangeSet.add(Range.closed(6, 8));
-        final Range<Integer> experienceSpan = numberRangeSet.span();
-
-        assertEquals(0, experienceSpan.lowerEndpoint().intValue());
-        assertEquals(8, experienceSpan.upperEndpoint().intValue());
-    }
-
-    @Test
-    public void givenRangeSet_whenSubRangeSetIsCalled_returnsSubRangeSucessfully() {
-        final RangeSet<Integer> numberRangeSet = TreeRangeSet.create();
-
-        numberRangeSet.add(Range.closed(0, 2));
-        numberRangeSet.add(Range.closed(3, 5));
-        numberRangeSet.add(Range.closed(6, 8));
-        final RangeSet<Integer> numberSubRangeSet = numberRangeSet.subRangeSet(Range.closed(4, 14));
-
-        assertFalse(numberSubRangeSet.contains(3));
-        assertFalse(numberSubRangeSet.contains(14));
-        assertTrue(numberSubRangeSet.contains(7));
-    }
-
-    @Test
-    public void givenImmutableRangeSet_whenQueryWithinRange_returnsSucessfully() {
-        final RangeSet<Integer> numberRangeSet = ImmutableRangeSet.<Integer> builder()
-	    .add(Range.closed(0, 2))
-	    .add(Range.closed(3, 5))
-	    .add(Range.closed(6, 8)).build();
-
-        assertTrue(numberRangeSet.contains(6));
-        assertFalse(numberRangeSet.contains(15));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void givenImmutableRangeMap_whenRangeOverlaps_ThrowsException() {
-        ImmutableRangeSet.<Integer> builder()
-	    .add(Range.closed(0, 2))
-	    .add(Range.closed(3, 5))
-	    .add(Range.closed(5, 8)).build();
-
-    }
-}

From e39c765db6a07ce5be9354eb04917ea4a9a88b94 Mon Sep 17 00:00:00 2001
From: Sushant <sushant57@gmail.com>
Date: Sat, 4 May 2019 13:19:58 +0300
Subject: [PATCH 191/295] Update read me

---
 guava-collections-set/README.md | 10 ++++++++++
 guava-collections/README.md     |  3 ---
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 guava-collections-set/README.md

diff --git a/guava-collections-set/README.md b/guava-collections-set/README.md
new file mode 100644
index 0000000000..665d04736f
--- /dev/null
+++ b/guava-collections-set/README.md
@@ -0,0 +1,10 @@
+=========
+
+## Guava Examples
+
+
+### Relevant Articles:
+- [Guava – Sets](http://www.baeldung.com/guava-sets)
+- [Guide to Guava RangeSet](http://www.baeldung.com/guava-rangeset)
+- [Guava Set + Function = Map](http://www.baeldung.com/guava-set-function-map-tutorial)
+- [Guide to Guava Multiset](https://www.baeldung.com/guava-multiset)
\ No newline at end of file
diff --git a/guava-collections/README.md b/guava-collections/README.md
index fc9cf549c3..e919a98c2b 100644
--- a/guava-collections/README.md
+++ b/guava-collections/README.md
@@ -11,13 +11,10 @@
 - [Filtering and Transforming Collections in Guava](http://www.baeldung.com/guava-filter-and-transform-a-collection)
 - [Guava – Join and Split Collections](http://www.baeldung.com/guava-joiner-and-splitter-tutorial)
 - [Guava – Lists](http://www.baeldung.com/guava-lists)
-- [Guava – Sets](http://www.baeldung.com/guava-sets)
 - [Guava – Maps](http://www.baeldung.com/guava-maps)
 - [Guide to Guava Multimap](http://www.baeldung.com/guava-multimap)
-- [Guide to Guava RangeSet](http://www.baeldung.com/guava-rangeset)
 - [Guide to Guava RangeMap](http://www.baeldung.com/guava-rangemap)
 - [Guide to Guava MinMaxPriorityQueue and EvictingQueue](http://www.baeldung.com/guava-minmax-priority-queue-and-evicting-queue)
 - [Initialize a HashMap in Java](https://www.baeldung.com/java-initialize-hashmap)
-- [Guava Set + Function = Map](http://www.baeldung.com/guava-set-function-map-tutorial)
 - [Guide to Guava Table](http://www.baeldung.com/guava-table)
 - [Guide to Guava ClassToInstanceMap](http://www.baeldung.com/guava-class-to-instance-map)
\ No newline at end of file

From 236d9ccc0f136c53df5146020cd118f4bfbce06b Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Sat, 4 May 2019 16:10:31 +0530
Subject: [PATCH 192/295] BAEL2848 JUnit Tagging and Filtering Tests

---
 testing-modules/junit-5-configuration/pom.xml | 118 ++++++++++++++++++
 .../baeldung/junit/tags/example/Employee.java |  44 +++++++
 .../junit/tags/example/EmployeeDAO.java       |  58 +++++++++
 .../junit/tags/example/EmployeeRowMapper.java |  21 ++++
 .../junit/tags/example/SpringJdbcConfig.java  |  19 +++
 .../src/main/resources/jdbc/schema.sql        |   7 ++
 .../main/resources/jdbc/springJdbc-config.xml |  19 +++
 .../src/main/resources/jdbc/test-data.sql     |   7 ++
 .../EmployeeDAOCategoryIntegrationTest.java   |  66 ++++++++++
 .../categories/EmployeeDAOUnitTestSuite.java  |  12 ++
 .../baeldung/categories/IntegrationTest.java  |   4 +
 .../com/baeldung/categories/UnitTest.java     |   4 +
 .../example/EmployeeDAOIntegrationTest.java   |  41 ++++++
 .../baeldung/example/EmployeeUnitTest.java    |  40 ++++++
 .../tags/EmployeeDAOIntegrationTest.java      |  65 ++++++++++
 .../baeldung/tags/EmployeeDAOTestSuite.java   |  12 ++
 16 files changed, 537 insertions(+)
 create mode 100644 testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/Employee.java
 create mode 100644 testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java
 create mode 100644 testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java
 create mode 100644 testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java
 create mode 100644 testing-modules/junit-5-configuration/src/main/resources/jdbc/schema.sql
 create mode 100644 testing-modules/junit-5-configuration/src/main/resources/jdbc/springJdbc-config.xml
 create mode 100644 testing-modules/junit-5-configuration/src/main/resources/jdbc/test-data.sql
 create mode 100644 testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java
 create mode 100644 testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java
 create mode 100644 testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/IntegrationTest.java
 create mode 100644 testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/UnitTest.java
 create mode 100644 testing-modules/junit-5-configuration/src/test/java/com/baeldung/example/EmployeeDAOIntegrationTest.java
 create mode 100644 testing-modules/junit-5-configuration/src/test/java/com/baeldung/example/EmployeeUnitTest.java
 create mode 100644 testing-modules/junit-5-configuration/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java
 create mode 100644 testing-modules/junit-5-configuration/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java

diff --git a/testing-modules/junit-5-configuration/pom.xml b/testing-modules/junit-5-configuration/pom.xml
index aa488ebb8b..f420af5429 100644
--- a/testing-modules/junit-5-configuration/pom.xml
+++ b/testing-modules/junit-5-configuration/pom.xml
@@ -16,11 +16,55 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${junit.platform.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
             <version>${junit.jupiter.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junit.vintage.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-migrationsupport</artifactId>
+            <version>${junit.vintage.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -29,13 +73,87 @@
                 <directory>src/test/resources</directory>
                 <filtering>true</filtering>
             </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+
         </resources>
     </build>
 
+    <profiles>
+        <profile>
+            <id>filtering</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.junit.platform</groupId>
+                                <artifactId>junit-platform-surefire-provider</artifactId>
+                                <version>${junit.platform.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <excludes>
+                                **/*IntegrationTest.java
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>category</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                        <configuration>
+                            <groups>com.baeldung.categories.UnitTest</groups>
+                            <excludedGroups>com.baeldung.categories.IntegrationTest</excludedGroups>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>tags</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                        <configuration>
+                            <groups>UnitTest</groups>
+                            <excludedGroups>IntegrationTest</excludedGroups>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+    
     <properties>
         <junit.jupiter.version>5.3.1</junit.jupiter.version>
         <junit.platform.version>1.2.0</junit.platform.version>
         <junit.vintage.version>5.2.0</junit.vintage.version>
+        <h2.version>1.4.196</h2.version>
+        <spring.version>5.0.6.RELEASE</spring.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
     </properties>
 
 </project>
diff --git a/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/Employee.java b/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/Employee.java
new file mode 100644
index 0000000000..66f41ee885
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/Employee.java
@@ -0,0 +1,44 @@
+package com.baeldung.junit.tags.example;
+
+public class Employee {
+    private int id;
+
+    private String firstName;
+
+    private String lastName;
+
+    private String address;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(final String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(final String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(final String address) {
+        this.address = address;
+    }
+
+}
diff --git a/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java b/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java
new file mode 100644
index 0000000000..2e9016018e
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java
@@ -0,0 +1,58 @@
+package com.baeldung.junit.tags.example;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.stereotype.Repository;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public class EmployeeDAO {
+
+    private JdbcTemplate jdbcTemplate;
+
+    private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
+    private SimpleJdbcInsert simpleJdbcInsert;
+
+    @Autowired
+    public void setDataSource(final DataSource dataSource) {
+        jdbcTemplate = new JdbcTemplate(dataSource);
+
+        namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
+        simpleJdbcInsert = new SimpleJdbcInsert(dataSource).withTableName("EMPLOYEE");
+
+    }
+
+    public int getCountOfEmployees() {
+        return jdbcTemplate.queryForObject("SELECT COUNT(*) FROM EMPLOYEE", Integer.class);
+    }
+
+    public List<Employee> getAllEmployees() {
+        return jdbcTemplate.query("SELECT * FROM EMPLOYEE", new EmployeeRowMapper());
+    }
+
+    public int addEmplyee(final int id) {
+        return jdbcTemplate.update("INSERT INTO EMPLOYEE VALUES (?, ?, ?, ?)", id, "Bill", "Gates", "USA");
+    }
+
+    public int addEmplyeeUsingSimpelJdbcInsert(final Employee emp) {
+        final Map<String, Object> parameters = new HashMap<String, Object>();
+        parameters.put("ID", emp.getId());
+        parameters.put("FIRST_NAME", emp.getFirstName());
+        parameters.put("LAST_NAME", emp.getLastName());
+        parameters.put("ADDRESS", emp.getAddress());
+
+        return simpleJdbcInsert.execute(parameters);
+    }
+
+    // for testing
+    public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+}
diff --git a/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java b/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java
new file mode 100644
index 0000000000..f480aac9a2
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java
@@ -0,0 +1,21 @@
+package com.baeldung.junit.tags.example;
+
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class EmployeeRowMapper implements RowMapper<Employee> {
+
+    @Override
+    public Employee mapRow(final ResultSet rs, final int rowNum) throws SQLException {
+        final Employee employee = new Employee();
+
+        employee.setId(rs.getInt("ID"));
+        employee.setFirstName(rs.getString("FIRST_NAME"));
+        employee.setLastName(rs.getString("LAST_NAME"));
+        employee.setAddress(rs.getString("ADDRESS"));
+
+        return employee;
+    }
+}
diff --git a/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java b/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java
new file mode 100644
index 0000000000..dc82409df9
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java
@@ -0,0 +1,19 @@
+package com.baeldung.junit.tags.example;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+
+import javax.sql.DataSource;
+
+@Configuration
+@ComponentScan("com.baeldung.junit.tags.example")
+public class SpringJdbcConfig {
+
+    @Bean
+    public DataSource dataSource() {
+        return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2).addScript("classpath:jdbc/schema.sql").addScript("classpath:jdbc/test-data.sql").build();
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-configuration/src/main/resources/jdbc/schema.sql b/testing-modules/junit-5-configuration/src/main/resources/jdbc/schema.sql
new file mode 100644
index 0000000000..c86d35cdae
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/main/resources/jdbc/schema.sql
@@ -0,0 +1,7 @@
+CREATE TABLE EMPLOYEE
+(
+	ID int  NOT NULL PRIMARY KEY,
+	FIRST_NAME varchar(255),
+	LAST_NAME varchar(255),
+	ADDRESS varchar(255),
+);
\ No newline at end of file
diff --git a/testing-modules/junit-5-configuration/src/main/resources/jdbc/springJdbc-config.xml b/testing-modules/junit-5-configuration/src/main/resources/jdbc/springJdbc-config.xml
new file mode 100644
index 0000000000..5fd2699b41
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/main/resources/jdbc/springJdbc-config.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
+>
+
+    <bean id="employeeDao" class="org.baeldung.jdbc.EmployeeDAO">
+        <property name="dataSource" ref="dataSource"/>
+    </bean>
+
+    <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+        <property name="driverClassName" value="${jdbc.driverClassName}"/>
+        <property name="url" value="${jdbc.url}"/>
+        <property name="username" value="${jdbc.username}"/>
+        <property name="password" value="${jdbc.password}"/>
+    </bean>
+
+    <context:property-placeholder location="jdbc.properties"/>
+</beans>
\ No newline at end of file
diff --git a/testing-modules/junit-5-configuration/src/main/resources/jdbc/test-data.sql b/testing-modules/junit-5-configuration/src/main/resources/jdbc/test-data.sql
new file mode 100644
index 0000000000..b9ef8fec25
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/main/resources/jdbc/test-data.sql
@@ -0,0 +1,7 @@
+INSERT INTO EMPLOYEE VALUES (1, 'James', 'Gosling', 'Canada');
+
+INSERT INTO EMPLOYEE VALUES (2, 'Donald', 'Knuth', 'USA');
+
+INSERT INTO EMPLOYEE VALUES (3, 'Linus', 'Torvalds', 'Finland');
+
+INSERT INTO EMPLOYEE VALUES (4, 'Dennis', 'Ritchie', 'USA');
\ No newline at end of file
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java
new file mode 100644
index 0000000000..6aa1652321
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java
@@ -0,0 +1,66 @@
+package com.baeldung.categories;
+
+import com.baeldung.junit.tags.example.Employee;
+import com.baeldung.junit.tags.example.EmployeeDAO;
+import com.baeldung.junit.tags.example.SpringJdbcConfig;
+import org.hamcrest.CoreMatchers;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { SpringJdbcConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class EmployeeDAOCategoryIntegrationTest {
+
+    @Autowired
+    private EmployeeDAO employeeDao;
+
+    @Mock
+    private JdbcTemplate jdbcTemplate;
+    private EmployeeDAO employeeDAO;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        employeeDAO = new EmployeeDAO();
+        employeeDAO.setJdbcTemplate(jdbcTemplate);
+    }
+
+    @Test
+    @Category(IntegrationTest.class)
+    public void testAddEmployeeUsingSimpelJdbcInsert() {
+        final Employee emp = new Employee();
+        emp.setId(12);
+        emp.setFirstName("testFirstName");
+        emp.setLastName("testLastName");
+        emp.setAddress("testAddress");
+
+        Assert.assertEquals(employeeDao.addEmplyeeUsingSimpelJdbcInsert(emp), 1);
+    }
+
+    @Test
+    @Category(UnitTest.class)
+    public void givenNumberOfEmployeeWhenCountEmployeeThenCountMatch() {
+
+        // given
+        Mockito.when(jdbcTemplate.queryForObject(Mockito.any(String.class), Mockito.eq(Integer.class)))
+                .thenReturn(1);
+
+        // when
+        int countOfEmployees = employeeDAO.getCountOfEmployees();
+
+        // then
+        Assert.assertThat(countOfEmployees, CoreMatchers.is(1));
+    }
+
+}
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java
new file mode 100644
index 0000000000..252e7ffe64
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java
@@ -0,0 +1,12 @@
+package com.baeldung.categories;
+
+import org.junit.experimental.categories.Categories;
+import org.junit.experimental.categories.Categories.IncludeCategory;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Categories.class)
+@IncludeCategory(UnitTest.class)
+@SuiteClasses(EmployeeDAOCategoryIntegrationTest.class)
+public class EmployeeDAOUnitTestSuite {
+}
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/IntegrationTest.java b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/IntegrationTest.java
new file mode 100644
index 0000000000..9ced880ffc
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/IntegrationTest.java
@@ -0,0 +1,4 @@
+package com.baeldung.categories;
+
+public interface IntegrationTest {
+}
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/UnitTest.java b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/UnitTest.java
new file mode 100644
index 0000000000..3790fc1d91
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/UnitTest.java
@@ -0,0 +1,4 @@
+package com.baeldung.categories;
+
+public interface UnitTest {
+}
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/example/EmployeeDAOIntegrationTest.java b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/example/EmployeeDAOIntegrationTest.java
new file mode 100644
index 0000000000..d3b6a52726
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/example/EmployeeDAOIntegrationTest.java
@@ -0,0 +1,41 @@
+package com.baeldung.example;
+
+import com.baeldung.junit.tags.example.Employee;
+import com.baeldung.junit.tags.example.EmployeeDAO;
+import com.baeldung.junit.tags.example.SpringJdbcConfig;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { SpringJdbcConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class EmployeeDAOIntegrationTest {
+
+    @Autowired
+    private EmployeeDAO employeeDao;
+
+    @Test
+    public void testQueryMethod() {
+        Assert.assertEquals(employeeDao.getAllEmployees().size(), 4);
+    }
+
+    @Test
+    public void testUpdateMethod() {
+        Assert.assertEquals(employeeDao.addEmplyee(5), 1);
+    }
+
+    @Test
+    public void testAddEmployeeUsingSimpelJdbcInsert() {
+        final Employee emp = new Employee();
+        emp.setId(11);
+        emp.setFirstName("testFirstName");
+        emp.setLastName("testLastName");
+        emp.setAddress("testAddress");
+
+        Assert.assertEquals(employeeDao.addEmplyeeUsingSimpelJdbcInsert(emp), 1);
+    }
+}
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/example/EmployeeUnitTest.java b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/example/EmployeeUnitTest.java
new file mode 100644
index 0000000000..f706af94ad
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/example/EmployeeUnitTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.example;
+
+import com.baeldung.junit.tags.example.EmployeeDAO;
+import org.hamcrest.CoreMatchers;
+import org.junit.Assert;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+public class EmployeeUnitTest {
+
+    @Mock
+    private JdbcTemplate jdbcTemplate;
+
+    private EmployeeDAO employeeDAO;
+
+    @BeforeEach
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        employeeDAO = new EmployeeDAO();
+        employeeDAO.setJdbcTemplate(jdbcTemplate);
+    }
+
+    @Test
+    public void givenNumberOfEmployeeWhenCountEmployeeThenCountMatch() {
+
+        // given
+        Mockito.when(jdbcTemplate.queryForObject(Mockito.any(String.class), Mockito.eq(Integer.class)))
+            .thenReturn(1);
+
+        // when
+        int countOfEmployees = employeeDAO.getCountOfEmployees();
+
+        // then
+        Assert.assertThat(countOfEmployees, CoreMatchers.is(1));
+    }
+}
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java
new file mode 100644
index 0000000000..bcd76cb4c2
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java
@@ -0,0 +1,65 @@
+package com.baeldung.tags;
+
+import com.baeldung.junit.tags.example.Employee;
+import com.baeldung.junit.tags.example.EmployeeDAO;
+import com.baeldung.junit.tags.example.SpringJdbcConfig;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = { SpringJdbcConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class EmployeeDAOIntegrationTest {
+
+    @Autowired
+    private EmployeeDAO employeeDao;
+
+    @Mock
+    private JdbcTemplate jdbcTemplate;
+    private EmployeeDAO employeeDAO;
+
+    @BeforeEach
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        employeeDAO = new EmployeeDAO();
+        employeeDAO.setJdbcTemplate(jdbcTemplate);
+    }
+
+    @Test
+    @Tag("IntegrationTest")
+    public void testAddEmployeeUsingSimpelJdbcInsert() {
+        final Employee emp = new Employee();
+        emp.setId(12);
+        emp.setFirstName("testFirstName");
+        emp.setLastName("testLastName");
+        emp.setAddress("testAddress");
+
+        Assertions.assertEquals(employeeDao.addEmplyeeUsingSimpelJdbcInsert(emp), 1);
+    }
+
+    @Test
+    @Tag("UnitTest")
+    public void givenNumberOfEmployeeWhenCountEmployeeThenCountMatch() {
+
+        // given
+        Mockito.when(jdbcTemplate.queryForObject(Mockito.any(String.class), Mockito.eq(Integer.class)))
+                .thenReturn(1);
+
+        // when
+        int countOfEmployees = employeeDAO.getCountOfEmployees();
+
+        // then
+        Assertions.assertEquals(1, countOfEmployees);
+    }
+
+}
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java
new file mode 100644
index 0000000000..783e5a81a2
--- /dev/null
+++ b/testing-modules/junit-5-configuration/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java
@@ -0,0 +1,12 @@
+package com.baeldung.tags;
+
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.platform.suite.api.IncludeTags;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.runner.RunWith;
+
+@RunWith(JUnitPlatform.class)
+@SelectPackages("com.baeldung.tags")
+@IncludeTags("UnitTest")
+public class EmployeeDAOTestSuite {
+}

From b15ba7ed4b5c8293fc136523f95f5297c7df2e88 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Sat, 4 May 2019 16:14:14 +0530
Subject: [PATCH 193/295] BAEL2848 JUnit Tagging and Filtering Tests

---
 testing-modules/junit-5-2/pom.xml             | 167 ------------------
 .../baeldung/junit/tags/example/Employee.java |  44 -----
 .../junit/tags/example/EmployeeDAO.java       |  66 -------
 .../junit/tags/example/EmployeeRowMapper.java |  21 ---
 .../junit/tags/example/SpringJdbcConfig.java  |  20 ---
 .../src/main/resources/jdbc/schema.sql        |   7 -
 .../main/resources/jdbc/springJdbc-config.xml |  19 --
 .../src/main/resources/jdbc/test-data.sql     |   7 -
 .../EmployeeDAOCategoryIntegrationTest.java   |  67 -------
 .../categories/EmployeeDAOUnitTestSuite.java  |  12 --
 .../baeldung/categories/IntegrationTest.java  |   4 -
 .../com/baeldung/categories/UnitTest.java     |   4 -
 .../example/EmployeeDAOIntegrationTest.java   |  42 -----
 .../junit/tags/example/EmployeeUnitTest.java  |  41 -----
 .../EmployeeDAOCategoryIntegrationTest.java   |  69 --------
 .../tags/EmployeeDAOIntegrationTest.java      |  70 --------
 .../baeldung/tags/EmployeeDAOTestSuite.java   |  12 --
 17 files changed, 672 deletions(-)
 delete mode 100644 testing-modules/junit-5-2/pom.xml
 delete mode 100644 testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/Employee.java
 delete mode 100644 testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java
 delete mode 100644 testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java
 delete mode 100644 testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java
 delete mode 100644 testing-modules/junit-5-2/src/main/resources/jdbc/schema.sql
 delete mode 100644 testing-modules/junit-5-2/src/main/resources/jdbc/springJdbc-config.xml
 delete mode 100644 testing-modules/junit-5-2/src/main/resources/jdbc/test-data.sql
 delete mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java
 delete mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java
 delete mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/categories/IntegrationTest.java
 delete mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/categories/UnitTest.java
 delete mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeDAOIntegrationTest.java
 delete mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeUnitTest.java
 delete mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOCategoryIntegrationTest.java
 delete mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java
 delete mode 100644 testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java

diff --git a/testing-modules/junit-5-2/pom.xml b/testing-modules/junit-5-2/pom.xml
deleted file mode 100644
index ec535f8413..0000000000
--- a/testing-modules/junit-5-2/pom.xml
+++ /dev/null
@@ -1,167 +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>
-    <!-- NOT NEEDED - JSP <groupId>com.baeldung</groupId> -->
-    <artifactId>junit-5-2</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>junit-5-2</name>
-    <description>JUnit-5 extended</description>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-engine</artifactId>
-            <version>${junit.platform.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <version>${junit.jupiter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit.vintage.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-migrationsupport</artifactId>
-            <version>${junit.vintage.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/test/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-    
-    <profiles>
-        <profile>
-            <id>filtering</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven-surefire-plugin.version}</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.junit.platform</groupId>
-                                <artifactId>junit-platform-surefire-provider</artifactId>
-                                <version>${junit.platform.version}</version>
-                            </dependency>
-                        </dependencies>
-                        <configuration>
-                            <excludes>
-                                **/*IntegrationTest.java
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>category</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven-surefire-plugin.version}</version>
-                        <configuration>
-                            <groups>com.baeldung.categories.UnitTest</groups>
-                            <excludedGroups>com.baeldung.categories.IntegrationTest</excludedGroups>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>tags</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven-surefire-plugin.version}</version>
-                        <configuration>
-                            <groups>UnitTest</groups>
-                            <excludedGroups>IntegrationTest</excludedGroups>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
-
-    <properties>
-        <junit.jupiter.version>5.3.1</junit.jupiter.version>
-        <mockito.junit.jupiter.version>2.23.0</mockito.junit.jupiter.version>
-        <junit.platform.version>1.2.0</junit.platform.version>
-        <junit.vintage.version>5.2.0</junit.vintage.version>
-        <log4j2.version>2.8.2</log4j2.version>
-        <h2.version>1.4.196</h2.version>
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
-        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
-        <spring.version>5.0.6.RELEASE</spring.version>
-    </properties>
-
-</project>
diff --git a/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/Employee.java b/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/Employee.java
deleted file mode 100644
index 66f41ee885..0000000000
--- a/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/Employee.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.baeldung.junit.tags.example;
-
-public class Employee {
-    private int id;
-
-    private String firstName;
-
-    private String lastName;
-
-    private String address;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(final int id) {
-        this.id = id;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(final String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(final String lastName) {
-        this.lastName = lastName;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(final String address) {
-        this.address = address;
-    }
-
-}
diff --git a/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java b/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java
deleted file mode 100644
index 21375dbed1..0000000000
--- a/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.baeldung.junit.tags.example;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import org.springframework.jdbc.core.namedparam.SqlParameterSource;
-import org.springframework.jdbc.core.namedparam.SqlParameterSourceUtils;
-import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class EmployeeDAO {
-
-    private JdbcTemplate jdbcTemplate;
-
-    private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
-
-    private SimpleJdbcInsert simpleJdbcInsert;
-
-    @Autowired
-    public void setDataSource(final DataSource dataSource) {
-        jdbcTemplate = new JdbcTemplate(dataSource);
-
-        namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
-        simpleJdbcInsert = new SimpleJdbcInsert(dataSource).withTableName("EMPLOYEE");
-
-    }
-
-    public int getCountOfEmployees() {
-        return jdbcTemplate.queryForObject("SELECT COUNT(*) FROM EMPLOYEE", Integer.class);
-    }
-
-    public List<Employee> getAllEmployees() {
-        return jdbcTemplate.query("SELECT * FROM EMPLOYEE", new EmployeeRowMapper());
-    }
-
-    public int addEmplyee(final int id) {
-        return jdbcTemplate.update("INSERT INTO EMPLOYEE VALUES (?, ?, ?, ?)", id, "Bill", "Gates", "USA");
-    }
-
-    public int addEmplyeeUsingSimpelJdbcInsert(final Employee emp) {
-        final Map<String, Object> parameters = new HashMap<String, Object>();
-        parameters.put("ID", emp.getId());
-        parameters.put("FIRST_NAME", emp.getFirstName());
-        parameters.put("LAST_NAME", emp.getLastName());
-        parameters.put("ADDRESS", emp.getAddress());
-
-        return simpleJdbcInsert.execute(parameters);
-    }
-
-    // for testing
-    public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
-    }
-}
diff --git a/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java b/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java
deleted file mode 100644
index f480aac9a2..0000000000
--- a/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.baeldung.junit.tags.example;
-
-import org.springframework.jdbc.core.RowMapper;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class EmployeeRowMapper implements RowMapper<Employee> {
-
-    @Override
-    public Employee mapRow(final ResultSet rs, final int rowNum) throws SQLException {
-        final Employee employee = new Employee();
-
-        employee.setId(rs.getInt("ID"));
-        employee.setFirstName(rs.getString("FIRST_NAME"));
-        employee.setLastName(rs.getString("LAST_NAME"));
-        employee.setAddress(rs.getString("ADDRESS"));
-
-        return employee;
-    }
-}
diff --git a/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java b/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java
deleted file mode 100644
index 3ddef7e5d4..0000000000
--- a/testing-modules/junit-5-2/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.baeldung.junit.tags.example;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
-
-import javax.sql.DataSource;
-
-@Configuration
-@ComponentScan("com.baeldung.junit.tags.example")
-public class SpringJdbcConfig {
-
-    @Bean
-    public DataSource dataSource() {
-        return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2).addScript("classpath:jdbc/schema.sql").addScript("classpath:jdbc/test-data.sql").build();
-    }
-}
\ No newline at end of file
diff --git a/testing-modules/junit-5-2/src/main/resources/jdbc/schema.sql b/testing-modules/junit-5-2/src/main/resources/jdbc/schema.sql
deleted file mode 100644
index c86d35cdae..0000000000
--- a/testing-modules/junit-5-2/src/main/resources/jdbc/schema.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE EMPLOYEE
-(
-	ID int  NOT NULL PRIMARY KEY,
-	FIRST_NAME varchar(255),
-	LAST_NAME varchar(255),
-	ADDRESS varchar(255),
-);
\ No newline at end of file
diff --git a/testing-modules/junit-5-2/src/main/resources/jdbc/springJdbc-config.xml b/testing-modules/junit-5-2/src/main/resources/jdbc/springJdbc-config.xml
deleted file mode 100644
index 5fd2699b41..0000000000
--- a/testing-modules/junit-5-2/src/main/resources/jdbc/springJdbc-config.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
->
-
-    <bean id="employeeDao" class="org.baeldung.jdbc.EmployeeDAO">
-        <property name="dataSource" ref="dataSource"/>
-    </bean>
-
-    <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-        <property name="driverClassName" value="${jdbc.driverClassName}"/>
-        <property name="url" value="${jdbc.url}"/>
-        <property name="username" value="${jdbc.username}"/>
-        <property name="password" value="${jdbc.password}"/>
-    </bean>
-
-    <context:property-placeholder location="jdbc.properties"/>
-</beans>
\ No newline at end of file
diff --git a/testing-modules/junit-5-2/src/main/resources/jdbc/test-data.sql b/testing-modules/junit-5-2/src/main/resources/jdbc/test-data.sql
deleted file mode 100644
index b9ef8fec25..0000000000
--- a/testing-modules/junit-5-2/src/main/resources/jdbc/test-data.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-INSERT INTO EMPLOYEE VALUES (1, 'James', 'Gosling', 'Canada');
-
-INSERT INTO EMPLOYEE VALUES (2, 'Donald', 'Knuth', 'USA');
-
-INSERT INTO EMPLOYEE VALUES (3, 'Linus', 'Torvalds', 'Finland');
-
-INSERT INTO EMPLOYEE VALUES (4, 'Dennis', 'Ritchie', 'USA');
\ No newline at end of file
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java
deleted file mode 100644
index 202ac728a6..0000000000
--- a/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.baeldung.categories;
-
-import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
-
-import com.baeldung.junit.tags.example.Employee;
-import com.baeldung.junit.tags.example.EmployeeDAO;
-import com.baeldung.junit.tags.example.SpringJdbcConfig;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { SpringJdbcConfig.class }, loader = AnnotationConfigContextLoader.class)
-public class EmployeeDAOCategoryIntegrationTest {
-
-    @Autowired
-    private EmployeeDAO employeeDao;
-
-    @Mock
-    private JdbcTemplate jdbcTemplate;
-    private EmployeeDAO employeeDAO;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        employeeDAO = new EmployeeDAO();
-        employeeDAO.setJdbcTemplate(jdbcTemplate);
-    }
-
-    @Test
-    @Category(IntegrationTest.class)
-    public void testAddEmployeeUsingSimpelJdbcInsert() {
-        final Employee emp = new Employee();
-        emp.setId(12);
-        emp.setFirstName("testFirstName");
-        emp.setLastName("testLastName");
-        emp.setAddress("testAddress");
-
-        Assert.assertEquals(employeeDao.addEmplyeeUsingSimpelJdbcInsert(emp), 1);
-    }
-
-    @Test
-    @Category(UnitTest.class)
-    public void givenNumberOfEmployeeWhenCountEmployeeThenCountMatch() {
-
-        // given
-        Mockito.when(jdbcTemplate.queryForObject(Mockito.any(String.class), Mockito.eq(Integer.class)))
-                .thenReturn(1);
-
-        // when
-        int countOfEmployees = employeeDAO.getCountOfEmployees();
-
-        // then
-        Assert.assertThat(countOfEmployees, CoreMatchers.is(1));
-    }
-
-}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java
deleted file mode 100644
index 252e7ffe64..0000000000
--- a/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.baeldung.categories;
-
-import org.junit.experimental.categories.Categories;
-import org.junit.experimental.categories.Categories.IncludeCategory;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Categories.class)
-@IncludeCategory(UnitTest.class)
-@SuiteClasses(EmployeeDAOCategoryIntegrationTest.class)
-public class EmployeeDAOUnitTestSuite {
-}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/IntegrationTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/IntegrationTest.java
deleted file mode 100644
index 9ced880ffc..0000000000
--- a/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/IntegrationTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.baeldung.categories;
-
-public interface IntegrationTest {
-}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/UnitTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/UnitTest.java
deleted file mode 100644
index 3790fc1d91..0000000000
--- a/testing-modules/junit-5-2/src/test/java/com/baeldung/categories/UnitTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.baeldung.categories;
-
-public interface UnitTest {
-}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeDAOIntegrationTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeDAOIntegrationTest.java
deleted file mode 100644
index 9b95b3701d..0000000000
--- a/testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeDAOIntegrationTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.baeldung.junit.tags.example;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DuplicateKeyException;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { SpringJdbcConfig.class }, loader = AnnotationConfigContextLoader.class)
-public class EmployeeDAOIntegrationTest {
-
-    @Autowired
-    private EmployeeDAO employeeDao;
-
-    @Test
-    public void testQueryMethod() {
-        Assert.assertEquals(employeeDao.getAllEmployees().size(), 4);
-    }
-
-    @Test
-    public void testUpdateMethod() {
-        Assert.assertEquals(employeeDao.addEmplyee(5), 1);
-    }
-
-    @Test
-    public void testAddEmployeeUsingSimpelJdbcInsert() {
-        final Employee emp = new Employee();
-        emp.setId(11);
-        emp.setFirstName("testFirstName");
-        emp.setLastName("testLastName");
-        emp.setAddress("testAddress");
-
-        Assert.assertEquals(employeeDao.addEmplyeeUsingSimpelJdbcInsert(emp), 1);
-    }
-}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeUnitTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeUnitTest.java
deleted file mode 100644
index 6ffb5586cc..0000000000
--- a/testing-modules/junit-5-2/src/test/java/com/baeldung/junit/tags/example/EmployeeUnitTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.baeldung.junit.tags.example;
-
-import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-public class EmployeeUnitTest {
-
-    @Mock
-    private JdbcTemplate jdbcTemplate;
-
-    private EmployeeDAO employeeDAO;
-
-    @BeforeEach
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        employeeDAO = new EmployeeDAO();
-        employeeDAO.setJdbcTemplate(jdbcTemplate);
-    }
-
-    @Test
-    public void givenNumberOfEmployeeWhenCountEmployeeThenCountMatch() {
-
-        // given
-        Mockito.when(jdbcTemplate.queryForObject(Mockito.any(String.class), Mockito.eq(Integer.class)))
-            .thenReturn(1);
-
-        // when
-        int countOfEmployees = employeeDAO.getCountOfEmployees();
-
-        // then
-        Assert.assertThat(countOfEmployees, CoreMatchers.is(1));
-    }
-}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOCategoryIntegrationTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOCategoryIntegrationTest.java
deleted file mode 100644
index 1b1518337d..0000000000
--- a/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOCategoryIntegrationTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.baeldung.tags;
-
-import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
-
-import com.baeldung.categories.IntegrationTest;
-import com.baeldung.categories.UnitTest;
-import com.baeldung.junit.tags.example.Employee;
-import com.baeldung.junit.tags.example.EmployeeDAO;
-import com.baeldung.junit.tags.example.SpringJdbcConfig;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { SpringJdbcConfig.class }, loader = AnnotationConfigContextLoader.class)
-public class EmployeeDAOCategoryIntegrationTest {
-
-    @Autowired
-    private EmployeeDAO employeeDao;
-
-    @Mock
-    private JdbcTemplate jdbcTemplate;
-    private EmployeeDAO employeeDAO;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        employeeDAO = new EmployeeDAO();
-        employeeDAO.setJdbcTemplate(jdbcTemplate);
-    }
-
-    @Test
-    @Category(IntegrationTest.class)
-    public void testAddEmployeeUsingSimpelJdbcInsert() {
-        final Employee emp = new Employee();
-        emp.setId(12);
-        emp.setFirstName("testFirstName");
-        emp.setLastName("testLastName");
-        emp.setAddress("testAddress");
-
-        Assert.assertEquals(employeeDao.addEmplyeeUsingSimpelJdbcInsert(emp), 1);
-    }
-
-    @Test
-    @Category(UnitTest.class)
-    public void givenNumberOfEmployeeWhenCountEmployeeThenCountMatch() {
-
-        // given
-        Mockito.when(jdbcTemplate.queryForObject(Mockito.any(String.class), Mockito.eq(Integer.class)))
-                .thenReturn(1);
-
-        // when
-        int countOfEmployees = employeeDAO.getCountOfEmployees();
-
-        // then
-        Assert.assertThat(countOfEmployees, CoreMatchers.is(1));
-    }
-
-}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java
deleted file mode 100644
index 7c16f5eb29..0000000000
--- a/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.baeldung.tags;
-
-import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
-
-import com.baeldung.junit.tags.example.Employee;
-import com.baeldung.junit.tags.example.EmployeeDAO;
-import com.baeldung.junit.tags.example.SpringJdbcConfig;
-
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = { SpringJdbcConfig.class }, loader = AnnotationConfigContextLoader.class)
-public class EmployeeDAOIntegrationTest {
-
-    @Autowired
-    private EmployeeDAO employeeDao;
-
-    @Mock
-    private JdbcTemplate jdbcTemplate;
-    private EmployeeDAO employeeDAO;
-
-    @BeforeEach
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        employeeDAO = new EmployeeDAO();
-        employeeDAO.setJdbcTemplate(jdbcTemplate);
-    }
-
-    @Test
-    @Tag("IntegrationTest")
-    public void testAddEmployeeUsingSimpelJdbcInsert() {
-        final Employee emp = new Employee();
-        emp.setId(12);
-        emp.setFirstName("testFirstName");
-        emp.setLastName("testLastName");
-        emp.setAddress("testAddress");
-
-        Assertions.assertEquals(employeeDao.addEmplyeeUsingSimpelJdbcInsert(emp), 1);
-    }
-
-    @Test
-    @Tag("UnitTest")
-    public void givenNumberOfEmployeeWhenCountEmployeeThenCountMatch() {
-
-        // given
-        Mockito.when(jdbcTemplate.queryForObject(Mockito.any(String.class), Mockito.eq(Integer.class)))
-                .thenReturn(1);
-
-        // when
-        int countOfEmployees = employeeDAO.getCountOfEmployees();
-
-        // then
-        Assertions.assertEquals(1, countOfEmployees);
-    }
-
-}
diff --git a/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java b/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java
deleted file mode 100644
index 783e5a81a2..0000000000
--- a/testing-modules/junit-5-2/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.baeldung.tags;
-
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.platform.suite.api.IncludeTags;
-import org.junit.platform.suite.api.SelectPackages;
-import org.junit.runner.RunWith;
-
-@RunWith(JUnitPlatform.class)
-@SelectPackages("com.baeldung.tags")
-@IncludeTags("UnitTest")
-public class EmployeeDAOTestSuite {
-}

From 478e9f0b53f746f5c74126219682a225508bb593 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Sat, 4 May 2019 18:14:59 +0530
Subject: [PATCH 194/295] BAEL2848 JUnit Tagging and Filtering Tests

---
 testing-modules/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testing-modules/pom.xml b/testing-modules/pom.xml
index 98c51e7bff..40ed63bc12 100644
--- a/testing-modules/pom.xml
+++ b/testing-modules/pom.xml
@@ -32,7 +32,6 @@
         <module>test-containers</module>
         <module>testing</module>
         <module>testng</module>
-        <module>junit-5-2</module>
         <module>junit-5-configuration</module>
     </modules>
 </project>

From 2a815eb742a4a79f69411c9d81f34de1b5222daa Mon Sep 17 00:00:00 2001
From: Ger Roza <rozagerardo@gmail.com>
Date: Sat, 4 May 2019 13:36:43 -0300
Subject: [PATCH 195/295] Upgraded spring Cloud Eureka article code to the
 latest versions

---
 spring-cloud/spring-cloud-eureka/pom.xml               |  4 ++--
 .../spring-cloud-eureka-client/pom.xml                 |  2 --
 .../spring-cloud-eureka-feign-client/pom.xml           | 10 +---------
 .../spring-cloud-eureka-server/pom.xml                 |  1 -
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/spring-cloud/spring-cloud-eureka/pom.xml b/spring-cloud/spring-cloud-eureka/pom.xml
index 924981765c..e8e3d67805 100644
--- a/spring-cloud/spring-cloud-eureka/pom.xml
+++ b/spring-cloud/spring-cloud-eureka/pom.xml
@@ -32,8 +32,8 @@
     </dependencies>
 
     <properties>
-        <spring-boot.version>2.0.1.RELEASE</spring-boot.version>
-        <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
+        <spring-boot.version>2.1.2.RELEASE</spring-boot.version>
+        <spring-cloud-dependencies.version>Greenwich.RELEASE</spring-cloud-dependencies.version>
     </properties>
 
 </project>
diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml
index 85fa6606d2..04a5bd3e58 100644
--- a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml
+++ b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml
@@ -19,12 +19,10 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-            <version>${spring-cloud-starter-eureka.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring-boot.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml
index 84ba1e28fe..acc436c574 100644
--- a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml
+++ b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml
@@ -18,23 +18,19 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-feign</artifactId>
-            <version>${spring-cloud-starter-feign.version}</version>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-            <version>${spring-cloud-starter-eureka.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
-            <version>${spring-boot.version}</version>
         </dependency>
     </dependencies>
 
@@ -49,8 +45,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-    <properties>
-        <spring-cloud-eureka-client.version>1.0.0-SNAPSHOT</spring-cloud-eureka-client.version>
-    </properties>
 </project>
diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml
index f51f6d229d..95edba29f9 100644
--- a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml
+++ b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml
@@ -19,7 +19,6 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
-            <version>${spring-cloud-starter-eureka.version}</version>
         </dependency>
     </dependencies>
 

From c5f02232822e7081221a770afd297059e97bc8ef Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date: Sat, 4 May 2019 19:59:12 +0200
Subject: [PATCH 196/295] test renamed to end with UnitTest suffix

---
 .../{RootCauseFinderTest.java => RootCauseFinderUnitTest.java}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename core-java/src/test/java/com/baeldung/exceptions/{RootCauseFinderTest.java => RootCauseFinderUnitTest.java} (98%)

diff --git a/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java b/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderUnitTest.java
similarity index 98%
rename from core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
rename to core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderUnitTest.java
index 5f61a39ad1..5d0f3b9c3e 100644
--- a/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderTest.java
+++ b/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderUnitTest.java
@@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 /**
  * Tests the {@link RootCauseFinder}.
  */
-public class RootCauseFinderTest {
+public class RootCauseFinderUnitTest {
 
     @Test
     public void givenBirthDate_whenCalculatingAge_thenAgeReturned() {

From 905df7b30b4b97b0e0230d02068f8f5816ceaa83 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sat, 4 May 2019 22:04:26 +0300
Subject: [PATCH 197/295] Update pom.xml

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

diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml
index 965cb195bf..b41ac6d845 100644
--- a/libraries-2/pom.xml
+++ b/libraries-2/pom.xml
@@ -49,7 +49,7 @@
 
 	<properties>
 		<assertj.version>3.6.2</assertj.version>
-		<classgraph.version>4.8.22</classgraph.version>
+		<classgraph.version>4.8.28</classgraph.version>
 		<jbpm.version>6.0.0.Final</jbpm.version>
 	</properties>
 </project>

From cb6c43efa1a3ac24d8e57ac344c5d19cf50d2c56 Mon Sep 17 00:00:00 2001
From: Alejandro Gervasio <alejandro.gervasio@gmail.com>
Date: Sun, 5 May 2019 00:30:08 -0300
Subject: [PATCH 198/295] Add h2 dependency to pom.xml (#6893)

---
 spring-data-rest/pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spring-data-rest/pom.xml b/spring-data-rest/pom.xml
index 525c88c9d8..8400993a38 100644
--- a/spring-data-rest/pom.xml
+++ b/spring-data-rest/pom.xml
@@ -41,6 +41,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-apt</artifactId>
@@ -87,4 +92,4 @@
         <start-class>com.baeldung.SpringDataRestApplication</start-class>
     </properties>
 
-</project>
+</project>
\ No newline at end of file

From 0f4dafeab8d9e0ddb4435b6a8df94d743bbc2835 Mon Sep 17 00:00:00 2001
From: KevinGilmore <kpg102@gmail.com>
Date: Sat, 4 May 2019 22:54:07 -0500
Subject: [PATCH 199/295] BAEL-2884 update README (#6895)

* BAEL-2246: add link back to article

* BAEL-2174: rename core-java-net module to core-java-networking

* BAEL-2174: add link back to article

* BAEL-2363 BAEL-2337 BAEL-1996 BAEL-2277 add links back to articles

* BAEL-2367: add link back to article

* BAEL-2335: add link back to article

* BAEL-2413: add link back to article

* Update README.MD

* BAEL-2577: add link back to article

* BAEL-2490: add link back to article

* BAEL-2471: add link back to article

* BAEL-2583: add link back to article

* BAEL-2738: add link back to article

* BAEL-2711: Add spring-boot-angular module to root pom

* BAEL-2544 BAEL-2711 BAEL-2575 BAEL-2657 Add links back to articles

* BAEL-2736: Add link back to article

* BAEL-2789: Add link back to article

* BAEL-2489: add link back to article

* BAEL-2840: add link back to article

* BAEL-2655: add link back to article

* BAEL-2884: add link back to article
---
 core-java-modules/README.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 core-java-modules/README.md

diff --git a/core-java-modules/README.md b/core-java-modules/README.md
new file mode 100644
index 0000000000..a90535a44f
--- /dev/null
+++ b/core-java-modules/README.md
@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Multi-Module Maven Application with Java Modules](https://www.baeldung.com/maven-multi-module-project-java-jpms)

From b22ded782ba046e948ab68e9565758e8dde490d1 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 5 May 2019 11:39:30 +0530
Subject: [PATCH 200/295] [BAEL-14251] - Make sure the tutorials build doesn't
 generate any un-committed or un-ignored artifacts

---
 .gitignore                                        |   3 ++-
 core-groovy/.gitignore                            |   1 +
 .../src/main/resources/ioSerializedObject.txt     | Bin 199 -> 0 bytes
 .../com/baeldung/io/DataAndObjectsUnitTest.groovy |   4 +++-
 jackson-2/.gitignore                              |   5 ++++-
 testing-modules/groovy-spock/.gitignore           |   1 +
 6 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 core-groovy/.gitignore
 delete mode 100644 core-groovy/src/main/resources/ioSerializedObject.txt
 create mode 100644 testing-modules/groovy-spock/.gitignore

diff --git a/.gitignore b/.gitignore
index b981a473f6..50cb889e5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,4 +76,5 @@ persistence-modules/hibernate5/transaction.log
 apache-avro/src/main/java/com/baeldung/avro/model/
 jta/transaction-logs/
 software-security/sql-injection-samples/derby.log
-spring-soap/src/main/java/com/baeldung/springsoap/gen/
\ No newline at end of file
+spring-soap/src/main/java/com/baeldung/springsoap/gen/
+/report-*.json
\ No newline at end of file
diff --git a/core-groovy/.gitignore b/core-groovy/.gitignore
new file mode 100644
index 0000000000..09220fdf52
--- /dev/null
+++ b/core-groovy/.gitignore
@@ -0,0 +1 @@
+/src/main/resources/ioSerializedObject.txt
\ No newline at end of file
diff --git a/core-groovy/src/main/resources/ioSerializedObject.txt b/core-groovy/src/main/resources/ioSerializedObject.txt
deleted file mode 100644
index 833ed32bf128ecf8d2d6b6893b3959bc3c4bf8a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 199
zcmZ4UmVvdnh(RPdKUXg)F*PTpG%sB*GhZ(xu{itSp^g0yHl1)~Vqo!PU@I<3EGaGa
zVc<?lElw`VEGWs$&nsaN^2tgpOVrOv%uCk~E-A{)OSkr6U{5JcbxABqEnyIVNSBsm
z=IDb&fRda*gNjN(oI-{=2BwMv1|R?$6q1;os*qn=qEM2Ns!&ptSe#J+bQmAVcs-DQ
fJ&=}+tVTxf$P!6r28N1)at;Ot#!SuGiX9aI5HUf!

diff --git a/core-groovy/src/test/groovy/com/baeldung/io/DataAndObjectsUnitTest.groovy b/core-groovy/src/test/groovy/com/baeldung/io/DataAndObjectsUnitTest.groovy
index 0b413cf76c..32a21f6b38 100644
--- a/core-groovy/src/test/groovy/com/baeldung/io/DataAndObjectsUnitTest.groovy
+++ b/core-groovy/src/test/groovy/com/baeldung/io/DataAndObjectsUnitTest.groovy
@@ -34,7 +34,9 @@ class DataAndObjectsUnitTest {
     @Test
     void whenUsingWithObjectOutputStream_thenObjectIsSerializedToFile() {
         Task task = new Task(description:'Take out the trash', startDate:new Date(), status:0)
-        new File('src/main/resources/ioSerializedObject.txt').withObjectOutputStream { out ->
+        def serializedDataFile = new File('src/main/resources/ioSerializedObject.txt')
+        serializedDataFile.createNewFile()
+        serializedDataFile.withObjectOutputStream { out ->
             out.writeObject(task)
         }
 
diff --git a/jackson-2/.gitignore b/jackson-2/.gitignore
index 83c05e60c8..4b1cfaf098 100644
--- a/jackson-2/.gitignore
+++ b/jackson-2/.gitignore
@@ -10,4 +10,7 @@
 # Packaged files #
 *.jar
 *.war
-*.ear
\ No newline at end of file
+*.ear
+
+# Files
+/src/main/resources/orderOutput.yaml
\ No newline at end of file
diff --git a/testing-modules/groovy-spock/.gitignore b/testing-modules/groovy-spock/.gitignore
new file mode 100644
index 0000000000..37118ef42c
--- /dev/null
+++ b/testing-modules/groovy-spock/.gitignore
@@ -0,0 +1 @@
+/report-*.json
\ No newline at end of file

From 0709445f24b1cbde6add02314e1a15d3cd35ad6a Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 5 May 2019 10:03:47 +0300
Subject: [PATCH 201/295] Create README.md

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

diff --git a/libraries-2/README.md b/libraries-2/README.md
new file mode 100644
index 0000000000..3d5dba80ee
--- /dev/null
+++ b/libraries-2/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles
+
+- [Guide to Classgraph Library](https://www.baeldung.com/classgraph)

From bfcf164951d174c355cff01332cd0f45e82bdf65 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 5 May 2019 10:04:29 +0300
Subject: [PATCH 202/295] Update README.md

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

diff --git a/spring-resttemplate/README.md b/spring-resttemplate/README.md
index 353e9f955e..c2c4965231 100644
--- a/spring-resttemplate/README.md
+++ b/spring-resttemplate/README.md
@@ -9,3 +9,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Spring RestTemplate Error Handling](http://www.baeldung.com/spring-rest-template-error-handling)
 - [Configure a RestTemplate with RestTemplateBuilder](http://www.baeldung.com/spring-rest-template-builder)
 - [Mocking a RestTemplate in Spring](https://www.baeldung.com/spring-mock-rest-template)
+- [RestTemplate Post Request with JSON](https://www.baeldung.com/spring-resttemplate-post-json)

From 3bae5e533447b326fb394f99be76da9185d331cd Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 5 May 2019 17:22:09 +0530
Subject: [PATCH 203/295] [BAEL-9555] - Created a core-java-modules folder

---
 core-java-lang/native/nativedatetimeutils.dll |   Bin 72050 -> 0 bytes
 .../core-java-10}/README.md                   |     0
 .../core-java-10}/pom.xml                     |     1 +
 .../src/main/java/com/baeldung/App.java       |     0
 .../com/baeldung/graal/CountUppercase.java    |     0
 .../src/main/resources/logback.xml            |     0
 .../src/test/java/com/baeldung/AppTest.java   |     0
 .../java10/Java10FeaturesUnitTest.java        |     0
 .../java10/list/CopyListServiceUnitTest.java  |     0
 .../core-java-11}/README.md                   |     0
 .../core-java-11}/pom.xml                     |     1 +
 .../src/main/java/com/baeldung/App.java       |     0
 .../src/main/java/com/baeldung/Outer.java     |     0
 .../src/main/java/com/baeldung/add            |     0
 .../baeldung/epsilongc/MemoryPolluter.java    |     0
 .../java11/httpclient/HttpClientExample.java  |   264 +-
 .../src/main/resources/logback.xml            |     0
 .../com/baeldung/jlink/HelloWorld.java        |     0
 .../src/modules/jlinkModule/module-info.java  |     0
 .../src/test/java/com/baeldung/AppTest.java   |     0
 .../EmptyStringToEmptyOptionalUnitTest.java   |     0
 .../com/baeldung/NewStringAPIUnitTest.java    |     0
 .../test/java/com/baeldung/OuterUnitTest.java |     0
 .../httpclient/test/HttpClientTest.java       |   480 +-
 .../httpclient/test/HttpRequestTest.java      |   336 +-
 .../httpclient/test/HttpResponseTest.java     |   108 +-
 .../baeldung/optional/OptionalUnitTest.java   |     0
 .../core-java-12}/pom.xml                     |     1 +
 .../collectors/CollectorsUnitTest.java        |     0
 .../switchExpression/SwitchUnitTest.java      |     0
 .../core-java-8-2}/.gitignore                 |     0
 .../core-java-8-2}/README.md                  |     0
 .../core-java-8-2}/pom.xml                    |     2 +-
 .../com/baeldung/jarArguments/JarExample.java |     0
 .../java/com/baeldung/localization/App.java   |     0
 .../com/baeldung/localization/ICUFormat.java  |     0
 .../baeldung/localization/JavaSEFormat.java   |     0
 .../baeldung/localization/Localization.java   |     0
 .../src/main/resources/example_manifest.txt   |     0
 .../src/main/resources/formats_en.properties  |     0
 .../src/main/resources/formats_fr.properties  |     0
 .../src/main/resources/formats_it.properties  |     0
 .../src/main/resources/formats_pl.properties  |     0
 .../src/main/resources/messages_en.properties |     0
 .../src/main/resources/messages_fr.properties |     0
 .../src/main/resources/messages_it.properties |     0
 .../src/main/resources/messages_pl.properties |     0
 .../localization/ICUFormatUnitTest.java       |     0
 .../core-java-8}/.gitignore                   |     0
 .../core-java-8}/README.md                    |     0
 .../core-java-8}/pom.xml                      |   398 +-
 .../annotations/ClassWithAnnotation.java      |     0
 .../ClassWithDeprecatedMethod.java            |     0
 .../annotations/ClassWithSafeVarargs.java     |     0
 .../ClassWithSuppressWarnings.java            |     0
 .../com/baeldung/annotations/IntConsumer.java |     0
 .../com/baeldung/annotations/Interval.java    |     0
 .../baeldung/annotations/IntervalUsage.java   |     0
 .../com/baeldung/annotations/Intervals.java   |     0
 .../baeldung/annotations/MyAnnotation.java    |     0
 .../annotations/MyAnnotationTarget.java       |     0
 .../com/baeldung/annotations/MyOperation.java |     0
 .../baeldung/annotations/MyOperationImpl.java |     0
 .../ChangeCallsToCurrentTimeInMillisMethod.aj |     0
 .../com/baeldung/customannotations/Init.java  |    26 +-
 .../customannotations/JsonElement.java        |    26 +-
 .../customannotations/JsonSerializable.java   |    26 +-
 .../JsonSerializationException.java           |    20 +-
 .../ObjectToJsonConverter.java                |   134 +-
 .../baeldung/customannotations/Person.java    |   132 +-
 .../application/Application.java              |     0
 .../model/Alarm.java                          |     0
 .../model/Car.java                            |     0
 .../model/Motorbike.java                      |     0
 .../model/MultiAlarmCar.java                  |     0
 .../model/Vehicle.java                        |     0
 .../com/baeldung/doublecolon/Computer.java    |     0
 .../baeldung/doublecolon/ComputerUtils.java   |     0
 .../com/baeldung/doublecolon/MacbookPro.java  |     0
 .../function/ComputerPredicate.java           |     0
 .../doublecolon/function/TriFunction.java     |     0
 .../exceptions/LambdaExceptionWrappers.java   |     0
 .../lambda/exceptions/ThrowingConsumer.java   |     0
 .../com/baeldung/java8/lambda/tips/Bar.java   |     0
 .../com/baeldung/java8/lambda/tips/Baz.java   |     0
 .../com/baeldung/java8/lambda/tips/Foo.java   |     0
 .../java8/lambda/tips/FooExtended.java        |     0
 .../baeldung/java8/lambda/tips/Processor.java |     0
 .../java8/lambda/tips/ProcessorImpl.java      |     0
 .../baeldung/java8/lambda/tips/UseFoo.java    |     0
 .../com/baeldung/java_8_features/Address.java |     0
 .../java_8_features/CustomException.java      |     0
 .../java_8_features/OptionalAddress.java      |     0
 .../java_8_features/OptionalUser.java         |     0
 .../com/baeldung/java_8_features/User.java    |     0
 .../com/baeldung/java_8_features/Vehicle.java |     0
 .../baeldung/java_8_features/VehicleImpl.java |     0
 .../java_8_features/groupingby/BlogPost.java  |     0
 .../groupingby/BlogPostType.java              |     0
 ...lectionStreamsUsingCommonsEmptyIfNull.java |     0
 ...ionStreamsUsingJava8OptionalContainer.java |     0
 ...ctionStreamsUsingNullDereferenceCheck.java |     0
 .../java/com/baeldung/optional/Modem.java     |     0
 .../baeldung/optional/OrElseAndOrElseGet.java |     0
 .../OrElseAndOrElseGetBenchmarkRunner.java    |     0
 .../java/com/baeldung/optional/Person.java    |     0
 .../baeldung/optional/PersonRepository.java   |     0
 .../baeldung/primitive/BenchmarkRunner.java   |     0
 .../primitive/BooleanPrimitiveLookup.java     |     0
 .../primitive/BooleanWrapperLookup.java       |     0
 .../primitive/BytePrimitiveLookup.java        |     0
 .../baeldung/primitive/ByteWrapperLookup.java |     0
 .../primitive/CharPrimitiveLookup.java        |     0
 .../primitive/CharacterWrapperLookup.java     |     0
 .../primitive/DoublePrimitiveLookup.java      |     0
 .../primitive/DoubleWrapperLookup.java        |     0
 .../primitive/FloatPrimitiveLookup.java       |     0
 .../primitive/FloatWrapperLookup.java         |     0
 .../primitive/IntPrimitiveLookup.java         |     0
 .../primitive/IntegerWrapperLookup.java       |     0
 .../primitive/LongPrimitiveLookup.java        |     0
 .../baeldung/primitive/LongWrapperLookup.java |     0
 .../java/com/baeldung/primitive/Lookup.java   |     0
 .../primitive/ShortPrimitiveLookup.java       |     0
 .../primitive/ShortWrapperLookup.java         |     0
 .../baeldung/reducingIfElse/AddCommand.java   |     0
 .../com/baeldung/reducingIfElse/AddRule.java  |     0
 .../com/baeldung/reducingIfElse/Addition.java |     0
 .../baeldung/reducingIfElse/Calculator.java   |     0
 .../com/baeldung/reducingIfElse/Command.java  |     0
 .../com/baeldung/reducingIfElse/Division.java |     0
 .../baeldung/reducingIfElse/Expression.java   |     0
 .../com/baeldung/reducingIfElse/Modulo.java   |     0
 .../reducingIfElse/Multiplication.java        |     0
 .../baeldung/reducingIfElse/Operation.java    |     0
 .../com/baeldung/reducingIfElse/Operator.java |     0
 .../reducingIfElse/OperatorFactory.java       |     0
 .../com/baeldung/reducingIfElse/Result.java   |     0
 .../com/baeldung/reducingIfElse/Rule.java     |     0
 .../baeldung/reducingIfElse/RuleEngine.java   |     0
 .../baeldung/reducingIfElse/Subtraction.java  |     0
 .../java/com/baeldung/reflect/Person.java     |    36 +-
 .../com/baeldung/spliteratorAPI/Article.java  |    86 +-
 .../com/baeldung/spliteratorAPI/Author.java   |    66 +-
 .../com/baeldung/spliteratorAPI/Executor.java |    36 +-
 .../spliteratorAPI/RelatedAuthorCounter.java  |    54 +-
 .../RelatedAuthorSpliterator.java             |    98 +-
 .../com/baeldung/spliteratorAPI/Task.java     |    54 +-
 .../strategy/ChristmasDiscounter.java         |     0
 .../com/baeldung/strategy/Discounter.java     |     0
 .../baeldung/strategy/EasterDiscounter.java   |     0
 .../streamreduce/application/Application.java |   124 +-
 .../baeldung/streamreduce/entities/User.java  |    50 +-
 .../streamreduce/utilities/NumberUtils.java   |   104 +-
 .../src/main/resources/logback.xml            |     0
 .../collectors/Java8CollectorsUnitTest.java   |     0
 .../baeldung/counter/CounterStatistics.java   |   122 +-
 .../com/baeldung/counter/CounterUnitTest.java |   106 +-
 .../com/baeldung/counter/CounterUtil.java     |   112 +-
 .../JsonSerializerUnitTest.java               |    52 +-
 .../StaticDefaulInterfaceMethodUnitTest.java  |     0
 .../doublecolon/ComputerUtilsUnitTest.java    |     0
 .../FunctionalInterfaceUnitTest.java          |     0
 .../ShortToByteFunction.java                  |     0
 .../DateFormatUnitTest.java                   |     0
 .../NumbersCurrenciesFormattingUnitTest.java  |     0
 ...8DefaultStaticIntefaceMethodsUnitTest.java |     0
 .../baeldung/java8/Java8ForEachUnitTest.java  |     0
 .../Java8GroupingByCollectorUnitTest.java     |     0
 .../java8/Java8MethodReferenceUnitTest.java   |     0
 .../baeldung/java8/Java8OptionalUnitTest.java |     0
 .../java8/Java8PredicateChainUnitTest.java    |     0
 .../com/baeldung/java8/Java8SortUnitTest.java |     0
 ...vaTryWithResourcesLongRunningUnitTest.java |     0
 .../java8/UnsignedArithmeticUnitTest.java     |     0
 .../baeldung/java8/comparator/Employee.java   |     0
 .../comparator/Java8ComparatorUnitTest.java   |     0
 .../java/com/baeldung/java8/entity/Human.java |     0
 .../LambdaExceptionWrappersUnitTest.java      |     0
 .../java8/lambda/methodreference/Bicycle.java |     0
 .../methodreference/BicycleComparator.java    |     0
 .../MethodReferenceUnitTest.java              |     0
 ...va8FunctionalInteracesLambdasUnitTest.java |     0
 .../optional/OptionalChainingUnitTest.java    |     0
 .../java8/optional/OptionalUnitTest.java      |     0
 .../optional/OrElseAndOrElseGetUnitTest.java  |     0
 .../baeldung/math/MathNewMethodsUnitTest.java |     0
 ...treamsUsingCommonsEmptyIfNullUnitTest.java |     0
 ...msUsingJava8OptionalContainerUnitTest.java |     0
 ...eamsUsingNullDereferenceCheckUnitTest.java |     0
 .../optional/PersonRepositoryUnitTest.java    |     0
 .../reduceIfelse/CalculatorUnitTest.java      |     0
 .../reduceIfelse/RuleEngineUnitTest.java      |     0
 .../reflect/MethodParamNameUnitTest.java      |    68 +-
 .../spliteratorAPI/ExecutorUnitTest.java      |    88 +-
 .../StrategyDesignPatternUnitTest.java        |     0
 .../StreamForEachIfElseUnitTest.java          |     0
 .../tests/StreamReduceManualTest.java         |   252 +-
 .../com/baeldung/time/InstantUnitTest.java    |     0
 .../time/InstantWithJMockUnitTest.java        |     0
 .../baeldung/time/LocalDateTimeUnitTest.java  |     0
 .../time/LocalDateTimeWithJMockUnitTest.java  |     0
 .../typeinference/TypeInferenceUnitTest.java  |     0
 .../util/CurrentDateTimeUnitTest.java         |     0
 .../src/test/resources/.gitignore             |     0
 .../core-java-9}/.gitignore                   |     0
 .../core-java-9}/README.md                    |     0
 .../core-java-9}/compile-aot.sh               |     0
 .../core-java-9}/compile-httpclient.bat       |     0
 .../core-java-9}/compile-modules.sh           |     0
 .../core-java-9}/compile-simple-modules.sh    |     0
 .../core-java-9}/compile-student-client.bat   |     0
 .../core-java-9}/compile-student-model.bat    |     0
 .../compile-student-service-dbimpl.bat        |     0
 .../core-java-9}/compile-student-service.bat  |     0
 .../core-java-9}/logging.sh                   |     0
 .../core-java-9}/mods/logback.xml             |     0
 .../core-java-9}/pom.xml                      |     1 +
 .../core-java-9}/run-aot.sh                   |     0
 .../core-java-9}/run-httpclient.bat           |     0
 .../core-java-9}/run-simple-module-app.sh     |     0
 .../core-java-9}/run-student-client.bat       |     0
 .../core-java-9}/run-student-client.sh        |     0
 .../core-java-9}/src/main/java/.gitignore     |     0
 .../baeldung/java9/aot/JaotCompilation.java   |     0
 .../java9/language/PrivateInterface.java      |    46 +-
 .../StreamsGroupingCollectionFilter.java      |     0
 .../maps/initialize/MapsInitializer.java      |     0
 .../baeldung/java9/methodhandles/Book.java    |     0
 .../rangedates/DatesCollectionIteration.java  |     0
 .../java9/rangedates/RangeDatesIteration.java |     0
 .../reactive/BaeldungBatchSubscriberImpl.java |   164 +-
 .../reactive/BaeldungSubscriberImpl.java      |   110 +-
 .../baeldung/java9/set/UnmodifiableSet.java   |     0
 .../java9/stackwalker/StackWalkerDemo.java    |     0
 .../java9/streams.reactive/EndSubscriber.java |     0
 .../streams.reactive/TransformProcessor.java  |     0
 .../com/baeldung/multireleaseapp/App.java     |     0
 .../baeldung/multireleaseapp/DateHelper.java  |     0
 .../com/baeldung/optionals/Optionals.java     |     0
 .../baeldung/multireleaseapp/DateHelper.java  |     0
 .../src/main/resources/logback.xml            |     0
 .../httpclient/HttpClientExample.java         |     0
 .../com.baeldung.httpclient/module-info.java  |     0
 .../com/baeldung/logging/app/MainApp.java     |     0
 .../com.baeldung.logging.app/module-info.java |     0
 .../baeldung/logging/slf4j/Slf4jLogger.java   |     0
 .../logging/slf4j/Slf4jLoggerFinder.java      |     0
 .../module-info.java                          |     0
 .../com/baeldung/logging/ConsoleLogger.java   |     0
 .../baeldung/logging/CustomLoggerFinder.java  |     0
 .../com.baeldung.logging/module-info.java     |     0
 .../student/client/StudentClient.java         |     0
 .../module-info.java                          |     0
 .../com/baeldung/student/model/Student.java   |     0
 .../module-info.java                          |     0
 .../service/dbimpl/StudentDbService.java      |     0
 .../module-info.java                          |     0
 .../student/service/StudentService.java       |     0
 .../module-info.java                          |     0
 .../modules/hello/HelloInterface.java         |     0
 .../baeldung/modules/hello/HelloModules.java  |     0
 .../hello.modules/module-info.java            |     0
 .../com/baeldung/modules/main/MainApp.java    |     0
 .../simple-modules/main.app/module-info.java  |     0
 .../com/baeldung/java9/Java9OptionalTest.java |     0
 .../java9/Java9OptionalsStreamUnitTest.java   |     0
 .../java9/MultiResultionImageUnitTest.java    |    88 +-
 .../java9/OptionalToStreamUnitTest.java       |     0
 .../test/java/com/baeldung/java9/README.MD    |     0
 .../baeldung/java9/SetExamplesUnitTest.java   |     0
 .../future/CompletableFutureUnitTest.java     |     0
 .../java9/httpclient/HttpClientTest.java      |     0
 .../java9/httpclient/HttpRequestTest.java     |     0
 .../java9/httpclient/HttpResponseTest.java    |     0
 .../java9/language/DiamondUnitTest.java       |    72 +-
 .../language/Java9ObjectsAPIUnitTest.java     |     0
 .../language/PrivateInterfaceUnitTest.java    |    30 +-
 .../language/TryWithResourcesUnitTest.java    |   134 +-
 .../ListFactoryMethodsUnitTest.java           |     0
 .../MapFactoryMethodsUnitTest.java            |     0
 .../SetFactoryMethodsUnitTest.java            |     0
 .../stream/CollectionFilterUnitTest.java      |     0
 .../stream/CollectorImprovementUnitTest.java  |     0
 .../stream/StreamFeaturesUnitTest.java        |     0
 .../methodhandles/MethodHandlesTest.java      |     0
 .../java9/modules/ModuleAPIUnitTest.java      |     0
 .../DatesCollectionIterationUnitTest.java     |     0
 .../RangeDatesIterationUnitTest.java          |     0
 ...ungBatchSubscriberImplIntegrationTest.java |   150 +-
 ...BaeldungSubscriberImplIntegrationTest.java |   200 +-
 .../stackwalker/StackWalkerDemoUnitTest.java  |     0
 .../streams.reactive/ReactiveStreamsTest.java |     0
 .../java9/varhandles/VariableHandlesTest.java |     0
 .../com/baeldung/optionals/OptionalsTest.java |     0
 .../src/test/resources/.gitignore             |     0
 .../core-java-arrays}/.gitignore              |     0
 .../core-java-arrays}/README.md               |     0
 .../core-java-arrays}/pom.xml                 |     2 +-
 .../array/AddElementToEndOfArray.java         |     0
 .../baeldung/array/ArrayBenchmarkRunner.java  |     0
 .../com/baeldung/array/ArrayInitializer.java  |     0
 .../com/baeldung/array/ArrayInverter.java     |     0
 .../baeldung/array/ArrayReferenceGuide.java   |     0
 .../baeldung/array/Find2ndLargestInArray.java |     0
 .../baeldung/array/FindElementInArray.java    |     0
 .../java/com/baeldung/array/JaggedArray.java  |     0
 .../baeldung/array/SearchArrayUnitTest.java   |     0
 .../baeldung/array/SumAndAverageInArray.java  |     0
 .../array/conversions/FloatToByteArray.java   |     0
 .../array/operations/ArrayOperations.java     |     0
 .../com/baeldung/arraycopy/model/Address.java |     0
 .../baeldung/arraycopy/model/Employee.java    |     0
 .../arrays/ParallelPrefixBenchmark.java       |     0
 .../array/AddElementToEndOfArrayUnitTest.java |     0
 .../array/ArrayInitializerUnitTest.java       |     0
 .../baeldung/array/ArrayInverterUnitTest.java |     0
 .../array/Find2ndLargestInArrayUnitTest.java  |     0
 .../array/FindElementInArrayUnitTest.java     |     0
 .../baeldung/array/JaggedArrayUnitTest.java   |     0
 .../array/SumAndAverageInArrayUnitTest.java   |     0
 .../conversions/FloatToByteArrayUnitTest.java |     0
 .../operations/ArrayOperationsUnitTest.java   |     0
 .../operations/IntersectionUnitTest.java      |     0
 .../arraycopy/ArrayCopyUtilUnitTest.java      |     0
 .../com/baeldung/arrays/ArraysUnitTest.java   |     0
 .../com/baeldung/sort/ArraySortUnitTest.java  |     0
 .../core-java-collections-list}/README.md     |     0
 .../core-java-collections-list}/pom.xml       |     2 +-
 .../VerifyAllEqualListElements.java           |     0
 .../ClassCastException.java                   |     0
 .../collection/filtering/Employee.java        |     0
 .../com/baeldung/findanelement/Customer.java  |     0
 .../FindACustomerInGivenList.java             |     0
 .../baeldung/java/list/CopyListService.java   |     0
 .../com/baeldung/java/list/CustomList.java    |     0
 .../java/com/baeldung/java/list/Flower.java   |     0
 .../baeldung/java/list/ReverseIterator.java   |     0
 .../com/baeldung/java/list/WaysToIterate.java |     0
 .../com/baeldung/java_8_features/Car.java     |     0
 .../com/baeldung/java_8_features/Person.java  |     0
 .../main/java/com/baeldung/list/Flower.java   |     0
 .../com/baeldung/list/listoflist/Pen.java     |     0
 .../com/baeldung/list/listoflist/Pencil.java  |     0
 .../com/baeldung/list/listoflist/Rubber.java  |     0
 .../baeldung/list/listoflist/Stationery.java  |     0
 .../ArrayListOfArrayList.java                 |     0
 .../ThreeDimensionalArrayList.java            |     0
 .../list/primitive/PrimitiveCollections.java  |     0
 .../primitive/PrimitivesListPerformance.java  |     0
 .../baeldung/list/removeall/RemoveAll.java    |     0
 .../src/main/resources/logback.xml            |     0
 .../VerifyAllEqualListElementsUnitTest.java   |     0
 .../converter/ArrayConvertToListUnitTest.java |     0
 .../collection/ClearVsRemoveAllUnitTest.java  |     0
 .../baeldung/collection/CollectionsEmpty.java |     0
 .../CollectionFilteringUnitTest.java          |     0
 .../FindItemsBasedOnOtherStreamUnitTest.java  |     0
 .../FindACustomerInGivenListUnitTest.java     |     0
 .../java/list/CopyListServiceUnitTest.java    |     0
 .../java/list/CustomListUnitTest.java         |     0
 .../java/list/ReverseIteratorUnitTest.java    |     0
 .../java/list/WaysToIterateUnitTest.java      |     0
 .../ListInitializationUnitTest.java           |     0
 .../java8/Java8CollectionCleanupUnitTest.java |     0
 .../baeldung/java8/Java8MaxMinUnitTest.java   |     0
 .../baeldung/list/AddElementsUnitTest.java    |     0
 .../FlattenNestedListUnitTest.java            |     0
 .../listoflist/AddElementsToListUnitTest.java |     0
 .../list/listoflist/ListOfListsUnitTest.java  |     0
 .../list/removeall/RemoveAllUnitTest.java     |     0
 .../RemoveFirstElementUnitTest.java           |     0
 .../baeldung/RandomListElementUnitTest.java   |     0
 .../java/collections/ArrayListUnitTest.java   |     0
 .../CoreJavaCollectionsUnitTest.java          |     0
 .../JavaCollectionCleanupUnitTest.java        |     0
 .../java/lists/ListAssertJUnitTest.java       |     0
 .../baeldung/java/lists/ListJUnitTest.java    |     0
 .../java/lists/ListTestNgUnitTest.java        |     0
 .../java/org/baeldung/java/lists/README.md    |     0
 .../core-java-collections-set}/README.md      |     0
 .../core-java-collections-set}/pom.xml        |    66 +-
 .../java/com/baeldung/enumset/EnumSets.java   |     0
 .../baeldung/collection/WhenUsingHashSet.java |     0
 .../baeldung/collection/WhenUsingTreeSet.java |     0
 .../java/set/HashSetInitalizingUnitTest.java  |     0
 .../com/baeldung/java/set/SetUnitTest.java    |     0
 .../baeldung/set/SetOperationsUnitTest.java   |     0
 .../core-java-collections}/README.md          |     0
 .../core-java-collections}/pom.xml            |   156 +-
 .../com/baeldung/charstack/CharStack.java     |     0
 .../charstack/CharStackWithArray.java         |     0
 .../charstack/EmptyStackException.java        |     0
 .../combiningcollections/CombiningArrays.java |     0
 .../combiningcollections/CombiningLists.java  |     0
 .../combiningcollections/CombiningMaps.java   |     0
 .../combiningcollections/CombiningSets.java   |     0
 .../java/com/baeldung/hashtable/Word.java     |     0
 .../baeldung/iteratorguide/IteratorGuide.java |     0
 .../com/baeldung/iterators/Iterators.java     |     0
 .../CollectionUtilsCollectionFilter.java      |     0
 .../EclipseCollectionsCollectionFilter.java   |     0
 .../java/filtering/GuavaCollectionFilter.java |     0
 .../filtering/StreamsCollectionFilter.java    |     0
 .../baeldung/java/iterable/IterableSize.java  |     0
 .../com/baeldung/java/list/VectorExample.java |     0
 .../java/sort/CollectionsSortCompare.java     |     0
 ...lectionStreamsUsingCommonsEmptyIfNull.java |     0
 ...ionStreamsUsingJava8OptionalContainer.java |     0
 ...ctionStreamsUsingNullDereferenceCheck.java |     0
 .../performance/ArrayListBenchmark.java       |     0
 .../performance/ArraySortBenchmark.java       |     0
 .../performance/CollectionsBenchmark.java     |     0
 .../performance/CopyOnWriteBenchmark.java     |     0
 .../com/baeldung/performance/Employee.java    |     0
 .../performance/HashMapBenchmark.java         |     0
 .../baeldung/performance/SetBenchMark.java    |     0
 .../queueInterface/CustomBaeldungQueue.java   |     0
 .../baeldung/removal/CollectionRemoveIf.java  |     0
 .../java/com/baeldung/removal/Iterators.java  |     0
 .../removal/StreamFilterAndCollector.java     |     0
 .../removal/StreamPartitioningBy.java         |     0
 .../application/Application.java              |    36 +-
 .../DequeBasedSynchronizedStack.java          |     0
 .../src/main/resources/logback.xml            |     0
 .../arraydeque/ArrayDequeUnitTest.java        |   100 +-
 .../baeldung/charstack/CharStackUnitTest.java |     0
 .../charstack/CharStackUsingJavaUnitTest.java |     0
 .../charstack/CharStackWithArrayUnitTest.java |     0
 .../CombiningArraysUnitTest.java              |     0
 .../CombiningListsUnitTest.java               |     0
 .../CombiningMapsUnitTest.java                |     0
 .../CombiningSetsUnitTest.java                |     0
 .../java/com/baeldung/enummap/DummyEnum.java  |     0
 .../enummap/EnumMapBenchmarkLiveTest.java     |     0
 .../com/baeldung/enummap/EnumMapUnitTest.java |     0
 .../HashmapVsHashtableDifferenceUnitTest.java |     0
 .../baeldung/hashtable/HashtableUnitTest.java |     0
 .../baeldung/iterators/IteratorsUnitTest.java |     0
 ...ncurrentModificationExceptionUnitTest.java |     0
 .../filtering/CollectionFiltersUnitTest.java  |     0
 .../java/iterable/IterableSizeUnitTest.java   |     0
 ...treamsUsingCommonsEmptyIfNullUnitTest.java |     0
 ...msUsingJava8OptionalContainerUnitTest.java |     0
 ...eamsUsingNullDereferenceCheckUnitTest.java |     0
 .../CustomBaeldungQueueUnitTest.java          |     0
 .../queueInterface/PriorityQueueUnitTest.java |     0
 .../com/baeldung/removal/RemovalUnitTest.java |     0
 .../ShufflingCollectionsUnitTest.java         |     0
 ...ultithreadingCorrectnessStackUnitTest.java |     0
 .../baeldung/stack_tests/StackUnitTest.java   |     0
 .../test/SynchronizedCollectionUnitTest.java  |    56 +-
 .../test/SynchronizedListUnitTest.java        |   102 +-
 .../test/SynchronizedMapUnitTest.java         |    60 +-
 .../test/SynchronizedSetUnitTest.java         |    52 +-
 .../test/SynchronizedSortedMapUnitTest.java   |    58 +-
 .../test/SynchronizedSortedSetUnitTest.java   |    56 +-
 .../CollectionsConcatenateUnitTest.java       |     0
 .../CollectionsJoinAndSplitJUnitTest.java     |     0
 .../JoinSplitCollectionsUnitTest.java         |     0
 .../org/baeldung/java/collections/README.md   |     0
 .../org/baeldung/java/sorting/Employee.java   |     0
 .../java/sorting/JavaSortingUnitTest.java     |     0
 .../.gitignore                                |     0
 .../core-java-concurrency-advanced}/README.md |     0
 .../core-java-concurrency-advanced}/pom.xml   |     2 +-
 .../atomic/SafeCounterWithLock.java           |     0
 .../atomic/SafeCounterWithoutLock.java        |     0
 .../concurrent/atomic/UnsafeCounter.java      |     0
 .../countdownlatch/BrokenWorker.java          |     0
 .../CountdownLatchCountExample.java           |     0
 .../CountdownLatchResetExample.java           |     0
 .../countdownlatch/WaitingWorker.java         |     0
 .../concurrent/countdownlatch/Worker.java     |     0
 .../CyclicBarrierCompletionMethodExample.java |     0
 .../CyclicBarrierCountExample.java            |     0
 .../cyclicbarrier/CyclicBarrierDemo.java      |     0
 .../CyclicBarrierResetExample.java            |     0
 .../daemon/MultipleThreadsExample.java        |     0
 .../baeldung/concurrent/daemon/NewThread.java |     0
 .../daemon/SingleThreadExample.java           |     0
 .../DiningPhilosophers.java                   |     0
 .../diningphilosophers/Philosopher.java       |     0
 .../evenandodd/PrintEvenOddSemaphore.java     |     0
 .../evenandodd/PrintEvenOddWaitNotify.java    |     0
 .../locks/ReentrantLockWithCondition.java     |     0
 .../locks/SharedObjectWithLock.java           |     0
 .../concurrent/locks/StampedLockDemo.java     |     0
 .../locks/SynchronizedHashMapWithRWLock.java  |     0
 .../parameter/AverageCalculator.java          |     0
 .../parameter/ParameterizedThreadExample.java |     0
 .../concurrent/phaser/LongRunningAction.java  |     0
 .../concurrent/prioritytaskexecution/Job.java |     0
 .../prioritytaskexecution/JobPriority.java    |     0
 .../PriorityJobScheduler.java                 |     0
 .../semaphores/CounterUsingMutex.java         |     0
 .../DelayQueueUsingTimedSemaphore.java        |     0
 .../semaphores/LoginQueueUsingSemaphore.java  |     0
 .../volatilekeyword/SharedObject.java         |     0
 .../concurrent/yield/ThreadYield.java         |     0
 .../forkjoin/CustomRecursiveAction.java       |     0
 .../forkjoin/CustomRecursiveTask.java         |     0
 .../com/baeldung/forkjoin/util/PoolUtil.java  |     0
 .../com/baeldung/threadlocal/Context.java     |     0
 .../threadlocal/SharedMapWithUserContext.java |     0
 .../ThreadLocalWithUserContext.java           |     0
 .../baeldung/threadlocal/UserRepository.java  |     0
 .../ThreadLocalRandomBenchMarkRunner.java     |     0
 .../ThreadLocalRandomBenchMarker.java         |     0
 .../com/baeldung/threadpool/CountingTask.java |     0
 .../ExitingExecutorServiceExample.java        |     0
 .../com/baeldung/threadpool/TreeNode.java     |     0
 .../src/main/java/log4j.properties            |     0
 .../src/main/resources/logback.xml            |     0
 .../accumulator/LongAccumulatorUnitTest.java  |     0
 .../concurrent/adder/LongAdderUnitTest.java   |     0
 .../ThreadSafeCounterIntegrationTest.java     |     0
 .../atomic/ThreadUnsafeCounterManualTest.java |     0
 .../CountdownLatchCountExampleUnitTest.java   |     0
 .../CountdownLatchExampleIntegrationTest.java |     0
 .../CountdownLatchResetExampleUnitTest.java   |     0
 ...arrierCompletionMethodExampleUnitTest.java |     0
 .../CyclicBarrierCountExampleUnitTest.java    |     0
 .../CyclicBarrierResetExampleUnitTest.java    |     0
 .../daemon/DaemonThreadUnitTest.java          |     0
 .../locks/SharedObjectWithLockManualTest.java |     0
 ...nchronizedHashMapWithRWLockManualTest.java |     0
 .../concurrent/phaser/PhaserUnitTest.java     |     0
 .../PriorityJobSchedulerUnitTest.java         |     0
 .../semaphores/SemaphoresManualTest.java      |     0
 .../SharedObjectManualTest.java               |     0
 .../java8/Java8ForkJoinIntegrationTest.java   |     0
 .../ParameterizedThreadUnitTest.java          |     0
 .../thread/join/ThreadJoinUnitTest.java       |     0
 .../ThreadLocalIntegrationTest.java           |     0
 .../ThreadLocalRandomIntegrationTest.java     |     0
 .../CoreThreadPoolIntegrationTest.java        |     0
 .../GuavaThreadPoolIntegrationTest.java       |     0
 .../src/test/resources/.gitignore             |     0
 .../core-java-concurrency-basic}/.gitignore   |     0
 .../core-java-concurrency-basic}/README.md    |     0
 .../core-java-concurrency-basic}/pom.xml      |     2 +-
 .../ScheduledExecutorServiceDemo.java         |     0
 .../concurrent/callable/FactorialTask.java    |     0
 .../cyclicbarrier/CyclicBarrierExample.java   |     0
 .../concurrent/cyclicbarrier/Task.java        |     0
 .../concurrent/executor/ExecutorDemo.java     |     0
 .../baeldung/concurrent/executor/Invoker.java |     0
 .../executorservice/DelayedCallable.java      |     0
 .../executorservice/ExecutorServiceDemo.java  |     0
 .../concurrent/executorservice/Task.java      |     0
 .../future/FactorialSquareCalculator.java     |     0
 .../concurrent/future/FutureDemo.java         |     0
 .../concurrent/future/SquareCalculator.java   |     0
 .../concurrent/runnable/EventLoggingTask.java |     0
 .../concurrent/runnable/TaskRunner.java       |     0
 .../concurrent/semaphore/SemaPhoreDemo.java   |     0
 .../concurrent/sleepwait/ThreadA.java         |     0
 .../concurrent/sleepwait/ThreadB.java         |     0
 .../sleepwait/WaitSleepExample.java           |     0
 .../concurrent/stopping/ControlSubThread.java |     0
 .../BaeldungSynchronizedBlocks.java           |     0
 .../BaeldungSynchronizedMethods.java          |     0
 .../threadfactory/BaeldungThreadFactory.java  |     0
 .../concurrent/threadfactory/Demo.java        |     0
 .../concurrent/threadfactory/Task.java        |     0
 .../threadlifecycle/BlockedState.java         |     0
 .../concurrent/threadlifecycle/NewState.java  |     0
 .../threadlifecycle/RunnableState.java        |     0
 .../threadlifecycle/TerminatedState.java      |     0
 .../threadlifecycle/TimedWaitingState.java    |     0
 .../threadlifecycle/WaitingState.java         |     0
 .../threadsafety/application/Application.java |   172 +-
 .../callables/AtomicCounterCallable.java      |    38 +-
 .../callables/CounterCallable.java            |    38 +-
 .../ExtrinsicLockCounterCallable.java         |    38 +-
 .../callables/MessageServiceCallable.java     |    38 +-
 .../ReentranReadWriteLockCounterCallable.java |    40 +-
 .../ReentrantLockCounterCallable.java         |    38 +-
 .../threadsafety/mathutils/MathUtils.java     |    28 +-
 .../threadsafety/services/AtomicCounter.java  |    36 +-
 .../threadsafety/services/Counter.java        |    36 +-
 .../services/ExtrinsicLockCounter.java        |    46 +-
 .../threadsafety/services/MessageService.java |    28 +-
 .../services/ReentrantLockCounter.java        |    52 +-
 .../ReentrantReadWriteLockCounter.java        |    68 +-
 .../threadsafety/services/StateHolder.java    |    28 +-
 .../concurrent/waitandnotify/Data.java        |     0
 .../waitandnotify/NetworkDriver.java          |     0
 .../concurrent/waitandnotify/Receiver.java    |     0
 .../concurrent/waitandnotify/Sender.java      |     0
 .../src/main/resources/logback.xml            |     0
 .../threadsafety/tests/CounterTest.java       |    46 +-
 .../tests/ExtrinsicLockCounterTest.java       |    46 +-
 .../threadsafety/tests/MathUtilsTest.java     |    26 +-
 .../tests/MessageServiceTest.java             |    46 +-
 .../tests/ReentrantLockCounterTest.java       |    46 +-
 .../ReentrantReadWriteLockCounterTest.java    |    48 +-
 .../CompletableFutureLongRunningUnitTest.java |     0
 .../callable/FactorialTaskManualTest.java     |     0
 .../WaitingForThreadsToFinishManualTest.java  |     0
 .../FactorialSquareCalculatorUnitTest.java    |     0
 .../SquareCalculatorIntegrationTest.java      |     0
 .../runnable/RunnableVsThreadLiveTest.java    |     0
 .../stopping/StopThreadManualTest.java        |     0
 .../BaeldungSychronizedBlockUnitTest.java     |     0
 .../BaeldungSynchronizeMethodsUnitTest.java   |     0
 .../waitandnotify/NetworkIntegrationTest.java |     0
 .../Java8ExecutorServiceIntegrationTest.java  |     0
 .../src/test/resources/.gitignore             |     0
 .../.gitignore                                |     0
 .../README.md                                 |     0
 .../pom.xml                                   |     2 +-
 .../blockingqueue/BlockingQueueUsage.java     |     0
 .../blockingqueue/NumbersConsumer.java        |     0
 .../blockingqueue/NumbersProducer.java        |     0
 .../concurrent/delayqueue/DelayObject.java    |     0
 .../delayqueue/DelayQueueConsumer.java        |     0
 .../delayqueue/DelayQueueProducer.java        |     0
 .../baeldung/concurrent/skiplist/Event.java   |     0
 .../concurrent/skiplist/EventWindowSort.java  |     0
 .../com/baeldung/transferqueue/Consumer.java  |     0
 .../com/baeldung/transferqueue/Producer.java  |     0
 .../src/main/resources/logback.xml            |     0
 .../CopyOnWriteArrayListUnitTest.java         |     0
 .../delayqueue/DelayQueueIntegrationTest.java |     0
 .../PriorityBlockingQueueIntegrationTest.java |     0
 .../ConcurrentSkipListSetIntegrationTest.java |     0
 ...oncurrentMapAggregateStatusManualTest.java |     0
 .../ConcurrentMapNullKeyValueManualTest.java  |     0
 .../ConcurrentMapPerformanceManualTest.java   |     0
 .../ConcurrentNavigableMapManualTest.java     |     0
 ...ncurretMapMemoryConsistencyManualTest.java |     0
 .../ConcurrentModificationUnitTest.java       |     0
 .../SynchronousQueueIntegrationTest.java      |     0
 .../TransferQueueIntegrationTest.java         |     0
 ...adPoolInParallelStreamIntegrationTest.java |     0
 .../src/test/resources/.gitignore             |     0
 .../core-java-io}/.gitignore                  |     0
 .../core-java-io}/README.md                   |     0
 core-java-modules/core-java-io/hard_link.txt  | 10000 ++++++++++++++++
 .../core-java-io}/pom.xml                     |     2 +-
 .../bufferedreader/BufferedReaderExample.java |     0
 .../com/baeldung/csv/WriteCsvFileExample.java |     0
 .../DirectoryMonitoringExample.java           |     0
 .../com/baeldung/download/FileDownload.java   |     0
 .../baeldung/download/ResumableDownload.java  |     0
 .../com/baeldung/extension/Extension.java     |     0
 .../fileparser/BufferedReaderExample.java     |     0
 .../fileparser/FileReaderExample.java         |     0
 .../fileparser/FilesReadLinesExample.java     |     0
 .../fileparser/ScannerIntExample.java         |     0
 .../fileparser/ScannerStringExample.java      |     0
 .../java/com/baeldung/files/ListFiles.java    |     0
 .../filesystem/jndi/LookupFSJNDI.java         |     0
 .../java/nio/selector/EchoClient.java         |     0
 .../java/nio/selector/EchoServer.java         |     0
 .../com/baeldung/java/nio/selector/README.md  |     0
 .../java/nio2/visitor/FileSearchExample.java  |     0
 .../java/nio2/visitor/FileVisitorImpl.java    |     0
 .../nio2/watcher/DirectoryWatcherExample.java |     0
 .../java/com/baeldung/stream/FileCopy.java    |     0
 .../baeldung/stream/OutputStreamExamples.java |     0
 .../com/baeldung/symlink/SymLinkExample.java  |     0
 .../java/com/baeldung/unzip/UnzipFile.java    |     0
 .../java/com/baeldung/util/StreamUtils.java   |     0
 .../java/com/baeldung/zip/ZipDirectory.java   |     0
 .../main/java/com/baeldung/zip/ZipFile.java   |     0
 .../com/baeldung/zip/ZipMultipleFiles.java    |     0
 .../src/main/resources/ESAPI.properties       |     0
 .../src/main/resources/META-INF/BenchmarkList |     0
 .../main/resources/META-INF/persistence.xml   |     0
 .../services/com.sun.source.util.Plugin       |     0
 .../src/main/resources/countries.properties   |     6 +-
 .../core-java-io}/src/main/resources/data.csv |     0
 .../src/main/resources/datasource.properties  |     0
 .../src/main/resources/dirCompressed.zip      |   Bin
 .../src/main/resources/input.txt              |     0
 .../src/main/resources/js/bind.js             |     0
 .../src/main/resources/js/locations.js        |     0
 .../src/main/resources/js/math_module.js      |     0
 .../src/main/resources/js/no_such.js          |     0
 .../src/main/resources/js/script.js           |     0
 .../src/main/resources/js/trim.js             |     0
 .../src/main/resources/js/typed_arrays.js     |     0
 .../src/main/resources/log4j.properties       |     0
 .../resources/log4jstructuraldp.properties    |     0
 .../src/main/resources/logback.xml            |     0
 .../src/main/resources/multiCompressed.zip    |   Bin
 .../main/resources/unzipTest/compressed.zip   |   Bin
 .../src/main/resources/zipTest/test1.txt      |     0
 .../src/main/resources/zipTest/test2.txt      |     0
 .../BufferedReaderExampleUnitTest.java        |     0
 .../BufferedReaderUnitTest.java               |     0
 .../copyfiles/FileCopierIntegrationTest.java  |   138 +-
 .../baeldung/csv/ReadCSVInArrayUnitTest.java  |     0
 .../csv/WriteCsvFileExampleUnitTest.java      |     0
 .../directories/NewDirectoryUnitTest.java     |     0
 .../download/FileDownloadIntegrationTest.java |     0
 .../baeldung/extension/ExtensionUnitTest.java |     0
 .../file/FileOperationsManualTest.java        |     0
 .../file/FilenameFilterManualTest.java        |     0
 .../baeldung/file/FilesClearDataUnitTest.java |     0
 .../com/baeldung/file/FilesManualTest.java    |     0
 .../com/baeldung/file/ListFilesUnitTest.java  |     0
 .../filechannel/FileChannelUnitTest.java      |     0
 .../fileparser/BufferedReaderUnitTest.java    |     0
 .../fileparser/FileReaderUnitTest.java        |     0
 .../fileparser/FilesReadAllLinesUnitTest.java |     0
 .../fileparser/ScannerIntUnitTest.java        |     0
 .../fileparser/ScannerStringUnitTest.java     |     0
 .../test/LookupFSJNDIIntegrationTest.java     |     0
 .../java/mimetype/MimeTypeUnitTest.java       |     0
 .../java/nio/selector/NioEchoLiveTest.java    |     0
 .../java/nio2/FileIntegrationTest.java        |     0
 .../baeldung/java/nio2/PathManualTest.java    |     0
 .../java/com/baeldung/java/nio2/README.md     |     0
 .../java/nio2/async/AsyncEchoClient.java      |     0
 .../nio2/async/AsyncEchoIntegrationTest.java  |     0
 .../java/nio2/async/AsyncEchoServer.java      |     0
 .../java/nio2/async/AsyncEchoServer2.java     |     0
 .../nio2/async/AsyncFileIntegrationTest.java  |     0
 .../BasicAttribsIntegrationTest.java          |     0
 .../baeldung/java8/JavaFileSizeUnitTest.java  |     0
 .../java8/JavaFolderSizeUnitTest.java         |     0
 .../MappedByteBufferUnitTest.java             |     0
 .../com/baeldung/stream/FileCopyUnitTest.java |     0
 .../stream/OutputStreamExamplesUnitTest.java  |     0
 .../symlink/SymLinkExampleManualTest.java     |     0
 .../FileNotFoundExceptionUnitTest.java        |     0
 .../io/InputStreamToByteBufferUnitTest.java   |     0
 .../java/io/JavaFilePathUnitTest.java         |     0
 .../baeldung/java/io/JavaFileUnitTest.java    |     0
 .../java/io/JavaInputStreamToXUnitTest.java   |     0
 .../java/io/JavaReadFromFileUnitTest.java     |     0
 .../java/io/JavaReaderToXUnitTest.java        |     0
 .../baeldung/java/io/JavaScannerUnitTest.java |     0
 .../java/io/JavaWriteToFileUnitTest.java      |     0
 .../java/io/JavaXToByteArrayUnitTest.java     |     0
 .../java/io/JavaXToInputStreamUnitTest.java   |     0
 .../java/io/JavaXToReaderUnitTest.java        |     0
 .../java/io/JavaXToWriterUnitTest.java        |     0
 .../src/test/resources/.gitignore             |     0
 .../src/test/resources/META-INF/mime.types    |     0
 .../src/test/resources/anothersample.txt      |     0
 .../core-java-io}/src/test/resources/book.csv |     0
 .../test/resources/configuration.properties   |     0
 .../resources/copiedWithApacheCommons.txt     |     0
 .../src/test/resources/copiedWithIo.txt       |     0
 .../src/test/resources/copiedWithNio.txt      |     0
 .../test/resources/copyTest/dest/readme.txt   |     0
 .../resources/copyTest/src/test_apache.txt    |     0
 .../resources/copyTest/src/test_channel.txt   |     0
 .../resources/copyTest/src/test_files.txt     |     0
 .../resources/copyTest/src/test_stream.txt    |     0
 .../src/test/resources/dictionary.in          |     0
 .../core-java-io}/src/test/resources/file.txt |     0
 .../people.json                               |     0
 .../students.json                             |     0
 .../teachers.xml                              |     0
 .../workers.xml                               |     0
 .../src/test/resources/fileTest.txt           |     0
 .../src/test/resources/fileToRead.txt         |     0
 .../src/test/resources/fileToWriteTo.txt      |     0
 .../src/test/resources/fileexample.txt        |     0
 .../resources/frontenac-2257154_960_720.jpg   |   Bin
 .../src/test/resources/initialFile.txt        |     0
 .../listFilesUnitTestFolder/country.txt       |     0
 .../listFilesUnitTestFolder/employee.json     |     0
 .../listFilesUnitTestFolder/students.json     |     0
 .../listFilesUnitTestFolder/test.xml          |     0
 .../src/test/resources/original.txt           |     0
 .../src/test/resources/product.png            |   Bin
 .../src/test/resources/sample.txt             |     0
 .../src/test/resources/sampleNumberFile.txt   |     0
 .../src/test/resources/sampleTextFile.txt     |     0
 .../src/test/resources/targetFile.tmp         |     0
 .../src/test/resources/targetFile.txt         |     0
 .../src/test/resources/test.find              |     0
 .../resources/testFolder/sample_file_1.in     |     0
 .../resources/testFolder/sample_file_2.in     |     0
 .../src/test/resources/test_read.in           |     0
 .../src/test/resources/test_read1.in          |     0
 .../src/test/resources/test_read2.in          |     0
 .../src/test/resources/test_read3.in          |     0
 .../src/test/resources/test_read4.in          |   Bin
 .../src/test/resources/test_read7.in          |     0
 .../src/test/resources/test_read8.in          |     0
 .../src/test/resources/test_read_d.in         |     0
 .../src/test/resources/test_read_multiple.in  |     0
 .../src/test/resources/test_truncate.txt      |     0
 .../src/test/resources/test_write.txt         |     0
 .../src/test/resources/test_write_1.txt       |   Bin
 .../src/test/resources/test_write_2.txt       |   Bin
 .../src/test/resources/test_write_3.txt       |     0
 .../src/test/resources/test_write_4.txt       |   Bin
 .../src/test/resources/test_write_5.txt       |     0
 .../test_write_using_filechannel.txt          |     0
 .../core-java-io/target_link.txt              | 10000 ++++++++++++++++
 .../core-java-jvm}/README.md                  |     0
 .../core-java-jvm}/pom.xml                    |     1 +
 .../inlining/ConsecutiveNumbersSum.java       |     0
 .../baeldung/inlining/InliningExample.java    |     0
 .../ConsecutiveNumbersSumUnitTest.java        |     0
 .../core-java-lambdas}/pom.xml                |     2 +-
 .../com/baeldung/lambdas/LambdaVariables.java |     0
 .../core-java-lang-oop-2}/.gitignore          |     0
 .../core-java-lang-oop-2}/README.md           |     0
 .../core-java-lang-oop-2}/pom.xml             |     2 +-
 .../java/com/baeldung/anonymous/Book.java     |     0
 .../java/com/baeldung/anonymous/Main.java     |     0
 .../java/com/baeldung/generics/Entry.java     |     0
 .../com/baeldung/generics/GenericEntry.java   |     0
 .../java/com/baeldung/generics/MapEntry.java  |     0
 .../java/com/baeldung/generics/Product.java   |     0
 .../java/com/baeldung/generics/Rankable.java  |     0
 .../supertypecompilerexception/MyClass.java   |     0
 .../MyClassSolution1.java                     |     0
 .../MyClassSolution2.java                     |     0
 .../MyClassSolution3.java                     |     0
 .../MyException.java                          |     0
 .../generics/GenericConstructorUnitTest.java  |     0
 .../core-java-lang-oop}/.gitignore            |     0
 .../core-java-lang-oop}/README.md             |     0
 .../core-java-lang-oop}/pom.xml               |     2 +-
 .../com/baeldung/accessmodifiers/Public.java  |     0
 .../baeldung/accessmodifiers/SubClass.java    |     0
 .../baeldung/accessmodifiers/SuperPublic.java |     0
 .../another/AnotherPublic.java                |     0
 .../another/AnotherSubClass.java              |     0
 .../another/AnotherSuperPublic.java           |     0
 .../java/com/baeldung/casting/Animal.java     |     0
 .../com/baeldung/casting/AnimalFeeder.java    |     0
 .../baeldung/casting/AnimalFeederGeneric.java |     0
 .../main/java/com/baeldung/casting/Cat.java   |     0
 .../main/java/com/baeldung/casting/Dog.java   |     0
 .../main/java/com/baeldung/casting/Mew.java   |     0
 .../baeldung/constructors/BankAccount.java    |     0
 .../baeldung/constructors/Transaction.java    |     0
 .../java/com/baeldung/deepcopy/Address.java   |     0
 .../main/java/com/baeldung/deepcopy/User.java |     0
 .../com/baeldung/equalshashcode/Money.java    |     0
 .../com/baeldung/equalshashcode/Team.java     |     0
 .../com/baeldung/equalshashcode/Voucher.java  |     0
 .../baeldung/equalshashcode/WrongTeam.java    |     0
 .../baeldung/equalshashcode/WrongVoucher.java |     0
 .../equalshashcode/entities/ComplexClass.java |     0
 .../entities/PrimitiveClass.java              |     0
 .../equalshashcode/entities/Rectangle.java    |     0
 .../equalshashcode/entities/Shape.java        |     0
 .../equalshashcode/entities/Square.java       |     0
 .../com/baeldung/finalkeyword/BlackCat.java   |     0
 .../com/baeldung/finalkeyword/BlackDog.java   |     0
 .../java/com/baeldung/finalkeyword/Cat.java   |     0
 .../java/com/baeldung/finalkeyword/Dog.java   |     0
 .../com/baeldung/hashcode/entities/User.java  |     0
 .../baeldung/immutableobjects/Currency.java   |     0
 .../com/baeldung/immutableobjects/Money.java  |     0
 .../com/baeldung/inheritance/ArmoredCar.java  |    86 +-
 .../java/com/baeldung/inheritance/BMW.java    |    24 +-
 .../java/com/baeldung/inheritance/Car.java    |    62 +-
 .../com/baeldung/inheritance/Employee.java    |    28 +-
 .../com/baeldung/inheritance/Floatable.java   |    20 +-
 .../com/baeldung/inheritance/Flyable.java     |    26 +-
 .../com/baeldung/inheritance/SpaceCar.java    |    36 +-
 .../baeldung/inheritance/SpaceTraveller.java  |    10 +-
 .../application/Application.java              |     0
 .../inheritancecomposition/model/Actress.java |     0
 .../model/Computer.java                       |     0
 .../inheritancecomposition/model/Memory.java  |     0
 .../inheritancecomposition/model/Person.java  |     0
 .../model/Processor.java                      |     0
 .../model/SoundCard.java                      |     0
 .../model/StandardMemory.java                 |     0
 .../model/StandardProcessor.java              |     0
 .../model/StandardSoundCard.java              |     0
 .../model/Waitress.java                       |     0
 .../baeldung/initializationguide/User.java    |   106 +-
 .../com/baeldung/keyword/KeywordDemo.java     |     0
 .../keyword/superkeyword/SuperBase.java       |     0
 .../keyword/superkeyword/SuperSub.java        |     0
 .../keyword/thiskeyword/KeywordUnitTest.java  |     0
 .../markerinterface/DeletableShape.java       |    10 +-
 .../baeldung/markerinterface/Rectangle.java   |    44 +-
 .../com/baeldung/markerinterface/Shape.java   |    10 +-
 .../baeldung/markerinterface/ShapeDao.java    |    28 +-
 .../application/Application.java              |     0
 .../model/Car.java                            |     0
 .../model/Vehicle.java                        |     0
 .../util/Multiplier.java                      |     0
 .../baeldung/polymorphism/FileManager.java    |     0
 .../baeldung/polymorphism/GenericFile.java    |     0
 .../com/baeldung/polymorphism/ImageFile.java  |     0
 .../com/baeldung/polymorphism/TextFile.java   |     0
 .../scope/method/BaseMethodClass.java         |     0
 .../scope/method/ChildMethodClass.java        |     0
 .../scope/method/MethodHidingDemo.java        |     0
 .../scope/variable/ChildVariable.java         |     0
 .../baeldung/scope/variable/HideVariable.java |     0
 .../scope/variable/ParentVariable.java        |     0
 .../scope/variable/VariableHidingDemo.java    |     0
 .../java/com/baeldung/staticdemo/Car.java     |     0
 .../com/baeldung/staticdemo/Singleton.java    |     0
 .../com/baeldung/staticdemo/StaticBlock.java  |     0
 .../typeerasure/ArrayContentPrintUtil.java    |     0
 .../com/baeldung/typeerasure/BoundStack.java  |     0
 .../baeldung/typeerasure/IntegerStack.java    |     0
 .../java/com/baeldung/typeerasure/Stack.java  |     0
 .../src/main/resources/logback.xml            |     0
 .../com/baeldung/casting/CastingUnitTest.java |     0
 .../constructors/ConstructorUnitTest.java     |     0
 .../baeldung/deepcopy/DeepCopyUnitTest.java   |     0
 .../deepcopy/ShallowCopyUnitTest.java         |     0
 .../equalshashcode/MoneyUnitTest.java         |     0
 .../baeldung/equalshashcode/TeamUnitTest.java |     0
 .../entities/ComplexClassUnitTest.java        |     0
 .../entities/PrimitiveClassUnitTest.java      |     0
 .../entities/SquareClassUnitTest.java         |     0
 .../baeldung/finalkeyword/FinalUnitTest.java  |     0
 .../application/ApplicationUnitTest.java      |     0
 .../hashcode/entities/UserUnitTest.java       |     0
 .../ImmutableObjectsUnitTest.java             |     0
 .../com/baeldung/inheritance/AppUnitTest.java |    92 +-
 .../test/ActressUnitTest.java                 |     0
 .../test/CompositionUnitTest.java             |     0
 .../test/InheritanceUnitTest.java             |     0
 .../test/PersonUnitTest.java                  |     0
 .../test/WaitressUnitTest.java                |     0
 .../initializationguide/UserUnitTest.java     |    74 +-
 .../MarkerInterfaceUnitTest.java              |    52 +-
 .../test/MethodOverloadingUnitTest.java       |     0
 .../test/MethodOverridingUnitTest.java        |     0
 .../NonPrimitivesUnitTest.java                |     0
 .../parameterpassing/PrimitivesUnitTest.java  |     0
 .../polymorphism/PolymorphismUnitTest.java    |     0
 .../staticdemo/CarIntegrationTest.java        |     0
 .../staticdemo/SingletonIntegrationTest.java  |     0
 .../StaticBlockIntegrationTest.java           |     0
 .../typeerasure/TypeErasureUnitTest.java      |     0
 .../src/test/resources/.gitignore             |     0
 .../core-java-lang-syntax}/.gitignore         |     0
 .../core-java-lang-syntax}/README.md          |     0
 .../core-java-lang-syntax}/pom.xml            |     2 +-
 .../baeldung/breakcontinue/BreakContinue.java |     0
 .../main/java/com/baeldung/enums/Pizza.java   |     0
 .../baeldung/enums/PizzaDeliveryStrategy.java |     0
 .../PizzaDeliverySystemConfiguration.java     |     0
 .../java/com/baeldung/generics/Building.java  |     0
 .../java/com/baeldung/generics/Generics.java  |     0
 .../java/com/baeldung/generics/House.java     |     0
 .../baeldung/initializationguide/User.java    |   106 +-
 .../java/com/baeldung/keyword/Circle.java     |    10 +-
 .../main/java/com/baeldung/keyword/Ring.java  |     8 +-
 .../main/java/com/baeldung/keyword/Round.java |     8 +-
 .../main/java/com/baeldung/keyword/Shape.java |     8 +-
 .../java/com/baeldung/keyword/Triangle.java   |     8 +-
 .../com/baeldung/loops/InfiniteLoops.java     |    46 +-
 .../java/com/baeldung/loops/LoopsInJava.java  |     0
 .../switchstatement/SwitchStatement.java      |     0
 .../java/com/baeldung/system/ChatWindow.java  |     0
 .../com/baeldung/system/DateTimeService.java  |     0
 .../baeldung/system/EnvironmentVariables.java |     0
 .../com/baeldung/system/SystemErrDemo.java    |     0
 .../com/baeldung/system/SystemExitDemo.java   |     0
 .../com/baeldung/system/SystemOutDemo.java    |     0
 .../com/baeldung/system/UserCredentials.java  |     0
 .../breakcontinue/BreakContinueUnitTest.java  |     0
 .../com/baeldung/enums/PizzaUnitTest.java     |     0
 .../baeldung/generics/GenericsUnitTest.java   |     0
 .../initializationguide/UserUnitTest.java     |    74 +-
 .../java/com/baeldung/java/diamond/Car.java   |     0
 .../java/diamond/DiamondOperatorUnitTest.java |     0
 .../com/baeldung/java/diamond/Diesel.java     |     0
 .../com/baeldung/java/diamond/Engine.java     |     0
 .../com/baeldung/java/diamond/Vehicle.java    |     0
 .../java/doublebrace/DoubleBraceUnitTest.java |     0
 .../keyword/test/InstanceOfUnitTest.java      |   110 +-
 .../com/baeldung/loops/WhenUsingLoops.java    |     0
 .../com/baeldung/modulo/ModuloUnitTest.java   |     0
 .../PrimitiveConversionsJUnitTest.java        |     0
 .../SwitchStatementUnitTest.java              |     0
 .../system/DateTimeServiceUnitTest.java       |     0
 .../system/EnvironmentVariablesUnitTest.java  |     0
 .../system/SystemArrayCopyUnitTest.java       |     0
 .../baeldung/system/SystemNanoUnitTest.java   |     0
 .../system/SystemPropertiesUnitTest.java      |     0
 .../TernaryOperatorUnitTest.java              |     0
 .../baeldung/varargs/FormatterUnitTest.java   |     0
 .../core-java-lang}/.gitignore                |     0
 .../core-java-lang}/README.md                 |     0
 .../core-java-lang}/pom.xml                   |     2 +-
 .../com/baeldung/assertion/Assertion.java     |     0
 .../java/com/baeldung/binding/Animal.java     |     0
 .../com/baeldung/binding/AnimalActivity.java  |     0
 .../main/java/com/baeldung/binding/Cat.java   |     0
 .../chainedexception/LogWithChain.java        |     0
 .../chainedexception/LogWithoutChain.java     |     0
 .../GirlFriendOfManagerUpsetException.java    |     0
 .../exceptions/ManagerUpsetException.java     |     0
 .../exceptions/NoLeaveGrantedException.java   |     0
 .../exceptions/TeamLeadUpsetException.java    |     0
 .../className/RetrievingClassName.java        |     0
 .../java/com/baeldung/comparable/Player.java  |     0
 .../com/baeldung/comparable/PlayerSorter.java |     0
 .../java/com/baeldung/comparator/Player.java  |     0
 .../comparator/PlayerAgeComparator.java       |     0
 .../baeldung/comparator/PlayerAgeSorter.java  |     0
 .../comparator/PlayerRankingComparator.java   |     0
 .../comparator/PlayerRankingSorter.java       |     0
 .../ConditionalBranches.java                  |     0
 .../com/baeldung/controlstructures/Loops.java |     0
 .../baeldung/customexception/FileManager.java |     0
 .../IncorrectFileExtensionException.java      |     0
 .../IncorrectFileNameException.java           |     0
 .../doubles/SplitFloatingPointNumbers.java    |     0
 .../DynamicInvocationHandler.java             |     0
 .../TimingDynamicInvocationHandler.java       |     0
 .../com/baeldung/enums/values/Element1.java   |     0
 .../com/baeldung/enums/values/Element2.java   |     0
 .../com/baeldung/enums/values/Element3.java   |     0
 .../com/baeldung/enums/values/Element4.java   |     0
 .../com/baeldung/enums/values/Labeled.java    |     0
 .../exceptionhandling/Exceptions.java         |   424 +-
 .../exceptionhandling/MyException.java        |    10 +-
 .../baeldung/exceptionhandling/Player.java    |    24 +-
 .../PlayerLoadException.java                  |    22 +-
 .../PlayerScoreException.java                 |    16 +-
 .../exceptionhandling/TimeoutException.java   |    16 +-
 .../baeldung/finalize/CloseableResource.java  |     0
 .../com/baeldung/finalize/Finalizable.java    |     0
 .../java/com/baeldung/interfaces/Box.java     |     0
 .../interfaces/CommaSeparatedCustomers.java   |     0
 .../com/baeldung/interfaces/Customer.java     |     0
 .../com/baeldung/interfaces/Employee.java     |     0
 .../interfaces/EmployeeSalaryComparator.java  |     0
 .../com/baeldung/interfaces/HasColor.java     |     0
 .../interfaces/multiinheritance/Car.java      |     0
 .../interfaces/multiinheritance/Fly.java      |     0
 .../multiinheritance/Transform.java           |     0
 .../interfaces/multiinheritance/Vehicle.java  |     0
 .../interfaces/polymorphysim/Circle.java      |     0
 .../polymorphysim/MainTestClass.java          |     0
 .../interfaces/polymorphysim/Shape.java       |     0
 .../interfaces/polymorphysim/Square.java      |     0
 .../com/baeldung/java/reflection/Animal.java  |     0
 .../com/baeldung/java/reflection/Bird.java    |     0
 .../java/reflection/DynamicGreeter.java       |     0
 .../com/baeldung/java/reflection/Eating.java  |     0
 .../com/baeldung/java/reflection/Goat.java    |     0
 .../com/baeldung/java/reflection/Greeter.java |     0
 .../java/reflection/GreetingAnnotation.java   |     0
 .../baeldung/java/reflection/Greetings.java   |     0
 .../baeldung/java/reflection/Locomotion.java  |     0
 .../baeldung/java/reflection/Operations.java  |     0
 .../com/baeldung/java/reflection/Person.java  |     0
 .../keywords/finalize/FinalizeObject.java     |     0
 .../baeldung/keywords/finalkeyword/Child.java |     0
 .../keywords/finalkeyword/GrandChild.java     |     0
 .../keywords/finalkeyword/Parent.java         |     0
 .../finallykeyword/FinallyExample.java        |     0
 .../baeldung/nativekeyword/DateTimeUtils.java |     0
 .../baeldung/nativekeyword/NativeMainApp.java |     0
 .../ClassWithInitErrors.java                  |    10 +-
 .../NoClassDefFoundErrorExample.java          |    26 +-
 .../main/java/com/baeldung/objects/Car.java   |     0
 .../java/com/baeldung/packages/TodoApp.java   |     0
 .../java/com/baeldung/packages/TodoList.java  |     0
 .../baeldung/packages/domain/TodoItem.java    |     0
 .../parameterpassing/NonPrimitives.java       |     0
 .../baeldung/parameterpassing/Primitives.java |     0
 .../com/baeldung/recursion/BinaryNode.java    |    62 +-
 .../baeldung/recursion/RecursionExample.java  |   128 +-
 .../baeldung/scope/BracketScopeExample.java   |     0
 .../com/baeldung/scope/ClassScopeExample.java |     0
 .../com/baeldung/scope/LoopScopeExample.java  |     0
 .../baeldung/scope/MethodScopeExample.java    |     0
 .../baeldung/scope/NestedScopesExample.java   |     0
 .../baeldung/sneakythrows/SneakyRunnable.java |     0
 .../baeldung/sneakythrows/SneakyThrows.java   |     0
 .../stackoverflowerror/AccountHolder.java     |    16 +-
 .../baeldung/stackoverflowerror/ClassOne.java |    32 +-
 .../baeldung/stackoverflowerror/ClassTwo.java |    32 +-
 ...niteRecursionWithTerminationCondition.java |    14 +-
 ...ursionWithCorrectTerminationCondition.java |    14 +-
 .../UnintendedInfiniteRecursion.java          |    14 +-
 .../baeldung/synthetic/BridgeMethodDemo.java  |     0
 .../synthetic/SyntheticConstructorDemo.java   |     0
 .../synthetic/SyntheticFieldDemo.java         |     0
 .../synthetic/SyntheticMethodDemo.java        |     0
 .../throwsexception/DataAccessException.java  |     0
 .../com/baeldung/throwsexception/Main.java    |     0
 .../throwsexception/PersonRepository.java     |     0
 .../throwsexception/SimpleService.java        |     0
 .../baeldung/throwsexception/TryCatch.java    |     0
 .../src/main/resources/file.txt               |     0
 .../binding/AnimalActivityUnitTest.java       |     0
 .../com/baeldung/binding/AnimalUnitTest.java  |     0
 .../com/baeldung/binding/CatUnitTest.java     |     0
 .../RetrievingClassNameUnitTest.java          |     0
 .../ClassNotFoundExceptionUnitTest.java       |    20 +-
 .../comparable/ComparableUnitTest.java        |     0
 .../comparator/ComparatorUnitTest.java        |     0
 .../comparator/Java8ComparatorUnitTest.java   |     0
 .../CompoundOperatorsUnitTest.java            |     0
 ...correctFileExtensionExceptionUnitTest.java |     0
 .../IncorrectFileNameExceptionUnitTest.java   |     0
 .../DynamicProxyIntegrationTest.java          |     0
 .../enums/values/Element1UnitTest.java        |     0
 .../enums/values/Element2UnitTest.java        |     0
 .../enums/values/Element3UnitTest.java        |     0
 .../enums/values/Element4UnitTest.java        |     0
 .../exceptionhandling/ExceptionsUnitTest.java |   160 +-
 .../baeldung/finalize/FinalizeUnitTest.java   |     0
 .../interfaces/InnerInterfaceUnitTest.java    |     0
 .../java/enumiteration/DaysOfWeekEnum.java    |     0
 .../enumiteration/EnumIterationExamples.java  |     0
 .../java/reflection/OperationsUnitTest.java   |     0
 .../java/reflection/ReflectionUnitTest.java   |     0
 .../DateTimeUtilsManualTest.java              |    54 +-
 .../baeldung/nestedclass/AnonymousInner.java  |     0
 .../com/baeldung/nestedclass/Enclosing.java   |     0
 .../baeldung/nestedclass/NewEnclosing.java    |     0
 .../com/baeldung/nestedclass/NewOuter.java    |     0
 .../java/com/baeldung/nestedclass/Outer.java  |     0
 .../NoClassDefFoundErrorUnitTest.java         |    22 +-
 .../com/baeldung/objects/CarUnitTest.java     |     0
 .../baeldung/packages/PackagesUnitTest.java   |     0
 .../recursion/RecursionExampleUnitTest.java   |   122 +-
 .../sneakythrows/SneakyRunnableUnitTest.java  |     0
 .../sneakythrows/SneakyThrowsUnitTest.java    |     0
 .../AccountHolderManualTest.java              |    20 +-
 .../CyclicDependancyManualTest.java           |    20 +-
 ...ionWithTerminationConditionManualTest.java |    62 +-
 ...CorrectTerminationConditionManualTest.java |    30 +-
 ...UnintendedInfiniteRecursionManualTest.java |    60 +-
 .../baeldung/synthetic/SyntheticUnitTest.java |     0
 .../SimpleServiceUnitTest.java                |     0
 .../correctFileNameWithoutProperExtension     |     0
 .../core-java-networking}/.gitignore          |     0
 .../core-java-networking}/README.md           |     0
 .../core-java-networking}/pom.xml             |     2 +-
 .../baeldung/http/FullResponseBuilder.java    |     0
 .../baeldung/http/ParameterStringBuilder.java |     0
 .../java/com/baeldung/mail/EmailService.java  |     0
 .../cookies/PersistentCookieStore.java        |     0
 .../cookies/ProxyAcceptCookiePolicy.java      |     0
 .../proxies/CommandLineProxyDemo.java         |     0
 .../networking/proxies/DirectProxyDemo.java   |     0
 .../networking/proxies/SocksProxyDemo.java    |     0
 .../proxies/SystemPropertyProxyDemo.java      |     0
 .../proxies/UrlConnectionUtils.java           |     0
 .../networking/proxies/WebProxyDemo.java      |     0
 .../baeldung/networking/udp/EchoClient.java   |     0
 .../baeldung/networking/udp/EchoServer.java   |     0
 .../udp/broadcast/BroadcastingClient.java     |     0
 .../udp/broadcast/BroadcastingEchoServer.java |     0
 .../udp/multicast/MulticastEchoServer.java    |     0
 .../udp/multicast/MulticastingClient.java     |     0
 .../baeldung/networking/uriurl/URIDemo.java   |     0
 .../baeldung/networking/uriurl/URLDemo.java   |     0
 .../java/com/baeldung/socket/EchoClient.java  |     0
 .../com/baeldung/socket/EchoMultiServer.java  |     0
 .../java/com/baeldung/socket/EchoServer.java  |     0
 .../java/com/baeldung/socket/GreetClient.java |     0
 .../java/com/baeldung/socket/GreetServer.java |     0
 .../java/com/baeldung/socket/read/Client.java |     0
 .../java/com/baeldung/socket/read/Server.java |     0
 .../src/main/resources/logback.xml            |     0
 .../EncoderDecoderUnitTest.java               |     0
 .../baeldung/http/HttpRequestLiveTest.java    |     0
 .../NetworkInterfaceManualTest.java           |     0
 .../baeldung/networking/udp/UDPLiveTest.java  |     0
 .../udp/broadcast/BroadcastLiveTest.java      |     0
 .../udp/multicast/MulticastLiveTest.java      |     0
 .../networking/uriurl/URIDemoLiveTest.java    |     0
 .../networking/uriurl/URIvsURLUnitTest.java   |     0
 .../networking/uriurl/URLDemoLiveTest.java    |     0
 .../baeldung/networking/url/UrlUnitTest.java  |     0
 .../baeldung/socket/EchoIntegrationTest.java  |     0
 .../socket/GreetServerIntegrationTest.java    |     0
 .../SocketEchoMultiIntegrationTest.java       |     0
 .../read/SocketReadAllDataLiveTest.java       |     0
 .../src/test/resources/.gitignore             |     0
 .../core-java-os}/.gitignore                  |     0
 .../core-java-os}/README.md                   |     0
 .../core-java-os}/pom.xml                     |   164 +-
 .../baeldung/java9/process/ChildProcess.java  |     0
 .../java9/process/OutputStreamExample.java    |    32 +-
 .../process/ProcessCompilationError.java      |     0
 .../java9/process/ProcessUnderstanding.java   |     0
 .../baeldung/java9/process/ProcessUtils.java  |    86 +-
 .../baeldung/java9/process/ServiceMain.java   |    42 +-
 .../src/main/resources/logback.xml            |     0
 .../ProcessAPIEnhancementsUnitTest.java       |     0
 .../java9/process/ProcessApiUnitTest.java     |   222 +-
 .../process/ProcessUnderstandingUnitTest.java |     0
 .../ProcessBuilderUnitTest.java               |   364 +-
 .../src/test/resources/.gitignore             |     0
 .../core-java-perf}/README.md                 |     0
 .../core-java-perf}/pom.xml                   |     2 +-
 .../flightrecorder/FlightRecorder.java        |     0
 .../gc/VerboseGarbageCollectorRunner.java     |   126 +-
 .../java/com/baeldung/heapdump/HeapDump.java  |     0
 .../src/main/java/com/baeldung/jmx/Game.java  |     0
 .../main/java/com/baeldung/jmx/GameMBean.java |     0
 .../baeldung/jmx/JMXTutorialMainlauncher.java |     0
 .../memoryleaks/equalshashcode/Person.java    |    18 +-
 .../equalshashcode/PersonOptimized.java       |    50 +-
 .../memoryleaks/finalize/BulkyObject.java     |    64 +-
 .../finalize/BulkyObjectOptimized.java        |    44 +-
 .../memoryleaks/innerclass/BulkyObject.java   |    44 +-
 .../innerclass/InnerClassDriver.java          |    34 +-
 .../innerclass/InnerClassWrapper.java         |    20 +-
 .../innerclass/StaticNestedClassWrapper.java  |    20 +-
 .../internedstrings/InternedString.java       |     0
 .../ReadStringFromFileUtil.java               |     0
 .../internedstrings/StringObject.java         |     0
 .../staticfields/NonStaticFieldsDemo.java     |     0
 .../staticfields/StaticFieldsDemo.java        |     0
 .../OutOfMemoryGCLimitExceed.java             |     0
 .../src/main/resources/logback.xml            |     0
 .../PersonMemoryLeakUnitTest.java             |     0
 .../finalize/FinalizeMemoryLeakUnitTest.java  |     0
 .../StaticInnerClassMemoryLeakUnitTest.java   |     0
 .../StringInternMemoryLeakUnitTest.java       |     0
 .../NonStaticFieldsMemoryLeakUnitTest.java    |     0
 .../StaticFieldsMemoryLeakUnitTest.java       |     0
 .../core-java-reflection}/pom.xml             |     2 +-
 .../baeldung/reflection/voidtype/Action.java  |     0
 .../reflection/voidtype/Calculator.java       |     0
 .../baeldung/reflection/voidtype/Defer.java   |     0
 .../reflection/voidtype/MyOwnDefer.java       |     0
 .../voidtype/CalculatorUnitTest.java          |     0
 .../reflection/voidtype/DeferUnitTest.java    |     0
 .../voidtype/MyOwnDeferUnitTest.java          |     0
 .../core-java-security}/README.md             |     0
 .../core-java-security}/pom.xml               |     2 +-
 .../java/com/baeldung/cipher/Encryptor.java   |     0
 .../encrypt/FileEncrypterDecrypter.java       |     0
 .../baeldung/hashing/DigestAlgorithms.java    |     0
 .../baeldung/hashing/Keccak256Hashing.java    |     0
 .../com/baeldung/hashing/SHA256Hashing.java   |     0
 .../com/baeldung/hashing/SHA3Hashing.java     |     0
 .../com/baeldung/hashing/SHACommonUtils.java  |     0
 .../com/baeldung/keystore/JavaKeyStore.java   |     0
 .../passwordhashing/PBKDF2Hasher.java         |     0
 .../passwordhashing/SHA512Hasher.java         |     0
 .../passwordhashing/SimplePBKDF2Hasher.java   |     0
 .../java/com/baeldung/ssl/EnableTLSv12.java   |     0
 .../com/baeldung/ssl/SecureConnection.java    |     0
 .../baeldung/ssl/example/SimpleClient.java    |     0
 .../baeldung/ssl/example/SimpleServer.java    |     0
 .../src/main/resources/logback.xml            |     0
 .../baeldung/cipher/EncryptorUnitTest.java    |     0
 ...FileEncrypterDecrypterIntegrationTest.java |     0
 .../hashing/Keccak256HashingUnitTest.java     |     0
 .../hashing/SHA256HashingUnitTest.java        |     0
 .../baeldung/hashing/SHA3HashingUnitTest.java |     0
 .../keystore/JavaKeyStoreUnitTest.java        |     0
 .../passwordhashing/PBKDF2HasherUnitTest.java |     0
 .../passwordhashing/SHA512HasherUnitTest.java |     0
 .../baeldung/java/md5/JavaMD5UnitTest.java    |     0
 .../src/test/resources/test_md5.txt           |     0
 .../core-java-sun}/.gitignore                 |     0
 .../core-java-sun}/README.md                  |     0
 .../core-java-sun}/pom.xml                    |     2 +-
 .../src/main/java/com/baeldung/.gitignore     |     0
 .../src/main/java/com/baeldung/README.md      |     0
 .../java/com/baeldung/javac/Positive.java     |     0
 .../com/baeldung/javac/SampleJavacPlugin.java |     0
 .../services/com.sun.source.util.Plugin       |     0
 .../src/main/resources/log4j.properties       |     0
 .../src/main/resources/logback.xml            |     0
 .../SampleJavacPluginIntegrationTest.java     |     0
 .../com/baeldung/javac/SimpleClassFile.java   |     0
 .../com/baeldung/javac/SimpleFileManager.java |     0
 .../com/baeldung/javac/SimpleSourceFile.java  |     0
 .../java/com/baeldung/javac/TestCompiler.java |     0
 .../java/com/baeldung/javac/TestRunner.java   |     0
 .../java/com/baeldung/unsafe/CASCounter.java  |     0
 .../com/baeldung/unsafe/OffHeapArray.java     |     0
 .../com/baeldung/unsafe/UnsafeUnitTest.java   |     0
 .../src/test/resources/.gitignore             |     0
 .../core-java}/.gitignore                     |     0
 .../core-java}/README.md                      |     0
 .../core-java}/customers.xml                  |     0
 .../core-java}/externalizable.txt             |   Bin
 .../core-java}/pom.xml                        |     2 +-
 .../src/main/java/com/baeldung/.gitignore     |     0
 .../src/main/java/com/baeldung/README.md      |     0
 .../application/Application.java              |    58 +-
 .../filereaders/BaseFileReader.java           |    54 +-
 .../filereaders/LowercaseFileReader.java      |    30 +-
 .../filereaders/UppercaseFileReader.java      |    30 +-
 .../java/com/baeldung/asciiart/AsciiArt.java  |     0
 .../baeldung/basicsyntax/SimpleAddition.java  |     0
 .../classloader/CustomClassLoader.java        |     0
 .../classloader/PrintClassLoader.java         |     0
 .../baeldung/console/ConsoleConsoleClass.java |     0
 .../baeldung/console/ConsoleScannerClass.java |     0
 .../baeldung/curltojava/JavaCurlExamples.java |     0
 .../deserialization/AppleProduct.java         |     0
 .../DeserializationUtility.java               |     0
 .../deserialization/SerializationUtility.java |     0
 .../encoding/CharacterEncodingExamples.java   |     0
 .../com/baeldung/exceptions/Arithmetic.java   |     0
 .../exceptions/ArrayIndexOutOfBounds.java     |     0
 .../com/baeldung/exceptions/ClassCast.java    |     0
 .../com/baeldung/exceptions/FileNotFound.java |     0
 .../exceptions/GlobalExceptionHandler.java    |     0
 .../baeldung/exceptions/IllegalArgument.java  |     0
 .../com/baeldung/exceptions/IllegalState.java |     0
 .../InterruptedExceptionExample.java          |     0
 .../com/baeldung/exceptions/MalformedURL.java |     0
 .../com/baeldung/exceptions/NullPointer.java  |     0
 .../com/baeldung/exceptions/NumberFormat.java |     0
 .../exceptions/ParseExceptionExample.java     |     0
 .../exceptions/StackTraceToString.java        |     0
 .../exceptions/StringIndexOutOfBounds.java    |     0
 .../executable/ExecutableMavenJar.java        |     0
 .../baeldung/externalizable/Community.java    |     0
 .../com/baeldung/externalizable/Country.java  |     0
 .../com/baeldung/externalizable/Region.java   |     0
 .../fileparser/BufferedReaderExample.java     |     0
 .../fileparser/FileReaderExample.java         |     0
 .../fileparser/FilesReadLinesExample.java     |     0
 .../fileparser/ScannerIntExample.java         |     0
 .../fileparser/ScannerStringExample.java      |     0
 .../filesystem/jndi/LookupFSJNDI.java         |     0
 .../main/java/com/baeldung/graph/Graph.java   |     0
 .../com/baeldung/graph/GraphTraversal.java    |     0
 .../instrumentation/agent/AtmTransformer.java |     0
 .../agent/MyInstrumentationAgent.java         |     0
 .../application/AgentLoader.java              |     0
 .../instrumentation/application/Launcher.java |     0
 .../instrumentation/application/MyAtm.java    |     0
 .../application/MyAtmApplication.java         |     0
 .../java/com/baeldung/jar/JarExample.java     |     0
 .../com/baeldung/jar/example_manifest.txt     |     0
 .../main/java/com/baeldung/javac/Data.java    |     0
 .../java/com/baeldung/javadoc/Person.java     |     0
 .../java/com/baeldung/javadoc/SuperHero.java  |     0
 .../baeldung/logforging/LogForgingDemo.java   |     0
 .../com/baeldung/manifest/AppExample.java     |     0
 .../com/baeldung/manifest/ExecuteJarFile.java |     0
 .../java/com/baeldung/manifest/MANIFEST.MF    |     1 +
 .../java/com/baeldung/money/JavaMoney.java    |   302 +-
 .../objectsize/InstrumentationAgent.java      |     0
 .../objectsize/InstrumentationExample.java    |     0
 .../java/com/baeldung/objectsize/MANIFEST.MF  |     0
 .../com/baeldung/printf/PrintfExamples.java   |     0
 .../java/com/baeldung/printscreen/README.md   |     0
 .../com/baeldung/printscreen/Screenshot.java  |     0
 .../reflection/BaeldungReflectionUtils.java   |     0
 .../com/baeldung/reflection/Customer.java     |     0
 .../com/baeldung/reflection/Employee.java     |     0
 .../baeldung/reflection/MonthEmployee.java    |     0
 .../java/com/baeldung/reflection/Person.java  |     0
 .../resourcebundle/ExampleControl.java        |     0
 .../resourcebundle/ExampleResource.java       |     0
 .../resourcebundle/ExampleResource_pl.java    |     0
 .../resourcebundle/ExampleResource_pl_PL.java |     0
 .../com/baeldung/serialization/Address.java   |     0
 .../com/baeldung/serialization/Employee.java  |     0
 .../com/baeldung/serialization/Person.java    |     0
 .../java/com/baeldung/staticclass/Pizza.java  |     0
 .../java/com/baeldung/system/DetectOS.java    |     0
 .../PostJSONWithHttpURLConnection.java        |     0
 .../com/baeldung/util/PropertiesLoader.java   |     0
 .../java/com/baeldung/uuid/UUIDGenerator.java |     0
 .../src/main/java/javac-args/arguments        |     0
 .../src/main/java/javac-args/options          |     0
 .../core-java}/src/main/java/javac-args/types |     0
 .../src/main/java/javac-args/xlint-ops        |     0
 .../core-java}/src/main/java/log4j.properties |     0
 .../executable/ExecutableMavenJar.java        |     0
 .../src/main/resources/ESAPI.properties       |     0
 .../src/main/resources/META-INF/BenchmarkList |     0
 .../src/main/resources/META-INF/MANIFEST.MF   |     0
 .../main/resources/META-INF/persistence.xml   |     0
 .../src/main/resources/countries.properties   |     0
 .../src/main/resources/datasource.properties  |     0
 .../src/main/resources/files/test.txt         |     0
 .../core-java}/src/main/resources/js/bind.js  |     0
 .../src/main/resources/js/locations.js        |     0
 .../src/main/resources/js/math_module.js      |     0
 .../src/main/resources/js/no_such.js          |     0
 .../src/main/resources/js/script.js           |     0
 .../core-java}/src/main/resources/js/trim.js  |     0
 .../src/main/resources/js/typed_arrays.js     |     0
 .../src/main/resources/log4j.properties       |     0
 .../core-java}/src/main/resources/log4j2.xml  |     0
 .../resources/log4jstructuraldp.properties    |     0
 .../core-java}/src/main/resources/logback.xml |     0
 .../core-java}/src/main/resources/product.png |   Bin
 .../resourcebundle/resource.properties        |     0
 .../resourcebundle/resource_en.properties     |     0
 .../resourcebundle/resource_pl_PL.properties  |     0
 .../test/LowercaseFileReaderUnitTest.java     |    40 +-
 .../test/UppercaseFileReaderUnitTest.java     |    40 +-
 .../asciiart/AsciiArtIntegrationTest.java     |     0
 .../test/BitwiseOperatorUnitTest.java         |   162 +-
 .../CustomClassLoaderUnitTest.java            |     0
 .../classloader/PrintClassLoaderUnitTest.java |     0
 .../curltojava/JavaCurlExamplesLiveTest.java  |     0
 .../DeserializationUnitTest.java              |     0
 .../CharacterEncodingExamplesUnitTest.java    |     0
 .../GlobalExceptionHandlerUnitTest.java       |     0
 .../ExternalizableUnitTest.java               |     0
 .../fileparser/BufferedReaderUnitTest.java    |     0
 .../fileparser/FileReaderUnitTest.java        |     0
 .../fileparser/FilesReadAllLinesUnitTest.java |     0
 .../fileparser/ScannerIntUnitTest.java        |     0
 .../fileparser/ScannerStringUnitTest.java     |     0
 .../graph/GraphTraversalUnitTest.java         |     0
 .../grep/GrepWithUnix4JIntegrationTest.java   |     0
 .../hexToAscii/HexToAsciiUnitTest.java        |     0
 .../java/com/baeldung/hexToAscii/README.md    |     0
 .../baeldung/java/clock/ClockUnitTest.java    |     0
 ...CurrentlyExecutedMethodFinderUnitTest.java |     0
 .../java/properties/PropertiesUnitTest.java   |     0
 .../baeldung/java/regex/RegexUnitTest.java    |     0
 .../baeldung/java8/Java8MapAndFlatMap.java    |     0
 .../junit4vstestng/DivisibilityUnitTest.java  |     0
 .../junit4vstestng/ParametrizedUnitTest.java  |     0
 .../junit4vstestng/RegistrationUnitTest.java  |     0
 .../junit4vstestng/SignInUnitTest.java        |     0
 .../junit4vstestng/StringCaseUnitTest.java    |     0
 .../junit4vstestng/SuiteUnitTest.java         |     0
 .../baeldung/leapyear/LeapYearUnitTest.java   |     0
 .../manifest/ExecuteJarFileUnitTest.java      |     0
 .../money/JavaMoneyUnitManualTest.java        |     0
 .../printscreen/ScreenshotLiveTest.java       |     0
 .../properties/MergePropertiesUnitTest.java   |   168 +-
 .../BaeldungReflectionUtilsUnitTest.java      |     0
 .../PersonAndEmployeeReflectionUnitTest.java  |     0
 .../regexp/EscapingCharsUnitTest.java         |     0
 .../OptimizedMatcherManualTest.java           |     0
 .../ExampleResourceUnitTest.java              |     0
 .../PropertyResourceUnitTest.java             |     0
 .../baeldung/scripting/NashornUnitTest.java   |     0
 .../serialization/PersonUnitTest.java         |     0
 .../com/baeldung/stack/StackUnitTest.java     |     0
 .../java/com/baeldung/stringisnumeric.zip     |   Bin
 .../system/WhenDetectingOSUnitTest.java       |     0
 .../util/PropertiesLoaderUnitTest.java        |     0
 .../org/baeldung/java/JavaIoUnitTest.java     |     0
 .../java/JavaTimerLongRunningUnitTest.java    |     0
 .../arrays/ArraysJoinAndSplitJUnitTest.java   |     0
 .../java/rawtypes/RawTypesUnitTest.java       |     0
 .../java/sandbox/SandboxJavaManualTest.java   |     0
 .../shell/JavaProcessUnitIntegrationTest.java |     0
 .../core-java}/src/test/resources/.gitignore  |     0
 .../src/test/resources/app.properties         |     0
 .../core-java}/src/test/resources/catalog     |     0
 .../test/resources/configuration.properties   |     0
 .../src/test/resources/default.properties     |     0
 .../src/test/resources/dictionary.in          |     0
 .../src/test/resources/encoding.txt           |     0
 .../core-java}/src/test/resources/icons.xml   |     0
 .../src/test/resources/newFile1.txt           |     0
 .../src/test/resources/newFile2.txt           |     0
 .../src/test/resources/newFile3.txt           |     0
 .../src/test/resources/original.txt           |     2 +-
 .../src/test/resources/sampleNumberFile.txt   |     0
 .../src/test/resources/sampleTextFile.txt     |     0
 .../src/test/resources/sourceFile.txt         |     0
 .../core-java}/src/test/resources/test.find   |     0
 .../src/test/resources/test_read.in           |     0
 .../src/test/resources/test_read1.in          |     0
 .../src/test/resources/test_read2.in          |     0
 .../src/test/resources/test_read3.in          |     0
 .../src/test/resources/test_read4.in          |   Bin
 .../src/test/resources/test_read7.in          |     0
 .../src/test/resources/test_read8.in          |     0
 .../src/test/resources/test_read_d.in         |     0
 .../src/test/resources/test_read_multiple.in  |     0
 .../core-java}/yofile.txt                     |   Bin
 .../core-java}/yofile2.txt                    |   Bin
 pom.xml                                       |   100 +-
 1480 files changed, 25600 insertions(+), 5594 deletions(-)
 delete mode 100644 core-java-lang/native/nativedatetimeutils.dll
 rename {core-java-10 => core-java-modules/core-java-10}/README.md (100%)
 rename {core-java-10 => core-java-modules/core-java-10}/pom.xml (96%)
 rename {core-java-10 => core-java-modules/core-java-10}/src/main/java/com/baeldung/App.java (100%)
 rename {core-java-10 => core-java-modules/core-java-10}/src/main/java/com/baeldung/graal/CountUppercase.java (100%)
 rename {core-java-10 => core-java-modules/core-java-10}/src/main/resources/logback.xml (100%)
 rename {core-java-10 => core-java-modules/core-java-10}/src/test/java/com/baeldung/AppTest.java (100%)
 rename {core-java-10 => core-java-modules/core-java-10}/src/test/java/com/baeldung/java10/Java10FeaturesUnitTest.java (100%)
 rename {core-java-10 => core-java-modules/core-java-10}/src/test/java/com/baeldung/java10/list/CopyListServiceUnitTest.java (100%)
 rename {core-java-11 => core-java-modules/core-java-11}/README.md (100%)
 rename {core-java-11 => core-java-modules/core-java-11}/pom.xml (97%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/main/java/com/baeldung/App.java (100%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/main/java/com/baeldung/Outer.java (100%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/main/java/com/baeldung/add (100%)
 mode change 100755 => 100644
 rename {core-java-11 => core-java-modules/core-java-11}/src/main/java/com/baeldung/epsilongc/MemoryPolluter.java (100%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/main/java/com/baeldung/java11/httpclient/HttpClientExample.java (97%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/main/resources/logback.xml (100%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/modules/jlinkModule/com/baeldung/jlink/HelloWorld.java (100%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/modules/jlinkModule/module-info.java (100%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/test/java/com/baeldung/AppTest.java (100%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/test/java/com/baeldung/EmptyStringToEmptyOptionalUnitTest.java (100%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/test/java/com/baeldung/NewStringAPIUnitTest.java (100%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/test/java/com/baeldung/OuterUnitTest.java (100%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/test/java/com/baeldung/java11/httpclient/test/HttpClientTest.java (97%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/test/java/com/baeldung/java11/httpclient/test/HttpRequestTest.java (97%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/test/java/com/baeldung/java11/httpclient/test/HttpResponseTest.java (97%)
 rename {core-java-11 => core-java-modules/core-java-11}/src/test/java/com/baeldung/optional/OptionalUnitTest.java (100%)
 rename {core-java-12 => core-java-modules/core-java-12}/pom.xml (96%)
 rename {core-java-12 => core-java-modules/core-java-12}/src/test/java/com/baeldung/collectors/CollectorsUnitTest.java (100%)
 rename {core-java-12 => core-java-modules/core-java-12}/src/test/java/com/baeldung/switchExpression/SwitchUnitTest.java (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/.gitignore (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/README.md (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/pom.xml (96%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/java/com/baeldung/jarArguments/JarExample.java (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/java/com/baeldung/localization/App.java (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/java/com/baeldung/localization/ICUFormat.java (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/java/com/baeldung/localization/JavaSEFormat.java (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/java/com/baeldung/localization/Localization.java (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/resources/example_manifest.txt (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/resources/formats_en.properties (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/resources/formats_fr.properties (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/resources/formats_it.properties (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/resources/formats_pl.properties (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/resources/messages_en.properties (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/resources/messages_fr.properties (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/resources/messages_it.properties (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/main/resources/messages_pl.properties (100%)
 rename {core-java-8-2 => core-java-modules/core-java-8-2}/src/test/java/com/baeldung/localization/ICUFormatUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/.gitignore (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/README.md (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/pom.xml (96%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/annotations/ClassWithAnnotation.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/annotations/ClassWithDeprecatedMethod.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/annotations/ClassWithSafeVarargs.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/annotations/ClassWithSuppressWarnings.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/annotations/IntConsumer.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/annotations/Interval.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/annotations/IntervalUsage.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/annotations/Intervals.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/annotations/MyAnnotation.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/annotations/MyAnnotationTarget.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/annotations/MyOperation.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/annotations/MyOperationImpl.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/aspect/ChangeCallsToCurrentTimeInMillisMethod.aj (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/customannotations/Init.java (95%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/customannotations/JsonElement.java (96%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/customannotations/JsonSerializable.java (95%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/customannotations/JsonSerializationException.java (96%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/customannotations/ObjectToJsonConverter.java (97%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/customannotations/Person.java (95%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/defaultstaticinterfacemethods/application/Application.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Alarm.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Car.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Motorbike.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/MultiAlarmCar.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Vehicle.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/doublecolon/Computer.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/doublecolon/ComputerUtils.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/doublecolon/MacbookPro.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/doublecolon/function/ComputerPredicate.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/doublecolon/function/TriFunction.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappers.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java8/lambda/exceptions/ThrowingConsumer.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java8/lambda/tips/Bar.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java8/lambda/tips/Baz.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java8/lambda/tips/Foo.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java8/lambda/tips/Processor.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java8/lambda/tips/ProcessorImpl.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java8/lambda/tips/UseFoo.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java_8_features/Address.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java_8_features/CustomException.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java_8_features/OptionalAddress.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java_8_features/OptionalUser.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java_8_features/User.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java_8_features/Vehicle.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java_8_features/VehicleImpl.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java_8_features/groupingby/BlogPost.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/java_8_features/groupingby/BlogPostType.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNull.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainer.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheck.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/optional/Modem.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/optional/OrElseAndOrElseGet.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/optional/OrElseAndOrElseGetBenchmarkRunner.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/optional/Person.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/optional/PersonRepository.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/BenchmarkRunner.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/BooleanPrimitiveLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/BooleanWrapperLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/BytePrimitiveLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/ByteWrapperLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/CharPrimitiveLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/CharacterWrapperLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/DoublePrimitiveLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/DoubleWrapperLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/FloatPrimitiveLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/FloatWrapperLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/IntPrimitiveLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/IntegerWrapperLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/LongPrimitiveLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/LongWrapperLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/Lookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/ShortPrimitiveLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/primitive/ShortWrapperLookup.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/AddCommand.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/AddRule.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/Addition.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/Calculator.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/Command.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/Division.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/Expression.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/Modulo.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/Multiplication.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/Operation.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/Operator.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/OperatorFactory.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/Result.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/Rule.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reducingIfElse/Subtraction.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/reflect/Person.java (93%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/spliteratorAPI/Article.java (94%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/spliteratorAPI/Author.java (95%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/spliteratorAPI/Executor.java (96%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorCounter.java (96%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorSpliterator.java (96%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/spliteratorAPI/Task.java (96%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/strategy/ChristmasDiscounter.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/strategy/Discounter.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/strategy/EasterDiscounter.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/streamreduce/application/Application.java (97%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/streamreduce/entities/User.java (94%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/java/com/baeldung/streamreduce/utilities/NumberUtils.java (97%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/main/resources/logback.xml (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/collectors/Java8CollectorsUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/counter/CounterStatistics.java (97%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/counter/CounterUnitTest.java (96%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/counter/CounterUtil.java (96%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/customannotations/JsonSerializerUnitTest.java (97%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/defaultistaticinterfacemethods/test/StaticDefaulInterfaceMethodUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/doublecolon/ComputerUtilsUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/internationalization/DateFormatUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/internationalization/NumbersCurrenciesFormattingUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/Java8DefaultStaticIntefaceMethodsUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/Java8ForEachUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/Java8GroupingByCollectorUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/Java8MethodReferenceUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/Java8OptionalUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/Java8PredicateChainUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/Java8SortUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/JavaTryWithResourcesLongRunningUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/UnsignedArithmeticUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/comparator/Employee.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/comparator/Java8ComparatorUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/entity/Human.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/lambda/methodreference/Bicycle.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/lambda/methodreference/BicycleComparator.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/lambda/methodreference/MethodReferenceUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/optional/OptionalChainingUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/math/MathNewMethodsUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNullUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainerUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheckUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/optional/PersonRepositoryUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/reduceIfelse/CalculatorUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/reflect/MethodParamNameUnitTest.java (97%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/spliteratorAPI/ExecutorUnitTest.java (97%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/strategy/StrategyDesignPatternUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/stream/conditional/StreamForEachIfElseUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/streamreduce/tests/StreamReduceManualTest.java (97%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/time/InstantUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/time/InstantWithJMockUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/time/LocalDateTimeUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/time/LocalDateTimeWithJMockUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/typeinference/TypeInferenceUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/java/com/baeldung/util/CurrentDateTimeUnitTest.java (100%)
 rename {core-java-8 => core-java-modules/core-java-8}/src/test/resources/.gitignore (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/.gitignore (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/README.md (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/compile-aot.sh (100%)
 mode change 100755 => 100644
 rename {core-java-9 => core-java-modules/core-java-9}/compile-httpclient.bat (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/compile-modules.sh (100%)
 mode change 100755 => 100644
 rename {core-java-9 => core-java-modules/core-java-9}/compile-simple-modules.sh (100%)
 mode change 100755 => 100644
 rename {core-java-9 => core-java-modules/core-java-9}/compile-student-client.bat (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/compile-student-model.bat (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/compile-student-service-dbimpl.bat (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/compile-student-service.bat (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/logging.sh (100%)
 mode change 100755 => 100644
 rename {core-java-9 => core-java-modules/core-java-9}/mods/logback.xml (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/pom.xml (98%)
 rename {core-java-9 => core-java-modules/core-java-9}/run-aot.sh (100%)
 mode change 100755 => 100644
 rename {core-java-9 => core-java-modules/core-java-9}/run-httpclient.bat (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/run-simple-module-app.sh (100%)
 mode change 100755 => 100644
 rename {core-java-9 => core-java-modules/core-java-9}/run-student-client.bat (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/run-student-client.sh (100%)
 mode change 100755 => 100644
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/.gitignore (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/java9/aot/JaotCompilation.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/java9/language/PrivateInterface.java (96%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/java9/language/stream/StreamsGroupingCollectionFilter.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/java9/maps/initialize/MapsInitializer.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/java9/methodhandles/Book.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/java9/rangedates/DatesCollectionIteration.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/java9/rangedates/RangeDatesIteration.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImpl.java (96%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/java9/reactive/BaeldungSubscriberImpl.java (95%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/java9/set/UnmodifiableSet.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/java9/stackwalker/StackWalkerDemo.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/java9/streams.reactive/EndSubscriber.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/java9/streams.reactive/TransformProcessor.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/multireleaseapp/App.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/multireleaseapp/DateHelper.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java/com/baeldung/optionals/Optionals.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/java9/com/baeldung/multireleaseapp/DateHelper.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/main/resources/logback.xml (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.httpclient/com/baeldung/httpclient/HttpClientExample.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.httpclient/module-info.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.logging.app/com/baeldung/logging/app/MainApp.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.logging.app/module-info.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLoggerFinder.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.logging.slf4j/module-info.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.logging/com/baeldung/logging/ConsoleLogger.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.logging/com/baeldung/logging/CustomLoggerFinder.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.logging/module-info.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.student.client/com/baeldung/student/client/StudentClient.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.student.client/module-info.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.student.model/com/baeldung/student/model/Student.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.student.model/module-info.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.student.service.dbimpl/com/baeldung/student/service/dbimpl/StudentDbService.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.student.service.dbimpl/module-info.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.student.service/com/baeldung/student/service/StudentService.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/modules/com.baeldung.student.service/module-info.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/simple-modules/hello.modules/com/baeldung/modules/hello/HelloInterface.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/simple-modules/hello.modules/com/baeldung/modules/hello/HelloModules.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/simple-modules/hello.modules/module-info.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/simple-modules/main.app/com/baeldung/modules/main/MainApp.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/simple-modules/main.app/module-info.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/Java9OptionalTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/Java9OptionalsStreamUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/MultiResultionImageUnitTest.java (97%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/OptionalToStreamUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/README.MD (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/SetExamplesUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/concurrent/future/CompletableFutureUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/httpclient/HttpClientTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/httpclient/HttpRequestTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/httpclient/HttpResponseTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/language/DiamondUnitTest.java (95%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/language/Java9ObjectsAPIUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/language/PrivateInterfaceUnitTest.java (95%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/language/TryWithResourcesUnitTest.java (96%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/language/collections/ListFactoryMethodsUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/language/collections/MapFactoryMethodsUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/language/collections/SetFactoryMethodsUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/language/stream/CollectionFilterUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/language/stream/CollectorImprovementUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/language/stream/StreamFeaturesUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/methodhandles/MethodHandlesTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/modules/ModuleAPIUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/rangedates/DatesCollectionIterationUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/rangedates/RangeDatesIterationUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplIntegrationTest.java (96%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplIntegrationTest.java (96%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/stackwalker/StackWalkerDemoUnitTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/streams.reactive/ReactiveStreamsTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/java9/varhandles/VariableHandlesTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/java/com/baeldung/optionals/OptionalsTest.java (100%)
 rename {core-java-9 => core-java-modules/core-java-9}/src/test/resources/.gitignore (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/.gitignore (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/README.md (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/pom.xml (99%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/array/AddElementToEndOfArray.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/array/ArrayBenchmarkRunner.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/array/ArrayInitializer.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/array/ArrayInverter.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/array/ArrayReferenceGuide.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/array/Find2ndLargestInArray.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/array/FindElementInArray.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/array/JaggedArray.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/array/SearchArrayUnitTest.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/array/SumAndAverageInArray.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/array/conversions/FloatToByteArray.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/array/operations/ArrayOperations.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/arraycopy/model/Address.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/arraycopy/model/Employee.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/main/java/com/baeldung/arrays/ParallelPrefixBenchmark.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/test/java/com/baeldung/array/AddElementToEndOfArrayUnitTest.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/test/java/com/baeldung/array/ArrayInitializerUnitTest.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/test/java/com/baeldung/array/ArrayInverterUnitTest.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/test/java/com/baeldung/array/Find2ndLargestInArrayUnitTest.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/test/java/com/baeldung/array/FindElementInArrayUnitTest.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/test/java/com/baeldung/array/JaggedArrayUnitTest.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/test/java/com/baeldung/array/SumAndAverageInArrayUnitTest.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/test/java/com/baeldung/array/conversions/FloatToByteArrayUnitTest.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/test/java/com/baeldung/array/operations/ArrayOperationsUnitTest.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/test/java/com/baeldung/array/operations/IntersectionUnitTest.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/test/java/com/baeldung/arraycopy/ArrayCopyUtilUnitTest.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/test/java/com/baeldung/arrays/ArraysUnitTest.java (100%)
 rename {core-java-arrays => core-java-modules/core-java-arrays}/src/test/java/com/baeldung/sort/ArraySortUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/README.md (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/pom.xml (98%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/allequalelements/VerifyAllEqualListElements.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/classcastexception/ClassCastException.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/collection/filtering/Employee.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/findanelement/Customer.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/findanelement/FindACustomerInGivenList.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/java/list/CopyListService.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/java/list/CustomList.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/java/list/Flower.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/java/list/ReverseIterator.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/java/list/WaysToIterate.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/java_8_features/Car.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/java_8_features/Person.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/list/Flower.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/list/listoflist/Pen.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/list/listoflist/Pencil.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/list/listoflist/Rubber.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/list/listoflist/Stationery.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/list/multidimensional/ArrayListOfArrayList.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/list/multidimensional/ThreeDimensionalArrayList.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/list/primitive/PrimitiveCollections.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/list/primitive/PrimitivesListPerformance.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/java/com/baeldung/list/removeall/RemoveAll.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/main/resources/logback.xml (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/allequalelements/VerifyAllEqualListElementsUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/array/converter/ArrayConvertToListUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/collection/ClearVsRemoveAllUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/collection/CollectionsEmpty.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/collection/filtering/CollectionFilteringUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/findItems/FindItemsBasedOnOtherStreamUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/findanelement/FindACustomerInGivenListUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/java/list/CopyListServiceUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/java/list/CustomListUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/java/list/ReverseIteratorUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/java/list/WaysToIterateUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/java/listInitialization/ListInitializationUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/java8/Java8CollectionCleanupUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/java8/Java8MaxMinUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/list/AddElementsUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/list/flattennestedlist/FlattenNestedListUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/list/listoflist/AddElementsToListUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/list/listoflist/ListOfListsUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/list/removeall/RemoveAllUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/com/baeldung/list/removefirst/RemoveFirstElementUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/org/baeldung/RandomListElementUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/org/baeldung/java/collections/ArrayListUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/org/baeldung/java/collections/CoreJavaCollectionsUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/org/baeldung/java/collections/JavaCollectionCleanupUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/org/baeldung/java/lists/ListAssertJUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/org/baeldung/java/lists/ListJUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/org/baeldung/java/lists/ListTestNgUnitTest.java (100%)
 rename {core-java-collections-list => core-java-modules/core-java-collections-list}/src/test/java/org/baeldung/java/lists/README.md (100%)
 rename {core-java-collections-set => core-java-modules/core-java-collections-set}/README.md (100%)
 rename {core-java-collections-set => core-java-modules/core-java-collections-set}/pom.xml (93%)
 rename {core-java-collections-set => core-java-modules/core-java-collections-set}/src/main/java/com/baeldung/enumset/EnumSets.java (100%)
 rename {core-java-collections-set => core-java-modules/core-java-collections-set}/src/test/java/com/baeldung/collection/WhenUsingHashSet.java (100%)
 rename {core-java-collections-set => core-java-modules/core-java-collections-set}/src/test/java/com/baeldung/collection/WhenUsingTreeSet.java (100%)
 rename {core-java-collections-set => core-java-modules/core-java-collections-set}/src/test/java/com/baeldung/java/set/HashSetInitalizingUnitTest.java (100%)
 rename {core-java-collections-set => core-java-modules/core-java-collections-set}/src/test/java/com/baeldung/java/set/SetUnitTest.java (100%)
 rename {core-java-collections-set => core-java-modules/core-java-collections-set}/src/test/java/com/baeldung/set/SetOperationsUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/README.md (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/pom.xml (95%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/charstack/CharStack.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/charstack/CharStackWithArray.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/charstack/EmptyStackException.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/combiningcollections/CombiningArrays.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/combiningcollections/CombiningLists.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/combiningcollections/CombiningMaps.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/combiningcollections/CombiningSets.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/hashtable/Word.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/iteratorguide/IteratorGuide.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/iterators/Iterators.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/java/filtering/CollectionUtilsCollectionFilter.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/java/filtering/EclipseCollectionsCollectionFilter.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/java/filtering/GuavaCollectionFilter.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/java/filtering/StreamsCollectionFilter.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/java/iterable/IterableSize.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/java/list/VectorExample.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/java/sort/CollectionsSortCompare.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNull.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainer.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheck.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/performance/ArrayListBenchmark.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/performance/ArraySortBenchmark.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/performance/CollectionsBenchmark.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/performance/CopyOnWriteBenchmark.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/performance/Employee.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/performance/HashMapBenchmark.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/performance/SetBenchMark.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/queueInterface/CustomBaeldungQueue.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/removal/CollectionRemoveIf.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/removal/Iterators.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/removal/StreamFilterAndCollector.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/removal/StreamPartitioningBy.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/synchronizedcollections/application/Application.java (97%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/java/com/baeldung/thread_safe_lifo/DequeBasedSynchronizedStack.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/main/resources/logback.xml (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/arraydeque/ArrayDequeUnitTest.java (95%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/charstack/CharStackUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/charstack/CharStackUsingJavaUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/charstack/CharStackWithArrayUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/combiningcollections/CombiningArraysUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/combiningcollections/CombiningListsUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/combiningcollections/CombiningMapsUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/combiningcollections/CombiningSetsUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/enummap/DummyEnum.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/enummap/EnumMapBenchmarkLiveTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/enummap/EnumMapUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/hashmapvshashtable/HashmapVsHashtableDifferenceUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/hashtable/HashtableUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/iterators/IteratorsUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/java/collections/ConcurrentModificationExceptionUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/java/filtering/CollectionFiltersUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/java/iterable/IterableSizeUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNullUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainerUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheckUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/queueInterface/CustomBaeldungQueueUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/queueInterface/PriorityQueueUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/removal/RemovalUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/shufflingcollections/ShufflingCollectionsUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/stack_tests/MultithreadingCorrectnessStackUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/stack_tests/StackUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedCollectionUnitTest.java (97%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedListUnitTest.java (97%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedMapUnitTest.java (96%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSetUnitTest.java (97%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedMapUnitTest.java (97%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedSetUnitTest.java (97%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/org/baeldung/java/collections/CollectionsConcatenateUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/org/baeldung/java/collections/CollectionsJoinAndSplitJUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/org/baeldung/java/collections/JoinSplitCollectionsUnitTest.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/org/baeldung/java/collections/README.md (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/org/baeldung/java/sorting/Employee.java (100%)
 rename {core-java-collections => core-java-modules/core-java-collections}/src/test/java/org/baeldung/java/sorting/JavaSortingUnitTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/.gitignore (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/README.md (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/pom.xml (98%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/atomic/SafeCounterWithLock.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/atomic/SafeCounterWithoutLock.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/atomic/UnsafeCounter.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/countdownlatch/BrokenWorker.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExample.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExample.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/countdownlatch/WaitingWorker.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/countdownlatch/Worker.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExample.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExample.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierDemo.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExample.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/daemon/MultipleThreadsExample.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/daemon/NewThread.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/daemon/SingleThreadExample.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/diningphilosophers/DiningPhilosophers.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/diningphilosophers/Philosopher.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddSemaphore.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddWaitNotify.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/locks/ReentrantLockWithCondition.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/locks/SharedObjectWithLock.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/locks/StampedLockDemo.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/locks/SynchronizedHashMapWithRWLock.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/parameter/AverageCalculator.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/parameter/ParameterizedThreadExample.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/phaser/LongRunningAction.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/prioritytaskexecution/Job.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/prioritytaskexecution/JobPriority.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobScheduler.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/semaphores/CounterUsingMutex.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/semaphores/DelayQueueUsingTimedSemaphore.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/semaphores/LoginQueueUsingSemaphore.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/volatilekeyword/SharedObject.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/concurrent/yield/ThreadYield.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/forkjoin/CustomRecursiveAction.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/forkjoin/CustomRecursiveTask.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/forkjoin/util/PoolUtil.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/threadlocal/Context.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/threadlocal/SharedMapWithUserContext.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/threadlocal/ThreadLocalWithUserContext.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/threadlocal/UserRepository.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarkRunner.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarker.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/threadpool/CountingTask.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/com/baeldung/threadpool/TreeNode.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/java/log4j.properties (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/main/resources/logback.xml (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/accumulator/LongAccumulatorUnitTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/adder/LongAdderUnitTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeCounterIntegrationTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/atomic/ThreadUnsafeCounterManualTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExampleUnitTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchExampleIntegrationTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExampleUnitTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExampleUnitTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExampleUnitTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExampleUnitTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadUnitTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/locks/SharedObjectWithLockManualTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/locks/SynchronizedHashMapWithRWLockManualTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerUnitTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/semaphores/SemaphoresManualTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/concurrent/volatilekeyword/SharedObjectManualTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/java8/Java8ForkJoinIntegrationTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/parameters/ParameterizedThreadUnitTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/thread/join/ThreadJoinUnitTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/threadlocal/ThreadLocalIntegrationTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/threadlocalrandom/ThreadLocalRandomIntegrationTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/threadpool/CoreThreadPoolIntegrationTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/java/com/baeldung/threadpool/GuavaThreadPoolIntegrationTest.java (100%)
 rename {core-java-concurrency-advanced => core-java-modules/core-java-concurrency-advanced}/src/test/resources/.gitignore (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/.gitignore (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/README.md (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/pom.xml (97%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/Scheduledexecutorservice/ScheduledExecutorServiceDemo.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/callable/FactorialTask.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierExample.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/cyclicbarrier/Task.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/executor/ExecutorDemo.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/executor/Invoker.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/executorservice/DelayedCallable.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/executorservice/ExecutorServiceDemo.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/executorservice/Task.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/future/FactorialSquareCalculator.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/future/FutureDemo.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/future/SquareCalculator.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/runnable/EventLoggingTask.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/runnable/TaskRunner.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/semaphore/SemaPhoreDemo.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/sleepwait/ThreadA.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/sleepwait/ThreadB.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/sleepwait/WaitSleepExample.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/stopping/ControlSubThread.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedBlocks.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedMethods.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadfactory/BaeldungThreadFactory.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadfactory/Demo.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadfactory/Task.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadlifecycle/BlockedState.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadlifecycle/NewState.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadlifecycle/RunnableState.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadlifecycle/TerminatedState.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadlifecycle/TimedWaitingState.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadlifecycle/WaitingState.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/application/Application.java (98%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/callables/AtomicCounterCallable.java (96%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/callables/CounterCallable.java (96%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/callables/ExtrinsicLockCounterCallable.java (96%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/callables/MessageServiceCallable.java (96%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentranReadWriteLockCounterCallable.java (96%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentrantLockCounterCallable.java (96%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/mathutils/MathUtils.java (96%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/services/AtomicCounter.java (95%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/services/Counter.java (94%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/services/ExtrinsicLockCounter.java (95%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/services/MessageService.java (95%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantLockCounter.java (95%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantReadWriteLockCounter.java (96%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/threadsafety/services/StateHolder.java (94%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/waitandnotify/Data.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/waitandnotify/NetworkDriver.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/waitandnotify/Receiver.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/java/com/baeldung/concurrent/waitandnotify/Sender.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/main/resources/logback.xml (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/com/baeldung/concurrent/threadsafety/tests/CounterTest.java (97%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/com/baeldung/concurrent/threadsafety/tests/ExtrinsicLockCounterTest.java (97%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/com/baeldung/concurrent/threadsafety/tests/MathUtilsTest.java (96%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/com/baeldung/concurrent/threadsafety/tests/MessageServiceTest.java (97%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantLockCounterTest.java (97%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantReadWriteLockCounterTest.java (97%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/java/com/baeldung/completablefuture/CompletableFutureLongRunningUnitTest.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/java/com/baeldung/concurrent/callable/FactorialTaskManualTest.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/java/com/baeldung/concurrent/executorservice/WaitingForThreadsToFinishManualTest.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/java/com/baeldung/concurrent/future/FactorialSquareCalculatorUnitTest.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/java/com/baeldung/concurrent/future/SquareCalculatorIntegrationTest.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadLiveTest.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/java/com/baeldung/concurrent/stopping/StopThreadManualTest.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockUnitTest.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsUnitTest.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/java/com/baeldung/concurrent/waitandnotify/NetworkIntegrationTest.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/java/com/baeldung/java8/Java8ExecutorServiceIntegrationTest.java (100%)
 rename {core-java-concurrency-basic => core-java-modules/core-java-concurrency-basic}/src/test/resources/.gitignore (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/.gitignore (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/README.md (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/pom.xml (98%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/main/java/com/baeldung/concurrent/blockingqueue/BlockingQueueUsage.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersConsumer.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersProducer.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/main/java/com/baeldung/concurrent/delayqueue/DelayObject.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueConsumer.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueProducer.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/main/java/com/baeldung/concurrent/skiplist/Event.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/main/java/com/baeldung/concurrent/skiplist/EventWindowSort.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/main/java/com/baeldung/transferqueue/Consumer.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/main/java/com/baeldung/transferqueue/Producer.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/main/resources/logback.xml (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListUnitTest.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/java/com/baeldung/concurrent/delayqueue/DelayQueueIntegrationTest.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/java/com/baeldung/concurrent/priorityblockingqueue/PriorityBlockingQueueIntegrationTest.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/java/com/baeldung/concurrent/skiplist/ConcurrentSkipListSetIntegrationTest.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapAggregateStatusManualTest.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapNullKeyValueManualTest.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapPerformanceManualTest.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTest.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/java/com/baeldung/java/concurrentmap/ConcurretMapMemoryConsistencyManualTest.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/java/com/baeldung/java/concurrentmodification/ConcurrentModificationUnitTest.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueIntegrationTest.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/java/org/baeldung/java/streams/ThreadPoolInParallelStreamIntegrationTest.java (100%)
 rename {core-java-concurrency-collections => core-java-modules/core-java-concurrency-collections}/src/test/resources/.gitignore (100%)
 rename {core-java-io => core-java-modules/core-java-io}/.gitignore (100%)
 rename {core-java-io => core-java-modules/core-java-io}/README.md (100%)
 create mode 100644 core-java-modules/core-java-io/hard_link.txt
 rename {core-java-io => core-java-modules/core-java-io}/pom.xml (99%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/bufferedreader/BufferedReaderExample.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/csv/WriteCsvFileExample.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/dirmonitoring/DirectoryMonitoringExample.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/download/FileDownload.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/download/ResumableDownload.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/extension/Extension.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/fileparser/FileReaderExample.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/fileparser/ScannerIntExample.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/fileparser/ScannerStringExample.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/files/ListFiles.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/filesystem/jndi/LookupFSJNDI.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/java/nio/selector/EchoClient.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/java/nio/selector/EchoServer.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/java/nio/selector/README.md (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/java/nio2/visitor/FileSearchExample.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/java/nio2/visitor/FileVisitorImpl.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/java/nio2/watcher/DirectoryWatcherExample.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/stream/FileCopy.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/stream/OutputStreamExamples.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/symlink/SymLinkExample.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/unzip/UnzipFile.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/util/StreamUtils.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/zip/ZipDirectory.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/zip/ZipFile.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/java/com/baeldung/zip/ZipMultipleFiles.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/ESAPI.properties (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/META-INF/BenchmarkList (100%)
 mode change 100755 => 100644
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/META-INF/persistence.xml (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/META-INF/services/com.sun.source.util.Plugin (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/countries.properties (82%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/data.csv (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/datasource.properties (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/dirCompressed.zip (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/input.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/js/bind.js (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/js/locations.js (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/js/math_module.js (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/js/no_such.js (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/js/script.js (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/js/trim.js (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/js/typed_arrays.js (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/log4j.properties (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/log4jstructuraldp.properties (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/logback.xml (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/multiCompressed.zip (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/unzipTest/compressed.zip (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/zipTest/test1.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/main/resources/zipTest/test2.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/bufferedreader/BufferedReaderExampleUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/bufferedreader/BufferedReaderUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/copyfiles/FileCopierIntegrationTest.java (97%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/csv/ReadCSVInArrayUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/csv/WriteCsvFileExampleUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/directories/NewDirectoryUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/download/FileDownloadIntegrationTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/extension/ExtensionUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/file/FileOperationsManualTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/file/FilenameFilterManualTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/file/FilesClearDataUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/file/FilesManualTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/file/ListFilesUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/filechannel/FileChannelUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/filesystem/jndi/test/LookupFSJNDIIntegrationTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/java/mimetype/MimeTypeUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/java/nio/selector/NioEchoLiveTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/java/nio2/FileIntegrationTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/java/nio2/PathManualTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/java/nio2/README.md (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/java/nio2/async/AsyncEchoClient.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/java/nio2/async/AsyncEchoIntegrationTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/java/nio2/async/AsyncEchoServer.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/java/nio2/async/AsyncEchoServer2.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/java/nio2/async/AsyncFileIntegrationTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/java/nio2/attributes/BasicAttribsIntegrationTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/java8/JavaFileSizeUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/java8/JavaFolderSizeUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/stream/FileCopyUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/stream/OutputStreamExamplesUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/com/baeldung/symlink/SymLinkExampleManualTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/org/baeldung/core/exceptions/FileNotFoundExceptionUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/org/baeldung/java/io/InputStreamToByteBufferUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/org/baeldung/java/io/JavaFilePathUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/org/baeldung/java/io/JavaFileUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/org/baeldung/java/io/JavaReadFromFileUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/org/baeldung/java/io/JavaReaderToXUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/org/baeldung/java/io/JavaScannerUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/org/baeldung/java/io/JavaWriteToFileUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/org/baeldung/java/io/JavaXToByteArrayUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/org/baeldung/java/io/JavaXToInputStreamUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/org/baeldung/java/io/JavaXToReaderUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/java/org/baeldung/java/io/JavaXToWriterUnitTest.java (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/.gitignore (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/META-INF/mime.types (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/anothersample.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/book.csv (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/configuration.properties (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/copiedWithApacheCommons.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/copiedWithIo.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/copiedWithNio.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/copyTest/dest/readme.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/copyTest/src/test_apache.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/copyTest/src/test_channel.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/copyTest/src/test_files.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/copyTest/src/test_stream.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/dictionary.in (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/file.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/fileNameFilterManualTestFolder/people.json (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/fileNameFilterManualTestFolder/students.json (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/fileNameFilterManualTestFolder/teachers.xml (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/fileNameFilterManualTestFolder/workers.xml (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/fileTest.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/fileToRead.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/fileToWriteTo.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/fileexample.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/frontenac-2257154_960_720.jpg (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/initialFile.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/listFilesUnitTestFolder/country.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/listFilesUnitTestFolder/employee.json (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/listFilesUnitTestFolder/students.json (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/listFilesUnitTestFolder/test.xml (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/original.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/product.png (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/sample.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/sampleNumberFile.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/sampleTextFile.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/targetFile.tmp (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/targetFile.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test.find (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/testFolder/sample_file_1.in (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/testFolder/sample_file_2.in (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_read.in (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_read1.in (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_read2.in (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_read3.in (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_read4.in (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_read7.in (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_read8.in (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_read_d.in (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_read_multiple.in (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_truncate.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_write.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_write_1.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_write_2.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_write_3.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_write_4.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_write_5.txt (100%)
 rename {core-java-io => core-java-modules/core-java-io}/src/test/resources/test_write_using_filechannel.txt (100%)
 create mode 100644 core-java-modules/core-java-io/target_link.txt
 rename {core-java-jvm => core-java-modules/core-java-jvm}/README.md (100%)
 rename {core-java-jvm => core-java-modules/core-java-jvm}/pom.xml (96%)
 rename {core-java-jvm => core-java-modules/core-java-jvm}/src/main/java/com/baeldung/inlining/ConsecutiveNumbersSum.java (100%)
 rename {core-java-jvm => core-java-modules/core-java-jvm}/src/main/java/com/baeldung/inlining/InliningExample.java (100%)
 rename {core-java-jvm => core-java-modules/core-java-jvm}/src/test/java/com/baeldung/inlining/ConsecutiveNumbersSumUnitTest.java (100%)
 rename {core-java-lambdas => core-java-modules/core-java-lambdas}/pom.xml (90%)
 rename {core-java-lambdas => core-java-modules/core-java-lambdas}/src/main/java/com/baeldung/lambdas/LambdaVariables.java (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/.gitignore (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/README.md (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/pom.xml (94%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/src/main/java/com/baeldung/anonymous/Book.java (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/src/main/java/com/baeldung/anonymous/Main.java (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/src/main/java/com/baeldung/generics/Entry.java (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/src/main/java/com/baeldung/generics/GenericEntry.java (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/src/main/java/com/baeldung/generics/MapEntry.java (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/src/main/java/com/baeldung/generics/Product.java (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/src/main/java/com/baeldung/generics/Rankable.java (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/src/main/java/com/baeldung/supertypecompilerexception/MyClass.java (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution1.java (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution2.java (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution3.java (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/src/main/java/com/baeldung/supertypecompilerexception/MyException.java (100%)
 rename {core-java-lang-oop-2 => core-java-modules/core-java-lang-oop-2}/src/test/java/com/baeldung/generics/GenericConstructorUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/.gitignore (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/README.md (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/pom.xml (98%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/accessmodifiers/Public.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/accessmodifiers/SubClass.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/accessmodifiers/SuperPublic.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/accessmodifiers/another/AnotherPublic.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/accessmodifiers/another/AnotherSubClass.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/accessmodifiers/another/AnotherSuperPublic.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/casting/Animal.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/casting/AnimalFeeder.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/casting/AnimalFeederGeneric.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/casting/Cat.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/casting/Dog.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/casting/Mew.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/constructors/BankAccount.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/constructors/Transaction.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/deepcopy/Address.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/deepcopy/User.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/equalshashcode/Money.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/equalshashcode/Team.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/equalshashcode/Voucher.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/equalshashcode/WrongTeam.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/equalshashcode/WrongVoucher.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/equalshashcode/entities/ComplexClass.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/equalshashcode/entities/PrimitiveClass.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/equalshashcode/entities/Rectangle.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/equalshashcode/entities/Shape.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/equalshashcode/entities/Square.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/finalkeyword/BlackCat.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/finalkeyword/BlackDog.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/finalkeyword/Cat.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/finalkeyword/Dog.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/hashcode/entities/User.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/immutableobjects/Currency.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/immutableobjects/Money.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritance/ArmoredCar.java (96%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritance/BMW.java (93%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritance/Car.java (95%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritance/Employee.java (94%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritance/Floatable.java (95%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritance/Flyable.java (94%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritance/SpaceCar.java (95%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritance/SpaceTraveller.java (96%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritancecomposition/application/Application.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritancecomposition/model/Actress.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritancecomposition/model/Computer.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritancecomposition/model/Memory.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritancecomposition/model/Person.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritancecomposition/model/Processor.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritancecomposition/model/SoundCard.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritancecomposition/model/StandardMemory.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritancecomposition/model/StandardProcessor.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritancecomposition/model/StandardSoundCard.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/inheritancecomposition/model/Waitress.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/initializationguide/User.java (94%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/keyword/KeywordDemo.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/keyword/superkeyword/SuperBase.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/keyword/superkeyword/SuperSub.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/keyword/thiskeyword/KeywordUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/markerinterface/DeletableShape.java (94%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/markerinterface/Rectangle.java (95%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/markerinterface/Shape.java (95%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/markerinterface/ShapeDao.java (95%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/methodoverloadingoverriding/application/Application.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/methodoverloadingoverriding/model/Car.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/methodoverloadingoverriding/model/Vehicle.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/methodoverloadingoverriding/util/Multiplier.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/polymorphism/FileManager.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/polymorphism/GenericFile.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/polymorphism/ImageFile.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/polymorphism/TextFile.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/scope/method/BaseMethodClass.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/scope/method/ChildMethodClass.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/scope/method/MethodHidingDemo.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/scope/variable/ChildVariable.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/scope/variable/HideVariable.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/scope/variable/ParentVariable.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/scope/variable/VariableHidingDemo.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/staticdemo/Car.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/staticdemo/Singleton.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/staticdemo/StaticBlock.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/typeerasure/ArrayContentPrintUtil.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/typeerasure/BoundStack.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/typeerasure/IntegerStack.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/java/com/baeldung/typeerasure/Stack.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/main/resources/logback.xml (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/casting/CastingUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/constructors/ConstructorUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/deepcopy/DeepCopyUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/deepcopy/ShallowCopyUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/equalshashcode/MoneyUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/equalshashcode/TeamUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/equalshashcode/entities/ComplexClassUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/equalshashcode/entities/PrimitiveClassUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/equalshashcode/entities/SquareClassUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/finalkeyword/FinalUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/hashcode/application/ApplicationUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/hashcode/entities/UserUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/immutableobjects/ImmutableObjectsUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/inheritance/AppUnitTest.java (96%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/inheritancecomposition/test/ActressUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/inheritancecomposition/test/CompositionUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/inheritancecomposition/test/InheritanceUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/inheritancecomposition/test/PersonUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/inheritancecomposition/test/WaitressUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/initializationguide/UserUnitTest.java (97%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/markerinterface/MarkerInterfaceUnitTest.java (96%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/methodoverloadingoverriding/test/MethodOverloadingUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/methodoverloadingoverriding/test/MethodOverridingUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/parameterpassing/NonPrimitivesUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/parameterpassing/PrimitivesUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/polymorphism/PolymorphismUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/staticdemo/CarIntegrationTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/staticdemo/SingletonIntegrationTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/staticdemo/StaticBlockIntegrationTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/java/com/baeldung/typeerasure/TypeErasureUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-oop}/src/test/resources/.gitignore (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/.gitignore (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/README.md (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/pom.xml (96%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/breakcontinue/BreakContinue.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/enums/Pizza.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/generics/Building.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/generics/Generics.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/generics/House.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/initializationguide/User.java (94%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/keyword/Circle.java (94%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/keyword/Ring.java (94%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/keyword/Round.java (93%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/keyword/Shape.java (93%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/keyword/Triangle.java (94%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/loops/InfiniteLoops.java (95%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/loops/LoopsInJava.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/switchstatement/SwitchStatement.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/system/ChatWindow.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/system/DateTimeService.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/system/EnvironmentVariables.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/system/SystemErrDemo.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/system/SystemExitDemo.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/system/SystemOutDemo.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/main/java/com/baeldung/system/UserCredentials.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/breakcontinue/BreakContinueUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/enums/PizzaUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/generics/GenericsUnitTest.java (100%)
 rename {core-java-lang-oop => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/initializationguide/UserUnitTest.java (97%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/java/diamond/Car.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/java/diamond/Diesel.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/java/diamond/Engine.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/java/diamond/Vehicle.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java (96%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/loops/WhenUsingLoops.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/modulo/ModuloUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/primitiveconversion/PrimitiveConversionsJUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/switchstatement/SwitchStatementUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/system/DateTimeServiceUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/system/EnvironmentVariablesUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/system/SystemArrayCopyUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/system/SystemNanoUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/system/SystemPropertiesUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java (100%)
 rename {core-java-lang-syntax => core-java-modules/core-java-lang-syntax}/src/test/java/com/baeldung/varargs/FormatterUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/.gitignore (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/README.md (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/pom.xml (98%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/assertion/Assertion.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/binding/Animal.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/binding/AnimalActivity.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/binding/Cat.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/chainedexception/LogWithChain.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/chainedexception/LogWithoutChain.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/chainedexception/exceptions/GirlFriendOfManagerUpsetException.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/chainedexception/exceptions/ManagerUpsetException.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/chainedexception/exceptions/NoLeaveGrantedException.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/chainedexception/exceptions/TeamLeadUpsetException.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/className/RetrievingClassName.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/comparable/Player.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/comparable/PlayerSorter.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/comparator/Player.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/comparator/PlayerAgeComparator.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/comparator/PlayerAgeSorter.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/comparator/PlayerRankingComparator.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/comparator/PlayerRankingSorter.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/controlstructures/ConditionalBranches.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/controlstructures/Loops.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/customexception/FileManager.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/customexception/IncorrectFileExtensionException.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/customexception/IncorrectFileNameException.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/doubles/SplitFloatingPointNumbers.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/dynamicproxy/DynamicInvocationHandler.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/dynamicproxy/TimingDynamicInvocationHandler.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/enums/values/Element1.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/enums/values/Element2.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/enums/values/Element3.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/enums/values/Element4.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/enums/values/Labeled.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/exceptionhandling/Exceptions.java (96%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/exceptionhandling/MyException.java (94%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/exceptionhandling/Player.java (93%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/exceptionhandling/PlayerLoadException.java (94%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/exceptionhandling/PlayerScoreException.java (95%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/exceptionhandling/TimeoutException.java (95%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/finalize/CloseableResource.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/finalize/Finalizable.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/Box.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/CommaSeparatedCustomers.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/Customer.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/Employee.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/EmployeeSalaryComparator.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/HasColor.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/multiinheritance/Car.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/multiinheritance/Fly.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/multiinheritance/Transform.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/multiinheritance/Vehicle.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/polymorphysim/Circle.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/polymorphysim/MainTestClass.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/polymorphysim/Shape.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/interfaces/polymorphysim/Square.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/java/reflection/Animal.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/java/reflection/Bird.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/java/reflection/DynamicGreeter.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/java/reflection/Eating.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/java/reflection/Goat.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/java/reflection/Greeter.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/java/reflection/GreetingAnnotation.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/java/reflection/Greetings.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/java/reflection/Locomotion.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/java/reflection/Operations.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/java/reflection/Person.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/keywords/finalize/FinalizeObject.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/keywords/finalkeyword/Child.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/keywords/finalkeyword/GrandChild.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/keywords/finalkeyword/Parent.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/keywords/finallykeyword/FinallyExample.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/nativekeyword/DateTimeUtils.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/nativekeyword/NativeMainApp.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/noclassdeffounderror/ClassWithInitErrors.java (95%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorExample.java (96%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/objects/Car.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/packages/TodoApp.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/packages/TodoList.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/packages/domain/TodoItem.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/parameterpassing/NonPrimitives.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/parameterpassing/Primitives.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/recursion/BinaryNode.java (95%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/recursion/RecursionExample.java (95%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/scope/BracketScopeExample.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/scope/ClassScopeExample.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/scope/LoopScopeExample.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/scope/MethodScopeExample.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/scope/NestedScopesExample.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/sneakythrows/SneakyRunnable.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/sneakythrows/SneakyThrows.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/stackoverflowerror/AccountHolder.java (96%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/stackoverflowerror/ClassOne.java (95%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/stackoverflowerror/ClassTwo.java (95%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationCondition.java (97%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationCondition.java (97%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursion.java (96%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/synthetic/BridgeMethodDemo.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/synthetic/SyntheticConstructorDemo.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/synthetic/SyntheticFieldDemo.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/synthetic/SyntheticMethodDemo.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/throwsexception/DataAccessException.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/throwsexception/Main.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/throwsexception/PersonRepository.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/throwsexception/SimpleService.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/java/com/baeldung/throwsexception/TryCatch.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/main/resources/file.txt (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/binding/AnimalActivityUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/binding/AnimalUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/binding/CatUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/className/RetrievingClassNameUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionUnitTest.java (96%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/comparable/ComparableUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/compoundoperators/CompoundOperatorsUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/customexception/IncorrectFileExtensionExceptionUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/customexception/IncorrectFileNameExceptionUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/dynamicproxy/DynamicProxyIntegrationTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/enums/values/Element1UnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/enums/values/Element2UnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/enums/values/Element3UnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/enums/values/Element4UnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/exceptionhandling/ExceptionsUnitTest.java (96%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/finalize/FinalizeUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/interfaces/InnerInterfaceUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/java/enumiteration/DaysOfWeekEnum.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/java/enumiteration/EnumIterationExamples.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/java/reflection/OperationsUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/java/reflection/ReflectionUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/nativekeyword/DateTimeUtilsManualTest.java (96%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/nestedclass/AnonymousInner.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/nestedclass/Enclosing.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/nestedclass/NewEnclosing.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/nestedclass/NewOuter.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/nestedclass/Outer.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorUnitTest.java (96%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/objects/CarUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/packages/PackagesUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/recursion/RecursionExampleUnitTest.java (96%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/sneakythrows/SneakyRunnableUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/sneakythrows/SneakyThrowsUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/stackoverflowerror/AccountHolderManualTest.java (96%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java (96%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java (97%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationConditionManualTest.java (96%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java (97%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/synthetic/SyntheticUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/java/com/baeldung/throwsexception/SimpleServiceUnitTest.java (100%)
 rename {core-java-lang => core-java-modules/core-java-lang}/src/test/resources/correctFileNameWithoutProperExtension (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/.gitignore (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/README.md (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/pom.xml (96%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/http/FullResponseBuilder.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/http/ParameterStringBuilder.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/mail/EmailService.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/cookies/PersistentCookieStore.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/cookies/ProxyAcceptCookiePolicy.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/proxies/CommandLineProxyDemo.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/proxies/DirectProxyDemo.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/proxies/SocksProxyDemo.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/proxies/SystemPropertyProxyDemo.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/proxies/UrlConnectionUtils.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/proxies/WebProxyDemo.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/udp/EchoClient.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/udp/EchoServer.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/udp/broadcast/BroadcastingClient.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/udp/broadcast/BroadcastingEchoServer.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/udp/multicast/MulticastEchoServer.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/udp/multicast/MulticastingClient.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/uriurl/URIDemo.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/networking/uriurl/URLDemo.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/socket/EchoClient.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/socket/EchoMultiServer.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/socket/EchoServer.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/socket/GreetClient.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/socket/GreetServer.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/socket/read/Client.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/java/com/baeldung/socket/read/Server.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/main/resources/logback.xml (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/encoderdecoder/EncoderDecoderUnitTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/http/HttpRequestLiveTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/networking/interfaces/NetworkInterfaceManualTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/networking/udp/UDPLiveTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/networking/udp/broadcast/BroadcastLiveTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/networking/udp/multicast/MulticastLiveTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/networking/uriurl/URIDemoLiveTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/networking/uriurl/URIvsURLUnitTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/networking/uriurl/URLDemoLiveTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/networking/url/UrlUnitTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/socket/EchoIntegrationTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/socket/GreetServerIntegrationTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/socket/SocketEchoMultiIntegrationTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/java/com/baeldung/socket/read/SocketReadAllDataLiveTest.java (100%)
 rename {core-java-networking => core-java-modules/core-java-networking}/src/test/resources/.gitignore (100%)
 rename {core-java-os => core-java-modules/core-java-os}/.gitignore (100%)
 rename {core-java-os => core-java-modules/core-java-os}/README.md (100%)
 rename {core-java-os => core-java-modules/core-java-os}/pom.xml (95%)
 rename {core-java-os => core-java-modules/core-java-os}/src/main/java/com/baeldung/java9/process/ChildProcess.java (100%)
 rename {core-java-os => core-java-modules/core-java-os}/src/main/java/com/baeldung/java9/process/OutputStreamExample.java (96%)
 rename {core-java-os => core-java-modules/core-java-os}/src/main/java/com/baeldung/java9/process/ProcessCompilationError.java (100%)
 rename {core-java-os => core-java-modules/core-java-os}/src/main/java/com/baeldung/java9/process/ProcessUnderstanding.java (100%)
 rename {core-java-os => core-java-modules/core-java-os}/src/main/java/com/baeldung/java9/process/ProcessUtils.java (96%)
 rename {core-java-os => core-java-modules/core-java-os}/src/main/java/com/baeldung/java9/process/ServiceMain.java (96%)
 rename {core-java-os => core-java-modules/core-java-os}/src/main/resources/logback.xml (100%)
 rename {core-java-os => core-java-modules/core-java-os}/src/test/java/com/baeldung/java9/process/ProcessAPIEnhancementsUnitTest.java (100%)
 rename {core-java-os => core-java-modules/core-java-os}/src/test/java/com/baeldung/java9/process/ProcessApiUnitTest.java (97%)
 rename {core-java-os => core-java-modules/core-java-os}/src/test/java/com/baeldung/java9/process/ProcessUnderstandingUnitTest.java (100%)
 rename {core-java-os => core-java-modules/core-java-os}/src/test/java/com/baeldung/processbuilder/ProcessBuilderUnitTest.java (97%)
 rename {core-java-os => core-java-modules/core-java-os}/src/test/resources/.gitignore (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/README.md (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/pom.xml (94%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/flightrecorder/FlightRecorder.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/gc/VerboseGarbageCollectorRunner.java (97%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/heapdump/HeapDump.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/jmx/Game.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/jmx/GameMBean.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/jmx/JMXTutorialMainlauncher.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/memoryleaks/equalshashcode/Person.java (94%)
 mode change 100755 => 100644
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/memoryleaks/equalshashcode/PersonOptimized.java (96%)
 mode change 100755 => 100644
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObject.java (95%)
 mode change 100755 => 100644
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObjectOptimized.java (96%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/memoryleaks/innerclass/BulkyObject.java (95%)
 mode change 100755 => 100644
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassDriver.java (97%)
 mode change 100755 => 100644
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassWrapper.java (95%)
 mode change 100755 => 100644
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/memoryleaks/innerclass/StaticNestedClassWrapper.java (95%)
 mode change 100755 => 100644
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/memoryleaks/internedstrings/InternedString.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/memoryleaks/internedstrings/ReadStringFromFileUtil.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/memoryleaks/internedstrings/StringObject.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/memoryleaks/staticfields/NonStaticFieldsDemo.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/memoryleaks/staticfields/StaticFieldsDemo.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/java/com/baeldung/outofmemoryerror/OutOfMemoryGCLimitExceed.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/main/resources/logback.xml (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/test/java/com/baeldung/memoryleaks/equalshashcode/PersonMemoryLeakUnitTest.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/test/java/com/baeldung/memoryleaks/finalize/FinalizeMemoryLeakUnitTest.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/test/java/com/baeldung/memoryleaks/innerclass/StaticInnerClassMemoryLeakUnitTest.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/test/java/com/baeldung/memoryleaks/internedstrings/StringInternMemoryLeakUnitTest.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/test/java/com/baeldung/memoryleaks/staticfields/NonStaticFieldsMemoryLeakUnitTest.java (100%)
 rename {core-java-perf => core-java-modules/core-java-perf}/src/test/java/com/baeldung/memoryleaks/staticfields/StaticFieldsMemoryLeakUnitTest.java (100%)
 rename {core-java-reflection => core-java-modules/core-java-reflection}/pom.xml (93%)
 rename {core-java-reflection => core-java-modules/core-java-reflection}/src/main/java/com/baeldung/reflection/voidtype/Action.java (100%)
 rename {core-java-reflection => core-java-modules/core-java-reflection}/src/main/java/com/baeldung/reflection/voidtype/Calculator.java (100%)
 rename {core-java-reflection => core-java-modules/core-java-reflection}/src/main/java/com/baeldung/reflection/voidtype/Defer.java (100%)
 rename {core-java-reflection => core-java-modules/core-java-reflection}/src/main/java/com/baeldung/reflection/voidtype/MyOwnDefer.java (100%)
 rename {core-java-reflection => core-java-modules/core-java-reflection}/src/test/java/com/baeldung/reflection/voidtype/CalculatorUnitTest.java (100%)
 rename {core-java-reflection => core-java-modules/core-java-reflection}/src/test/java/com/baeldung/reflection/voidtype/DeferUnitTest.java (100%)
 rename {core-java-reflection => core-java-modules/core-java-reflection}/src/test/java/com/baeldung/reflection/voidtype/MyOwnDeferUnitTest.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/README.md (100%)
 rename {core-java-security => core-java-modules/core-java-security}/pom.xml (97%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/cipher/Encryptor.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/encrypt/FileEncrypterDecrypter.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/hashing/DigestAlgorithms.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/hashing/Keccak256Hashing.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/hashing/SHA256Hashing.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/hashing/SHA3Hashing.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/hashing/SHACommonUtils.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/keystore/JavaKeyStore.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/passwordhashing/PBKDF2Hasher.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/passwordhashing/SHA512Hasher.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/passwordhashing/SimplePBKDF2Hasher.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/ssl/EnableTLSv12.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/ssl/SecureConnection.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/ssl/example/SimpleClient.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/java/com/baeldung/ssl/example/SimpleServer.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/main/resources/logback.xml (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/test/java/com/baeldung/cipher/EncryptorUnitTest.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/test/java/com/baeldung/encrypt/FileEncrypterDecrypterIntegrationTest.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/test/java/com/baeldung/hashing/Keccak256HashingUnitTest.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/test/java/com/baeldung/hashing/SHA256HashingUnitTest.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/test/java/com/baeldung/hashing/SHA3HashingUnitTest.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/test/java/com/baeldung/keystore/JavaKeyStoreUnitTest.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/test/java/com/baeldung/passwordhashing/PBKDF2HasherUnitTest.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/test/java/com/baeldung/passwordhashing/SHA512HasherUnitTest.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/test/java/org/baeldung/java/md5/JavaMD5UnitTest.java (100%)
 rename {core-java-security => core-java-modules/core-java-security}/src/test/resources/test_md5.txt (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/.gitignore (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/README.md (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/pom.xml (99%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/main/java/com/baeldung/.gitignore (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/main/java/com/baeldung/README.md (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/main/java/com/baeldung/javac/Positive.java (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/main/java/com/baeldung/javac/SampleJavacPlugin.java (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/main/resources/META-INF/services/com.sun.source.util.Plugin (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/main/resources/log4j.properties (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/main/resources/logback.xml (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/test/java/com/baeldung/javac/SampleJavacPluginIntegrationTest.java (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/test/java/com/baeldung/javac/SimpleClassFile.java (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/test/java/com/baeldung/javac/SimpleFileManager.java (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/test/java/com/baeldung/javac/SimpleSourceFile.java (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/test/java/com/baeldung/javac/TestCompiler.java (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/test/java/com/baeldung/javac/TestRunner.java (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/test/java/com/baeldung/unsafe/CASCounter.java (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/test/java/com/baeldung/unsafe/OffHeapArray.java (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/test/java/com/baeldung/unsafe/UnsafeUnitTest.java (100%)
 rename {core-java-sun => core-java-modules/core-java-sun}/src/test/resources/.gitignore (100%)
 rename {core-java => core-java-modules/core-java}/.gitignore (100%)
 rename {core-java => core-java-modules/core-java}/README.md (100%)
 rename {core-java => core-java-modules/core-java}/customers.xml (100%)
 rename {core-java => core-java-modules/core-java}/externalizable.txt (100%)
 rename {core-java => core-java-modules/core-java}/pom.xml (99%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/.gitignore (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/README.md (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/abstractclasses/application/Application.java (97%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/abstractclasses/filereaders/BaseFileReader.java (96%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/abstractclasses/filereaders/LowercaseFileReader.java (95%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/abstractclasses/filereaders/UppercaseFileReader.java (95%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/asciiart/AsciiArt.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/basicsyntax/SimpleAddition.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/classloader/CustomClassLoader.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/classloader/PrintClassLoader.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/console/ConsoleConsoleClass.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/console/ConsoleScannerClass.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/curltojava/JavaCurlExamples.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/deserialization/AppleProduct.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/deserialization/DeserializationUtility.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/deserialization/SerializationUtility.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/encoding/CharacterEncodingExamples.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/Arithmetic.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/ArrayIndexOutOfBounds.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/ClassCast.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/FileNotFound.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/GlobalExceptionHandler.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/IllegalArgument.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/IllegalState.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/InterruptedExceptionExample.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/MalformedURL.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/NullPointer.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/NumberFormat.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/ParseExceptionExample.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/StackTraceToString.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/StringIndexOutOfBounds.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/executable/ExecutableMavenJar.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/externalizable/Community.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/externalizable/Country.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/externalizable/Region.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/fileparser/FileReaderExample.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/fileparser/ScannerIntExample.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/fileparser/ScannerStringExample.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/filesystem/jndi/LookupFSJNDI.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/graph/Graph.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/graph/GraphTraversal.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/instrumentation/agent/AtmTransformer.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/instrumentation/agent/MyInstrumentationAgent.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/instrumentation/application/AgentLoader.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/instrumentation/application/Launcher.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/instrumentation/application/MyAtm.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/instrumentation/application/MyAtmApplication.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/jar/JarExample.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/jar/example_manifest.txt (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/javac/Data.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/javadoc/Person.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/javadoc/SuperHero.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/logforging/LogForgingDemo.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/manifest/AppExample.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/manifest/ExecuteJarFile.java (100%)
 create mode 100644 core-java-modules/core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/money/JavaMoney.java (97%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/objectsize/InstrumentationAgent.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/objectsize/InstrumentationExample.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/objectsize/MANIFEST.MF (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/printf/PrintfExamples.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/printscreen/README.md (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/printscreen/Screenshot.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/reflection/BaeldungReflectionUtils.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/reflection/Customer.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/reflection/Employee.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/reflection/MonthEmployee.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/reflection/Person.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/resourcebundle/ExampleControl.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/resourcebundle/ExampleResource.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl_PL.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/serialization/Address.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/serialization/Employee.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/serialization/Person.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/staticclass/Pizza.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/system/DetectOS.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnection.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/util/PropertiesLoader.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/uuid/UUIDGenerator.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/javac-args/arguments (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/javac-args/options (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/javac-args/types (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/javac-args/xlint-ops (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/log4j.properties (100%)
 rename {core-java => core-java-modules/core-java}/src/main/java/org/baeldung/executable/ExecutableMavenJar.java (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/ESAPI.properties (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/META-INF/BenchmarkList (100%)
 mode change 100755 => 100644
 rename {core-java => core-java-modules/core-java}/src/main/resources/META-INF/MANIFEST.MF (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/META-INF/persistence.xml (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/countries.properties (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/datasource.properties (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/files/test.txt (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/js/bind.js (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/js/locations.js (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/js/math_module.js (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/js/no_such.js (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/js/script.js (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/js/trim.js (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/js/typed_arrays.js (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/log4j.properties (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/log4j2.xml (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/log4jstructuraldp.properties (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/logback.xml (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/product.png (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/resourcebundle/resource.properties (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/resourcebundle/resource_en.properties (100%)
 rename {core-java => core-java-modules/core-java}/src/main/resources/resourcebundle/resource_pl_PL.properties (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/abstractclasses/test/LowercaseFileReaderUnitTest.java (97%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/abstractclasses/test/UppercaseFileReaderUnitTest.java (97%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/asciiart/AsciiArtIntegrationTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/bitwiseoperator/test/BitwiseOperatorUnitTest.java (96%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/classloader/CustomClassLoaderUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/classloader/PrintClassLoaderUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/curltojava/JavaCurlExamplesLiveTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/deserialization/DeserializationUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/encoding/CharacterEncodingExamplesUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/exceptions/GlobalExceptionHandlerUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/externalizable/ExternalizableUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/graph/GraphTraversalUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/grep/GrepWithUnix4JIntegrationTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/hexToAscii/HexToAsciiUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/hexToAscii/README.md (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/java/clock/ClockUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/java/currentmethod/CurrentlyExecutedMethodFinderUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/java/properties/PropertiesUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/java/regex/RegexUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/java8/Java8MapAndFlatMap.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/junit4vstestng/DivisibilityUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/junit4vstestng/ParametrizedUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/junit4vstestng/RegistrationUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/junit4vstestng/SignInUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/junit4vstestng/StringCaseUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/junit4vstestng/SuiteUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/leapyear/LeapYearUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/manifest/ExecuteJarFileUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/money/JavaMoneyUnitManualTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/printscreen/ScreenshotLiveTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/properties/MergePropertiesUnitTest.java (97%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/reflection/BaeldungReflectionUtilsUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/reflection/PersonAndEmployeeReflectionUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/regexp/EscapingCharsUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/regexp/optmization/OptimizedMatcherManualTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/resourcebundle/ExampleResourceUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/resourcebundle/PropertyResourceUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/scripting/NashornUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/serialization/PersonUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/stack/StackUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/stringisnumeric.zip (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/system/WhenDetectingOSUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/util/PropertiesLoaderUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/org/baeldung/java/JavaIoUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/org/baeldung/java/JavaTimerLongRunningUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/org/baeldung/java/arrays/ArraysJoinAndSplitJUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/org/baeldung/java/rawtypes/RawTypesUnitTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/org/baeldung/java/sandbox/SandboxJavaManualTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/org/baeldung/java/shell/JavaProcessUnitIntegrationTest.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/.gitignore (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/app.properties (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/catalog (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/configuration.properties (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/default.properties (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/dictionary.in (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/encoding.txt (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/icons.xml (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/newFile1.txt (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/newFile2.txt (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/newFile3.txt (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/original.txt (56%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/sampleNumberFile.txt (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/sampleTextFile.txt (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/sourceFile.txt (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/test.find (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/test_read.in (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/test_read1.in (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/test_read2.in (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/test_read3.in (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/test_read4.in (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/test_read7.in (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/test_read8.in (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/test_read_d.in (100%)
 rename {core-java => core-java-modules/core-java}/src/test/resources/test_read_multiple.in (100%)
 rename {core-java => core-java-modules/core-java}/yofile.txt (100%)
 rename {core-java => core-java-modules/core-java}/yofile2.txt (100%)

diff --git a/core-java-lang/native/nativedatetimeutils.dll b/core-java-lang/native/nativedatetimeutils.dll
deleted file mode 100644
index ecdd3883806f95f1c309debac6fefd2897b77a10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72050
zcmeFa3w%`7wLg9)GZQ9|aDpTn6=c+)i9$?xC{fTHG6QFD5@Hfwf=)sn5DiJ1%s^BM
z!I=?GkArEet!=HP*0$cOZK<`quIMCzB;YH64-g-SR?jdX4=n^x=l@;%oHH|twD*5M
zzt8Xf?!(cOwI6G*z4qE`uf6u;9E$F2=ZqZ3neap+9Jd9Keg*9BKmXH)?BQd!4d-4+
zdhN<B2Ip&6mM^Vqu{Jd~E@`e@X057hXlQg>7uQ&uJq^~n2CHp$nRQuXbxlr6%Fs-W
zbcvngsvk<_ZkcfDBJLTEOEq)c3GN!}u!Mw*xurl_k0*`eta!LoD)e|g{bk_<m2Zlg
zIYj8!X5hF)j>{fnVC_OlmaLYgAR`h5(Ue0R_Yg%+a9nv31+?D=j$2B?(SKG0H%Sj)
z2&NjitP7+sI>mAQVC^6Ma@;koZe;e?;t#P%ZAUxee-&IwMNW04yAp{(%4oww&2GRG
z_bcE^f;r79VlL##wc{aLO>syF7H|~>IZY}aYvTqa65et=alZmCw;-oA4sRne32$W_
z5`qkGaZ3xOmW;%oAcemDYvU?{IW;Q1hba3H9%{#fc;bGHUY&}^`s4&MhvM<YAt4C7
zU`}CaIi=2LSr9bQBi)Jn6>tT?9CtnAPo#A86~iO>#Qh)_$gifpv5Hgs8hy_2eiVm<
zAnKidgQg56l$ERDJvtb#Wcm$x`7H6CVE_fdO9uSOV7%1nH%!c9i7cx`qxaMW@Fq=W
zi8(;wDm1*OFMv1sCYH$B+oa+BZZKZK^noeg#s0TQpiJ~0wQl907|KW094AU$qST?x
z7=obxpeUJ-c2c7G7=U|ZUQq0z$$}HTJFE-4_%Q|C7ScaGYU4Pee9pYNjHrLFD7{uB
z?eKhGHvi;L9On=6>u&|NS21j(LXx=+sd>Q@BLC;~UxI$#Y0)1P<<Wt|9QQI|xG$@1
z->RU($UadzL3q<V#Ew7cQDpOC1ik$UyzeYfw~oOd<yy2L#?alayM#qu-g5?)<O$b^
zvT1BC@I<-EqSiZktV++FFXngiJ{rGZAQ=qgMZzi6K9-(=^e7|!#K`2M9V#Oq<{gyH
z?;zssH}F0(6tcM&QMA@a=1Mki(=#tZrvIR4C{?}I{4A11+59kUHyY$lDUuFtOCaW?
zP^8amuKFX#sf;t>s%_!NKwhCSkw~PLAL9cukw|fXlH!A%C-F($ZU@q)QCbtFp+mi4
zi<tkxijkr`QuOb2AE$)KUL-9)CQ2ujvx|Y&V@^a7MzP2IMNkd)n9ph<mFF{v4VLe}
z8Gsw=|0WXQ$DsekK>Ds@1X7*{=rM0W5yDV@fm%YJ15NF!l@$FDQ50xX3w#eiaU;FQ
z{2)pt5ZzaSQHx)W-d;_+vPiq$koGyHol^SLWgO?3A)9mmKyr8Aty~NBbx2AcaLy|C
zUjkk0_MSKLKIj{IfcO0#P&(0Lj=+_GFe4Cg)<TH5tF~PUV`2*wM$nxr@<2m+muOt`
zbtHlw^*@P%d8fl&F@C(~4ZMFVl9lP0nW6>EsMH^nx;<-w;CV1_FLH>`v5P@KkDQ2)
zbbS?x5R?9e)V<O6Mk#gyS&vBF%A-K{2bs6V+fIaXP>9K2M^SzZeByxjFF+n+b2<XZ
zSH)5W0--YyFH$tcJF66<kklP|1IhfDHna*u`zUnd)Uy<ZlAklUQy?ud<Yp)ZoK&8f
zD@xAHDNf0jnWfwX*Gburxy>mfD$2-^34@9VDAGPhm?z8?<_P6vCDt4jp&Mf0xy&{Y
z=d(RlKKuK*Ha^>4fImeg_%o*hf9`6+pWhM=;2&tV2K?&=6>i@MC`y4;A|*XWV^s{8
zKVgaXJ_M7XQlezvF9z&~#K0V@D5XN_W-){kizrnfYTrO+?|2%<Inp_$CY_bZKu!kb
zP`t<f3}}N?rzo@96jvp~vV<=Y1IrGHvV9|PAmj)Yc^<@c!cS6Iwp;itG%<^sm_<#@
zq9$fh6SJs^S-))qeL$^=Sy~gb)F!UkLDGVr3X6ohgu4akYkPZS?5Ypo;I-@HgG?_v
z<Q3R}yzOX6J&K6lesE;Vw7QpXwNUHExQLyUR6@9&5ag6(gc*)<GZLHu>b*dDCWLi>
zlCzXA?j}4ZrF1FRutHAYNao!yf=W6P7;PkUP{ON(F6~Fh=PtyQav+j^<NK6?u$BlD
zM)tycG)tLDBEyKgG)N;6t&069A2ut)d(P+{soS2cuBiP}UKt*<Nhr$Zo-FUQsybK@
z_s|~mJPM%E-g61=i%5TOi&9y5cUQX@80`pwjlksT1oFRd9};CFS>%LBpXlv^<@~~P
zEWU`c05yiUY2za=IDp-DQR?lAw^tO8wWeL=Z;A-{&ZiMm;l$WkO8td_G+&kU&+a0A
z(igW95G$0k7a<_K(Fdzpj#wc|?>eLtiWNS#(t@=1n7vR3mu4k__`003;2D&c-hrv~
z@8Z{!y~eyV6^VHVYulZ&XmRGh-i*niBvmf8I1GCb<sW>LMAl^xy}^w9S3J;xlgbDl
zCH+B%w1fBkjHpx{bO!1(bDe=n3o&aRfmL;Md}?$Wz7VCtRMk;XUPK`QCLmeZk_(ce
zq0cEDLB0h%Y(WVW-1#oY&61tD7EJRrZL&$!mRauYH}U=s;=}wHFbygNR{W%fdL`I^
zp&?YyWEe70ItNanL=|Mt)o~J9u!!TL`ocIyr6s5|{D<0hZ-0Ti+Zk|XjuW;N5QE@V
zBt6ds($zqU?2FP>cu-QSD{zlOo$gCmNgL9}#R^9DwGZT=3zhJ`8=>S*Ii(BE_u#6E
z3@0P$n+}k{=KaITfTUXx!zB9Fav0=Jr5p2)I$rV)hMHhUA-(&F5V*AfZ8^}2Wm~RA
zc><V7up>c~PALI3Iu}uB%r@!*<vyfE?S*EErN3dIRmh`9gQ)+Yd#ETKWrpUit{$@)
zX^=Cgl%#;@<6^*6fM@3wBrWfu6UqV7i@@Z=_Y)X>5TM8W(QlDU2-!PG*R5nHkOVhQ
z%*OcdAF}F~_&aRXM4LSNUr@r1Y1zL41#EKqFIjvq?{8=ElpnJAF3-iFE+K4_jdr+z
z9{F~Yf0w60F0)`*^L`$q90N8P1D5wrC5sZ6cE#T?zrh@-(>w~uMt)P7MKtt_hO^#t
zsZN>WeOI7y{Mv&+@}9HsJ{zKt;J<kQdhESaSeb#zQnOb?{R8TOz_j2ekqBsFPT3)B
zF#!)mWrNX3W<#>?P?}H*+%&^OeCuf%Zh5EC!Rt4mv{N4Y`a38fPkR|4JSwW6-foP!
zu8dnI{{|)a08O*#>-C6;hW&CXOyT<?hO9Q40(1I=$eV1`V1I$ebu}=ZfubFvJVz1b
zqCT5!%80xZe#U#w%KLr^9PhaT-aiWBabyRbMgy4dbxQVLVGElXwx36Rnh+l(=POhI
zR2#oJN#Hl{aY%a|Yj%?`YwiAB4qn_VW_LObox&Efu%a}lm&hrtAQIkc<2RwuCcO~I
z*nI=akWNL**r<%(CMVgX-KeH0>F}T$O!3$k13OeseQX@v{2P!7q|mm5C>Nqj3oUYq
zMfveL<OWh+M6$9LVa*8Bd;&3z#nN7snddzkc3w88Q9=OjfLs8VAl*z+DA~tsLW=W0
z)%gVle!Kv(?2kxY?r~Ts1txnDcMofq_D9mXy<vmrG%A0DIK+&$@a|CBS#qfgpaj63
z2i))wHvdUofkFd33h&gnInSx^3s^5aMRvfQ_yt>E^_YK$IEgCkqb5YxR|T+7A1(%$
zTP8g9;rO3jk5CT=8W1syb-6DQ&tTCs`ZdDv?kG^rA^ckrrp_8k?|^-G%GDHHkD#<u
zgFTV-KO#<8xl(r|eGlPDhsBBH#BD)y@I!Xq5i#$an0HFNvQx}|*F8p*`ouGRkXsSe
zCz<CCtXACe>Rr~owQoWi+a_w<hWD`c&w)Uh@oB<b1(Ch_Yp7THJ;Z}Ndh=7T3|Mpq
z=Im!K#6n7@8K{Hzq1VACJUX;`3bon+$3mX7KW`V!qPfVzY{0x2b1P_47>&J>5jNiq
z!h|^aePs2RC&I!dnYdt&dAw%p(1r;JqMskAq{8+S2)3!g{z&@aeN=hM@d{%0?}$Xw
zZ^PehL<GJc<c65Ce-2R~2hx0uSP0mmTIL5447EazOe2}UCL5;x5W8h7rcVn1G~dhC
zRC#+<XYDDX0_O;RC+{0=K*Yb7`6KQmh7j2c2{AW|^lRFqpuqe73W2O>nT8E3L@;8x
zX+K8L{X5-}fm5d1vuPOiK%o^8zxEMAOu)V(@B0Y_v3?ACUIinxX{B7MF~a+{Bg%}<
zDg;<&qz?<z<!IEj$Eco#(@;L>`5}tZxK%zVSKGk*9#@OHXR-`d>^2mO+CR*1#`yTO
z(L`_aw1)wB|1@OjtyTF~?XK2*o92Wn4X7_KNK3uLuwkSIiZO}J-C3bNq_7PLwN-@-
zHMA|7$`~H6rap~ST7Jg)SJC|q<)cJ2O4=!#H#|)v)-zW0A9Guw7F!xgsUAWqdW%yW
z5F@1JPSb^N)kY)RUkFUT4~Sc7W_AX~9>XLF6Cs`XLVVUKefDQ7AZD7kX&TQy9-fHt
zYkmzlLbvI?Bx&k?d3v&xXq;|w1k&Dv-8P8XN2IwHX@*Jkb|;J8^H%pnj2xv~WdSPW
zc?tVEyzhGur1UQK6Uey<q@2cRiliUygJ#Y{&NeH!34cQT>Go~}d{j9>>R9s;@~vym
z78cI5^1k)JW2(D+rlxq~&}9Chw<(=z!d*-gc;6>TVeOU8b*PNwF_YF7%sPsZL;Ctf
z9RZG)NOJlJ*ifo#&o@Y=qFYtX?_(B8rJ?Eb>FFl;0!zVU_%Is}q~Gp$__bs&m~Ojw
zGri{hBm-Tyr$ws>s#Wm5Qe<no9sX%lKiQCSuVurD_tUaFRDwUzd|l&@-l6mC)d?Di
zpb4=^U#JjaX8-a|htlKAtNOlG)A!e*f1yj_^Ht4dbG3vj{HJ*zE#j3-C?mBu6pAV`
z8?@Cx3cVFgqw19sO6x!xERepR0wwq%^e~d%_&OMuM?Z%MGzID-k57JslBRi((=HE-
zyoF7s$U9K@;iCVvI|-96%-TtsMHi-`i03_+$~8nKka8<gVO{LHi*+)m*C(43ke7E_
zdJRhx&>9BMP($q6mH{reva$1r5@G{3waYzC$`Ykk@^%%bt=+E?S7sws5lDHHlu8=?
zcLoYmBk2)j$I*NVLX3oe-p;lrWwRf6(krN!XXb=$X11YLA|)~MOBng|r->lEu2FJA
z{(etNxY#ChLjHdDwQL(;IvO1G97UmWR_F&Pq!U!_6P&eFQJRIPLusGQ=w~xj7f{3d
zL>VL`^Q}~i)E7R0mBZ02TBXixPNyYrg>Ez0lGjH2iMug(q0(B}97G5cg9k1}%9{xH
znEw@j=@&`g@G8i6*0#&$pEG>-wTx1ac`c$OT9P*W0jwj`{GTW%VPwLOfYv&szz-k_
zyOo2K`eQa%(Vx6v?V9|eJKaObJpn&r)g4ns!=5$ybdcvcLfQ9a3`^i24eI#<@;ms=
zLK+qVh75kQBhkOho#hR|^-Pwqe(KGV#biP1b>#Q0uoy)wxOX=X!@4uencwUABro{I
zfc3PtxeRAP`B^cwqTjOOUhq8W00w~zeGKccP^?O?KpeJmGyy{&zqtg}FG@xA1&P4O
z$0jt^Fl}OBWmi@>36?WU%s=nGO7()Va3Z5AfIb9$SlzK8qYZhHai$Fn7KQy}`b6vZ
zK+2!@gN64ntWW_qj#7S&I9BRn_HKqBI!Pl=*ACs@F@H3W;-Rv%Fv#1B(j&zx^RK9M
zAbk-4zqvdi5gr!xSX_Mqm8n<jD?yW&u@dI%2pBr~&C^NZ321U@A{02sdjw5R`w@0^
z`m$p4+3A97tr)`?={&ZDX}u3g^m!DWPmRB~-a%cQ#vkOm6LFEp_L|04)c&dS1xbm#
zxhJXEE@%+sn8f4;U$_eyeku<!XYW?trMV4_J|xf2JhQJOJSK`q_Dr`IOv1B?-2IH4
zyB0EffT#o}PXWj~Ccl_S3r2s$eY3g^ptNa}ucNr(lxJwz+Rob8nI_Mowc`*>pQ!nA
z|H0Lt$@e6ShQEuL4s|o6+GlK$$C7GQ`vJ4_!mprwC=034QAo7?dAkA&49W~BBISOM
z-<0Y-{9)U<BF_wdQ;C6v%RDzDoWR0!Jvj&)S-8-16~ZPKF7;fDuvyyU{piECv*qq&
z?~&ZLb4klh(t+@k%)>n1%NT(1$ObFC-;FAvkC3fn2@T&NyO1xLlaU#kk34MzAN+X0
zb`<sx=YkOJBi^mSVg_~nyrV>%M(5GABFJdIR9q8cF>ewlj%Oj3yW%r3yF*0c`~?Ha
zw==5~mo_*a`WPFrQR~v)9y&NM4*e5p2LT&p`feFk1P*DBDD7rG{Z_7m8j3}LV!aq4
z>@>$!NA`3Iu&J~aMNpO%P`*rOxKrYBi4EY-$NKZ&bqD_Tiw_UIzyI_OgZuK+J50Rq
zK`0jnl?Ce!n-Sr>z2WrQc4T>G>&Zw(@>s5o7FSPX0&s$4B=$wx=gY-or5z(1dTAd#
zOdENojQ1j`Px%NtDqw$p*XbPv?rU|L2_Ukq>tz_>-_v-Y+D%BxgV!Jad2PFnMkZbA
zTyr?Gn&Z|SxwQbjP8y-jchfOL?*mznMJ~<EFUwkW(divl&(&g8VI~fR)+Hy%WtrYi
zgH)EOsdM!F0oh841M|)x1YJL3>rp4|?Y>Ss$K%xH<6C)qm7+-~TA1n&wwm*I^0O7W
zFgbtc_g7~tIGQL-UX^&dFv;Y8z<+F2IluYhSXp?l3CakR^#@no%xv{a+Gngb<?%1^
zWK+F82IWe$&zb+3=cxCX!GCP^OW{<~f9c(=R>(r3RRn4al)&~#Wyz~QMa%SMa8F?}
zawFlj*#A=uU?gS_Sz!=Sx?t?6yh!D5PxgEonu{V)e@T!FFmb;wy@h78)^+Nw;{#Z$
zaC!@~sfC`a)oQ?Blz!D<`T={ye+&~+qQN~S#t;9}aMs>#gOZ05V*WRtqjAkzby>8*
z7ik3J8?2sc>COEm$p_=Xzf0&TNF@olp^4B*yFB00jR7*=8MwnBct5t<^L9<=H<^Zd
z4}EA$+F!WNG}PhkFgUztjh@dOfl?#c?Ng`^!)3>mE-EgZ=_0qnoyrIjvFnLg_|L-W
zt^)U^(NyR^QhyP(mn_2}?GCR~{UzPr>xV)%I7l|^OJhEg-gZc@VCPTZ9YNttCs`j`
zK)l2~tk!$K6&CO#)GyCS7V<j;zNiBmmEIt%Gd3uv(56=Q4&ihsP53wl86jdPd|e)f
zme6*1wGAt#BL6|BbO4)wNOMU2j;*h~s{X=)nExT~TL9XpXC$S%Z>aUIvT|;W+Wlg7
zKRJON=WY`_j@$|_!+QvV!8F~EqsB=nK;xBmCE(ix<{KPmJ^~)Bf$2x0Aqacv?Z|~^
zDXhcT+~fI~O`eg8#;v+Rl=`tpDj0$kyHX(Sm-f#Jlp761ubaz7y9_i(e>p3#2pf3$
z=Xu|9wdp9ZfabdFcMYBL42yrSG&gzGtbYk2*PV#@A5nQO_7M4XIP2iZbd8tiCI@Ck
zfLWZp%F4#iDRumGL1>VsI)3J2{D9yyZSKZy<9N2v%>S?@kLeSf2I&<4(lF(RB<B3{
z(9c*g(oc<G^I(EvpynA`3Bzoh54{O(qV@^h1%`1DS3;;0DP&&_?(4ga*HfM0AJn$n
zq~2|F=ggUN<_JO^{bRB_1;d_@nQ+;B{Y(MxtAJ*A8?97?Z4#1Q<gh+kbB<1ect0}@
zv3B$8Gf_Z0&*?Vif_*9)ZTZm<t=zPHsG#G_!O*L4Em(bWaVm7lw;BwfD66ssVQNwi
zAkI6Zr=4t@%eo~4qW7L{bV@yT*bqV5Ew8Zfk9A<XGz24!xr*PkYuiOYnh_XxYzQE4
z>&p##J809JRR2u3s`;4-r1`5!^PfNm+hkX=J^wwMv>)2PBToBo?q}K$7Y_zB6N~nI
z2*EDB?UX(iyq{Xb!yNlU>&hZU@XD{Yk+0KbuwB_3D1pC`zv^Re@FwKjl1?ChU17xY
zz9auV-gg=mf*pSST?ja(Ls5n0*VB1oywZM4VV(IO^S;M`CGEFm9}@Dr`1NPdO1t#F
zkiFCHKW38}lUHR4-gAxa^wTqwEN)&1*uSC5en_OHoi=$UjTC+z85|+ti7?y|40o7q
z-N^1j19e0KXsx;hsW=)Eq`zzZCt$L`5K(pfLx={%4gTQj&uoDPY%O6u?dS#{L>7!L
zPh(E8bdL1<&%j2S=O_`rLZj#XJVve^2!R<y4LzxzpU^?=U0pWZ?a-C>kfyY6hGvm|
z^vq;a(Mt$Ngzfkf35~~}sC}fi@%~<9Q~P)yA?k|uJi_u!%UIIwX{u@;LlQNSI+9EV
zOh<eN6jdE#HNkRRZ_uivgxGvzlV?M?(CEA4Dk?=-Ywwy*BWEB6>0@byC3F^}0FwF|
zof7gg94`JmDc5^n+SiyQ)!jsX^BozrScu#$R?SFrNS{Q_^Uway6x128f7N6E3aS8S
za}jxK2bAICm<upVbpeb9_&YBRqjdw6RJjt2Fni+!vFLdf*_#~DP!f>c9!uBwk7j>-
z8V<nDcCALmU4UxkR2-drB?gMl30p9`aLTQq1f!bDZ=Q3mR+^h3%}5JPLHF>R=VpXY
zF?$u=541@=w3+d?AJTcnE(^*0`bRL*Z23KW;6~Ea?0&l>Bs0yW^K-aGw)`L;xQykI
zwYR|&;n!b+IBEN*C`<#%A7SZ_3_*HrJJ42L=|9H%-l1a1*2=k)u?=&2M<VZ=N9B+4
z{%Sy$hW)T>Kns@9-v%g`CHwcT8i}kp#qnK?9DigxX{j?%W#!iwA_4ZD-;~JqCVfHo
z5dNiJIA+kPca`6w&%DP$nQmP$2ajK0i6C_vX@wuYQ>y#wP!-bt0g1&R0VK^qOI@w6
zs_D{JOdmDhMc6_^!yn<-pNF2or%L60w4Sc@J^%yg`xL>z>;yK*FfE)NbLL3)ZaNiQ
zPiI&p^7XVYW|M;1eV9GN7e&Vx<@p{4mn2IeKj`_Kq#b$;*v!61-K)QRsrrLa_li2<
z37`?icv6-h0weS!QdIWX{H3zD8HrN=nPXBv8~g!NDU`zhYox+GU^{wF=_BRORQ_Qk
zqHEZk&HJuLEOascMEM163-2fPAPmfxyzk!-HuU4fJ<4w`abpBEc*(7whkhDgp2?z>
z#x3a%^fBZ{Bqnca4bGA{rRxh+-G@B#8_JS(f1mOh{of!z&JkVxX}tD4vJ(Xd^3y`}
z_98hd(Mn2bKniP<Zw#^79!f$2Ivp%<p~(od?e`de+WwEAN$nLo9CTsJ5@0!`eQ*gJ
zRVM}Xzi>wBIF}$uefI2Lcc!qF5EwsD0Rf#LV6`Kh2?56j4?^nmd?r6I4kJUzKZoh_
zTwrEGe&^~kP5GR3-Qs}2mafV$9O}xqTjauVXb1!h!Arf~kE|)=WqEhmr9z9c_7uA0
zfn*@iy@_lndOKTJVFxL@6T-yB16`hMzho(Sxd*c`{Zsd>dmL>)xH7YZmWocgg_FCL
z7Mvok8I;g!5mys%eT1zW+1ipqR%QB0C^#~l*q#;E^mA=+@2hZ;L4=bE_LWldzhVob
zRaZy*#|q-gK32RinFI<hY*_QG#@5$K<zJx=#Qsw3+|;)BOi#sZgBuL=mo15?3g+c@
zD!)RHQjrz$MOX($*ORQht<m-h-hPgM_$IOvz7hC~W>-+N7g4hdw!#LnW>-)X3#i#k
zDa3XJm;kKG?I+Y`FN!sr_a(9c-TyWJ@JdjCmBGkf?N-Omdqh(@X#<@p%AA|Yb3(|L
z9i$~`D!+~{0-#MGe~QF*InIvb#kMf2zrSWRUqE85*QpX~g~X^%54uFF?{E29eHeYH
zjp{)qs7kq-4ULn^Epdfme<5$Q1@fl9q4zOHy!WOW!ri+54D65X$VW>+Ih0S+)EL$h
zt#=I2%J37+{PXKCL$;xhOdTx*W8;gi=4orNrA#9a1koqCY&WEKEN8Es#^Ijplh8+g
z^UBOA(%Cg1(RK&#zZwi`dnOv58RtX5t6lS1WHs*_iG1q7+}btABe%(AsorzLSL9=p
ztksO=(0%8(4rk4zy$x}XlD((nqXfskLrw$6Ll&q2XDg39mLcv_P*B9>qXOP{D{^fZ
zk)rgu9TTs#TUhfkXCZ@r*c#45MVRf_;-@TC>`<`n=U(hRo3!d)0j{k*sn519kxgne
z4`8nh3$~!(J;Xy{Y*L3ODCU2@VmNN6c#>@Lz3_~Vts2sun8Qk7>wWo%z`O|9mENHf
zT7*}ef)BaN^CT5Ri7J%%r1dwbDmVNSHs03Evb3R=&>r*@*>5J2Ji7gc5kS+}%Lzf`
zJbVzrZ3YCTcWC1l5;`5~K^h42zI!n)&`_JaFj;t!#t2=XS^paZpz6{o8~^h0>?48X
z1RBP@{OmnrnQfx`bvEn>C&D@0Mh5ZB5uxMjF|dKs9$R+EeYLQiQrY|oj$t2<3EmwB
z<Y({33iUHP|MDkxa@Xk^qCLAyK-a?x;KnNA0`AO$3n<j8E21N0^|1kCXZ5ExT-Kpw
zIPa$mgS3bTP<030RlxhNN1TeYDW-smQ^&pw`|8~_U%5f02N&oXjH?8<m5m~@vuXi;
zaDCJb*M^Ju&4t!lf3OxqKF56#Z8_xV6R&a$$^Z>3dbsk~ZSkJXal5={$GNe+_^z`3
zD8|g8Xa#>nG~Q?VG>*Lzr5(98Lsjyc+btw;k$?FOqLF=Ewf``n>YX&Y52@_K{2YF$
zour{nGrTWM9gM~>cVarIg-#&FCM`@3b!%B{ZoZbX=unT4t>|_ool<Da3Nun@AEv1H
z_dBpPkMjeZ_2unS%%3B_6(b!<MMy&Pm6K?Bs2XWBdi;B#P*|-8JO*su6y$U#Vhz=8
z2t5w7gfSHUP&m^;qY9(U{c(8zKbgN;>q&WFG~(wk-H`v2`Rl<W#L2+<D^HzVU?4k{
z1gx%Ta=C2m1?MALDTk%@xY=j~^(+d6GGhhW_3OvX#;rN}3`#lWr!&dO3OKTm-i8|w
z|6N$~DOUlx)?g13o3#^5$i_?&C3j|%4S!m(4Z9MOi}d(1+dx7K`VfS?BDF|fhcJ%h
ze3`TxNIyz!XCVY0WdW>#U(BT0UNKWWI50@%UrJ?{sj%OV8>`Dxl-sX?TXD#6X1_OR
zlzf>_0NW;=XnQpQ$~;wF4+UBbv|@W6S>Cf_v07v}#AS>-d){81XMR(m!Jdb6jWf=`
zqRf?IVEnx}n1qAB7!JNyv5EngVd|ayL%1;ldine#KZk4u@7G3tZ978Vvp4YT*CGI8
z$orkJ0K#@ikHZ$4J6({C<iQL@HjdW<HlYt2;QXeUSTua-3&Ji+=V=9}a_ldLtYlRf
z;+h@Q7y1yP>&@)`6Zrv6qV$C_F$8U;yOI2+pjc(|V@6OShuQ`2kpyf&V3};-AKGJv
z6y;opcZUT>)7l*&Xh7ox+8n3tWso|lOo67c!Gie_jqnV!<wID!@8@WXLr%+d1l*Yx
zhP|~FJUOH<>2_{~l1qa~#vns&CWmaw<bB6bBdgnY4GDrS84tx@YyfUXTz-^wH1Q*)
zhVDQ~>|dQ#tYC-cFS?w67h1FpsL-;>-9?&9MFJDprF>z#33*fNc|W=N=$QoMB?!+O
zL(d}4)@Ou@DG<FtsE~8$$1IDK5yq8~qW;lHE#>{}0%??#DO3@Mj{(@q+VAbPK4XH8
zK`v)Oo|=0wOYIHV&jJVqL%cv4hh=nV1(aS}Utg&Ffqzo|D_Zp2^v}zOU_Jg({VU<s
zhR(p?Y4vOR5U2U9dmefjG-TYcAr%1s6>R-L9kUL{O3F0~sQejJ+SfQUTiZxltP_ub
zbLv#ycPE7Fs4`^|H3xJOvl0qoBMa$BGdZL;u_i}^?haQlIVriMvI{{~CHAK%u`xsp
ztXS-FCZp(-s)^XbC^1~I{y8GvvmW;!>1HvUVsNhfF${`Hpcu8k7n1kze<H6@)L%Ui
znkFwV+G|o(LmQ@{@_70f_ZV0iV4Z1FRL5=r68SI82waW`369<()~O6<2x|U$)W`Cn
zhkE|!j0a{lek+`z^<sqg7lU&Fn#LrI?M~Q^b@R2lAz?e6D}NaJ3oGhFFKI^T7f7&S
zh-NvZMVYy*rc~HoTjnA{Q69%G4z9OjNVA27GxJVud&f13wpwhEZ<bR=$yF&hYR|m0
zR(h0KYM5Ix-o$ZeDyy>q!xZ*N`5kWlhSt!nQnmfaWVKpi?HkStXzd3k3A#XU{7EFB
z3vJLzeY`z`%kGyz3c~xQ%upHvYJR*TGr{PliM04mRg0xB$+NjrX(Fz|XJJ$0iJsDl
z9!Egs_Zn2s_=UK2mhMIxtry~p4nZF>eoP2lfZuEN{LE-Rk&CxSQ*Y#b0SIyGMBd*I
z*4kDlOyK>WBLrhcGlNlhJ|Xl0;wpXUTf!FfI9`LXDWPYO?vN*C;>N)*L>e<IGc6A3
zD;ReXZ#|JMe{US!o5R?^NerUPK86SscnbRZi1>lp#Ej!|m5E8bzb=l6&>~h7G>_&E
z8rq?WXcJkTSV{v@;!OIw)X*x_r1cP31|v^owgECBY=>~UkO_3Xp<F>4Mv0-nqd**q
zT1*SHKTnn=R?k+b4jTngUcN*MdS<Ft7nGX=kFB9%)&ywe*0D&UX)^gR1n?Q{jPfs|
z6&N&XYidXxq1;H>!Dh422BgsJXJeXxk$VQtK<GzkqgWN2w?uIGI3xEG$f>k0C0d)J
z(Rql*sVP}PRp_B1Xj<IaJ_QH)U*xLr*)L>n1hiurB)uU>Zx%^A1vw91m~_H>2nhy)
zL-4-Eie|X4H$xG`D$|3w;}SXCj$0Ba)s3?XF)#xbWI`IcA-~`AnScXJp?gT~wmc#o
zs5Gog6}DRuc0x^-j{yzui<z{Nfobq%79h}_2+zvu9wwrLC_|Jc*pja2vsCV!IF?(p
zgZLfbqsZBLyS!gpSEX(t+O_QloYWZdcdkC8Ou%uzL+Zw{Zc(5(qody}KJJuu7X{$D
zI3-2bPuYTfaFaAt^mdvY`N5XsPFxr2IFcY%bz+8iC=J)ma6U)dLVg2zH(px7O1sg%
zo*8H=vvL&#saeObC3^<5^&ArH(jnge2lT5T7pK8L^#5AJx{vM|$PcqN>upu{7kUg#
z9=Mz^17`D%OQ``pp>uE#FgR6vO9e<+aEkvGNCF$HJqfhiq|;I|w1RZSP#3PAiE?$U
zoCVzU;Hoih^e7o>ML#6`z@v<NG{*)N&sEM}4I>G?J;jf}WeHj!<dUt<5(2hV?6kjY
z$0l3H5$h@bx?bFVi12XZJLnyS6SvVmAdXhWj*qO4q}?`Ymy@Q5ypB_RDpAVbwI(zf
z;yJ}HGJj)-;C7wj7o;SEIY9H5NIAvN*I~!1RMfyQPN_K{Gp@ImpLe>J&pAOaaq(*p
z!RwVe?9v{L26FI8m>nOb8PK7J!NMNz%FLw~7fG+IxKXU4x4r`Dx1u(>8IlE_)W4?P
zpx41a^a5<4w?1>JL8ApyObpsUqiA*~ZOvlv^Xuq+Z3t;89qrz)g$>97w!Zw(<}@gM
zF8E5~*Y1UV(qd+Q{Tmc}j^&y1f?7J<*ynI<nt!A_h6`WlYotLMJGWrY#)UOhLTeam
zErL$~P&%}5otiR*a_}RuZnqH}*Nfv!>0#E<>+rr6>uHh$-XdKDr}Fo>$OFxjXD0KT
zC|m7x%0|x@V9}4=5-3N#+sf8Td=bLlPc1Adg=ysVNTH~2FYh}F<{_N=VGt1S|A1mI
zu>N6^2g@{C=!Z_I&dkD{){77_Uj|mu7d!a1&tq$<me1OOF+)v)TI?Xz7{S^?TImFN
z_#S<BX)m^ztXRGm7{!i5=<`lmm}OIysyIOARa~yXAR>{WyL_{TVW}k2x;zi`n2J*E
zZx%9X>a2-X(7jaDa*Ds(v>OuK;|Q!UKy^FO5qrIzxx%_j5L1<BEpA>@W5&+|5!Cn=
za`vDpo&4H2G0UTJB8wgH{7z^Eh55jX=p+;wJq|^}lVkgV1B*X4uy~(deEs)X@ddA-
zkGqIFjjMGR(<Xw>*z)JW#Oq{>@5edSFQG-kcACmUb<Fo@Ly(qfFl5(U#Uw_oWn-SP
z2TZ2WWK1))?GS_@%}wh#Y!>+Kw)Gj_6Sx9EtFzE~5W)VmkLfUxGJk_HH0=zA1OJm?
zC>!1n{2NWPO?WdPF;4&e<B%Pv$mnWPTO)=k^ptcOW*vrC)c}6|7%=ZWJ6zLY{wJMR
zc7`U9e+3#e^ywFJGOs9$l!YnGA%SH4?<fo@nyv-RBrGy-L^);^)(&AKFE#ylEM*>b
zcQ3#8QnV9vp}Wj7vNMDoU;x8r=`AzU_(wKV<VB{uVik6U%-xKW)U-YvB0W+}2E)hN
z+o6o{1$p08N_m0dV;SwIZFqESdKOC203~Y$tw-g3y!Q!Y+VCdPQtT+e<E8~O7DPJ|
zNIx<E=H=m7+ln-N*FcF}LNnM(An`sAd;{?ogt6&I6C0LIt;z>L2rWcTbiT2nCupd!
zGwCkWb$xwig*?xM%~>4WXNU6lXww}Zs5HfOsIM#*gBi0UCS>;sfdYd~8;bfgiQU9Y
zG_5eKO37EpDgW@5C?P+`%qK+A1{T<jbc2tD4YV37$e?DS%^3bo*k!)je|pszY$Y^7
z@J;;e?raqo8r-B+mfelY9|kQ{T81Dq0ucB`s0>@nc}xn@5#>hApia7l+`;H8iKq$V
zf+C`_m99CW3Y@xhV=NQ7>?6GYEogyyY5o}!GhR$l_nT1FML=r@8uh_J#`I3T#n4wG
zKtF!{MHmuVsh8m)flGI)Y)^y16(8rfuk>el&y2Z#CEE9BW*f4-$4%bP#u(0F6N^Tw
z)DIb4M8kJ8a{#EVluptybRrKY_aWsM$Wxi4aYBC0zkzWZ_Tb32V!NDwq#pr|zXX2$
z5h9^0qvsZSA502ugUWCU4@oew!1v#&2$wOrUdptQR4_#6oN;PNmC&emO5c!HlIao7
zycb#wtf;=7c^69Dgd7gGtqmabG^u0s{EEB)8g*pBQjx>v=uo1nvNmuEi;?{>D+$q(
z(CK&P04xQ`IkXa(1Jx=zYC?YnBR2U7P2cgBjscPhq}>Y9@#^@vn{^&E&Zc#|lZK5Q
z^N2qOV^);Z^#^Ju!K10vR#C<%6Qz23<NOt;g#L3PQW4sQ>~<&KOIQj=62px71tCuc
z=~l&Q&fpnN6K_446W=#**J!D`&I7^QhN+GMUI0PgR-8`2iO^k0NB$$9LWOMWuF<AS
zvi|w%JkR@_;1Ios4%;>qRV#O(TI$XG5245`317(IeLtYQ$;iVlIkL5k9_1>Q)aBLM
zMpdIhC)wVkG8Sh;xYmQXAobV+6}iep5*4I_bG&zPKSgOl+=iDiaK1yfgk1u|wlY&6
z@-vOdr;k?T;x5Z)Y(uOKjBv`cBZ+bk-arZaV)F-X7JP{L2pUdWt92;GN%l?{5bEgf
zUn+H8uMW<<V}=3y37Txc#JUBLnodJCGMb?XJwnvg@?cRJn@%24cZhacL>O(~tC;QR
zgCfu2rda6Z*!+pEf1LQnFLV=DhgzIe!G<Y-)Zb3mDCi~##u&wi3;a)dP#1;48v$)z
zw@K%qw>0}**@*x(HRQwwQd}kBe-Wi4#36m31ezjE0EcnC%*KaO3ogl8MJ=BHV|Df=
z+T7~l(b4{hL{pDir&i-YW!9##@KxIW6{^;iMBz}2t{$jOV{B*&nhuSCR+2j2q8h8!
z-FXpcP(8U|Ef{8)mFnTzK8~Q^U6qFZeG`4dZ<-syi@Jl>m{%c(tua+ggGo-E;+V~$
z7k$|z8OOKktEqElRxeyQ^5C$5xQ?#bG0$xQQWkZ<uypfsB3WV8FUx<F37z+S1~HL)
z7RYDfp`L)F@M)OW5%=)EE;X^2E^@2IF=@X7G}LrA{KRoV)EGpKx>vRUiHop?$$6cS
z?tcNHS3Q5!%_p4^gx<gzH$+o`n?4_-Ve(899Sr90fOrsvu-j0n!3&c~3l&m)Xb%_K
zOqr^~F+5HVY<g0iB{TMY1@@IE<de#=a?6<oM7NMh^U=O9^$W~PJ|@U0W1*e6QK24u
z###5!53o(aJSWwiK0Jkq4DJf+4mgf+oWLwXIHMqS>J|J=p9u8u$abW5!qtQBkp+cZ
z&|Ty9;M!U;gr~_Xs{;=Ax{INvgu`rHho>7vQmz0Il-UQ5Pjk4daQFu)qZ{C<Jv0}C
zhjsD~CZTOG+V~4Ghf|~TPgK`(X+Oh#g1qIB14LlT>Ty*-Qta4>kja?CtT&06F518Z
zEi?WEVw&#$Op_cm`bz|h=wjNU%#!fTc8mfxIzy^m#eh(DVR_@sKaP>4rt!9ZpwMSt
z{)8NiBDf(KPD%%yPZ~%L>3#MQj*#*O1{`iXJ}Y>?$}f^aB35T5IQd|F?7;m(D>y@i
ztm8;bwBTyRC^3XSM-Nhk)a%N+5%JaBPoo&8;g76_CGiXu+CG8uwIHmut(=A^o4mtj
ztOv07vnrwr>x-C%tf$Lmszud$9Tnl#yz5m*B9x1c5M+l%c{mw$!w|IMQ!A+;CRX9K
zDQ_n(0-F4o^El=547`6qY|{4P2k;s2_Ic>XH1n$#gNLe9`{^3Tx4MP*{VR&v1NE73
zJK-ZU0oc~D`vXy%VF(?<V1UX5p&D4D6`=@1ePn!W<WJl`)MI%DLbwD6n%au#Jq(l!
z*2roIU4_|$Tm-TcY$$nfGlyJhvbQw-t$!5>q_I;cLz-J@!4A!TRW%kPu<l?h2_%`X
z1_G^iRrv2LUSQy<hR`T>nFtN0YgSARu=_^+ej3%HA2Xo)i_ip280()z0bLbraBy>}
z2~(67HlyphR|COADPlVT{Q9p^js)+XWe-$DEig0PZ%~%HwERA5i3&3G7S2xuc}51g
zomNbmWa73118j!&Bd<F#p9zqZbsJ1A7aF2sg@3E{@dZbpyN7(E^^c)IjF(UX2s5`W
zIzhRx)`wXn5kZ~c#;qQz&wQ(CgN!m@y4gHyf`;<`FQHwbd%yz|+7?Iw8{>8*^gDHI
z;C4Lkr}uwVA&0&~aNz72>L5c)Gny(8{*imtp_E~;UwTY9^OoTKTWV+?(jW`1XP!ii
z)u44Jd=kdea*(3;qu>$Z8eJ_`-Ag?qYjF(1tteeLVhbB2^!}0<D9?1-Xj_ZE3}%Hx
z?PM)RAeRCHn+IqYdJ1jbFU{LapG@ff5g8M=1%uHEd;3=<1c$GOyAB1mkbdF{+Wf9|
z_5L4jz?nAzU%e=db@|&koagQM%G8TkxA2?a79<$30|FeR+o>qt1;KZyaQ&`*!1s}I
z^G-XYxAFESzKs+~UxT6!`BniN<g$4_QODI=Im<nr-j1xp%l)2Fwe8_zv8q=zydoN2
zZ+jrZ;RPCRPlA~L_vJV8n=i3TA?&)+?GCz}0n4~g?CEB_vp1261MQ<kINSD-C}2%)
z4S(e5!IY2sa04ZbueluaWQJeU{2Q#-+44&?yxq3agf~yF(kpxx71AM)RjpN7tXBDY
zSY~t{RyW?+eY^R1&xBscl=ksH`e0}gx%3kd;5S_)$OfT@x{h|#3TVIVUl4{`J`P}5
zzPb&kycn%dBStULVTTScvO&k%kq}A$A%H(felzywkl~)~z(pwjp_9l(cV{u3z=a8`
z!0z(VtsAnc(eibyJhmB;sD4BSy-XJkb@@OAsV2NXYUei@Yo)}fngI*`crEdc*-9(c
zj_pK2uUM^<=^*J@LD-A^p@B>hf8S#2%}1CfUe2ltKOLn`=bc+1<w&?)ablK=Q_j!>
zNCtz#Is?N9-Ai%cYj^49L#51U2q|na-ac|tZ@g0rZi*p|EYe*j-AMZRQ4lnfXCTE@
zLrQoWtF<hM-bxD`-j0F?l(ArgX*GmJ-z|);PY39C0q%B;0S&yn!Swuf2X7DI#gj<-
zW2gnIB5>7+#uoWc+hnV|#UWn|O>y6gI^Fl+tkoa!To!gvY8Bq@>`o93T{v}N3$}}w
zUy1jmFeln@be-kM-fsh!RtFaNKVWuU>R8=_i*WcF)A^Pmx_+}ad$pJF=*<ZBK6My(
z`EX;#mU%1QQaWLiKFvEA_dO)4{P6+xZY8C^l~t?PNgqQS$*NubM)+rR;WR1_P5$_#
zm)XA_(qwYSJ9}D%a#kc=x}5qY{ah6Z8}HJCx-M~QB5%VjUUn69BkUp*y2ymi1{ixE
zJMW<P?B%OQuy2vz0Epflx+H)1$}iDT<KVbT8Fa=26~&9f>if|!IoQC$Z6oDH=m}o^
z!E0f+8|=QIZ5`Ax=pG%_fBK4&13tG1rxf2$vahq?a|7reqf^4YMf$W5y&fNHujZ=s
z%8sx09hO9VoJ#ykDzSuo;DhvW!1){A1<VV|&3GFF{^1_s77z9cXJJUtOD%yrGl~K=
z8P2M29Nr$&4B58LQYhQDTV@67w^{P`suu)L&>4L<baR}#Zl{~Z2aBY`c|mM)v-54c
zY;<_LOiun!owEW{IlG*I_uHfhZIe5)`-`%Bi|E88!9mAg9U-gW{m9_Vf4`-7ro3po
zh3;M6czeLM9sPq(GeL-s{2eV;ybt&lyc+kgaC*B<1{UcV4#vPX@|%wek|z!C`Z}SE
z<6&)Z#nde@@AIR)y>xqPoJ}^$kSN&74$>QYQl~@$Hqk+n_b^_md%xv9v8tOYw97U>
zY6yDra2$tAM{#^yF3<W3w@EGGi|D&t16cT+Sim42hc22Dv--Hxr1rmT{t|AbJbHa4
zwBvP9&ye;@liBx$v_94CpCWfa=>q9*;^H5B?>mD15xOaM4SjM$GCPUF{vPuN&?94}
z>x5n&-=RSc{lZUB|6~5nlGE=;8d$zaHYcMzm4Pj7BP``|wLZGS&FXtZt1lzc$8<|F
zAE-c;={JD{D=3?Lk$|_M!!#iD_GR9K?5dOaK(D(1?W^5rII-5uBN35e90Ia@d9(x6
z@h!hV%2Z^rz_Y}}r+>gEgZaHW_0x^`Y{4dMTAxG|-;BU_M$Ee<wep2`<EtW6$BnZ2
zd1Pbm@r=ROOJ;#AhLBC$5smD__qx<<_veKE2Te>p=2j$Qy~5#LYKHHfR!1pu-?!L>
zs+S`TTu55=zmX7)93pwL@z0K&(7qdhM&xmtOJkkMTOOTG*nyM@$Yd?N0|EUb5}-oE
zH#UB?_Zy_wacOfSjJ)@oq}8Lqf!l>bRd0*(s6KK>7Kt);Q<M9`6Qz@E6}|7Xz)Uhu
zfn@)+XpYzsGD^E}^l4Ov4ntJ^gv#Yoi$!`M8Kl!;c6tioU||+3OeLUm1Sd%&2|3=4
zO&ygoPFZ8b17<t1lZ}^OLq<{Rqni4SqM=uuW`z>2Sc{ij@kLAX7!(i71KOv4zrw!@
z7SLVjz0Z=gdOX;n?;DC$_%L6<EZ+^vGJ07;OQm7>N*Bp8R1I0E`b)7HL-qbuB^{HW
zX797)@1?;6IRgtaaHqggwO_2-%ldbwoF>B<?R6O5bxQkYN@+5^*(`R1t+xEvSARsZ
zz37$|$=|;e;~zFdTC_GpS^;a)uWAhDT6wkwC6qFnfk~`8@r@i>J66ra_crFm7LJFL
zNT_E;>9{fk(jGuB{6~CW`d_2^BfX+-+($?Z7~4ao`58S0Y1(+E&r3w-vqAPd%UM;K
z=B#Q4hp#xKckKCJexJwNhVb-?sy=l{Z#b(?<n1a9Oqz5{OEUkf4&&_><>zW8yzej6
z>rkmcE524z-=0B}UH<WwRH29Tfy1n0a^~+`al#q67gNE!47@b>n~d3k>dhHN`G;GI
z)$wANFC*IxOHE&z!Uk*zVz<dy?oJ?!TEzdUtH^Mo$Ut`9CMB?I4zTlL{wpgE*y!3r
zkEtmC%@td4baJ&#w&UfyIk4?P_lR&B>o3uJ#3T=eg*U^xdrnGCSe>gMYu3MlJ8=Hf
z`yZE|>HE-lC7btS{Ba%U6TspfqCEMW>Qs5sLLErobKX7GDJQ}scH5j%_vtQ!`zWS+
z+FE7T5!4=Drgh}4klmj1p4Vgj5w984pK3>*#)?gpbLfL$1=?cgbLH1ql!u=rZ$6N|
z41<(5Sss_u9#llNN3hGx`^%v!bPpz`Z;YFhiZQBhqLk=<PgFZ8{A;yBKdW%^6>8hu
zyqbCgY7AwA;@0oM#wqQ3J=hvGe^Cv0>oJ|o8~S_^_x=Y~Z*NFgNxfy0m!x%kW5#hj
zc1#4rmqK7srXjy;RWkf<^}b6N?z>D!W$J+7eSS#Rf7%%kGggg4GYfl6Ymh=JWw7OU
zuRe~x#AUp{j-o+h!~St#W`_6h7%|{po8i7|ixsH2vz6Tk`gS=Lo(Wu;4to;rdW^8k
z8KjsPv?gI+*qPtG;(Y-}J<vb9bg97G-=hz_NN1(H($x3S>4oN)zF_?)r&4)A8bKte
z{IT$>arW0)H7iXP(rnqip6iPP$pNyB&VT^rFCPlu$C(5-<OqDZkjW+wwdE&yhCA|m
zo5S=qq&A>(mj=DPhPd$>{az95;XBHc=nM9y$KQa;KTOwc@=oLSy<(>Rqg5Ft;k}MD
zsR@>(FoQ(s#MpCGVUl$JI76(O2P?Dkrx|&B)$u3DmkF|kxld@8n0-LZrca{?61+y$
zp^;vJOXJLcXT_UnZ4tReJ<D%FVIQ%J%Rwki1utBxd&LLhnRhVt-9(p?iUQ6bLG&RL
z{IZMH`Y9$r=5~1mxn%I)=hFza!s%i2AB=l8_Atn*Woss_r+|4RIu<4#_O&-$4aW#z
zpNPk&P5w=jC-W!JY#~ixdLahB2Z5BYNp%G7v=jyIL^s_26|Mqw;39yK9rX4Og_T+D
zU>|P7r$nKA*&X|is276h8jdsngO(vSxv*c@rv$`wydSggkS!@FCc$3dLN416Mi=kM
zV9Uz__%&1_Q7-E*lJ*HwC+-&ybKfRxfqR78Vta72Fgqyh`$+18KQFA=MfZ;ODMC_*
zqvIp1Bmax#iGsZFt9@b0-?Q&f(tc-BZ}>6PibIJL_-@1@D{2n=V)jJa-(cfcy(<8{
zfnlP()hy)$x`{_>5<vA1yp{-u759w<y7?4YEzrmLZ~?002nN+|YI7>>{$aytH*8;x
zjeqf=O**hIjKRYD=yv~BD{IAWTlN8rusul!BryXR!oHB;J&Sk9#Zi~;@^)Zw?Ulqd
zk4>z?TUlmdO?Uz=CbpNiqna_^Q)9CCNW&pAw!tFsFYeO%8DyyTzyd2MWv~{xUn~qf
zI`TDG3h9z<*jVIj+3!lYBchfi`-zz^{9xR86s6uUhFj3UZ=ySL2H!5MfR29={cI1j
z_w;e7`=BI_G^r04?ecs10BJWa+yxfNZ1Dx_f*oD2Be2xsUX4vvujM6byR-+&pPc<R
zSS`YvO%MGBX%6X}Aal~meTVQ`R8p@XCD_$5LW4|2T=9V;JM0J)p2spK0k2?sM_~<O
zlPqp{H#C;|DIKpJp*>M2i|IUDH#+jem?`mDspW_9{WZ3%(eM9ttvD{8d23d{HX0tB
zMp`3BZzra?H!}*D9>M{2{L#n|19xCd*w$n?^E+FzWJd<QgND`7C9t1t?nLi&;@}1f
z*|*|zn5q|d8G5_&g2Z1`km`0(JDlqfJTRHlzNbj*1$@(xTx6vcwrN`qLRc6mEr`&l
z9uDURi>Dn~p*p0f-#3f<KD)XeP<FncO%7e|@tFP|vN9r=jdNGQD}Eb<FeP!=i+5vh
zoa{AouWi5znD2vbBlj@*v3g$Aet}pKBX&Tiavj)r_u|{Wf%F?#$@FKUCA;vQt8Y*v
z`)<Al-`3zm8eBgp|JFhIHxA0*q{Uy-;BpOi4}v<K;ad7!4c2P#oA0Z96>ITT8r1pG
z@$c5s6E%3ZR&JFB8#LIxQl<B{27fmQ>iM5*>8Jl4I9#JUSHsiGZPMa5YVZRMuF~Me
z8oXPBI$o_7e_ew!G&om-YPmV;*MY5~RFsO3MdNaUJ(WJ(EVoTDLmy;HDN3bJ_3yB<
ze-8m&PCsZV`>C<`xPf%}yPqb3!Sd<5So`<Yw0vdxz<9w<HC_=^;b37Fpj_9>kx1}1
zbw7g0;1n_XgN<PO6naA2u7UI`+ymqK$E|hz*R&5w>+$d4|Ct1e>Kc};7{B7iN%W8O
zx$BnISZgcm>OIXhH)Dy7pHN-hT+`BG9ouAGTG?W4XtdTXt6WkuzNMzhUDw#aS*>&H
zn%$nt`a3)|&G)gwHPzPI#%Al-YU|?r+%+xMO1HH#N=4^3TCSwI(G6O9$rW|(rPeC^
zBZ1c3*0HS|=+9}mx1n)GgSDxp##7yBW&bW)CDl#;(4f1qs<Ga>yr#K@62?~Ns9gW^
za*ONS)|R^aYvS>BzVv?&PmeF-TJX=|RdLOno6F&<xqAE;|0}L6<{S;R_&5I=I1kIs
zMs`+%r@lU$D=Bppm(Ot7=a<YbwilPXY>t_Z@-pt|Un7xcH>%I8TKGi`I^*(^5k88E
zlW<=Jd`=6m+!QOX)A^6WN{z-i4JHG=i026{{+<Sj?!#KW7pfy?^S609`Im2}4KC}{
zXf6Wo6L?19dGC3I@zfJU+zCkKt_1w*&yh$69-{p)pia+;FyY15sfQ^YeN)#^=f01l
zj>_e@Avo(U!FeJ*O$Zm@iS=jyZIy+MRli@m_qM<ER>)aD=)UdzeZMLhY1?<3>D>2!
zdGYv1r%t$Y<{XNvWlm@iM`Y}0(cmZzrfHCC;|BZ=Y2`T1)l%bjHG14l9=8jlW?7}1
zb1nH+(tyGjhz#aqK><T5ctnNkx>R^iKZ9+)9D(xtE~;YC_s&llta<G<f>zgtgz13F
za`7gDPd$3sGQfhrJ(2qqVEYw2UVIyH(lvj-H@T2&J9N{1T|yzZVZVRgq~(QNZ}F04
z9nTixv)~n<%>Ssc;Nicvj{Z}+t>pOOw?Db;cH58MDoT9gL>oLi_4lH*|EJIIePZgw
z-#_!#)u$c#(|-S@?Q8zG6Mp&Ahu^SlTR66`@ww`(#9n<^>&0SFtN)S)^I!kE<;OGr
ze)hJIarTs=38Qn*iYp$xbLz`2tKXlUPS+N>OYy*o8SrztT=i8hGB`~zYpz;PLlrk5
zX#n>Bzz8-tZl_I-jT~13_#2#SS`gj{cq#UWGZ3}{HsZ-bxC!v3biB`pa3A3P*y3$N
zxDD`8JnInN0Qd%;cESP7$9?3-5iS5M#Pc-5C4l94o<X<*uo};E2sZ(C<JpLCA7DQ^
z?L~w+T<$$G3TX(R0317-<32$+7qA`AQG^LTho>Lmjerka!Es+9+y?l-82po)e?}Pa
zsw+8e6vDX#uj05&gsp&IUk$BBn9Jn2Wq1k@ZUQ`xrv%{>fRBs?zX-PjUV9DxnO1~z
z0T<$FLbw9(X*_O(Hv&$>Mqew!1qAW<5N-q9i05I#0kmd8b_f%kiRTG~O9<k58sQCq
zIha;9BAg2t!V^UJ1mG8VdJ(R;4m;v_UPZVGa5<hngxdi9c-};~9q=(c`w`v%_!ge`
z5IzKGz=p;r2&V#mi03G!1Ku=_<Gw_=0Pu$KkSD^qfXDD8KMx)Ne}FaND1_SqU3m~6
z!WDq@@z+TRmjKc|BPYTIfWMxCe1tawuE+<!2)6-N-i&`z7U3qq#Hr9Fgi`@;Du8?t
zE&x1^=NW`g09MZ8xEBy^0?e&I+Yu)CCp-$m8v&2wIf3vAz;`RbKf;Fq7vZ!w^)KK9
zup7@Pg!=&ZRdd`pgbxAUQiD1XE&y!8Q-UzTE<E!IAMhxiYJ^V!HZ6fZ5Dwr`JZ+Q?
z=v<1vMz{oUXdT*ua4O(bJR1-$0DKV7(+IZ%R^0<VMz{&E8_yPm`v6zoi+)GA4e)n(
z`Vig-*j0}{B^*FY1L{OL70}$sK|lxt&c&04a0TGcnlP>r-T?T}_t0Mmw*x-b4Ea$y
z;1)bn5e@=wYXOfG1~j<Q9)wc?FT+!UuoZ9~o^pgM0FUEYgz$#t9QQh&T#Ui*e*ZNk
zU@#|e<_U&e!_Y)-=!C>vbA_qNSdtJlSj?Pdx+&LKk<er)LBE>}oasS8i*c;QXqmv$
z=8f^sGtTQD$<0<S;%4q2!QIxI%H6bu=O#QeoE!gm3YWDmnY+4m7&m6=P;R6ln@i3e
zRxz|GDLAChe8_l$(V+TEQ9se2uGK>@(a0rEPslY?APmt(A4*@Wr4P4o!=E3Tn^a+G
z8d8!NH1#DMGNcSKr#zoz)LIgZ@_r$j)aK^6HV-wMhwe=@8gmmW2JkjmHu1a-meb(4
zE?>QUdRvB=xFHi*O-<20&~XNr`DgX%xH{c<sP`Gc#hPrN0@TY4ZvSB3^>V3+{#0X3
z8w?|o%p)eG7&XZU&3(p0OkO1W(m}ExEW7x2Q@c8~zNGMBEu1`rOYXGf4yj0NGMAWw
z34P!>9(N>ZQ@XBAC6-`fpXpG-3B%>d+~rG$A@9;}=TTdz?NooMCU?@G(n0z|^*p8V
zLGpMiZVV89^B{b}c`yz~mo3qmuF;`BNloHX7i;<-<ydQ%jz>IRNKbW|@v_s?2KSks
zPW4T{Kz)PpN!HT`$(s0$uZ!ApmDZMc`4OJU#ObY%j?oLW1E}Bq{)<ZBmI;?GBGx7x
zLVp74PZr|i@Z{nlzke1W$2DN{WqD0?rMrf<i#+bS`j(vP`g(3w<?>1_q?WlBSJu>5
zdm5IwRLpy8?px8=T<x-<L^(>#p%S#lExWJ9U9*gmi0pU2|0fctJ`t;SQa}8*Q&^+K
zrENjlN~G1FjKez%pZ5#+fk@YXHl*3U)MEo-xt3n9LEj*}4O)DQ2KzMli3ZPUF!k>$
zU8@EsX>f)HD>T@o!G|@tL4#W~*sH-0G}y1f;ipylS7~sn21_*9puy!D{DB4^*We2p
z?AGAh8q}q6REwX}pyiC3lcB+DG&n(nQ#B}RutbA*YOq>^4H{go!BrYur@?j&KCZ#1
zG`LZN+cdaCgMAu&SA(Bu@Pr1>Y0w1Si2tPyihtMds&xLh^?NGkn$xhNuA$mhc8~KO
zS82_XI#~K<Zp7g977w%iBL}9>X=v6<aNIkbt){-lT~pXx=dP=&tS{5f9nNs}2GAUw
z%)M%uS>rDBG&k2YxN)>lg|iFpwQr|6s<}OJspU(XYbvXe$ngm%@2qTb+nbvkvG%>1
z;zf<sp86WGvZ1=ZM&P(Plt#q0!x7vgpp@8rCbZ0`t7nrP_Z!M7udBMZuo34gcoRIq
zf$iwJ%6gnX3}$|~(a~a?URdS?FVk^!VsFK51S4Y0zlF-pHaZ(CtDSX=n=6~|n}>ZA
zW09xcT}Q>r8|T$k*Ay<TZ05EY*|AJXO*7kDZm6nZY@jc`F_yaP!T$_wc+z1?dFA5z
z8ZJVqg_TWi8~_zILcpzVF42TEXJg~No+cd`qHn&B<5DO`JN{8S9D7!#vKsfChNVna
z)%Mn^nkFI-d5{MDi>a)>rlyJ8Y$~s5URDPOp+@f{?j=)seG7y&x3b<-!@XkqheYsE
zEv-_NrL!YkGSyR9b2)C9Sr<WhV^l6&F?M$0sWdj!wAQ(~GQ{c{7pq&o+(N{bEp}CT
znqA8(A@^3!Rk^HXiHo6fzvo<#(z2QxCt){|bJa9AH((#-3WJNz7SOO|oY&y0Z>+kP
z%Sv!*^tU9qv?6aLxI7IkcfGN4abvTa`>C<g-H4r@Ul^g%$iY<{V=ayVs<@Yowaqnf
zh+a1?fz~%H=eUzbAXL`ZR5enp-?&UG!I_rTEURilKU{9YA%cp;jW)H^EorF4PEfX~
z#ob)B6gqqZg}^iE^8^al*I;*OGKCtdmNjwprWI8!EREwf@-Eks)>c;&j?@}K2S+Ea
zmV0ussRUc5J@s{qmsC}`T98qH&-gs%{iPxAKl8cWURrE-PMp9h2WwfV|3B+l*0Q{+
z*{#+*74<?ME$-^7>#rYwqs~tJwD{jMoI3CvUT=hcKVZY4djfj?cksWL1ccO|!B)U`
z*Wf7aUPmscrvLY9&3D}Xhb7PkyNyDr8>}00H%!^kwxN9k?Es`AErX>{rW)rqST>|?
z$Uy#gzyB!`7>9-=u*O)}U+Z<M-JkFe8i=D;;P1g-75^WgeV6>-L;|mYPp$uH+mF-x
zzf{wMoSYk?|HEO&U9px%PcxQPH^2oPKPl&?oZK5!fA9u4sI_%VZm63$<;EMT?puNd
zU``olyLr*Fmit;3Ep1#@v#6nN{<6x3MXfhZQcI4<Wv-gamYVUvoj74Ub0?c?mgkON
z?5V4-UKFiiQR|c&T_}WWYU3Fb6DKTEE9GVu&#?++)(JTiCgkMja)!3YhEjvbq*)A<
zS!iWUa)xL#5cqdmqSBs_Q}utH{Rc_>hQumbtR+~6U~RI*%Kms7$dAWWx;m^H6D;Of
z4ogTF(y|l_3F|;KlbL0jRBSaoWFU%V2;F>h--mPT1e03dKm>y&8rQfoRX2KQahPB-
z)z&xSf>J`NiLs-l8!dD(++;{dFsn>a#pXKdGq<Oq25Y41Iw%Y<zRpg<$^Lv~l+P))
zyXKVHT~50&*B+l(GN(**71@hsmoC7ePZak~d+BUkq${@<+g$S;<)TX{ws8ru{5i#?
zvz<;?S$V0`Ud$O|8PiLJ;zH3?Qfjw33d<d{i(Miv<&|-!7>aH7oas)xM%HHI%&{zD
zu}lzWaEY<BqS<rjb3<bB5}~x*Avj&7_L-<(a5_25w=-urg_&^}NihtnLUa_(w%J`X
z9J5Qfp#!tZ;<APf%mO31T=KxQLT9;+OBt9pzfhbxof{rYEGuz3%3aRc#WP)?VK3wO
zSYD}Jup!mvn6bb$uhda)=Ta}2$&H95mz2&fnq6*p-NAU}E{f&M5X#C)_A?ywxskEt
zGDq=DNF2R|0NR`u%Tj5$iiC2JOOGXM5@N|0$C6_;lW@zpOTL{YI@GL;Se90O32MGH
zma3@%rCt_G)p4Pg+~u)k9hs6x#gd^~_L=rlmu&{?P*u94WBKvAVzZY(o9)Gg3%Dy{
z7-dk0e}FY+Al95>!ReS;Y`38&(Py(u${j_5le7LKtg`airS>S=l>^aAgu>fFNo%d6
zxU4vedDTEnRe6}SuO66FzM#bJw3n5kUr|#TmpL$-xXg7;U*Ia4Kf9D08_QHjyQ|1i
zhVI2!RR_^EF$DCobN0+RWHF#GOlP@kW7+l+$G5VxV%cS)V@7!%mmN!?Ava@2soh?}
zT^CEGzAJUjDaO!H`|bJ*<`vE^o@*~HgC!~B#>FsZ%$`%~nl-1W#N~7pIm)^5v8=K}
z(QcdLv~xMJG-6?TId{Xr6i0EP&0fgm#!^erv!(X(Ii;vAZ(wqnIJ>mmHDgXOGi%(0
zST5|OYfA3KDL1*mETl>HZelE(6|@(-<^uuh#!ZT433F#VY_7TXLiC^utiUR9lVjQX
zaMMPkqiBwkyD^qs=A1pxMTz)RG;so%aqgynkUfQ)63ZcZyNdE$a~*;Ux{)8tDV|-9
zE-4Wlr2=d;ck{p;l~EdM+%2&jlC9Q+86_kF^cN&B^@14D>}j#=8APEFU5QD?rA{E+
zt+8y3G?y@Q4tHBDNv+Otr`@F*1}+#k&y~%dQ9e(=*ds$|hlZ09Pq!DtDi&hm;5y=P
zg}L+dCQONrz0SBSSmv^_*@Z6XsjGZ8841iab|=?$0UWeD9%V-yiW4T8+liadY=*AH
z7Gc~B{jA|n`V=jcVkj0;&uG)LmQX^|i8eLICrz2I&BrWpzJQ5TorYO_df7aoM4NP3
z0%OBW&X4BksNP1Z8N0F#ZpZ*`#t=Om^>g3~8F9wkRA19-)t!-Og6^kSqbc!j3cMDV
zi<M!-twtAiW!b9*E*EE^i@&ZWcQa?az8T(3(v5H<=i(W91!4wnn9Ie6gwuif%*7@2
zTIdr5h9qO3_I?ZyY&2$cgk3tqp+PUukdysi=w}##`F(`pB7@O#xn-<nq#3*!Mi>wp
zMk(}<Jtkyw!-n08D87fyBj^|jZ!ev@HW@bzO(-{P*v-Rk8D>CgVisq#j7ouSMbpic
zZn+rgghWM?3<k$YN*#J7=NNgzFznV(QnSsDk+&r$K(62Y{?jCYmk6<3nv1^%!};MU
z_)Bk~(-n~a$bu<u>4)p9`r3~OaY+gKlF}#{3|C#XWI?Xy_9aVlr#Y{>D#3vIo&iz<
z_Y_t7f4~72byzOOuR*#0{|i2jqeW}ZQfhW=?T2OYlEwAotK5yvEyz<>$<(C(Nk3XB
z(>s9ZiB@a!5X%PEX}I^JHB#?9eLqMTp88;dFg&Bp*f2abC=9oB{!fy||Gu{5)Z(NX
z%_cqgCIXE&;Ajhnq}cly@SCB<44joSYC19i0g*fKl;9y8b+jzhP%w*dMi$0(b#5av
z86B3g8h@=Oy;Kf6b7mR9K`BEc@@`ZUw7)sHd{(K2sh$h*ld~8H|Jsk$ZUC7<zns<>
zA)5D$hTK6Ic<-VqhC>uo987(Kem_J!0}s3>;LzUaKq2XJrv1~XoEPJsLqkl`dfS_r
zH2y)mV(c&(|FgE!9=_Uk1P1+dex@K@<%bYF1DQt3FYs)rRa;{;;02GkpW4S9_i_{m
z{r)WqYJv9w)OL|>e7mK^C^v9N`9IRj|E#4{|D~W#eXI8Jz~0kaajS--_A=q98cXE~
zN7oj-kfPDCQP#J9RiJYsDlwA(z@M&BMCU?v5w<R$AQ%QYaFSC;9iMsA|5w}<0LhtD
z<$sfK#HtAEnZt+y=g#Gb5aK56ZbA`slWdLz_rhMX@nSgd-`Sbj-AQI=hMCz-Lfyd@
zM!kXvDT!2oSS*;5D+!poiqt77Dp(OujpwRC4h$GIN-RRvmKF3k1Lybp_3Qroe>0oC
z@qn(o&HUg0y1#y}U%&3Z=b!F=I2hT<A-w}ABtUuwQQZLP>%^r+Y=3_%%HVd#n+WEG
z2=9lu6@3!4bB4Wno8rw4dWj;Mfr8xMrOup-y!Rr?c^MVv(u>um(iSr)ncI{+AWUNC
z9e~-+)IY=akY4b1++l0rm6UoTi*NT`{1d%qji#hm$U|3JFS2%+BqA;3t5P2dU0k0=
zsa~I|`r2@re}p=4eKJk!LsGP<&YWwVI6j<@v)C~KcT9}J`z}D<#Sxnk%JnzM)&J6T
zn|j@UA2KN$+K5DYQ9o%K{cJS$x;JSr8;y^n3~p0uuP{lQjsWI1?ZPLjy-(}5?WU6<
z1}L%_y_!X1mf6<5kPJ*OrP4FW(vCIwORPRwuKoRhJeR*upRCLl%H2{1TwVM3?;n5+
zbD<ehX&uRI*|Mb{cuN_h*T5Fn%0~CFAg<5A{vp6E>tmzDuS16YFh_4X6%H4?CrZB<
zGTyRqzsR5*_6>YUCFvI#;N)3N`<Kyc+y3Ra-?Gjuvjrlzk=eOFb9<RB<e@FOtbKk5
zGHf67jZ!>ODA9{k&PZQHGqQb}M^R*t{u44Is>gY&(#$MO5^XYo7jM<jbE!m$qL1S<
z_c*d|n54%Y1xzI@?PwiEKZW~j4c@DPzTT_koH3&BLer|%v{@??^KvLOCo%*?uLjbO
ze~oWMjfnz&GM}qc?`8xaqSuib&?)@Pa{vhSZk7>WWp>iyT~Jt_X{ZDr!!!6y#Wky;
z_^K<pqe<)3{1k1eDM!zV#PVlxpDo{mPhk?vp90L5@4_eYNS|c9_!B^Ec{~J9W|Naj
zBfJL+&0|Vq?1NTFr|P=C?l-RA6lHM3=xziGWJ9dxuvPJXBnrkaMIAyyhafYAe?vPn
z7uoPU?xpH%&6B|$!__Q4+wsDcyuj@J8p^rdcyR$Tx3l5jLdMz<Z#GU<tN4D^`z|(i
zMP<*5?oDin?9oRdGmC${UW9TYjM5WS4*p$8=F7M_gQ=7E=j%X5kjwl0cY*XnagVHk
zyLC&+ZVt(HrndNN)EYm9Pb7&XE>}mV&F_W8=SKh;u8zZG?jVUj-vY{QkqPe8h4?eI
z7q><0NJ28)7I+$s`DNl-qA~7<rZX>Z?a##bX0palByIQrkn4fPMu3n~-i8OLWW*nj
zG=OC8lyW4JFgscGQ7D7W2@*-H+7FCdIdRi|6sum9`gF{aXpqFJtI=+3)vn+^U5Hi5
z@@!R-N%c4zk?<N9o*SsnP%xDwlH35!mdA8sl3sJoIZ4r-77M5YG>wq9clYBy>rS-_
zljuH!;f6gbyiZqBA0l$~X-w4eiTaS-`$-{FpG?#Gkj$qcGb>yK;B9N{nh+p=0fc_z
z=6l>VAg+cc*Z%;S4`hA{${oK;a%ua#7AE*PlUM$TZwvvroo_gH`f+V4iEs2f-=IDm
zCh?67WY{-ICVcu8J1=*3rZQe1G@9tu{fgVS`(pIEDwc1u6`R!O9#@}gf%ck8HGA|+
zs3F%U({jyWH)KXkogrgPlLc}%K&FAvz9hcgKLlhZKt4^m0^|!oG6-Kj*V90T0_0mj
zW&`BM(TTf%I+^RWK<337E@FE-lb<$^EsL?UE4kTIfPLDkI{(>cER_5s{xjtK=P+)k
zMi3iY$j4Aw^g)<6m84DkU7KR69*<Smcl%bwCH5IBH0H%VkWD8m5;+-XF-C};>JX+E
z(&H#_wv0&DVo#xF9F5VysU#L78M?c)BV0!!ap_Ieu%x70$=SFDo`C;6()$qHHb8pv
zxE~;W!yvMVT{~T_O74b0kgK<(N^Yo<>CA|*<W5!cT2*phm0VIKmwd_gNoqGt!Et^p
zd$52Esq|(tIT9vduqwTOiXu|!tyYHCoR&73nUnZlD}%`cWZsLv)CN9D>tsaJj_@gg
zBws9#qO!8KKE_YX`ZLUzN>wY<34CeC4*U&eq<@V%8~QJ?q$tsA#OWn>{J$@zUesRH
zO59!_!LwQO_QG&#)(E*Rd|l)d*+)jLr5zc-VSAArwJEhEx9J&zf+Y5#SjRqwFE~<9
zNdu+Q{q%Ul_Gvz*Xd6<j2-AyYLmA&Mq0ZF&OPf6b+3zMULx!x|G}_qy_3otZ_-$nE
zh>yLb!J{Cl8sAu0ca|ZpAH42!i_rb*B6L6Ibf+KWg?bZ0`p+yvca|aDsYOs|BE8t{
zPHlR-cE7O*-9PGdH$Pwuls5=;IKBwoS>}hM`!kEs{n<t6{<zbfSLZN)z^g@L&Ia#?
zfoB(?JIj#ny|5MvO{5pQ-LE*^Y2*!)%r2H8{NJv>e=eo_bV~V;LHDbR(4A#S_q$P<
zAFS@z7NL9RB6R<9O7|*ntm)eQ40P}O8PX;Ly+Rw))mXK-u5W#Bx0_=d5jt}Gs^l`r
zUjpf0ZObvp*MZQEgr;PJ%mbMZ5NwEqJv5UttALE$okU&>WT-2NYz5N)nk4cdkh5!&
z$Rv=NpHCu>0-@aieSJOvq;qW&`2>)D46$D32_W+p@!!?5#mEyLz#fXIZX)SkfCryc
zlBfQ~%&{r5!EoTZnkvPwc&v7wa1JtW2;|n;r;>h@!%ro%`1FoY#*U2tjypUn7|%B<
zS?47rjNd{NW_Bbb`{<QiKcA;v3sDs6d;u#0Zx6Zbsz?<ms@>G<7G)o+*Hsk4dYwdR
zWGSEA%mFfNL%3)vNhFzbHZ=3kKuTs!-*NUigyo>h<Y-`_DEc#a3w0IaKV*PZvbmzO
zR)+M){-ESz4w0D^mqYfUb8{h*NaADvZyVa@I9gF<`=Ar0lGx{pvky9BdR5K(&yPWd
z{bzC%_BoXJ!o!sMRj6_Gf!6l1xuTIhEW`Hs4^m#9Mol^212PxLycElL%bX0#F~8xz
zI-D%$)sR{4WW>%~AF}g1;6^k@_o+QQlmCQC{IC-YZ0G(^09RsXa%LXUx`Bpei66ew
z**QO1tf#GvvY=`IUaNZ(KP2+EK&C1(1Vr}(nG2A8K;|7H7UPo1V%?|*^*x_nh{doi
z+ih1EhMdL78etNPbuYqVbh<cuCY5m>dWES#*1+B&ts)yqzlUV-FL@<v{eB=$3lfPw
z3}jx)G00gUw4T7Z#D>g8HoSs+Sej2HZNnz>A9;(w*^qoDOcMELP+6+)(vEvW0bGe^
zk_>w$J%xrz>^uS)_DmYls8jkRo=M-X*$B|gF{8hSHHP-Fotw=!sKhIfnZdUV#6b0?
zqo<>2HbDLxNawHGa*WIp7^y!%RsuP0ktGrBB~rrXI~lQ<$#pkmX7I_k>FWszWHth+
z?zg^Sa%}@L7a$K%E)1&1e~ipKfSe7GG0OFj$W(jzm5TX5uPMk}hmlQtnR4C(r1N3P
zMbI%q;w186AR__t2_Um0NtsUrIi5`-e@rr?f{15w>yWo#qtYltgf59^&HynMTj2Xj
zXXlP*V9hXz*PVcx>~&{C0bGgK9fk~hUF*5c1<2q()VW7RJMqj>=b7V8W9AoOjSFH8
zRSH+{X_CpMEylTseT&K`7CVjt*kW8#@~@li{N(N9VLwd47VAtFVLpq+=$u`)SnGbe
z0p{}Y@Qtd4{t23P=2_EL{q!beBB`^f0gbL1$z>4of)R&^k8#Olv44hCYK*h<LvJyn
z2@R_)MlxX%9~*)x*kWXjFp0(Jy+Qnk`gGxMXbg#>R0#XnJz*iZ620d0TvM!LTP<dB
z*R*>ib?$T)llK^D1flx7)$iV$APSJ4TQER?^wGFt5xds?Y+LM?QAkj7?<0!+sA6BG
z*rP%_y3?F3WWS===~+0C={v62m$$`!Rq0L<Dd6fkrPwzs_RhB0uPgS`iv5gYA5!eA
z+G4+^*iR|;(~5nEV$Zb2PTx2OcJ9q9_L5@1fhmE_Wqp24TkQ00V90(>v7cA$d8K=I
zTkMw<dr7f36#H{Z_f2iFQ`8Q1Kd;y?D)zF{olXLP7)7lY5bIW|{(eib)0$pT!@fUN
z>^s_GU#-|zAnXTRJu4OaoMInpi~W|e{3WG3t#t?W>3g?g-`5uV8l`)e(tWMceO|GT
zw8g$wvC}Li(6pyVu|KESC)#4ap)7w!S^k`|{C>q=ZHxUG#eP(=A5-l2D)z%|vD0)W
zuygNa#ZD{jflS|HihZUn_7#f#hGM^|*gvV*A8U*Kin9DM#ePDuZ&2*V+hV8LaA4J5
zdXFkVdTuE8lZyRhTkKtmeYNUwU8=`jQ|z;Cv3D!>9>u;{u`l!OWykl&+hU*d<?wHX
zdK=2}k0{G8SGu>yzDnu7OzFNt>3&hMpKVKbdg2Ovtaqhir|$~_nZB<n_9xq7e^y!k
zqO$xYW%+5(Zda1~k&B;C^*b;V<*fOl+RqQi8WY&R06VdJF6%!RL<?}HlbW|QlaX~c
zd1`AW!#=iQ4G4@?&HFZ}N+Q{3y&hj@izMg0R`)y6UafSOC(R$CUOfZiEoQYRp%gxf
z7MsP#TFY$g5zp+vMhB^+^m;+F%2Uegy1XZF>-4NuURPE#>Zin8UJ(0P#XhLmhZXym
z6#HCT>}M4FfMOq1?B^8wGi|Xyq}Wf3w}@}_(Aplv{Q5>;=Sv)7`{~uT*e4YGdBuKF
zvEQfIueZfMtk_Q|_EU=en)DREYSb3{KE-}Yv7c7#&nfn2+hQ*%_KS-Bl42iGmXF5T
zd5S!$*l#NKTZ;V~ihX%o?8g-QGS%Z&s2=w+)#EzbVn43fS19(Civ1qNzN#(u6N-JM
zVqdM;H!Jo`TkIzl`)bABrPzlQ`<k}cA6M*~75ji<KdIQe+hQM5?8lVPpHMzOr~3P*
zw%BJC`&y-YkJ5cw>E7QK`(ujzmePHhVt-ck_Z@Aq4=VPfiv5_f{FBP^Lv692R_r~>
z@|%_J?^BlF*B1L>#ePNUeog5<t1Lg#7W)px{)l2fs@aw0C)#4KD)vi?{jy@GH`I}l
zW;=FnQ*DcVM6sVy?DUPO<>FaxUq-PXZj1d9#ePk(-%#vND)yPS*v~2UVde7=DWCtx
zJDfGF<sWN{y`k7IE8Xd>jnMMPl<vpdVxLj$Hx&C##r~9HKiL+0Ua_B3?B^AGk7u{f
zuo?8hR?o2V{O)_MJijM;w{5{$(E_cVPA~TJ`%2Mkf#-K$XL<5X)Y<C3ZUNmTCj1cf
z>d8w_Y5i>8`;hdn)-oHP6yN9w-;$$tk+&?iI^FStWT71VMD<6YyZOOV&`%fhJF*R%
z#S`Qib}>5(^*o|-HPU@&V~^NSO70m>%k&PyhC!V-4#>(0?NpPaooeVlK=W<^cCx|8
z?%zFGdj5Gq#(|u-Z3+UUIuL0=Mm`9He;=2z<$MYVCA!Ztp96B$_CZGe9LTAl<i7(V
zk(Oot6^J|+F!Eg>8CQ;+!Ne=u!hRRtH@f6X<};+QlURYC5Jl!5$jC^<CHDfMME@`{
zU=XneELMuMI1vf=Q3)$E1Q}WJ;9S23L{=dfnF2y@+1%lB9Rt#hScgj5a%O?Zsw3xm
z0tmfNLM_C|(?Dbecu6E@S@CxY8OX?qQ?r4l-#{*T2ZqbJ0fdro<z=*xhAMjGRY1Cf
za@Lr|woF21D-bA=KpqAX+NTOcBHI%3x>B5vqD{!fHjMF;_!#|r00>o!Yj_N~F1r>4
z9GwJmG(bKDMAq3j*Et|$XWu$s0`f?Z>nlLQ8h#VVu|Vb~kbacI^^p_7`U7h`51DI0
zt`#fL?l6aM<<|f?g{pB2${Az)ZV$B=rC)@MtQx^S^dsK;hYdU3XPMoQkvTsj4+D|s
zFGearB-$|Y8$c-e`g{n8%mG;DGeAN=oCDJ7`WNN@CY2NT#`8c<qX6%jcOsBq39Rud
zAQGdPYa<X@VPIq!$OYuWe^%2Nh^$_+Oc_W9_q`U60@(q?xAF&pTnXy)hd}ZHauG=M
z%47ui8jy=lhR=|LRfAUkHe@`PIq42N6;tv(<$F|efZT~6%bs^7)4gsW^2~@ENZaWL
zwUNXY`aBHeVqn7<$nu~q-buNFw)ia|2olDAT=K_(9CwJEg*O!Fb&kqG@;&YgK-L6Y
zUjZV&gXWU|4alvahVwwe@#1Cp!RW0(_ccJ|8^a|LpH+x<H}#Qr-w2rts1Na=7ua(F
zt3jOyATt-#a5oT{YjF)rKxB+#<h?+uL9P!08M5EPn21!QaWDgB?@=Fz%nZ!xJ@d0b
zo^^GunytJ1?v%{+dC06mIlf=~0}x8A7k&B`kT6F5FOdGAhA)S}QDpJuybj1}<i5j{
zC8rVY2<+1fnT*qmxCV&`$?Nqn5P5Hq>s$hI!g0yzg(E@9zX=&xrQuw^2jrZ~MI286
z30vojKpKI!Tn5q^^ug;u<jol_`8z=5`IM0r_N8{;<9-&%&4B$aK;+4eb3F*;p+Ke%
zqzi58tvUnbLeR<|0CF>^^T&Wt^Lh5q0=X2F{4|h>pari3p<d~8eGkaxAlFK~uN~I#
z9w73R4N;_D0J7QD$Bdrv)qdRJHjQcMv=NEqIoB@aTJ3TXUIlVGK;8{Rp6oc+ZvzQu
zXdeTz%IO96BF%r$KnagJ1DP2oLtGbtbOl_Ofb4TJC?`kdQ1YJnFOZ?Ky~UmbvLldL
z0q;h^37J;{;kQ*YR`=HcISU!miS^nFq$jA)Fp$Rs4}Ta)x2qwtMpYok1LP=>0ap&6
zEQ<DW<(SsVp&aD)dVK`BNDCin{{YA;{C@{fuHh57iUO{`0y5~ha5wrokP`v&Z6Fl=
zd^yW-SqfzC0&*ij?gcXA>P#iC2SRP?Ew&TLawj7vu1+|Fa_xbPym`f1WPwofEqFvB
z?*nq-CCO2E7Kpr8z~y`f$eEzdp9hjLaYHQj6p%I0-|PMjAo6Aim-8(k^QO*}OHPpO
zbO_b;`;ZCeKb?0mhu2~)5K0~y0CFy<;chF#u|>|ZeJrq82{Q5?{gQ~!s>PF(laVuI
z_c?@Ek0MtI3USGhF{jU-4P-tEnUTPMo&>TisNo!tP}Bbcl5yq8X}W71LhRp%%rVDK
z$SbfFP1q~%1tQ<b^RHt_E(*%&hs-QMYMCX`Zd|R)7e=SX<7_Qk9>+OW_Oe(WtH|f<
z=qS!DldDp(T#(OWHF|FYd)vf0b67A>n|I=n89ZQAafWo9Z8WmEi9#ONb`uIrtoP6!
zv{ThcBfNd*&MjMbskJNKziZ>$cJ16=o{raV*i|^Rr-2{2kMAA6Z~M?M=c0x0zAZbQ
zjd7etJen<(@>AvU7~9_#rwa!QM-EkL`FH@k{0?J-guRU-o_z2S=a0CyKccz~J^$9=
zc0$;*5a%rCa8h*KFvn0Ywo2=A)oR4Q?YD<6W7>P9Y@XBbyWJX0Dwni<DJ~l&oGs3`
z@;FgBUx=#}><NIQsWCc**Kw^tTL4lAF(n<s3FL(sPgoV~ol&JNg1aLe6>SeBuSYmC
znNAUiYdGf{HbZtgl9_68C|fsej~|t9>fS_^s>I`^%4inPmvp#5fSBV3BC0MQ5>9@B
z4X~!be#Df52CEz_l7rEP(21K1<J8VLHf0iff1pIG+jxB}TP)$Q@93?2Vte5CZrG)k
zC%~QF-2@t9vr*l-0rqU)!KRY!`rIATB`(-a{ERUs3bg`^(f7uUQDJf_=50*q6aO?f
z9xqQ>hrrR{>GH4%9N9RAld}1wF>Fofey$$L?U;W5hPuQ!JdmqO0@-}t6(AMmjJB7i
z<ZEd5>4M4<4-f94r<Tzyj{Z(=din-p#Sf)poMuknQWSPhX2%O#an@lJ--iS7hPGS3
zNnLI|vWwz{7!}8%Te<rxH92iw-{iC9!-BUTE`S~d3~f(v@2u~tl*yB+pY1Gfo2u2|
z5Jtd}7RpnTadFZ(KQ<Dg1LhGICK36B8Id67L$Gb*M8OqpCi<p6iGYiXld0g!VH45M
z95rv8&9U2^EZnthZ2`dU^bqH!smbNa9IWmy579LaTqJ#xA}Oda3AaV%<4O(cmlMKt
zzM;>0IJ`93YT0}dXQ)#jNl2Pod}@);ZoonsO<#|vfx{(x+EJn;k>L($RRh2M1%8~X
z(z2WR4Zmqi{<%8ACIsTN_jqy?yPr1->o)YP@7oyR%KW0e-c(@Yrl_9G@TMMc)uv-}
zK7Bl}VGAzHscZT{s@YK?j^8;|L9eoMTxIP47FVVkXrGw3?7+ZT88x9|eP2|{)*JD3
zwlwAY2RUMk3>((V$dD`$U6SZ|oz;BWwugH>U!Z58!?Da%83FvDmydHeth9_lIgYn_
z9jh1-Vr-z_KwXQ|upJE%Btoi+c2lJWMI5$Cal>c=w;!vOL%ov_GnduwUTT4jy(p(t
zpD2zo9LKrIs+G?d$Hwf((G5~^-jz&~FA=RJOK8*(@ZV)}+CCeXau^%(g(?D6OvhkJ
zXHMRT&@?ohl`xMH*$E1ICb&C@v(quLG+S_@6bR#Z_ugGNp%AB_?b*I};O#ioZV-o=
z+4Hh+&=*wWg)Qh@97V9k--Cr(xlqDMa#=Kz35<KoI4d?E?>R7dAl_TXV2(ITqjyZB
zVQjYU$1^6_lBaQT>D=f$>jPW2?HMd&^IMNJ3fm7umZ*0(O21OXlq*|ehG<WrvA4{F
zR^APS_Z3UbMp-EES4cCu7_4OTgB&a$BzjsZ_O<a57y)?@e!SgGDsbUvR9osO-AuQv
z<C1Ah4Q&5kq27=qug7$xS~n95Te@Y3`lyRJ#=#-uhY^9W8F>Z$n&uAm1KswXYfD@w
z8Xs3EC8p4r%|T6AwwS9MYtosqab=7&${nPc1jR-&bFnhYK7)BkAVZru)-Ym{&}8-i
zVrYG86bAt}&|9WaD;n5MJJANeSZMdQB5MxdT;N7w8+v0AR(3<Bu{1x;+9tKDZ;@@g
z2c`<OBVde8sl`;Oadxskj){et35p0WO4#Bs*DF^d-*}`Ussmpxl&47(<Jy%{9@ACK
zR%K4ZQfN&(o(@mc;9om2iE_{oruv0?9oTTG4jA(S#IfN*4Mieo*xM0ykk97H^XrX#
z4tn%alYkg+WT%w5AHkwXE<9X$u$V7wqZ5RYp>-#tlXK$;em;o#<5cxN^z;T=!3?m-
zDb0rpz_k-C4E<4G@3gEeMK^m^R*b40C>@B`8~3sOR6132GMKY&Vvub&sNcXQuh#Li
z)oN@`D3*q-rgTT|oo?YB2ns$x>@L)&Xf_pME@V*CLbc&y?x3APS;wi`r7F|laNSBh
z@L8L$Y1f503$<pBOVM={^FQu3U^Y+HXpU{!Y6CNHJNu@VfF-DVpxcg@X})f<@RJ#t
zn07A21U`$N4QY1C@kF#`|DCGik#d0uwsXs{(~=ajUmY#vL8ik)6qUwYR2*p7JhHJ@
zVAzqzB@>UOb0yDCbS|C_@#IcPx3?i5Ep&e+KUFI1$d>b^0?jI@H%QTqVi}#lx>MMi
z(wCUX4tH7Px3-+l<w^)K-j*B_@Gxo?DqE}Bypbv7V{9tWkYX83RGTvH+o1R@1U}kv
z&^8A_;lA}O8%BK0;5#~6NCuMhj|ag~m7EoRG8*F{60sQ73;P525mS_1t#=hk8$K9+
z5btf3P1qeO)Xb!<oP#gp8Q6@<q>zNC;fjk{HeaeDLC1tE(RM~??Bcj<U#^(_b`qy~
zV!%vw6C&K{9-h-3vGpAo$c$1=x_Xlt19cv0!_>%66<DC#(e2w$Eo21{{v0-Ka#jQX
z45uuu4b9(VwFsL*<WG*<?5z!_DMFJQ!x0OTqbXt*uTbzJ1Pvg5v4M0>j(UFn0sTT>
zkDQAH!y1*48Y<A4sKZGZ;C_UwXklkeO%$kLGyjLXPKNU?S~-$=mk~=&b_n44Fpj>Q
zjuIa+iLxtDJT;cp0nfrt4F4`;Iu8eD$1BnTK`_jeFr_TiaAa+EoM&MR%;<Qnl}naI
za0)jQ2kVW4cvc5ZDkP!G2W>aB?_&7IaPyaN#!1#S15V4?90nuY)2bNz+2<)2|7qDT
zIdw>xA5((R{>iA7nEEd?S8O)C-fo7Z=hEIVHX_3c(l^BaFm{E*j2*qqaGvZM(f<Jp
CHFaA6

diff --git a/core-java-10/README.md b/core-java-modules/core-java-10/README.md
similarity index 100%
rename from core-java-10/README.md
rename to core-java-modules/core-java-10/README.md
diff --git a/core-java-10/pom.xml b/core-java-modules/core-java-10/pom.xml
similarity index 96%
rename from core-java-10/pom.xml
rename to core-java-modules/core-java-10/pom.xml
index b15f8b5d63..7163619679 100644
--- a/core-java-10/pom.xml
+++ b/core-java-modules/core-java-10/pom.xml
@@ -12,6 +12,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
     </parent>
 
     <build>
diff --git a/core-java-10/src/main/java/com/baeldung/App.java b/core-java-modules/core-java-10/src/main/java/com/baeldung/App.java
similarity index 100%
rename from core-java-10/src/main/java/com/baeldung/App.java
rename to core-java-modules/core-java-10/src/main/java/com/baeldung/App.java
diff --git a/core-java-10/src/main/java/com/baeldung/graal/CountUppercase.java b/core-java-modules/core-java-10/src/main/java/com/baeldung/graal/CountUppercase.java
similarity index 100%
rename from core-java-10/src/main/java/com/baeldung/graal/CountUppercase.java
rename to core-java-modules/core-java-10/src/main/java/com/baeldung/graal/CountUppercase.java
diff --git a/core-java-10/src/main/resources/logback.xml b/core-java-modules/core-java-10/src/main/resources/logback.xml
similarity index 100%
rename from core-java-10/src/main/resources/logback.xml
rename to core-java-modules/core-java-10/src/main/resources/logback.xml
diff --git a/core-java-10/src/test/java/com/baeldung/AppTest.java b/core-java-modules/core-java-10/src/test/java/com/baeldung/AppTest.java
similarity index 100%
rename from core-java-10/src/test/java/com/baeldung/AppTest.java
rename to core-java-modules/core-java-10/src/test/java/com/baeldung/AppTest.java
diff --git a/core-java-10/src/test/java/com/baeldung/java10/Java10FeaturesUnitTest.java b/core-java-modules/core-java-10/src/test/java/com/baeldung/java10/Java10FeaturesUnitTest.java
similarity index 100%
rename from core-java-10/src/test/java/com/baeldung/java10/Java10FeaturesUnitTest.java
rename to core-java-modules/core-java-10/src/test/java/com/baeldung/java10/Java10FeaturesUnitTest.java
diff --git a/core-java-10/src/test/java/com/baeldung/java10/list/CopyListServiceUnitTest.java b/core-java-modules/core-java-10/src/test/java/com/baeldung/java10/list/CopyListServiceUnitTest.java
similarity index 100%
rename from core-java-10/src/test/java/com/baeldung/java10/list/CopyListServiceUnitTest.java
rename to core-java-modules/core-java-10/src/test/java/com/baeldung/java10/list/CopyListServiceUnitTest.java
diff --git a/core-java-11/README.md b/core-java-modules/core-java-11/README.md
similarity index 100%
rename from core-java-11/README.md
rename to core-java-modules/core-java-11/README.md
diff --git a/core-java-11/pom.xml b/core-java-modules/core-java-11/pom.xml
similarity index 97%
rename from core-java-11/pom.xml
rename to core-java-modules/core-java-11/pom.xml
index 933acdbecc..b78c141552 100644
--- a/core-java-11/pom.xml
+++ b/core-java-modules/core-java-11/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/core-java-11/src/main/java/com/baeldung/App.java b/core-java-modules/core-java-11/src/main/java/com/baeldung/App.java
similarity index 100%
rename from core-java-11/src/main/java/com/baeldung/App.java
rename to core-java-modules/core-java-11/src/main/java/com/baeldung/App.java
diff --git a/core-java-11/src/main/java/com/baeldung/Outer.java b/core-java-modules/core-java-11/src/main/java/com/baeldung/Outer.java
similarity index 100%
rename from core-java-11/src/main/java/com/baeldung/Outer.java
rename to core-java-modules/core-java-11/src/main/java/com/baeldung/Outer.java
diff --git a/core-java-11/src/main/java/com/baeldung/add b/core-java-modules/core-java-11/src/main/java/com/baeldung/add
old mode 100755
new mode 100644
similarity index 100%
rename from core-java-11/src/main/java/com/baeldung/add
rename to core-java-modules/core-java-11/src/main/java/com/baeldung/add
diff --git a/core-java-11/src/main/java/com/baeldung/epsilongc/MemoryPolluter.java b/core-java-modules/core-java-11/src/main/java/com/baeldung/epsilongc/MemoryPolluter.java
similarity index 100%
rename from core-java-11/src/main/java/com/baeldung/epsilongc/MemoryPolluter.java
rename to core-java-modules/core-java-11/src/main/java/com/baeldung/epsilongc/MemoryPolluter.java
diff --git a/core-java-11/src/main/java/com/baeldung/java11/httpclient/HttpClientExample.java b/core-java-modules/core-java-11/src/main/java/com/baeldung/java11/httpclient/HttpClientExample.java
similarity index 97%
rename from core-java-11/src/main/java/com/baeldung/java11/httpclient/HttpClientExample.java
rename to core-java-modules/core-java-11/src/main/java/com/baeldung/java11/httpclient/HttpClientExample.java
index fb4abd3bb6..725f969596 100644
--- a/core-java-11/src/main/java/com/baeldung/java11/httpclient/HttpClientExample.java
+++ b/core-java-modules/core-java-11/src/main/java/com/baeldung/java11/httpclient/HttpClientExample.java
@@ -1,132 +1,132 @@
-/*
- * 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.java11.httpclient;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpClient.Version;
-import java.net.http.HttpRequest;
-import java.net.http.HttpRequest.BodyPublishers;
-import java.net.http.HttpResponse;
-import java.net.http.HttpResponse.BodyHandlers;
-import java.net.http.HttpResponse.PushPromiseHandler;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-public class HttpClientExample {
-
-    public static void main(String[] args) throws Exception {
-        httpGetRequest();
-        httpPostRequest();
-        asynchronousGetRequest();
-        asynchronousMultipleRequests();
-        pushRequest();
-    }
-
-    public static void httpGetRequest() throws URISyntaxException, IOException, InterruptedException {
-        HttpClient client = HttpClient.newHttpClient();
-        HttpRequest request = HttpRequest.newBuilder()
-            .version(HttpClient.Version.HTTP_2)
-            .uri(URI.create("http://jsonplaceholder.typicode.com/posts/1"))
-            .headers("Accept-Enconding", "gzip, deflate")
-            .build();
-        HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
-
-        String responseBody = response.body();
-        int responseStatusCode = response.statusCode();
-
-        System.out.println("httpGetRequest: " + responseBody);
-        System.out.println("httpGetRequest status code: " + responseStatusCode);
-    }
-
-    public static void httpPostRequest() throws URISyntaxException, IOException, InterruptedException {
-        HttpClient client = HttpClient.newBuilder()
-            .version(HttpClient.Version.HTTP_2)
-            .build();
-        HttpRequest request = HttpRequest.newBuilder(new URI("http://jsonplaceholder.typicode.com/posts"))
-            .version(HttpClient.Version.HTTP_2)
-            .POST(BodyPublishers.ofString("Sample Post Request"))
-            .build();
-        HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
-        String responseBody = response.body();
-        System.out.println("httpPostRequest : " + responseBody);
-    }
-
-    public static void asynchronousGetRequest() throws URISyntaxException {
-        HttpClient client = HttpClient.newHttpClient();
-        URI httpURI = new URI("http://jsonplaceholder.typicode.com/posts/1");
-        HttpRequest request = HttpRequest.newBuilder(httpURI)
-            .version(HttpClient.Version.HTTP_2)
-            .build();
-        CompletableFuture<Void> futureResponse = client.sendAsync(request, HttpResponse.BodyHandlers.ofString())
-            .thenAccept(resp -> {
-                System.out.println("Got pushed response " + resp.uri());
-                System.out.println("Response statuscode: " + resp.statusCode());
-                System.out.println("Response body: " + resp.body());
-            });
-        System.out.println("futureResponse" + futureResponse);
-
-    }
-
-    public static void asynchronousMultipleRequests() throws URISyntaxException {
-        HttpClient client = HttpClient.newHttpClient();
-        List<URI> uris = Arrays.asList(new URI("http://jsonplaceholder.typicode.com/posts/1"), new URI("http://jsonplaceholder.typicode.com/posts/2"));
-        List<HttpRequest> requests = uris.stream()
-            .map(HttpRequest::newBuilder)
-            .map(reqBuilder -> reqBuilder.build())
-            .collect(Collectors.toList());
-        System.out.println("Got pushed response1 " + requests);
-        CompletableFuture.allOf(requests.stream()
-            .map(request -> client.sendAsync(request, BodyHandlers.ofString()))
-            .toArray(CompletableFuture<?>[]::new))
-            .thenAccept(System.out::println)
-            .join();
-    }
-
-    public static void pushRequest() throws URISyntaxException, InterruptedException {
-        System.out.println("Running HTTP/2 Server Push example...");
-
-        HttpClient httpClient = HttpClient.newBuilder()
-            .version(Version.HTTP_2)
-            .build();
-
-        HttpRequest pageRequest = HttpRequest.newBuilder()
-            .uri(URI.create("https://http2.golang.org/serverpush"))
-            .build();
-
-        // Interface HttpResponse.PushPromiseHandler<T>
-        // void applyPushPromise​(HttpRequest initiatingRequest, HttpRequest pushPromiseRequest, Function<HttpResponse.BodyHandler<T>,​CompletableFuture<HttpResponse<T>>> acceptor)
-        httpClient.sendAsync(pageRequest, BodyHandlers.ofString(), pushPromiseHandler())
-            .thenAccept(pageResponse -> {
-                System.out.println("Page response status code: " + pageResponse.statusCode());
-                System.out.println("Page response headers: " + pageResponse.headers());
-                String responseBody = pageResponse.body();
-                System.out.println(responseBody);
-            }).join();
-
-        Thread.sleep(1000); // waiting for full response
-    }
-
-    private static PushPromiseHandler<String> pushPromiseHandler() {
-        return (HttpRequest initiatingRequest, 
-            HttpRequest pushPromiseRequest, 
-            Function<HttpResponse.BodyHandler<String>, 
-            CompletableFuture<HttpResponse<String>>> acceptor) -> {
-            acceptor.apply(BodyHandlers.ofString())
-                .thenAccept(resp -> {
-                    System.out.println(" Pushed response: " + resp.uri() + ", headers: " + resp.headers());
-                });
-            System.out.println("Promise request: " + pushPromiseRequest.uri());
-            System.out.println("Promise request: " + pushPromiseRequest.headers());
-        };
-    }
-
-}
+/*
+ * 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.java11.httpclient;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class HttpClientExample {
+
+    public static void main(String[] args) throws Exception {
+        httpGetRequest();
+        httpPostRequest();
+        asynchronousGetRequest();
+        asynchronousMultipleRequests();
+        pushRequest();
+    }
+
+    public static void httpGetRequest() throws URISyntaxException, IOException, InterruptedException {
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder()
+            .version(HttpClient.Version.HTTP_2)
+            .uri(URI.create("http://jsonplaceholder.typicode.com/posts/1"))
+            .headers("Accept-Enconding", "gzip, deflate")
+            .build();
+        HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+
+        String responseBody = response.body();
+        int responseStatusCode = response.statusCode();
+
+        System.out.println("httpGetRequest: " + responseBody);
+        System.out.println("httpGetRequest status code: " + responseStatusCode);
+    }
+
+    public static void httpPostRequest() throws URISyntaxException, IOException, InterruptedException {
+        HttpClient client = HttpClient.newBuilder()
+            .version(HttpClient.Version.HTTP_2)
+            .build();
+        HttpRequest request = HttpRequest.newBuilder(new URI("http://jsonplaceholder.typicode.com/posts"))
+            .version(HttpClient.Version.HTTP_2)
+            .POST(BodyPublishers.ofString("Sample Post Request"))
+            .build();
+        HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+        String responseBody = response.body();
+        System.out.println("httpPostRequest : " + responseBody);
+    }
+
+    public static void asynchronousGetRequest() throws URISyntaxException {
+        HttpClient client = HttpClient.newHttpClient();
+        URI httpURI = new URI("http://jsonplaceholder.typicode.com/posts/1");
+        HttpRequest request = HttpRequest.newBuilder(httpURI)
+            .version(HttpClient.Version.HTTP_2)
+            .build();
+        CompletableFuture<Void> futureResponse = client.sendAsync(request, HttpResponse.BodyHandlers.ofString())
+            .thenAccept(resp -> {
+                System.out.println("Got pushed response " + resp.uri());
+                System.out.println("Response statuscode: " + resp.statusCode());
+                System.out.println("Response body: " + resp.body());
+            });
+        System.out.println("futureResponse" + futureResponse);
+
+    }
+
+    public static void asynchronousMultipleRequests() throws URISyntaxException {
+        HttpClient client = HttpClient.newHttpClient();
+        List<URI> uris = Arrays.asList(new URI("http://jsonplaceholder.typicode.com/posts/1"), new URI("http://jsonplaceholder.typicode.com/posts/2"));
+        List<HttpRequest> requests = uris.stream()
+            .map(HttpRequest::newBuilder)
+            .map(reqBuilder -> reqBuilder.build())
+            .collect(Collectors.toList());
+        System.out.println("Got pushed response1 " + requests);
+        CompletableFuture.allOf(requests.stream()
+            .map(request -> client.sendAsync(request, BodyHandlers.ofString()))
+            .toArray(CompletableFuture<?>[]::new))
+            .thenAccept(System.out::println)
+            .join();
+    }
+
+    public static void pushRequest() throws URISyntaxException, InterruptedException {
+        System.out.println("Running HTTP/2 Server Push example...");
+
+        HttpClient httpClient = HttpClient.newBuilder()
+            .version(Version.HTTP_2)
+            .build();
+
+        HttpRequest pageRequest = HttpRequest.newBuilder()
+            .uri(URI.create("https://http2.golang.org/serverpush"))
+            .build();
+
+        // Interface HttpResponse.PushPromiseHandler<T>
+        // void applyPushPromise​(HttpRequest initiatingRequest, HttpRequest pushPromiseRequest, Function<HttpResponse.BodyHandler<T>,​CompletableFuture<HttpResponse<T>>> acceptor)
+        httpClient.sendAsync(pageRequest, BodyHandlers.ofString(), pushPromiseHandler())
+            .thenAccept(pageResponse -> {
+                System.out.println("Page response status code: " + pageResponse.statusCode());
+                System.out.println("Page response headers: " + pageResponse.headers());
+                String responseBody = pageResponse.body();
+                System.out.println(responseBody);
+            }).join();
+
+        Thread.sleep(1000); // waiting for full response
+    }
+
+    private static PushPromiseHandler<String> pushPromiseHandler() {
+        return (HttpRequest initiatingRequest, 
+            HttpRequest pushPromiseRequest, 
+            Function<HttpResponse.BodyHandler<String>, 
+            CompletableFuture<HttpResponse<String>>> acceptor) -> {
+            acceptor.apply(BodyHandlers.ofString())
+                .thenAccept(resp -> {
+                    System.out.println(" Pushed response: " + resp.uri() + ", headers: " + resp.headers());
+                });
+            System.out.println("Promise request: " + pushPromiseRequest.uri());
+            System.out.println("Promise request: " + pushPromiseRequest.headers());
+        };
+    }
+
+}
diff --git a/core-java-11/src/main/resources/logback.xml b/core-java-modules/core-java-11/src/main/resources/logback.xml
similarity index 100%
rename from core-java-11/src/main/resources/logback.xml
rename to core-java-modules/core-java-11/src/main/resources/logback.xml
diff --git a/core-java-11/src/modules/jlinkModule/com/baeldung/jlink/HelloWorld.java b/core-java-modules/core-java-11/src/modules/jlinkModule/com/baeldung/jlink/HelloWorld.java
similarity index 100%
rename from core-java-11/src/modules/jlinkModule/com/baeldung/jlink/HelloWorld.java
rename to core-java-modules/core-java-11/src/modules/jlinkModule/com/baeldung/jlink/HelloWorld.java
diff --git a/core-java-11/src/modules/jlinkModule/module-info.java b/core-java-modules/core-java-11/src/modules/jlinkModule/module-info.java
similarity index 100%
rename from core-java-11/src/modules/jlinkModule/module-info.java
rename to core-java-modules/core-java-11/src/modules/jlinkModule/module-info.java
diff --git a/core-java-11/src/test/java/com/baeldung/AppTest.java b/core-java-modules/core-java-11/src/test/java/com/baeldung/AppTest.java
similarity index 100%
rename from core-java-11/src/test/java/com/baeldung/AppTest.java
rename to core-java-modules/core-java-11/src/test/java/com/baeldung/AppTest.java
diff --git a/core-java-11/src/test/java/com/baeldung/EmptyStringToEmptyOptionalUnitTest.java b/core-java-modules/core-java-11/src/test/java/com/baeldung/EmptyStringToEmptyOptionalUnitTest.java
similarity index 100%
rename from core-java-11/src/test/java/com/baeldung/EmptyStringToEmptyOptionalUnitTest.java
rename to core-java-modules/core-java-11/src/test/java/com/baeldung/EmptyStringToEmptyOptionalUnitTest.java
diff --git a/core-java-11/src/test/java/com/baeldung/NewStringAPIUnitTest.java b/core-java-modules/core-java-11/src/test/java/com/baeldung/NewStringAPIUnitTest.java
similarity index 100%
rename from core-java-11/src/test/java/com/baeldung/NewStringAPIUnitTest.java
rename to core-java-modules/core-java-11/src/test/java/com/baeldung/NewStringAPIUnitTest.java
diff --git a/core-java-11/src/test/java/com/baeldung/OuterUnitTest.java b/core-java-modules/core-java-11/src/test/java/com/baeldung/OuterUnitTest.java
similarity index 100%
rename from core-java-11/src/test/java/com/baeldung/OuterUnitTest.java
rename to core-java-modules/core-java-11/src/test/java/com/baeldung/OuterUnitTest.java
diff --git a/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpClientTest.java b/core-java-modules/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpClientTest.java
similarity index 97%
rename from core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpClientTest.java
rename to core-java-modules/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpClientTest.java
index bade666636..0e9c12675c 100644
--- a/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpClientTest.java
+++ b/core-java-modules/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpClientTest.java
@@ -1,240 +1,240 @@
-package com.baeldung.java11.httpclient.test;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.net.Authenticator;
-import java.net.CookieManager;
-import java.net.CookiePolicy;
-import java.net.HttpURLConnection;
-import java.net.PasswordAuthentication;
-import java.net.ProxySelector;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.net.http.HttpResponse.BodyHandlers;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import org.junit.jupiter.api.Test;
-
-public class HttpClientTest {
-
-    @Test
-    public void shouldReturnSampleDataContentWhenConnectViaSystemProxy() throws IOException, InterruptedException, URISyntaxException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/post"))
-            .headers("Content-Type", "text/plain;charset=UTF-8")
-            .POST(HttpRequest.BodyPublishers.ofString("Sample body"))
-            .build();
-      
-        
-        HttpResponse<String> response = HttpClient.newBuilder()
-            .proxy(ProxySelector.getDefault())
-            .build()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-        
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-        assertThat(response.body(), containsString("Sample body"));
-    }
-
-    @Test
-    public void shouldNotFollowRedirectWhenSetToDefaultNever() throws IOException, InterruptedException, URISyntaxException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("http://stackoverflow.com"))
-            .version(HttpClient.Version.HTTP_1_1)
-            .GET()
-            .build();
-        HttpResponse<String> response = HttpClient.newBuilder()
-            .build()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_MOVED_PERM));
-        assertThat(response.body(), containsString("https://stackoverflow.com/"));
-    }
-
-    @Test
-    public void shouldFollowRedirectWhenSetToAlways() throws IOException, InterruptedException, URISyntaxException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("http://stackoverflow.com"))
-            .version(HttpClient.Version.HTTP_1_1)
-            .GET()
-            .build();
-        HttpResponse<String> response = HttpClient.newBuilder()
-            .followRedirects(HttpClient.Redirect.ALWAYS)
-            .build()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-        assertThat(response.request()
-            .uri()
-            .toString(), equalTo("https://stackoverflow.com/"));
-    }
-
-    @Test
-    public void shouldReturnOKStatusForAuthenticatedAccess() throws URISyntaxException, IOException, InterruptedException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/basic-auth"))
-            .GET()
-            .build();
-        HttpResponse<String> response = HttpClient.newBuilder()
-            .authenticator(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication("postman", "password".toCharArray());
-                }
-            })
-            .build()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-    }
-
-    @Test
-    public void shouldSendRequestAsync() throws URISyntaxException, InterruptedException, ExecutionException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/post"))
-            .headers("Content-Type", "text/plain;charset=UTF-8")
-            .POST(HttpRequest.BodyPublishers.ofString("Sample body"))
-            .build();
-        CompletableFuture<HttpResponse<String>> response = HttpClient.newBuilder()
-            .build()
-            .sendAsync(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.get()
-            .statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-    }
-
-    @Test
-    public void shouldUseJustTwoThreadWhenProcessingSendAsyncRequest() throws URISyntaxException, InterruptedException, ExecutionException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/get"))
-            .GET()
-            .build();
-
-        ExecutorService executorService = Executors.newFixedThreadPool(2);
-
-        CompletableFuture<HttpResponse<String>> response1 = HttpClient.newBuilder()
-            .executor(executorService)
-            .build()
-            .sendAsync(request, HttpResponse.BodyHandlers.ofString());
-
-        CompletableFuture<HttpResponse<String>> response2 = HttpClient.newBuilder()
-            .executor(executorService)
-            .build()
-            .sendAsync(request, HttpResponse.BodyHandlers.ofString());
-
-        CompletableFuture<HttpResponse<String>> response3 = HttpClient.newBuilder()
-            .executor(executorService)
-            .build()
-            .sendAsync(request, HttpResponse.BodyHandlers.ofString());
-
-        CompletableFuture.allOf(response1, response2, response3)
-            .join();
-
-        assertThat(response1.get()
-            .statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-        assertThat(response2.get()
-            .statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-        assertThat(response3.get()
-            .statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-    }
-
-    @Test
-    public void shouldNotStoreCookieWhenPolicyAcceptNone() throws URISyntaxException, IOException, InterruptedException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/get"))
-            .GET()
-            .build();
-
-        HttpClient httpClient = HttpClient.newBuilder()
-            .cookieHandler(new CookieManager(null, CookiePolicy.ACCEPT_NONE))
-            .build();
-
-        httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertTrue(httpClient.cookieHandler()
-            .isPresent());
-    }
-
-    @Test
-    public void shouldStoreCookieWhenPolicyAcceptAll() throws URISyntaxException, IOException, InterruptedException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/get"))
-            .GET()
-            .build();
-
-        HttpClient httpClient = HttpClient.newBuilder()
-            .cookieHandler(new CookieManager(null, CookiePolicy.ACCEPT_ALL))
-            .build();
-
-        httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertTrue(httpClient.cookieHandler()
-            .isPresent());
-    }
-
-    @Test
-    public void shouldProcessMultipleRequestViaStream() throws URISyntaxException, ExecutionException, InterruptedException {
-        List<URI> targets = Arrays.asList(new URI("https://postman-echo.com/get?foo1=bar1"), new URI("https://postman-echo.com/get?foo2=bar2"));
-
-        HttpClient client = HttpClient.newHttpClient();
-
-        List<CompletableFuture<String>> futures = targets.stream()
-            .map(target -> client.sendAsync(HttpRequest.newBuilder(target)
-                .GET()
-                .build(), HttpResponse.BodyHandlers.ofString())
-                .thenApply(response -> response.body()))
-            .collect(Collectors.toList());
-
-        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
-            .join();
-
-        if (futures.get(0)
-            .get()
-            .contains("foo1")) {
-            assertThat(futures.get(0)
-                .get(), containsString("bar1"));
-            assertThat(futures.get(1)
-                .get(), containsString("bar2"));
-        } else {
-            assertThat(futures.get(1)
-                .get(), containsString("bar2"));
-            assertThat(futures.get(1)
-                .get(), containsString("bar1"));
-        }
-
-    }
-    
-    @Test
-    public void completeExceptionallyExample() {
-        CompletableFuture<String> cf = CompletableFuture.completedFuture("message").thenApplyAsync(String::toUpperCase,
-                CompletableFuture.delayedExecutor(1, TimeUnit.SECONDS));
-        CompletableFuture<String> exceptionHandler = cf.handle((s, th) -> { return (th != null) ? "message upon cancel" : ""; });
-        cf.completeExceptionally(new RuntimeException("completed exceptionally"));
-        assertTrue("Was not completed exceptionally", cf.isCompletedExceptionally());
-        try {
-            cf.join();
-            fail("Should have thrown an exception");
-        } catch (CompletionException ex) { // just for testing
-            assertEquals("completed exceptionally", ex.getCause().getMessage());
-        }
-
-        assertEquals("message upon cancel", exceptionHandler.join());
-    }
-
-}
+package com.baeldung.java11.httpclient.test;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.net.Authenticator;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
+import java.net.HttpURLConnection;
+import java.net.PasswordAuthentication;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Test;
+
+public class HttpClientTest {
+
+    @Test
+    public void shouldReturnSampleDataContentWhenConnectViaSystemProxy() throws IOException, InterruptedException, URISyntaxException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/post"))
+            .headers("Content-Type", "text/plain;charset=UTF-8")
+            .POST(HttpRequest.BodyPublishers.ofString("Sample body"))
+            .build();
+      
+        
+        HttpResponse<String> response = HttpClient.newBuilder()
+            .proxy(ProxySelector.getDefault())
+            .build()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+        
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+        assertThat(response.body(), containsString("Sample body"));
+    }
+
+    @Test
+    public void shouldNotFollowRedirectWhenSetToDefaultNever() throws IOException, InterruptedException, URISyntaxException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("http://stackoverflow.com"))
+            .version(HttpClient.Version.HTTP_1_1)
+            .GET()
+            .build();
+        HttpResponse<String> response = HttpClient.newBuilder()
+            .build()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_MOVED_PERM));
+        assertThat(response.body(), containsString("https://stackoverflow.com/"));
+    }
+
+    @Test
+    public void shouldFollowRedirectWhenSetToAlways() throws IOException, InterruptedException, URISyntaxException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("http://stackoverflow.com"))
+            .version(HttpClient.Version.HTTP_1_1)
+            .GET()
+            .build();
+        HttpResponse<String> response = HttpClient.newBuilder()
+            .followRedirects(HttpClient.Redirect.ALWAYS)
+            .build()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+        assertThat(response.request()
+            .uri()
+            .toString(), equalTo("https://stackoverflow.com/"));
+    }
+
+    @Test
+    public void shouldReturnOKStatusForAuthenticatedAccess() throws URISyntaxException, IOException, InterruptedException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/basic-auth"))
+            .GET()
+            .build();
+        HttpResponse<String> response = HttpClient.newBuilder()
+            .authenticator(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication("postman", "password".toCharArray());
+                }
+            })
+            .build()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+    }
+
+    @Test
+    public void shouldSendRequestAsync() throws URISyntaxException, InterruptedException, ExecutionException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/post"))
+            .headers("Content-Type", "text/plain;charset=UTF-8")
+            .POST(HttpRequest.BodyPublishers.ofString("Sample body"))
+            .build();
+        CompletableFuture<HttpResponse<String>> response = HttpClient.newBuilder()
+            .build()
+            .sendAsync(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.get()
+            .statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+    }
+
+    @Test
+    public void shouldUseJustTwoThreadWhenProcessingSendAsyncRequest() throws URISyntaxException, InterruptedException, ExecutionException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/get"))
+            .GET()
+            .build();
+
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+
+        CompletableFuture<HttpResponse<String>> response1 = HttpClient.newBuilder()
+            .executor(executorService)
+            .build()
+            .sendAsync(request, HttpResponse.BodyHandlers.ofString());
+
+        CompletableFuture<HttpResponse<String>> response2 = HttpClient.newBuilder()
+            .executor(executorService)
+            .build()
+            .sendAsync(request, HttpResponse.BodyHandlers.ofString());
+
+        CompletableFuture<HttpResponse<String>> response3 = HttpClient.newBuilder()
+            .executor(executorService)
+            .build()
+            .sendAsync(request, HttpResponse.BodyHandlers.ofString());
+
+        CompletableFuture.allOf(response1, response2, response3)
+            .join();
+
+        assertThat(response1.get()
+            .statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+        assertThat(response2.get()
+            .statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+        assertThat(response3.get()
+            .statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+    }
+
+    @Test
+    public void shouldNotStoreCookieWhenPolicyAcceptNone() throws URISyntaxException, IOException, InterruptedException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/get"))
+            .GET()
+            .build();
+
+        HttpClient httpClient = HttpClient.newBuilder()
+            .cookieHandler(new CookieManager(null, CookiePolicy.ACCEPT_NONE))
+            .build();
+
+        httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertTrue(httpClient.cookieHandler()
+            .isPresent());
+    }
+
+    @Test
+    public void shouldStoreCookieWhenPolicyAcceptAll() throws URISyntaxException, IOException, InterruptedException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/get"))
+            .GET()
+            .build();
+
+        HttpClient httpClient = HttpClient.newBuilder()
+            .cookieHandler(new CookieManager(null, CookiePolicy.ACCEPT_ALL))
+            .build();
+
+        httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertTrue(httpClient.cookieHandler()
+            .isPresent());
+    }
+
+    @Test
+    public void shouldProcessMultipleRequestViaStream() throws URISyntaxException, ExecutionException, InterruptedException {
+        List<URI> targets = Arrays.asList(new URI("https://postman-echo.com/get?foo1=bar1"), new URI("https://postman-echo.com/get?foo2=bar2"));
+
+        HttpClient client = HttpClient.newHttpClient();
+
+        List<CompletableFuture<String>> futures = targets.stream()
+            .map(target -> client.sendAsync(HttpRequest.newBuilder(target)
+                .GET()
+                .build(), HttpResponse.BodyHandlers.ofString())
+                .thenApply(response -> response.body()))
+            .collect(Collectors.toList());
+
+        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
+            .join();
+
+        if (futures.get(0)
+            .get()
+            .contains("foo1")) {
+            assertThat(futures.get(0)
+                .get(), containsString("bar1"));
+            assertThat(futures.get(1)
+                .get(), containsString("bar2"));
+        } else {
+            assertThat(futures.get(1)
+                .get(), containsString("bar2"));
+            assertThat(futures.get(1)
+                .get(), containsString("bar1"));
+        }
+
+    }
+    
+    @Test
+    public void completeExceptionallyExample() {
+        CompletableFuture<String> cf = CompletableFuture.completedFuture("message").thenApplyAsync(String::toUpperCase,
+                CompletableFuture.delayedExecutor(1, TimeUnit.SECONDS));
+        CompletableFuture<String> exceptionHandler = cf.handle((s, th) -> { return (th != null) ? "message upon cancel" : ""; });
+        cf.completeExceptionally(new RuntimeException("completed exceptionally"));
+        assertTrue("Was not completed exceptionally", cf.isCompletedExceptionally());
+        try {
+            cf.join();
+            fail("Should have thrown an exception");
+        } catch (CompletionException ex) { // just for testing
+            assertEquals("completed exceptionally", ex.getCause().getMessage());
+        }
+
+        assertEquals("message upon cancel", exceptionHandler.join());
+    }
+
+}
diff --git a/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpRequestTest.java b/core-java-modules/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpRequestTest.java
similarity index 97%
rename from core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpRequestTest.java
rename to core-java-modules/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpRequestTest.java
index 7d138bd8d5..274d3a93fc 100644
--- a/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpRequestTest.java
+++ b/core-java-modules/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpRequestTest.java
@@ -1,168 +1,168 @@
-package com.baeldung.java11.httpclient.test;
-
-import static java.time.temporal.ChronoUnit.SECONDS;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.nio.file.Paths;
-import java.security.NoSuchAlgorithmException;
-import java.time.Duration;
-
-import org.junit.Test;
-
-public class HttpRequestTest {
-
-    @Test
-    public void shouldReturnStatusOKWhenSendGetRequest() throws IOException, InterruptedException, URISyntaxException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/get"))
-            .GET()
-            .build();
-
-        HttpResponse<String> response = HttpClient.newHttpClient()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-    }
-
-    @Test
-    public void shouldUseHttp2WhenWebsiteUsesHttp2() throws IOException, InterruptedException, URISyntaxException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://stackoverflow.com"))
-            .version(HttpClient.Version.HTTP_2)
-            .GET()
-            .build();
-        HttpResponse<String> response = HttpClient.newHttpClient()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-        assertThat(response.version(), equalTo(HttpClient.Version.HTTP_2));
-    }
-
-    @Test
-    public void shouldFallbackToHttp1_1WhenWebsiteDoesNotUseHttp2() throws IOException, InterruptedException, URISyntaxException, NoSuchAlgorithmException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/get"))
-            .version(HttpClient.Version.HTTP_2)
-            .GET()
-            .build();
-
-        HttpResponse<String> response = HttpClient.newHttpClient()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.version(), equalTo(HttpClient.Version.HTTP_1_1));
-    }
-
-    @Test
-    public void shouldReturnStatusOKWhenSendGetRequestWithDummyHeaders() throws IOException, InterruptedException, URISyntaxException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/get"))
-            .headers("key1", "value1", "key2", "value2")
-            .GET()
-            .build();
-
-        HttpResponse<String> response = HttpClient.newHttpClient()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-    }
-
-    @Test
-    public void shouldReturnStatusOKWhenSendGetRequestTimeoutSet() throws IOException, InterruptedException, URISyntaxException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/get"))
-            .timeout(Duration.of(10, SECONDS))
-            .GET()
-            .build();
-
-        HttpResponse<String> response = HttpClient.newHttpClient()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-    }
-
-    @Test
-    public void shouldReturnNoContentWhenPostWithNoBody() throws IOException, InterruptedException, URISyntaxException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/post"))
-            .POST(HttpRequest.BodyPublishers.noBody())
-            .build();
-
-        HttpResponse<String> response = HttpClient.newHttpClient()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-    }
-
-    @Test
-    public void shouldReturnSampleDataContentWhenPostWithBodyText() throws IOException, InterruptedException, URISyntaxException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/post"))
-            .headers("Content-Type", "text/plain;charset=UTF-8")
-            .POST(HttpRequest.BodyPublishers.ofString("Sample request body"))
-            .build();
-
-        HttpResponse<String> response = HttpClient.newHttpClient()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-        assertThat(response.body(), containsString("Sample request body"));
-    }
-
-    @Test
-    public void shouldReturnSampleDataContentWhenPostWithInputStream() throws IOException, InterruptedException, URISyntaxException {
-        byte[] sampleData = "Sample request body".getBytes();
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/post"))
-            .headers("Content-Type", "text/plain;charset=UTF-8")
-            .POST(HttpRequest.BodyPublishers.ofInputStream(() -> new ByteArrayInputStream(sampleData)))
-            .build();
-
-        HttpResponse<String> response = HttpClient.newHttpClient()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-        assertThat(response.body(), containsString("Sample request body"));
-    }
-
-    @Test
-    public void shouldReturnSampleDataContentWhenPostWithByteArrayProcessorStream() throws IOException, InterruptedException, URISyntaxException {
-        byte[] sampleData = "Sample request body".getBytes();
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/post"))
-            .headers("Content-Type", "text/plain;charset=UTF-8")
-            .POST(HttpRequest.BodyPublishers.ofByteArray(sampleData))
-            .build();
-
-        HttpResponse<String> response = HttpClient.newHttpClient()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-        assertThat(response.body(), containsString("Sample request body"));
-    }
-
-    @Test
-    public void shouldReturnSampleDataContentWhenPostWithFileProcessorStream() throws IOException, InterruptedException, URISyntaxException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/post"))
-            .headers("Content-Type", "text/plain;charset=UTF-8")
-            .POST(HttpRequest.BodyPublishers.ofFile(Paths.get("src/test/resources/sample.txt")))
-            .build();
-
-        HttpResponse<String> response = HttpClient.newHttpClient()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-        assertThat(response.body(), containsString("Sample file content"));
-    }
-
-}
+package com.baeldung.java11.httpclient.test;
+
+import static java.time.temporal.ChronoUnit.SECONDS;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.file.Paths;
+import java.security.NoSuchAlgorithmException;
+import java.time.Duration;
+
+import org.junit.Test;
+
+public class HttpRequestTest {
+
+    @Test
+    public void shouldReturnStatusOKWhenSendGetRequest() throws IOException, InterruptedException, URISyntaxException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/get"))
+            .GET()
+            .build();
+
+        HttpResponse<String> response = HttpClient.newHttpClient()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+    }
+
+    @Test
+    public void shouldUseHttp2WhenWebsiteUsesHttp2() throws IOException, InterruptedException, URISyntaxException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://stackoverflow.com"))
+            .version(HttpClient.Version.HTTP_2)
+            .GET()
+            .build();
+        HttpResponse<String> response = HttpClient.newHttpClient()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+        assertThat(response.version(), equalTo(HttpClient.Version.HTTP_2));
+    }
+
+    @Test
+    public void shouldFallbackToHttp1_1WhenWebsiteDoesNotUseHttp2() throws IOException, InterruptedException, URISyntaxException, NoSuchAlgorithmException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/get"))
+            .version(HttpClient.Version.HTTP_2)
+            .GET()
+            .build();
+
+        HttpResponse<String> response = HttpClient.newHttpClient()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.version(), equalTo(HttpClient.Version.HTTP_1_1));
+    }
+
+    @Test
+    public void shouldReturnStatusOKWhenSendGetRequestWithDummyHeaders() throws IOException, InterruptedException, URISyntaxException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/get"))
+            .headers("key1", "value1", "key2", "value2")
+            .GET()
+            .build();
+
+        HttpResponse<String> response = HttpClient.newHttpClient()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+    }
+
+    @Test
+    public void shouldReturnStatusOKWhenSendGetRequestTimeoutSet() throws IOException, InterruptedException, URISyntaxException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/get"))
+            .timeout(Duration.of(10, SECONDS))
+            .GET()
+            .build();
+
+        HttpResponse<String> response = HttpClient.newHttpClient()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+    }
+
+    @Test
+    public void shouldReturnNoContentWhenPostWithNoBody() throws IOException, InterruptedException, URISyntaxException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/post"))
+            .POST(HttpRequest.BodyPublishers.noBody())
+            .build();
+
+        HttpResponse<String> response = HttpClient.newHttpClient()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+    }
+
+    @Test
+    public void shouldReturnSampleDataContentWhenPostWithBodyText() throws IOException, InterruptedException, URISyntaxException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/post"))
+            .headers("Content-Type", "text/plain;charset=UTF-8")
+            .POST(HttpRequest.BodyPublishers.ofString("Sample request body"))
+            .build();
+
+        HttpResponse<String> response = HttpClient.newHttpClient()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+        assertThat(response.body(), containsString("Sample request body"));
+    }
+
+    @Test
+    public void shouldReturnSampleDataContentWhenPostWithInputStream() throws IOException, InterruptedException, URISyntaxException {
+        byte[] sampleData = "Sample request body".getBytes();
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/post"))
+            .headers("Content-Type", "text/plain;charset=UTF-8")
+            .POST(HttpRequest.BodyPublishers.ofInputStream(() -> new ByteArrayInputStream(sampleData)))
+            .build();
+
+        HttpResponse<String> response = HttpClient.newHttpClient()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+        assertThat(response.body(), containsString("Sample request body"));
+    }
+
+    @Test
+    public void shouldReturnSampleDataContentWhenPostWithByteArrayProcessorStream() throws IOException, InterruptedException, URISyntaxException {
+        byte[] sampleData = "Sample request body".getBytes();
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/post"))
+            .headers("Content-Type", "text/plain;charset=UTF-8")
+            .POST(HttpRequest.BodyPublishers.ofByteArray(sampleData))
+            .build();
+
+        HttpResponse<String> response = HttpClient.newHttpClient()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+        assertThat(response.body(), containsString("Sample request body"));
+    }
+
+    @Test
+    public void shouldReturnSampleDataContentWhenPostWithFileProcessorStream() throws IOException, InterruptedException, URISyntaxException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/post"))
+            .headers("Content-Type", "text/plain;charset=UTF-8")
+            .POST(HttpRequest.BodyPublishers.ofFile(Paths.get("src/test/resources/sample.txt")))
+            .build();
+
+        HttpResponse<String> response = HttpClient.newHttpClient()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+        assertThat(response.body(), containsString("Sample file content"));
+    }
+
+}
diff --git a/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpResponseTest.java b/core-java-modules/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpResponseTest.java
similarity index 97%
rename from core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpResponseTest.java
rename to core-java-modules/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpResponseTest.java
index 78d86fbf4e..abbc0233c1 100644
--- a/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpResponseTest.java
+++ b/core-java-modules/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpResponseTest.java
@@ -1,54 +1,54 @@
-package com.baeldung.java11.httpclient.test;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-
-import org.junit.Test;
-
-public class HttpResponseTest {
-
-    @Test
-    public void shouldReturnStatusOKWhenSendGetRequest() throws IOException, InterruptedException, URISyntaxException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("https://postman-echo.com/get"))
-            .version(HttpClient.Version.HTTP_2)
-            .GET()
-            .build();
-
-        HttpResponse<String> response = HttpClient.newBuilder()
-            .followRedirects(HttpClient.Redirect.NORMAL)
-            .build()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
-        assertNotNull(response.body());
-    }
-
-    @Test
-    public void shouldResponseURIDifferentThanRequestUIRWhenRedirect() throws IOException, InterruptedException, URISyntaxException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(new URI("http://stackoverflow.com"))
-            .version(HttpClient.Version.HTTP_2)
-            .GET()
-            .build();
-        HttpResponse<String> response = HttpClient.newBuilder()
-            .followRedirects(HttpClient.Redirect.NORMAL)
-            .build()
-            .send(request, HttpResponse.BodyHandlers.ofString());
-
-        assertThat(request.uri()
-            .toString(), equalTo("http://stackoverflow.com"));
-        assertThat(response.uri()
-            .toString(), equalTo("https://stackoverflow.com/"));
-    }
-
-}
+package com.baeldung.java11.httpclient.test;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+import org.junit.Test;
+
+public class HttpResponseTest {
+
+    @Test
+    public void shouldReturnStatusOKWhenSendGetRequest() throws IOException, InterruptedException, URISyntaxException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("https://postman-echo.com/get"))
+            .version(HttpClient.Version.HTTP_2)
+            .GET()
+            .build();
+
+        HttpResponse<String> response = HttpClient.newBuilder()
+            .followRedirects(HttpClient.Redirect.NORMAL)
+            .build()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_OK));
+        assertNotNull(response.body());
+    }
+
+    @Test
+    public void shouldResponseURIDifferentThanRequestUIRWhenRedirect() throws IOException, InterruptedException, URISyntaxException {
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(new URI("http://stackoverflow.com"))
+            .version(HttpClient.Version.HTTP_2)
+            .GET()
+            .build();
+        HttpResponse<String> response = HttpClient.newBuilder()
+            .followRedirects(HttpClient.Redirect.NORMAL)
+            .build()
+            .send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(request.uri()
+            .toString(), equalTo("http://stackoverflow.com"));
+        assertThat(response.uri()
+            .toString(), equalTo("https://stackoverflow.com/"));
+    }
+
+}
diff --git a/core-java-11/src/test/java/com/baeldung/optional/OptionalUnitTest.java b/core-java-modules/core-java-11/src/test/java/com/baeldung/optional/OptionalUnitTest.java
similarity index 100%
rename from core-java-11/src/test/java/com/baeldung/optional/OptionalUnitTest.java
rename to core-java-modules/core-java-11/src/test/java/com/baeldung/optional/OptionalUnitTest.java
diff --git a/core-java-12/pom.xml b/core-java-modules/core-java-12/pom.xml
similarity index 96%
rename from core-java-12/pom.xml
rename to core-java-modules/core-java-12/pom.xml
index c5eec1a4bb..06c49a0021 100644
--- a/core-java-12/pom.xml
+++ b/core-java-modules/core-java-12/pom.xml
@@ -14,6 +14,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-12/src/test/java/com/baeldung/collectors/CollectorsUnitTest.java b/core-java-modules/core-java-12/src/test/java/com/baeldung/collectors/CollectorsUnitTest.java
similarity index 100%
rename from core-java-12/src/test/java/com/baeldung/collectors/CollectorsUnitTest.java
rename to core-java-modules/core-java-12/src/test/java/com/baeldung/collectors/CollectorsUnitTest.java
diff --git a/core-java-12/src/test/java/com/baeldung/switchExpression/SwitchUnitTest.java b/core-java-modules/core-java-12/src/test/java/com/baeldung/switchExpression/SwitchUnitTest.java
similarity index 100%
rename from core-java-12/src/test/java/com/baeldung/switchExpression/SwitchUnitTest.java
rename to core-java-modules/core-java-12/src/test/java/com/baeldung/switchExpression/SwitchUnitTest.java
diff --git a/core-java-8-2/.gitignore b/core-java-modules/core-java-8-2/.gitignore
similarity index 100%
rename from core-java-8-2/.gitignore
rename to core-java-modules/core-java-8-2/.gitignore
diff --git a/core-java-8-2/README.md b/core-java-modules/core-java-8-2/README.md
similarity index 100%
rename from core-java-8-2/README.md
rename to core-java-modules/core-java-8-2/README.md
diff --git a/core-java-8-2/pom.xml b/core-java-modules/core-java-8-2/pom.xml
similarity index 96%
rename from core-java-8-2/pom.xml
rename to core-java-modules/core-java-8-2/pom.xml
index 4692a0fca6..fbaf795b95 100644
--- a/core-java-8-2/pom.xml
+++ b/core-java-modules/core-java-8-2/pom.xml
@@ -14,7 +14,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <properties>
diff --git a/core-java-8-2/src/main/java/com/baeldung/jarArguments/JarExample.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/jarArguments/JarExample.java
similarity index 100%
rename from core-java-8-2/src/main/java/com/baeldung/jarArguments/JarExample.java
rename to core-java-modules/core-java-8-2/src/main/java/com/baeldung/jarArguments/JarExample.java
diff --git a/core-java-8-2/src/main/java/com/baeldung/localization/App.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/localization/App.java
similarity index 100%
rename from core-java-8-2/src/main/java/com/baeldung/localization/App.java
rename to core-java-modules/core-java-8-2/src/main/java/com/baeldung/localization/App.java
diff --git a/core-java-8-2/src/main/java/com/baeldung/localization/ICUFormat.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/localization/ICUFormat.java
similarity index 100%
rename from core-java-8-2/src/main/java/com/baeldung/localization/ICUFormat.java
rename to core-java-modules/core-java-8-2/src/main/java/com/baeldung/localization/ICUFormat.java
diff --git a/core-java-8-2/src/main/java/com/baeldung/localization/JavaSEFormat.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/localization/JavaSEFormat.java
similarity index 100%
rename from core-java-8-2/src/main/java/com/baeldung/localization/JavaSEFormat.java
rename to core-java-modules/core-java-8-2/src/main/java/com/baeldung/localization/JavaSEFormat.java
diff --git a/core-java-8-2/src/main/java/com/baeldung/localization/Localization.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/localization/Localization.java
similarity index 100%
rename from core-java-8-2/src/main/java/com/baeldung/localization/Localization.java
rename to core-java-modules/core-java-8-2/src/main/java/com/baeldung/localization/Localization.java
diff --git a/core-java-8-2/src/main/resources/example_manifest.txt b/core-java-modules/core-java-8-2/src/main/resources/example_manifest.txt
similarity index 100%
rename from core-java-8-2/src/main/resources/example_manifest.txt
rename to core-java-modules/core-java-8-2/src/main/resources/example_manifest.txt
diff --git a/core-java-8-2/src/main/resources/formats_en.properties b/core-java-modules/core-java-8-2/src/main/resources/formats_en.properties
similarity index 100%
rename from core-java-8-2/src/main/resources/formats_en.properties
rename to core-java-modules/core-java-8-2/src/main/resources/formats_en.properties
diff --git a/core-java-8-2/src/main/resources/formats_fr.properties b/core-java-modules/core-java-8-2/src/main/resources/formats_fr.properties
similarity index 100%
rename from core-java-8-2/src/main/resources/formats_fr.properties
rename to core-java-modules/core-java-8-2/src/main/resources/formats_fr.properties
diff --git a/core-java-8-2/src/main/resources/formats_it.properties b/core-java-modules/core-java-8-2/src/main/resources/formats_it.properties
similarity index 100%
rename from core-java-8-2/src/main/resources/formats_it.properties
rename to core-java-modules/core-java-8-2/src/main/resources/formats_it.properties
diff --git a/core-java-8-2/src/main/resources/formats_pl.properties b/core-java-modules/core-java-8-2/src/main/resources/formats_pl.properties
similarity index 100%
rename from core-java-8-2/src/main/resources/formats_pl.properties
rename to core-java-modules/core-java-8-2/src/main/resources/formats_pl.properties
diff --git a/core-java-8-2/src/main/resources/messages_en.properties b/core-java-modules/core-java-8-2/src/main/resources/messages_en.properties
similarity index 100%
rename from core-java-8-2/src/main/resources/messages_en.properties
rename to core-java-modules/core-java-8-2/src/main/resources/messages_en.properties
diff --git a/core-java-8-2/src/main/resources/messages_fr.properties b/core-java-modules/core-java-8-2/src/main/resources/messages_fr.properties
similarity index 100%
rename from core-java-8-2/src/main/resources/messages_fr.properties
rename to core-java-modules/core-java-8-2/src/main/resources/messages_fr.properties
diff --git a/core-java-8-2/src/main/resources/messages_it.properties b/core-java-modules/core-java-8-2/src/main/resources/messages_it.properties
similarity index 100%
rename from core-java-8-2/src/main/resources/messages_it.properties
rename to core-java-modules/core-java-8-2/src/main/resources/messages_it.properties
diff --git a/core-java-8-2/src/main/resources/messages_pl.properties b/core-java-modules/core-java-8-2/src/main/resources/messages_pl.properties
similarity index 100%
rename from core-java-8-2/src/main/resources/messages_pl.properties
rename to core-java-modules/core-java-8-2/src/main/resources/messages_pl.properties
diff --git a/core-java-8-2/src/test/java/com/baeldung/localization/ICUFormatUnitTest.java b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/localization/ICUFormatUnitTest.java
similarity index 100%
rename from core-java-8-2/src/test/java/com/baeldung/localization/ICUFormatUnitTest.java
rename to core-java-modules/core-java-8-2/src/test/java/com/baeldung/localization/ICUFormatUnitTest.java
diff --git a/core-java-8/.gitignore b/core-java-modules/core-java-8/.gitignore
similarity index 100%
rename from core-java-8/.gitignore
rename to core-java-modules/core-java-8/.gitignore
diff --git a/core-java-8/README.md b/core-java-modules/core-java-8/README.md
similarity index 100%
rename from core-java-8/README.md
rename to core-java-modules/core-java-8/README.md
diff --git a/core-java-8/pom.xml b/core-java-modules/core-java-8/pom.xml
similarity index 96%
rename from core-java-8/pom.xml
rename to core-java-modules/core-java-8/pom.xml
index b63afef7d4..c09c970e07 100644
--- a/core-java-8/pom.xml
+++ b/core-java-modules/core-java-8/pom.xml
@@ -1,199 +1,199 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>core-java-8</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>core-java-8</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>${commons-collections4.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
-            <version>${commons-math3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>${commons-codec.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- test scoped -->
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${avaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-            <version>${jmh-core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh-generator.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-bytecode</artifactId>
-            <version>${jmh-generator.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.codepoetics</groupId>
-            <artifactId>protonpack</artifactId>
-            <version>${protonpack.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.vavr</groupId>
-            <artifactId>vavr</artifactId>
-            <version>${vavr.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${joda.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>${asspectj.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-            <version>${asspectj.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>${powermock.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <version>${powermock.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jmockit</groupId>
-            <artifactId>jmockit</artifactId>
-            <version>${jmockit.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>core-java-8</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <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>
-                    <compilerArgument>-parameters</compilerArgument>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>spring-boot</classifier>
-                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <argLine>
-                        -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
-                    </argLine>
-                    <disableXmlReport>true</disableXmlReport>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
-        <commons-math3.version>3.6.1</commons-math3.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
-        <collections-generic.version>4.01</collections-generic.version>
-        <commons-codec.version>1.10</commons-codec.version>
-        <vavr.version>0.9.0</vavr.version>
-        <protonpack.version>1.13</protonpack.version>
-        <joda.version>2.10</joda.version>
-        <!-- testing -->
-        <assertj.version>3.6.1</assertj.version>
-        <asspectj.version>1.8.9</asspectj.version>
-        <powermock.version>2.0.0-RC.4</powermock.version>
-        <jmockit.version>1.44</jmockit.version>
-        <avaitility.version>1.7.0</avaitility.version>
-        <jmh-core.version>1.19</jmh-core.version>
-        <jmh-generator.version>1.19</jmh-generator.version>
-        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
-        <!-- plugins -->
-        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
-    </properties>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>core-java-8</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-8</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>${commons-collections4.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>${commons-math3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>${commons-codec.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${avaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh-core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh-generator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-bytecode</artifactId>
+            <version>${jmh-generator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.codepoetics</groupId>
+            <artifactId>protonpack</artifactId>
+            <version>${protonpack.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.vavr</groupId>
+            <artifactId>vavr</artifactId>
+            <version>${vavr.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>${joda.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>${asspectj.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>${asspectj.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jmockit</groupId>
+            <artifactId>jmockit</artifactId>
+            <version>${jmockit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-8</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <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>
+                    <compilerArgument>-parameters</compilerArgument>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>spring-boot</classifier>
+                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <argLine>
+                        -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
+                    </argLine>
+                    <disableXmlReport>true</disableXmlReport>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- util -->
+        <commons-lang3.version>3.5</commons-lang3.version>
+        <commons-math3.version>3.6.1</commons-math3.version>
+        <commons-collections4.version>4.1</commons-collections4.version>
+        <collections-generic.version>4.01</collections-generic.version>
+        <commons-codec.version>1.10</commons-codec.version>
+        <vavr.version>0.9.0</vavr.version>
+        <protonpack.version>1.13</protonpack.version>
+        <joda.version>2.10</joda.version>
+        <!-- testing -->
+        <assertj.version>3.6.1</assertj.version>
+        <asspectj.version>1.8.9</asspectj.version>
+        <powermock.version>2.0.0-RC.4</powermock.version>
+        <jmockit.version>1.44</jmockit.version>
+        <avaitility.version>1.7.0</avaitility.version>
+        <jmh-core.version>1.19</jmh-core.version>
+        <jmh-generator.version>1.19</jmh-generator.version>
+        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
+        <!-- plugins -->
+        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
+    </properties>
+</project>
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/ClassWithAnnotation.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/ClassWithAnnotation.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/annotations/ClassWithAnnotation.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/ClassWithAnnotation.java
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/ClassWithDeprecatedMethod.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/ClassWithDeprecatedMethod.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/annotations/ClassWithDeprecatedMethod.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/ClassWithDeprecatedMethod.java
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/ClassWithSafeVarargs.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/ClassWithSafeVarargs.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/annotations/ClassWithSafeVarargs.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/ClassWithSafeVarargs.java
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/ClassWithSuppressWarnings.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/ClassWithSuppressWarnings.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/annotations/ClassWithSuppressWarnings.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/ClassWithSuppressWarnings.java
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/IntConsumer.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/IntConsumer.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/annotations/IntConsumer.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/IntConsumer.java
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/Interval.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/Interval.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/annotations/Interval.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/Interval.java
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/IntervalUsage.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/IntervalUsage.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/annotations/IntervalUsage.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/IntervalUsage.java
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/Intervals.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/Intervals.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/annotations/Intervals.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/Intervals.java
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/MyAnnotation.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/MyAnnotation.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/annotations/MyAnnotation.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/MyAnnotation.java
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/MyAnnotationTarget.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/MyAnnotationTarget.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/annotations/MyAnnotationTarget.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/MyAnnotationTarget.java
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/MyOperation.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/MyOperation.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/annotations/MyOperation.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/MyOperation.java
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/MyOperationImpl.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/MyOperationImpl.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/annotations/MyOperationImpl.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/annotations/MyOperationImpl.java
diff --git a/core-java-8/src/main/java/com/baeldung/aspect/ChangeCallsToCurrentTimeInMillisMethod.aj b/core-java-modules/core-java-8/src/main/java/com/baeldung/aspect/ChangeCallsToCurrentTimeInMillisMethod.aj
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/aspect/ChangeCallsToCurrentTimeInMillisMethod.aj
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/aspect/ChangeCallsToCurrentTimeInMillisMethod.aj
diff --git a/core-java-8/src/main/java/com/baeldung/customannotations/Init.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/Init.java
similarity index 95%
rename from core-java-8/src/main/java/com/baeldung/customannotations/Init.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/Init.java
index 265e7ba1d6..c27d7d7980 100644
--- a/core-java-8/src/main/java/com/baeldung/customannotations/Init.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/Init.java
@@ -1,13 +1,13 @@
-package com.baeldung.customannotations;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Retention(RUNTIME)
-@Target(METHOD)
-public @interface Init {
-
-}
+package com.baeldung.customannotations;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Retention(RUNTIME)
+@Target(METHOD)
+public @interface Init {
+
+}
diff --git a/core-java-8/src/main/java/com/baeldung/customannotations/JsonElement.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/JsonElement.java
similarity index 96%
rename from core-java-8/src/main/java/com/baeldung/customannotations/JsonElement.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/JsonElement.java
index e41a5b1e30..3c953f9081 100644
--- a/core-java-8/src/main/java/com/baeldung/customannotations/JsonElement.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/JsonElement.java
@@ -1,13 +1,13 @@
-package com.baeldung.customannotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Retention(RUNTIME)
-@Target({ FIELD })
-public @interface JsonElement {
-    public String key() default "";
-}
+package com.baeldung.customannotations;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Retention(RUNTIME)
+@Target({ FIELD })
+public @interface JsonElement {
+    public String key() default "";
+}
diff --git a/core-java-8/src/main/java/com/baeldung/customannotations/JsonSerializable.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/JsonSerializable.java
similarity index 95%
rename from core-java-8/src/main/java/com/baeldung/customannotations/JsonSerializable.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/JsonSerializable.java
index 48eeb09a1b..f6feba1b7b 100644
--- a/core-java-8/src/main/java/com/baeldung/customannotations/JsonSerializable.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/JsonSerializable.java
@@ -1,13 +1,13 @@
-package com.baeldung.customannotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Retention(RUNTIME)
-@Target(TYPE)
-public @interface JsonSerializable {
-
-}
+package com.baeldung.customannotations;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Retention(RUNTIME)
+@Target(TYPE)
+public @interface JsonSerializable {
+
+}
diff --git a/core-java-8/src/main/java/com/baeldung/customannotations/JsonSerializationException.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/JsonSerializationException.java
similarity index 96%
rename from core-java-8/src/main/java/com/baeldung/customannotations/JsonSerializationException.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/JsonSerializationException.java
index f2c29855ac..544d1311aa 100644
--- a/core-java-8/src/main/java/com/baeldung/customannotations/JsonSerializationException.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/JsonSerializationException.java
@@ -1,10 +1,10 @@
-package com.baeldung.customannotations;
-
-public class JsonSerializationException extends RuntimeException {
-
-    private static final long serialVersionUID = 1L;
-
-    public JsonSerializationException(String message) {
-        super(message);
-    }
-}
+package com.baeldung.customannotations;
+
+public class JsonSerializationException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+    public JsonSerializationException(String message) {
+        super(message);
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/customannotations/ObjectToJsonConverter.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/ObjectToJsonConverter.java
similarity index 97%
rename from core-java-8/src/main/java/com/baeldung/customannotations/ObjectToJsonConverter.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/ObjectToJsonConverter.java
index dd126be8ed..b809ea0d1d 100644
--- a/core-java-8/src/main/java/com/baeldung/customannotations/ObjectToJsonConverter.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/ObjectToJsonConverter.java
@@ -1,67 +1,67 @@
-package com.baeldung.customannotations;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-public class ObjectToJsonConverter {
-    public String convertToJson(Object object) throws JsonSerializationException {
-        try {
-
-            checkIfSerializable(object);
-            initializeObject(object);
-            return getJsonString(object);
-
-        } catch (Exception e) {
-            throw new JsonSerializationException(e.getMessage());
-        }
-    }
-
-    private void checkIfSerializable(Object object) {
-        if (Objects.isNull(object)) {
-            throw new JsonSerializationException("Can't serialize a null object");
-        }
-
-        Class<?> clazz = object.getClass();
-        if (!clazz.isAnnotationPresent(JsonSerializable.class)) {
-            throw new JsonSerializationException("The class " + clazz.getSimpleName() + " is not annotated with JsonSerializable");
-        }
-    }
-
-    private void initializeObject(Object object) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
-        Class<?> clazz = object.getClass();
-        for (Method method : clazz.getDeclaredMethods()) {
-            if (method.isAnnotationPresent(Init.class)) {
-                method.setAccessible(true);
-                method.invoke(object);
-            }
-        }
-    }
-
-    private String getJsonString(Object object) throws IllegalArgumentException, IllegalAccessException {
-        Class<?> clazz = object.getClass();
-        Map<String, String> jsonElementsMap = new HashMap<>();
-        for (Field field : clazz.getDeclaredFields()) {
-            field.setAccessible(true);
-            if (field.isAnnotationPresent(JsonElement.class)) {
-                jsonElementsMap.put(getKey(field), (String) field.get(object));
-            }
-        }
-
-        String jsonString = jsonElementsMap.entrySet()
-            .stream()
-            .map(entry -> "\"" + entry.getKey() + "\":\"" + entry.getValue() + "\"")
-            .collect(Collectors.joining(","));
-        return "{" + jsonString + "}";
-    }
-
-    private String getKey(Field field) {
-        String value = field.getAnnotation(JsonElement.class)
-            .key();
-        return value.isEmpty() ? field.getName() : value;
-    }
-}
+package com.baeldung.customannotations;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public class ObjectToJsonConverter {
+    public String convertToJson(Object object) throws JsonSerializationException {
+        try {
+
+            checkIfSerializable(object);
+            initializeObject(object);
+            return getJsonString(object);
+
+        } catch (Exception e) {
+            throw new JsonSerializationException(e.getMessage());
+        }
+    }
+
+    private void checkIfSerializable(Object object) {
+        if (Objects.isNull(object)) {
+            throw new JsonSerializationException("Can't serialize a null object");
+        }
+
+        Class<?> clazz = object.getClass();
+        if (!clazz.isAnnotationPresent(JsonSerializable.class)) {
+            throw new JsonSerializationException("The class " + clazz.getSimpleName() + " is not annotated with JsonSerializable");
+        }
+    }
+
+    private void initializeObject(Object object) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+        Class<?> clazz = object.getClass();
+        for (Method method : clazz.getDeclaredMethods()) {
+            if (method.isAnnotationPresent(Init.class)) {
+                method.setAccessible(true);
+                method.invoke(object);
+            }
+        }
+    }
+
+    private String getJsonString(Object object) throws IllegalArgumentException, IllegalAccessException {
+        Class<?> clazz = object.getClass();
+        Map<String, String> jsonElementsMap = new HashMap<>();
+        for (Field field : clazz.getDeclaredFields()) {
+            field.setAccessible(true);
+            if (field.isAnnotationPresent(JsonElement.class)) {
+                jsonElementsMap.put(getKey(field), (String) field.get(object));
+            }
+        }
+
+        String jsonString = jsonElementsMap.entrySet()
+            .stream()
+            .map(entry -> "\"" + entry.getKey() + "\":\"" + entry.getValue() + "\"")
+            .collect(Collectors.joining(","));
+        return "{" + jsonString + "}";
+    }
+
+    private String getKey(Field field) {
+        String value = field.getAnnotation(JsonElement.class)
+            .key();
+        return value.isEmpty() ? field.getName() : value;
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/customannotations/Person.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/Person.java
similarity index 95%
rename from core-java-8/src/main/java/com/baeldung/customannotations/Person.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/Person.java
index 5db1a7f279..ba702d6d76 100644
--- a/core-java-8/src/main/java/com/baeldung/customannotations/Person.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/customannotations/Person.java
@@ -1,66 +1,66 @@
-package com.baeldung.customannotations;
-
-@JsonSerializable
-public class Person {
-    @JsonElement
-    private String firstName;
-    @JsonElement
-    private String lastName;
-    @JsonElement(key = "personAge")
-    private String age;
-
-    private String address;
-
-    public Person(String firstName, String lastName) {
-        super();
-        this.firstName = firstName;
-        this.lastName = lastName;
-    }
-
-    public Person(String firstName, String lastName, String age) {
-        this.firstName = firstName;
-        this.lastName = lastName;
-        this.age = age;
-    }
-
-    @Init
-    private void initNames() {
-        this.firstName = this.firstName.substring(0, 1)
-            .toUpperCase() + this.firstName.substring(1);
-        this.lastName = this.lastName.substring(0, 1)
-            .toUpperCase() + this.lastName.substring(1);
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-}
+package com.baeldung.customannotations;
+
+@JsonSerializable
+public class Person {
+    @JsonElement
+    private String firstName;
+    @JsonElement
+    private String lastName;
+    @JsonElement(key = "personAge")
+    private String age;
+
+    private String address;
+
+    public Person(String firstName, String lastName) {
+        super();
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    public Person(String firstName, String lastName, String age) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.age = age;
+    }
+
+    @Init
+    private void initNames() {
+        this.firstName = this.firstName.substring(0, 1)
+            .toUpperCase() + this.firstName.substring(1);
+        this.lastName = this.lastName.substring(0, 1)
+            .toUpperCase() + this.lastName.substring(1);
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+}
diff --git a/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/application/Application.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/application/Application.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/application/Application.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/application/Application.java
diff --git a/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Alarm.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Alarm.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Alarm.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Alarm.java
diff --git a/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Car.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Car.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Car.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Car.java
diff --git a/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Motorbike.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Motorbike.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Motorbike.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Motorbike.java
diff --git a/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/MultiAlarmCar.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/MultiAlarmCar.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/MultiAlarmCar.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/MultiAlarmCar.java
diff --git a/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Vehicle.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Vehicle.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Vehicle.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Vehicle.java
diff --git a/core-java-8/src/main/java/com/baeldung/doublecolon/Computer.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/doublecolon/Computer.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/doublecolon/Computer.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/doublecolon/Computer.java
diff --git a/core-java-8/src/main/java/com/baeldung/doublecolon/ComputerUtils.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/doublecolon/ComputerUtils.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/doublecolon/ComputerUtils.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/doublecolon/ComputerUtils.java
diff --git a/core-java-8/src/main/java/com/baeldung/doublecolon/MacbookPro.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/doublecolon/MacbookPro.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/doublecolon/MacbookPro.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/doublecolon/MacbookPro.java
diff --git a/core-java-8/src/main/java/com/baeldung/doublecolon/function/ComputerPredicate.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/doublecolon/function/ComputerPredicate.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/doublecolon/function/ComputerPredicate.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/doublecolon/function/ComputerPredicate.java
diff --git a/core-java-8/src/main/java/com/baeldung/doublecolon/function/TriFunction.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/doublecolon/function/TriFunction.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/doublecolon/function/TriFunction.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/doublecolon/function/TriFunction.java
diff --git a/core-java-8/src/main/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappers.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappers.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappers.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappers.java
diff --git a/core-java-8/src/main/java/com/baeldung/java8/lambda/exceptions/ThrowingConsumer.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/exceptions/ThrowingConsumer.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java8/lambda/exceptions/ThrowingConsumer.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/exceptions/ThrowingConsumer.java
diff --git a/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Bar.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Bar.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Bar.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Bar.java
diff --git a/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Baz.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Baz.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Baz.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Baz.java
diff --git a/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Foo.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Foo.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Foo.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Foo.java
diff --git a/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java
diff --git a/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Processor.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Processor.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Processor.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Processor.java
diff --git a/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/ProcessorImpl.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/ProcessorImpl.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java8/lambda/tips/ProcessorImpl.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/ProcessorImpl.java
diff --git a/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/UseFoo.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/UseFoo.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java8/lambda/tips/UseFoo.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/UseFoo.java
diff --git a/core-java-8/src/main/java/com/baeldung/java_8_features/Address.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/Address.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java_8_features/Address.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/Address.java
diff --git a/core-java-8/src/main/java/com/baeldung/java_8_features/CustomException.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/CustomException.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java_8_features/CustomException.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/CustomException.java
diff --git a/core-java-8/src/main/java/com/baeldung/java_8_features/OptionalAddress.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/OptionalAddress.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java_8_features/OptionalAddress.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/OptionalAddress.java
diff --git a/core-java-8/src/main/java/com/baeldung/java_8_features/OptionalUser.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/OptionalUser.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java_8_features/OptionalUser.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/OptionalUser.java
diff --git a/core-java-8/src/main/java/com/baeldung/java_8_features/User.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/User.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java_8_features/User.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/User.java
diff --git a/core-java-8/src/main/java/com/baeldung/java_8_features/Vehicle.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/Vehicle.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java_8_features/Vehicle.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/Vehicle.java
diff --git a/core-java-8/src/main/java/com/baeldung/java_8_features/VehicleImpl.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/VehicleImpl.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java_8_features/VehicleImpl.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/VehicleImpl.java
diff --git a/core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/BlogPost.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/BlogPost.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/BlogPost.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/BlogPost.java
diff --git a/core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/BlogPostType.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/BlogPostType.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/BlogPostType.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/BlogPostType.java
diff --git a/core-java-8/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNull.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNull.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNull.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNull.java
diff --git a/core-java-8/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainer.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainer.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainer.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainer.java
diff --git a/core-java-8/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheck.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheck.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheck.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheck.java
diff --git a/core-java-8/src/main/java/com/baeldung/optional/Modem.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/optional/Modem.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/optional/Modem.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/optional/Modem.java
diff --git a/core-java-8/src/main/java/com/baeldung/optional/OrElseAndOrElseGet.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/optional/OrElseAndOrElseGet.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/optional/OrElseAndOrElseGet.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/optional/OrElseAndOrElseGet.java
diff --git a/core-java-8/src/main/java/com/baeldung/optional/OrElseAndOrElseGetBenchmarkRunner.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/optional/OrElseAndOrElseGetBenchmarkRunner.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/optional/OrElseAndOrElseGetBenchmarkRunner.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/optional/OrElseAndOrElseGetBenchmarkRunner.java
diff --git a/core-java-8/src/main/java/com/baeldung/optional/Person.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/optional/Person.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/optional/Person.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/optional/Person.java
diff --git a/core-java-8/src/main/java/com/baeldung/optional/PersonRepository.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/optional/PersonRepository.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/optional/PersonRepository.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/optional/PersonRepository.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/BenchmarkRunner.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/BenchmarkRunner.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/BenchmarkRunner.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/BenchmarkRunner.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/BooleanPrimitiveLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/BooleanPrimitiveLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/BooleanPrimitiveLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/BooleanPrimitiveLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/BooleanWrapperLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/BooleanWrapperLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/BooleanWrapperLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/BooleanWrapperLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/BytePrimitiveLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/BytePrimitiveLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/BytePrimitiveLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/BytePrimitiveLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/ByteWrapperLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/ByteWrapperLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/ByteWrapperLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/ByteWrapperLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/CharPrimitiveLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/CharPrimitiveLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/CharPrimitiveLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/CharPrimitiveLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/CharacterWrapperLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/CharacterWrapperLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/CharacterWrapperLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/CharacterWrapperLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/DoublePrimitiveLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/DoublePrimitiveLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/DoublePrimitiveLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/DoublePrimitiveLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/DoubleWrapperLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/DoubleWrapperLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/DoubleWrapperLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/DoubleWrapperLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/FloatPrimitiveLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/FloatPrimitiveLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/FloatPrimitiveLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/FloatPrimitiveLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/FloatWrapperLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/FloatWrapperLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/FloatWrapperLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/FloatWrapperLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/IntPrimitiveLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/IntPrimitiveLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/IntPrimitiveLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/IntPrimitiveLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/IntegerWrapperLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/IntegerWrapperLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/IntegerWrapperLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/IntegerWrapperLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/LongPrimitiveLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/LongPrimitiveLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/LongPrimitiveLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/LongPrimitiveLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/LongWrapperLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/LongWrapperLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/LongWrapperLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/LongWrapperLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/Lookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/Lookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/Lookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/Lookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/ShortPrimitiveLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/ShortPrimitiveLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/ShortPrimitiveLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/ShortPrimitiveLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/primitive/ShortWrapperLookup.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/ShortWrapperLookup.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/primitive/ShortWrapperLookup.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/primitive/ShortWrapperLookup.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddCommand.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddCommand.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/AddCommand.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddCommand.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddRule.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddRule.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/AddRule.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddRule.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Addition.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Addition.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/Addition.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Addition.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Calculator.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Calculator.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/Calculator.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Calculator.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Command.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Command.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/Command.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Command.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Division.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Division.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/Division.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Division.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Expression.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Expression.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/Expression.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Expression.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Modulo.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Modulo.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/Modulo.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Modulo.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Multiplication.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Multiplication.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/Multiplication.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Multiplication.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Operation.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Operation.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/Operation.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Operation.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Operator.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Operator.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/Operator.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Operator.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/OperatorFactory.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/OperatorFactory.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/OperatorFactory.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/OperatorFactory.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Result.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Result.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/Result.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Result.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Rule.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Rule.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/Rule.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Rule.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Subtraction.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Subtraction.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/reducingIfElse/Subtraction.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reducingIfElse/Subtraction.java
diff --git a/core-java-8/src/main/java/com/baeldung/reflect/Person.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/reflect/Person.java
similarity index 93%
rename from core-java-8/src/main/java/com/baeldung/reflect/Person.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/reflect/Person.java
index fba25aca8b..f15250869d 100644
--- a/core-java-8/src/main/java/com/baeldung/reflect/Person.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/reflect/Person.java
@@ -1,18 +1,18 @@
-package com.baeldung.reflect;
-
-public class Person {
-
-	private String fullName;
-
-	public Person(String fullName) {
-		this.fullName = fullName;
-	}
-
-	public void setFullName(String fullName) {
-		this.fullName = fullName;
-	}
-
-	public String getFullName() {
-		return fullName;
-	}
-}
+package com.baeldung.reflect;
+
+public class Person {
+
+	private String fullName;
+
+	public Person(String fullName) {
+		this.fullName = fullName;
+	}
+
+	public void setFullName(String fullName) {
+		this.fullName = fullName;
+	}
+
+	public String getFullName() {
+		return fullName;
+	}
+}
diff --git a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Article.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Article.java
similarity index 94%
rename from core-java-8/src/main/java/com/baeldung/spliteratorAPI/Article.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Article.java
index 402ec6ec5f..3cd2a00da1 100644
--- a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Article.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Article.java
@@ -1,44 +1,44 @@
-package com.baeldung.spliteratorAPI;
-
-import java.util.List;
-
-public class Article {
-    private List<Author> listOfAuthors;
-    private int id;
-    private String name;
-
-    public Article(String name) {
-        this.name = name;
-    }
-
-    public Article(List<Author> listOfAuthors, int id) {
-        super();
-        this.listOfAuthors = listOfAuthors;
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public List<Author> getListOfAuthors() {
-        return listOfAuthors;
-    }
-
-    public void setListOfAuthors(List<Author> listOfAuthors) {
-        this.listOfAuthors = listOfAuthors;
-    }
-
+package com.baeldung.spliteratorAPI;
+
+import java.util.List;
+
+public class Article {
+    private List<Author> listOfAuthors;
+    private int id;
+    private String name;
+
+    public Article(String name) {
+        this.name = name;
+    }
+
+    public Article(List<Author> listOfAuthors, int id) {
+        super();
+        this.listOfAuthors = listOfAuthors;
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public List<Author> getListOfAuthors() {
+        return listOfAuthors;
+    }
+
+    public void setListOfAuthors(List<Author> listOfAuthors) {
+        this.listOfAuthors = listOfAuthors;
+    }
+
 }
\ No newline at end of file
diff --git a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Author.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Author.java
similarity index 95%
rename from core-java-8/src/main/java/com/baeldung/spliteratorAPI/Author.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Author.java
index 40c381f4a6..18bbbd073e 100644
--- a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Author.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Author.java
@@ -1,33 +1,33 @@
-package com.baeldung.spliteratorAPI;
-
-public class Author {
-    private String name;
-    private int relatedArticleId;
-
-    public Author(String name, int relatedArticleId) {
-        this.name = name;
-        this.relatedArticleId = relatedArticleId;
-    }
-
-    public int getRelatedArticleId() {
-        return relatedArticleId;
-    }
-
-    public void setRelatedArticleId(int relatedArticleId) {
-        this.relatedArticleId = relatedArticleId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return "[name: " + name + ", relatedId: " + relatedArticleId + "]";
-    }
-}
-
+package com.baeldung.spliteratorAPI;
+
+public class Author {
+    private String name;
+    private int relatedArticleId;
+
+    public Author(String name, int relatedArticleId) {
+        this.name = name;
+        this.relatedArticleId = relatedArticleId;
+    }
+
+    public int getRelatedArticleId() {
+        return relatedArticleId;
+    }
+
+    public void setRelatedArticleId(int relatedArticleId) {
+        this.relatedArticleId = relatedArticleId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "[name: " + name + ", relatedId: " + relatedArticleId + "]";
+    }
+}
+
diff --git a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Executor.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Executor.java
similarity index 96%
rename from core-java-8/src/main/java/com/baeldung/spliteratorAPI/Executor.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Executor.java
index 024d5dabdb..dd124948d8 100644
--- a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Executor.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Executor.java
@@ -1,19 +1,19 @@
-package com.baeldung.spliteratorAPI;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class Executor {
-
-	public static int countAutors(Stream<Author> stream) {
-		RelatedAuthorCounter wordCounter = stream.reduce(new RelatedAuthorCounter(0, true),
-				RelatedAuthorCounter::accumulate, RelatedAuthorCounter::combine);
-		return wordCounter.getCounter();
-	}
-
-	public static List<Article> generateElements() {
-		return Stream.generate(() -> new Article("Java")).limit(35000).collect(Collectors.toList());
-	}
-
+package com.baeldung.spliteratorAPI;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class Executor {
+
+	public static int countAutors(Stream<Author> stream) {
+		RelatedAuthorCounter wordCounter = stream.reduce(new RelatedAuthorCounter(0, true),
+				RelatedAuthorCounter::accumulate, RelatedAuthorCounter::combine);
+		return wordCounter.getCounter();
+	}
+
+	public static List<Article> generateElements() {
+		return Stream.generate(() -> new Article("Java")).limit(35000).collect(Collectors.toList());
+	}
+
 }
\ No newline at end of file
diff --git a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorCounter.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorCounter.java
similarity index 96%
rename from core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorCounter.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorCounter.java
index b7120b3af2..282c0be727 100644
--- a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorCounter.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorCounter.java
@@ -1,27 +1,27 @@
-package com.baeldung.spliteratorAPI;
-
-public class RelatedAuthorCounter {
-    private final int counter;
-    private final boolean isRelated;
-
-    public RelatedAuthorCounter(int counter, boolean isRelated) {
-        this.counter = counter;
-        this.isRelated = isRelated;
-    }
-
-    public RelatedAuthorCounter accumulate(Author author) {
-        if (author.getRelatedArticleId() == 0) {
-            return isRelated ? this : new RelatedAuthorCounter(counter, true);
-        } else {
-            return isRelated ? new RelatedAuthorCounter(counter + 1, false) : this;
-        }
-    }
-
-    public RelatedAuthorCounter combine(RelatedAuthorCounter RelatedAuthorCounter) {
-        return new RelatedAuthorCounter(counter + RelatedAuthorCounter.counter, RelatedAuthorCounter.isRelated);
-    }
-
-    public int getCounter() {
-        return counter;
-    }
-}
+package com.baeldung.spliteratorAPI;
+
+public class RelatedAuthorCounter {
+    private final int counter;
+    private final boolean isRelated;
+
+    public RelatedAuthorCounter(int counter, boolean isRelated) {
+        this.counter = counter;
+        this.isRelated = isRelated;
+    }
+
+    public RelatedAuthorCounter accumulate(Author author) {
+        if (author.getRelatedArticleId() == 0) {
+            return isRelated ? this : new RelatedAuthorCounter(counter, true);
+        } else {
+            return isRelated ? new RelatedAuthorCounter(counter + 1, false) : this;
+        }
+    }
+
+    public RelatedAuthorCounter combine(RelatedAuthorCounter RelatedAuthorCounter) {
+        return new RelatedAuthorCounter(counter + RelatedAuthorCounter.counter, RelatedAuthorCounter.isRelated);
+    }
+
+    public int getCounter() {
+        return counter;
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorSpliterator.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorSpliterator.java
similarity index 96%
rename from core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorSpliterator.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorSpliterator.java
index 0a7190964e..094638da37 100644
--- a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorSpliterator.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorSpliterator.java
@@ -1,49 +1,49 @@
-package com.baeldung.spliteratorAPI;
-
-import java.util.List;
-import java.util.Spliterator;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-
-public class RelatedAuthorSpliterator implements Spliterator<Author> {
-	private final List<Author> list;
-	AtomicInteger current = new AtomicInteger();
-
-	public RelatedAuthorSpliterator(List<Author> list) {
-		this.list = list;
-	}
-
-	@Override
-	public boolean tryAdvance(Consumer<? super Author> action) {
-
-		action.accept(list.get(current.getAndIncrement()));
-		return current.get() < list.size();
-	}
-
-	@Override
-	public Spliterator<Author> trySplit() {
-		int currentSize = list.size() - current.get();
-		if (currentSize < 10) {
-			return null;
-		}
-		for (int splitPos = currentSize / 2 + current.intValue(); splitPos < list.size(); splitPos++) {
-			if (list.get(splitPos).getRelatedArticleId() == 0) {
-				Spliterator<Author> spliterator = new RelatedAuthorSpliterator(list.subList(current.get(), splitPos));
-				current.set(splitPos);
-				return spliterator;
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public long estimateSize() {
-		return list.size() - current.get();
-	}
-
-	@Override
-	public int characteristics() {
-		return CONCURRENT;
-	}
-
-}
+package com.baeldung.spliteratorAPI;
+
+import java.util.List;
+import java.util.Spliterator;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+
+public class RelatedAuthorSpliterator implements Spliterator<Author> {
+	private final List<Author> list;
+	AtomicInteger current = new AtomicInteger();
+
+	public RelatedAuthorSpliterator(List<Author> list) {
+		this.list = list;
+	}
+
+	@Override
+	public boolean tryAdvance(Consumer<? super Author> action) {
+
+		action.accept(list.get(current.getAndIncrement()));
+		return current.get() < list.size();
+	}
+
+	@Override
+	public Spliterator<Author> trySplit() {
+		int currentSize = list.size() - current.get();
+		if (currentSize < 10) {
+			return null;
+		}
+		for (int splitPos = currentSize / 2 + current.intValue(); splitPos < list.size(); splitPos++) {
+			if (list.get(splitPos).getRelatedArticleId() == 0) {
+				Spliterator<Author> spliterator = new RelatedAuthorSpliterator(list.subList(current.get(), splitPos));
+				current.set(splitPos);
+				return spliterator;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public long estimateSize() {
+		return list.size() - current.get();
+	}
+
+	@Override
+	public int characteristics() {
+		return CONCURRENT;
+	}
+
+}
diff --git a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Task.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Task.java
similarity index 96%
rename from core-java-8/src/main/java/com/baeldung/spliteratorAPI/Task.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Task.java
index 70435d1c75..06a124cc98 100644
--- a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Task.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Task.java
@@ -1,27 +1,27 @@
-package com.baeldung.spliteratorAPI;
-
-import java.util.Spliterator;
-import java.util.concurrent.Callable;
-
-public class Task implements Callable<String> {
-    private Spliterator<Article> spliterator;
-    private final static String SUFFIX = "- published by Baeldung";
-
-    public Task(Spliterator<Article> spliterator) {
-        this.spliterator = spliterator;
-    }
-
-    @Override
-    public String call() {
-        int current = 0;
-        while (spliterator.tryAdvance(article -> {
-            article.setName(article.getName()
-                .concat(SUFFIX));
-        })) {
-            current++;
-        }
-        ;
-        return Thread.currentThread()
-            .getName() + ":" + current;
-    }
-}
+package com.baeldung.spliteratorAPI;
+
+import java.util.Spliterator;
+import java.util.concurrent.Callable;
+
+public class Task implements Callable<String> {
+    private Spliterator<Article> spliterator;
+    private final static String SUFFIX = "- published by Baeldung";
+
+    public Task(Spliterator<Article> spliterator) {
+        this.spliterator = spliterator;
+    }
+
+    @Override
+    public String call() {
+        int current = 0;
+        while (spliterator.tryAdvance(article -> {
+            article.setName(article.getName()
+                .concat(SUFFIX));
+        })) {
+            current++;
+        }
+        ;
+        return Thread.currentThread()
+            .getName() + ":" + current;
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/strategy/ChristmasDiscounter.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/strategy/ChristmasDiscounter.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/strategy/ChristmasDiscounter.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/strategy/ChristmasDiscounter.java
diff --git a/core-java-8/src/main/java/com/baeldung/strategy/Discounter.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/strategy/Discounter.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/strategy/Discounter.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/strategy/Discounter.java
diff --git a/core-java-8/src/main/java/com/baeldung/strategy/EasterDiscounter.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/strategy/EasterDiscounter.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/strategy/EasterDiscounter.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/strategy/EasterDiscounter.java
diff --git a/core-java-8/src/main/java/com/baeldung/streamreduce/application/Application.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/application/Application.java
similarity index 97%
rename from core-java-8/src/main/java/com/baeldung/streamreduce/application/Application.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/application/Application.java
index 0b1dd952dc..00fc45ccae 100644
--- a/core-java-8/src/main/java/com/baeldung/streamreduce/application/Application.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/application/Application.java
@@ -1,62 +1,62 @@
-package com.baeldung.streamreduce.application;
-
-import com.baeldung.streamreduce.entities.User;
-import com.baeldung.streamreduce.utilities.NumberUtils;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class Application {
-
-    public static void main(String[] args) {
-        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
-        int result1 = numbers.stream().reduce(0, (a, b) -> a + b);
-        System.out.println(result1);
-        
-        int result2 = numbers.stream().reduce(0, Integer::sum);
-        System.out.println(result2);
-
-        List<String> letters = Arrays.asList("a", "b", "c", "d", "e");
-        String result3 = letters.stream().reduce("", (a, b) -> a + b);
-        System.out.println(result3);
-        
-        String result4 = letters.stream().reduce("", String::concat);
-        System.out.println(result4);
-
-        String result5 = letters.stream().reduce("", (a, b) -> a.toUpperCase() + b.toUpperCase());
-        System.out.println(result5);
-        
-        List<User> users = Arrays.asList(new User("John", 30), new User("Julie", 35));
-        int result6 = users.stream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
-        System.out.println(result6);
-        
-        String result7 = letters.parallelStream().reduce("", String::concat);
-        System.out.println(result7);
-        
-        int result8 = users.parallelStream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
-        System.out.println(result8);
-        
-        List<User> userList = new ArrayList<>();
-        for (int i = 0; i <= 1000000; i++) {
-            userList.add(new User("John" + i, i));
-        }
-        
-        long t1 = System.currentTimeMillis();
-        int result9 = userList.stream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
-        long t2 = System.currentTimeMillis();
-        System.out.println(result9);
-        System.out.println("Sequential stream time: " + (t2 - t1) + "ms");
-        
-        long t3 = System.currentTimeMillis();
-        int result10 = userList.parallelStream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
-        long t4 = System.currentTimeMillis();
-        System.out.println(result10);
-        System.out.println("Parallel stream time: " + (t4 - t3) + "ms");
-        
-        int result11 = NumberUtils.divideListElements(numbers, 1);
-        System.out.println(result11);
-        
-        int result12 = NumberUtils.divideListElementsWithExtractedTryCatchBlock(numbers, 0);
-        System.out.println(result12);
-    }    
-}
+package com.baeldung.streamreduce.application;
+
+import com.baeldung.streamreduce.entities.User;
+import com.baeldung.streamreduce.utilities.NumberUtils;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class Application {
+
+    public static void main(String[] args) {
+        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
+        int result1 = numbers.stream().reduce(0, (a, b) -> a + b);
+        System.out.println(result1);
+        
+        int result2 = numbers.stream().reduce(0, Integer::sum);
+        System.out.println(result2);
+
+        List<String> letters = Arrays.asList("a", "b", "c", "d", "e");
+        String result3 = letters.stream().reduce("", (a, b) -> a + b);
+        System.out.println(result3);
+        
+        String result4 = letters.stream().reduce("", String::concat);
+        System.out.println(result4);
+
+        String result5 = letters.stream().reduce("", (a, b) -> a.toUpperCase() + b.toUpperCase());
+        System.out.println(result5);
+        
+        List<User> users = Arrays.asList(new User("John", 30), new User("Julie", 35));
+        int result6 = users.stream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
+        System.out.println(result6);
+        
+        String result7 = letters.parallelStream().reduce("", String::concat);
+        System.out.println(result7);
+        
+        int result8 = users.parallelStream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
+        System.out.println(result8);
+        
+        List<User> userList = new ArrayList<>();
+        for (int i = 0; i <= 1000000; i++) {
+            userList.add(new User("John" + i, i));
+        }
+        
+        long t1 = System.currentTimeMillis();
+        int result9 = userList.stream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
+        long t2 = System.currentTimeMillis();
+        System.out.println(result9);
+        System.out.println("Sequential stream time: " + (t2 - t1) + "ms");
+        
+        long t3 = System.currentTimeMillis();
+        int result10 = userList.parallelStream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
+        long t4 = System.currentTimeMillis();
+        System.out.println(result10);
+        System.out.println("Parallel stream time: " + (t4 - t3) + "ms");
+        
+        int result11 = NumberUtils.divideListElements(numbers, 1);
+        System.out.println(result11);
+        
+        int result12 = NumberUtils.divideListElementsWithExtractedTryCatchBlock(numbers, 0);
+        System.out.println(result12);
+    }    
+}
diff --git a/core-java-8/src/main/java/com/baeldung/streamreduce/entities/User.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/entities/User.java
similarity index 94%
rename from core-java-8/src/main/java/com/baeldung/streamreduce/entities/User.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/entities/User.java
index bc13a8cde6..39a42beab7 100644
--- a/core-java-8/src/main/java/com/baeldung/streamreduce/entities/User.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/entities/User.java
@@ -1,25 +1,25 @@
-package com.baeldung.streamreduce.entities;
-
-public class User {
-
-    private final String name;
-    private final int age;
-
-    public User(String name, int age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getAge() {
-        return age;
-    }
-    
-    @Override
-    public String toString() {
-        return "User{" + "name=" + name + ", age=" + age + '}';
-    }
-}
+package com.baeldung.streamreduce.entities;
+
+public class User {
+
+    private final String name;
+    private final int age;
+
+    public User(String name, int age) {
+        this.name = name;
+        this.age = age;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getAge() {
+        return age;
+    }
+    
+    @Override
+    public String toString() {
+        return "User{" + "name=" + name + ", age=" + age + '}';
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/streamreduce/utilities/NumberUtils.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/utilities/NumberUtils.java
similarity index 97%
rename from core-java-8/src/main/java/com/baeldung/streamreduce/utilities/NumberUtils.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/utilities/NumberUtils.java
index 7a6a85e6c4..a2325cc701 100644
--- a/core-java-8/src/main/java/com/baeldung/streamreduce/utilities/NumberUtils.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/utilities/NumberUtils.java
@@ -1,52 +1,52 @@
-package com.baeldung.streamreduce.utilities;
-
-import java.util.List;
-import java.util.function.BiFunction;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public abstract class NumberUtils {
-
-    private static final Logger LOGGER = Logger.getLogger(NumberUtils.class.getName());
-
-    public static int divideListElements(List<Integer> values, Integer divider) {
-        return values.stream()
-                .reduce(0, (a, b) -> {
-                    try {
-                        return a / divider + b / divider;
-                    } catch (ArithmeticException e) {
-                        LOGGER.log(Level.INFO, "Arithmetic Exception: Division by Zero");
-                    }
-                    return 0;
-                });
-    }
-    
-    public static int divideListElementsWithExtractedTryCatchBlock(List<Integer> values, int divider) {
-        return values.stream().reduce(0, (a, b) -> divide(a, divider) + divide(b, divider));
-    }
-    
-    public static int divideListElementsWithApplyFunctionMethod(List<Integer> values, int divider) {
-        BiFunction<Integer, Integer, Integer> division = (a, b) -> a / b;
-        return values.stream().reduce(0, (a, b) -> applyFunction(division, a, divider) + applyFunction(division, b, divider));
-    }
-    
-    private static int divide(int value, int factor) {
-        int result = 0;
-        try {
-            result = value / factor;
-        } catch (ArithmeticException e) {
-            LOGGER.log(Level.INFO, "Arithmetic Exception: Division by Zero");
-        }
-        return result;
-    }
-    
-    private static int applyFunction(BiFunction<Integer, Integer, Integer> function, int a, int b) {
-        try {
-            return function.apply(a, b);
-        }
-        catch(Exception e) {
-            LOGGER.log(Level.INFO, "Exception occurred!");
-        }
-        return 0;
-    }
-}
+package com.baeldung.streamreduce.utilities;
+
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public abstract class NumberUtils {
+
+    private static final Logger LOGGER = Logger.getLogger(NumberUtils.class.getName());
+
+    public static int divideListElements(List<Integer> values, Integer divider) {
+        return values.stream()
+                .reduce(0, (a, b) -> {
+                    try {
+                        return a / divider + b / divider;
+                    } catch (ArithmeticException e) {
+                        LOGGER.log(Level.INFO, "Arithmetic Exception: Division by Zero");
+                    }
+                    return 0;
+                });
+    }
+    
+    public static int divideListElementsWithExtractedTryCatchBlock(List<Integer> values, int divider) {
+        return values.stream().reduce(0, (a, b) -> divide(a, divider) + divide(b, divider));
+    }
+    
+    public static int divideListElementsWithApplyFunctionMethod(List<Integer> values, int divider) {
+        BiFunction<Integer, Integer, Integer> division = (a, b) -> a / b;
+        return values.stream().reduce(0, (a, b) -> applyFunction(division, a, divider) + applyFunction(division, b, divider));
+    }
+    
+    private static int divide(int value, int factor) {
+        int result = 0;
+        try {
+            result = value / factor;
+        } catch (ArithmeticException e) {
+            LOGGER.log(Level.INFO, "Arithmetic Exception: Division by Zero");
+        }
+        return result;
+    }
+    
+    private static int applyFunction(BiFunction<Integer, Integer, Integer> function, int a, int b) {
+        try {
+            return function.apply(a, b);
+        }
+        catch(Exception e) {
+            LOGGER.log(Level.INFO, "Exception occurred!");
+        }
+        return 0;
+    }
+}
diff --git a/core-java-8/src/main/resources/logback.xml b/core-java-modules/core-java-8/src/main/resources/logback.xml
similarity index 100%
rename from core-java-8/src/main/resources/logback.xml
rename to core-java-modules/core-java-8/src/main/resources/logback.xml
diff --git a/core-java-8/src/test/java/com/baeldung/collectors/Java8CollectorsUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/collectors/Java8CollectorsUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/collectors/Java8CollectorsUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/collectors/Java8CollectorsUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/counter/CounterStatistics.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/counter/CounterStatistics.java
similarity index 97%
rename from core-java-8/src/test/java/com/baeldung/counter/CounterStatistics.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/counter/CounterStatistics.java
index 015ca3f942..e5b03bf355 100644
--- a/core-java-8/src/test/java/com/baeldung/counter/CounterStatistics.java
+++ b/core-java-modules/core-java-8/src/test/java/com/baeldung/counter/CounterStatistics.java
@@ -1,61 +1,61 @@
-package com.baeldung.counter;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Mode;
-
-import com.baeldung.counter.CounterUtil.MutableInteger;
-
-@Fork(value = 1, warmups = 3)
-@BenchmarkMode(Mode.All)
-public class CounterStatistics {
-
-    private static final Map<String, Integer> counterMap = new HashMap<>();
-    private static final Map<String, MutableInteger> counterWithMutableIntMap = new HashMap<>();
-    private static final Map<String, int[]> counterWithIntArrayMap = new HashMap<>();
-    private static final Map<String, Long> counterWithLongWrapperMap = new HashMap<>();
-    private static final Map<String, Long> counterWithLongWrapperStreamMap = new HashMap<>();
-    
-    static {
-        CounterUtil.COUNTRY_NAMES = new String[10000];
-        final String prefix = "NewString"; 
-        Random random = new Random();
-        for (int i=0; i<10000; i++) {
-            CounterUtil.COUNTRY_NAMES[i] = new String(prefix + random.nextInt(1000));
-        }
-    }
-
-  @Benchmark
-    public void wrapperAsCounter() {
-        CounterUtil.counterWithWrapperObject(counterMap);
-    }
-
-    @Benchmark
-    public void lambdaExpressionWithWrapper() {
-        CounterUtil.counterWithLambdaAndWrapper(counterWithLongWrapperMap);
-    }
-    
-    @Benchmark
-    public void parallelStreamWithWrapper() {
-        CounterUtil.counterWithParallelStreamAndWrapper(counterWithLongWrapperStreamMap);
-    }
-
-    @Benchmark
-    public void mutableIntegerAsCounter() {
-        CounterUtil.counterWithMutableInteger(counterWithMutableIntMap);
-    }
-
-    @Benchmark
-    public void primitiveArrayAsCounter() {
-        CounterUtil.counterWithPrimitiveArray(counterWithIntArrayMap);
-    }
-
-    public static void main(String[] args) throws Exception {
-        org.openjdk.jmh.Main.main(args);
-    }
-}
+package com.baeldung.counter;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Mode;
+
+import com.baeldung.counter.CounterUtil.MutableInteger;
+
+@Fork(value = 1, warmups = 3)
+@BenchmarkMode(Mode.All)
+public class CounterStatistics {
+
+    private static final Map<String, Integer> counterMap = new HashMap<>();
+    private static final Map<String, MutableInteger> counterWithMutableIntMap = new HashMap<>();
+    private static final Map<String, int[]> counterWithIntArrayMap = new HashMap<>();
+    private static final Map<String, Long> counterWithLongWrapperMap = new HashMap<>();
+    private static final Map<String, Long> counterWithLongWrapperStreamMap = new HashMap<>();
+    
+    static {
+        CounterUtil.COUNTRY_NAMES = new String[10000];
+        final String prefix = "NewString"; 
+        Random random = new Random();
+        for (int i=0; i<10000; i++) {
+            CounterUtil.COUNTRY_NAMES[i] = new String(prefix + random.nextInt(1000));
+        }
+    }
+
+  @Benchmark
+    public void wrapperAsCounter() {
+        CounterUtil.counterWithWrapperObject(counterMap);
+    }
+
+    @Benchmark
+    public void lambdaExpressionWithWrapper() {
+        CounterUtil.counterWithLambdaAndWrapper(counterWithLongWrapperMap);
+    }
+    
+    @Benchmark
+    public void parallelStreamWithWrapper() {
+        CounterUtil.counterWithParallelStreamAndWrapper(counterWithLongWrapperStreamMap);
+    }
+
+    @Benchmark
+    public void mutableIntegerAsCounter() {
+        CounterUtil.counterWithMutableInteger(counterWithMutableIntMap);
+    }
+
+    @Benchmark
+    public void primitiveArrayAsCounter() {
+        CounterUtil.counterWithPrimitiveArray(counterWithIntArrayMap);
+    }
+
+    public static void main(String[] args) throws Exception {
+        org.openjdk.jmh.Main.main(args);
+    }
+}
diff --git a/core-java-8/src/test/java/com/baeldung/counter/CounterUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/counter/CounterUnitTest.java
similarity index 96%
rename from core-java-8/src/test/java/com/baeldung/counter/CounterUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/counter/CounterUnitTest.java
index ef57fc2c6e..4f914bd289 100644
--- a/core-java-8/src/test/java/com/baeldung/counter/CounterUnitTest.java
+++ b/core-java-modules/core-java-8/src/test/java/com/baeldung/counter/CounterUnitTest.java
@@ -1,53 +1,53 @@
-package com.baeldung.counter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.baeldung.counter.CounterUtil.MutableInteger;
-
-public class CounterUnitTest {
-
-    @Test
-    public void whenMapWithWrapperAsCounter_runsSuccessfully() {
-        Map<String, Integer> counterMap = new HashMap<>();
-        CounterUtil.counterWithWrapperObject(counterMap);
-
-        assertEquals(3, counterMap.get("China")
-            .intValue());
-        assertEquals(2, counterMap.get("India")
-            .intValue());
-    }
-
-    @Test
-    public void whenMapWithLambdaAndWrapperCounter_runsSuccessfully() {
-        Map<String, Long> counterMap = new HashMap<>();
-        CounterUtil.counterWithLambdaAndWrapper(counterMap);
-
-        assertEquals(3l, counterMap.get("China")
-            .longValue());
-        assertEquals(2l, counterMap.get("India")
-            .longValue());
-    }
-
-    @Test
-    public void whenMapWithMutableIntegerCounter_runsSuccessfully() {
-        Map<String, MutableInteger> counterMap = new HashMap<>();
-        CounterUtil.counterWithMutableInteger(counterMap);
-        assertEquals(3, counterMap.get("China")
-            .getCount());
-        assertEquals(2, counterMap.get("India")
-            .getCount());
-    }
-
-    @Test
-    public void whenMapWithPrimitiveArray_runsSuccessfully() {
-        Map<String, int[]> counterMap = new HashMap<>();
-        CounterUtil.counterWithPrimitiveArray(counterMap);
-        assertEquals(3, counterMap.get("China")[0]);
-        assertEquals(2, counterMap.get("India")[0]);
-    }
-}
+package com.baeldung.counter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import com.baeldung.counter.CounterUtil.MutableInteger;
+
+public class CounterUnitTest {
+
+    @Test
+    public void whenMapWithWrapperAsCounter_runsSuccessfully() {
+        Map<String, Integer> counterMap = new HashMap<>();
+        CounterUtil.counterWithWrapperObject(counterMap);
+
+        assertEquals(3, counterMap.get("China")
+            .intValue());
+        assertEquals(2, counterMap.get("India")
+            .intValue());
+    }
+
+    @Test
+    public void whenMapWithLambdaAndWrapperCounter_runsSuccessfully() {
+        Map<String, Long> counterMap = new HashMap<>();
+        CounterUtil.counterWithLambdaAndWrapper(counterMap);
+
+        assertEquals(3l, counterMap.get("China")
+            .longValue());
+        assertEquals(2l, counterMap.get("India")
+            .longValue());
+    }
+
+    @Test
+    public void whenMapWithMutableIntegerCounter_runsSuccessfully() {
+        Map<String, MutableInteger> counterMap = new HashMap<>();
+        CounterUtil.counterWithMutableInteger(counterMap);
+        assertEquals(3, counterMap.get("China")
+            .getCount());
+        assertEquals(2, counterMap.get("India")
+            .getCount());
+    }
+
+    @Test
+    public void whenMapWithPrimitiveArray_runsSuccessfully() {
+        Map<String, int[]> counterMap = new HashMap<>();
+        CounterUtil.counterWithPrimitiveArray(counterMap);
+        assertEquals(3, counterMap.get("China")[0]);
+        assertEquals(2, counterMap.get("India")[0]);
+    }
+}
diff --git a/core-java-8/src/test/java/com/baeldung/counter/CounterUtil.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/counter/CounterUtil.java
similarity index 96%
rename from core-java-8/src/test/java/com/baeldung/counter/CounterUtil.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/counter/CounterUtil.java
index c2bf47e213..7e15fa1356 100644
--- a/core-java-8/src/test/java/com/baeldung/counter/CounterUtil.java
+++ b/core-java-modules/core-java-8/src/test/java/com/baeldung/counter/CounterUtil.java
@@ -1,57 +1,57 @@
-package com.baeldung.counter;
-
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class CounterUtil {
-
-    public static String[] COUNTRY_NAMES = { "China", "Australia", "India", "USA", "USSR", "UK", "China", "France", "Poland", "Austria", "India", "USA", "Egypt", "China" };
-
-    public static void counterWithWrapperObject(Map<String, Integer> counterMap) {
-        for (String country : COUNTRY_NAMES) {
-            counterMap.compute(country, (k, v) -> v == null ? 1 : v + 1);
-        }
-    }
-
-    public static void counterWithLambdaAndWrapper(Map<String, Long> counterMap) {
-        Stream.of(COUNTRY_NAMES)
-            .collect(Collectors.groupingBy(k -> k, () -> counterMap, Collectors.counting()));
-    }
-
-    public static void counterWithParallelStreamAndWrapper(Map<String, Long> counterMap) {
-        Stream.of(COUNTRY_NAMES)
-            .parallel()
-            .collect(Collectors.groupingBy(k -> k, () -> counterMap, Collectors.counting()));
-    }
-
-    public static class MutableInteger {
-        int count;
-
-        public MutableInteger(int count) {
-            this.count = count;
-        }
-
-        public void increment() {
-            this.count++;
-        }
-
-        public int getCount() {
-            return this.count;
-        }
-    }
-
-    public static void counterWithMutableInteger(Map<String, MutableInteger> counterMap) {
-        for (String country : COUNTRY_NAMES) {
-            counterMap.compute(country, (k, v) -> v == null ? new MutableInteger(0) : v)
-                .increment();
-        }
-    }
-
-    public static void counterWithPrimitiveArray(Map<String, int[]> counterMap) {
-        for (String country : COUNTRY_NAMES) {
-            counterMap.compute(country, (k, v) -> v == null ? new int[] { 0 } : v)[0]++;
-        }
-    }
-
+package com.baeldung.counter;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class CounterUtil {
+
+    public static String[] COUNTRY_NAMES = { "China", "Australia", "India", "USA", "USSR", "UK", "China", "France", "Poland", "Austria", "India", "USA", "Egypt", "China" };
+
+    public static void counterWithWrapperObject(Map<String, Integer> counterMap) {
+        for (String country : COUNTRY_NAMES) {
+            counterMap.compute(country, (k, v) -> v == null ? 1 : v + 1);
+        }
+    }
+
+    public static void counterWithLambdaAndWrapper(Map<String, Long> counterMap) {
+        Stream.of(COUNTRY_NAMES)
+            .collect(Collectors.groupingBy(k -> k, () -> counterMap, Collectors.counting()));
+    }
+
+    public static void counterWithParallelStreamAndWrapper(Map<String, Long> counterMap) {
+        Stream.of(COUNTRY_NAMES)
+            .parallel()
+            .collect(Collectors.groupingBy(k -> k, () -> counterMap, Collectors.counting()));
+    }
+
+    public static class MutableInteger {
+        int count;
+
+        public MutableInteger(int count) {
+            this.count = count;
+        }
+
+        public void increment() {
+            this.count++;
+        }
+
+        public int getCount() {
+            return this.count;
+        }
+    }
+
+    public static void counterWithMutableInteger(Map<String, MutableInteger> counterMap) {
+        for (String country : COUNTRY_NAMES) {
+            counterMap.compute(country, (k, v) -> v == null ? new MutableInteger(0) : v)
+                .increment();
+        }
+    }
+
+    public static void counterWithPrimitiveArray(Map<String, int[]> counterMap) {
+        for (String country : COUNTRY_NAMES) {
+            counterMap.compute(country, (k, v) -> v == null ? new int[] { 0 } : v)[0]++;
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/core-java-8/src/test/java/com/baeldung/customannotations/JsonSerializerUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/customannotations/JsonSerializerUnitTest.java
similarity index 97%
rename from core-java-8/src/test/java/com/baeldung/customannotations/JsonSerializerUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/customannotations/JsonSerializerUnitTest.java
index f24b37aef7..fd8f8ba8b3 100644
--- a/core-java-8/src/test/java/com/baeldung/customannotations/JsonSerializerUnitTest.java
+++ b/core-java-modules/core-java-8/src/test/java/com/baeldung/customannotations/JsonSerializerUnitTest.java
@@ -1,26 +1,26 @@
-package com.baeldung.customannotations;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import org.junit.jupiter.api.Test;
-
-public class JsonSerializerUnitTest {
-
-    @Test
-    public void givenObjectNotSerializedThenExceptionThrown() throws JsonSerializationException {
-        Object object = new Object();
-        ObjectToJsonConverter serializer = new ObjectToJsonConverter();
-        assertThrows(JsonSerializationException.class, () -> {
-            serializer.convertToJson(object);
-        });
-    }
-
-    @Test
-    public void givenObjectSerializedThenTrueReturned() throws JsonSerializationException {
-        Person person = new Person("soufiane", "cheouati", "34");
-        ObjectToJsonConverter serializer = new ObjectToJsonConverter();
-        String jsonString = serializer.convertToJson(person);
-        assertEquals("{\"personAge\":\"34\",\"firstName\":\"Soufiane\",\"lastName\":\"Cheouati\"}", jsonString);
-    }
-}
+package com.baeldung.customannotations;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class JsonSerializerUnitTest {
+
+    @Test
+    public void givenObjectNotSerializedThenExceptionThrown() throws JsonSerializationException {
+        Object object = new Object();
+        ObjectToJsonConverter serializer = new ObjectToJsonConverter();
+        assertThrows(JsonSerializationException.class, () -> {
+            serializer.convertToJson(object);
+        });
+    }
+
+    @Test
+    public void givenObjectSerializedThenTrueReturned() throws JsonSerializationException {
+        Person person = new Person("soufiane", "cheouati", "34");
+        ObjectToJsonConverter serializer = new ObjectToJsonConverter();
+        String jsonString = serializer.convertToJson(person);
+        assertEquals("{\"personAge\":\"34\",\"firstName\":\"Soufiane\",\"lastName\":\"Cheouati\"}", jsonString);
+    }
+}
diff --git a/core-java-8/src/test/java/com/baeldung/defaultistaticinterfacemethods/test/StaticDefaulInterfaceMethodUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/defaultistaticinterfacemethods/test/StaticDefaulInterfaceMethodUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/defaultistaticinterfacemethods/test/StaticDefaulInterfaceMethodUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/defaultistaticinterfacemethods/test/StaticDefaulInterfaceMethodUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/doublecolon/ComputerUtilsUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/doublecolon/ComputerUtilsUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/doublecolon/ComputerUtilsUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/doublecolon/ComputerUtilsUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java
diff --git a/core-java-8/src/test/java/com/baeldung/internationalization/DateFormatUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/internationalization/DateFormatUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/internationalization/DateFormatUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/internationalization/DateFormatUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/internationalization/NumbersCurrenciesFormattingUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/internationalization/NumbersCurrenciesFormattingUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/internationalization/NumbersCurrenciesFormattingUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/internationalization/NumbersCurrenciesFormattingUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/Java8DefaultStaticIntefaceMethodsUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8DefaultStaticIntefaceMethodsUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/Java8DefaultStaticIntefaceMethodsUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8DefaultStaticIntefaceMethodsUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/Java8ForEachUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8ForEachUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/Java8ForEachUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8ForEachUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/Java8GroupingByCollectorUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8GroupingByCollectorUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/Java8GroupingByCollectorUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8GroupingByCollectorUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/Java8MethodReferenceUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8MethodReferenceUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/Java8MethodReferenceUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8MethodReferenceUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/Java8OptionalUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8OptionalUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/Java8OptionalUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8OptionalUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/Java8PredicateChainUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8PredicateChainUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/Java8PredicateChainUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8PredicateChainUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/Java8SortUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8SortUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/Java8SortUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8SortUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/JavaTryWithResourcesLongRunningUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/JavaTryWithResourcesLongRunningUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/JavaTryWithResourcesLongRunningUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/JavaTryWithResourcesLongRunningUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/UnsignedArithmeticUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/UnsignedArithmeticUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/UnsignedArithmeticUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/UnsignedArithmeticUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/comparator/Employee.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/comparator/Employee.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/comparator/Employee.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/comparator/Employee.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/comparator/Java8ComparatorUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/comparator/Java8ComparatorUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/comparator/Java8ComparatorUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/comparator/Java8ComparatorUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/entity/Human.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/entity/Human.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/entity/Human.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/entity/Human.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/Bicycle.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/Bicycle.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/Bicycle.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/Bicycle.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/BicycleComparator.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/BicycleComparator.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/BicycleComparator.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/BicycleComparator.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/MethodReferenceUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/MethodReferenceUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/MethodReferenceUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/MethodReferenceUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalChainingUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalChainingUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/optional/OptionalChainingUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalChainingUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/math/MathNewMethodsUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/math/MathNewMethodsUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/math/MathNewMethodsUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/math/MathNewMethodsUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNullUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNullUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNullUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNullUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainerUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainerUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainerUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainerUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheckUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheckUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheckUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheckUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/optional/PersonRepositoryUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/optional/PersonRepositoryUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/optional/PersonRepositoryUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/optional/PersonRepositoryUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/reduceIfelse/CalculatorUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/reduceIfelse/CalculatorUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/reduceIfelse/CalculatorUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/reduceIfelse/CalculatorUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/reflect/MethodParamNameUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/reflect/MethodParamNameUnitTest.java
similarity index 97%
rename from core-java-8/src/test/java/com/baeldung/reflect/MethodParamNameUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/reflect/MethodParamNameUnitTest.java
index b191c94826..dadd6d7543 100644
--- a/core-java-8/src/test/java/com/baeldung/reflect/MethodParamNameUnitTest.java
+++ b/core-java-modules/core-java-8/src/test/java/com/baeldung/reflect/MethodParamNameUnitTest.java
@@ -1,34 +1,34 @@
-package com.baeldung.reflect;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.lang.reflect.Parameter;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-import org.junit.Test;
-
-public class MethodParamNameUnitTest {
-
-    @Test
-    public void whenGetConstructorParams_thenOk() 
-    		throws NoSuchMethodException, SecurityException {
-    	List<Parameter> parameters 
-    		= Arrays.asList(Person.class.getConstructor(String.class).getParameters());
-    	Optional<Parameter> parameter 
-    		= parameters.stream().filter(Parameter::isNamePresent).findFirst();
-    	assertThat(parameter.get().getName()).isEqualTo("fullName");  
-    }
-
-    @Test
-    public void whenGetMethodParams_thenOk() 
-    		throws NoSuchMethodException, SecurityException {
-    	List<Parameter> parameters 
-    		= Arrays.asList(
-    			Person.class.getMethod("setFullName", String.class).getParameters());
-    	Optional<Parameter> parameter 
-			= parameters.stream().filter(Parameter::isNamePresent).findFirst();
-    	assertThat(parameter.get().getName()).isEqualTo("fullName");
-    }
-}
+package com.baeldung.reflect;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.lang.reflect.Parameter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.Test;
+
+public class MethodParamNameUnitTest {
+
+    @Test
+    public void whenGetConstructorParams_thenOk() 
+    		throws NoSuchMethodException, SecurityException {
+    	List<Parameter> parameters 
+    		= Arrays.asList(Person.class.getConstructor(String.class).getParameters());
+    	Optional<Parameter> parameter 
+    		= parameters.stream().filter(Parameter::isNamePresent).findFirst();
+    	assertThat(parameter.get().getName()).isEqualTo("fullName");  
+    }
+
+    @Test
+    public void whenGetMethodParams_thenOk() 
+    		throws NoSuchMethodException, SecurityException {
+    	List<Parameter> parameters 
+    		= Arrays.asList(
+    			Person.class.getMethod("setFullName", String.class).getParameters());
+    	Optional<Parameter> parameter 
+			= parameters.stream().filter(Parameter::isNamePresent).findFirst();
+    	assertThat(parameter.get().getName()).isEqualTo("fullName");
+    }
+}
diff --git a/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorUnitTest.java
similarity index 97%
rename from core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorUnitTest.java
index 81fad12eb0..6981898500 100644
--- a/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorUnitTest.java
+++ b/core-java-modules/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorUnitTest.java
@@ -1,44 +1,44 @@
-package com.baeldung.spliteratorAPI;
-
-import java.util.Arrays;
-import java.util.Spliterator;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import static org.assertj.core.api.Assertions.*;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ExecutorUnitTest {
-	Article article;
-	Stream<Author> stream;
-	Spliterator<Author> spliterator;
-	Spliterator<Article> split1;
-	Spliterator<Article> split2;
-
-	@Before
-	public void init() {
-		article = new Article(Arrays.asList(new Author("Ahmad", 0), new Author("Eugen", 0), new Author("Alice", 1),
-				new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0),
-				new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0),
-				new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1),
-				new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1),
-				new Author("Mike", 0), new Author("Michał", 0), new Author("Loredana", 1)), 0);
-		stream = article.getListOfAuthors().stream();
-		split1 = Executor.generateElements().spliterator();
-		split2 = split1.trySplit();
-		spliterator = new RelatedAuthorSpliterator(article.getListOfAuthors());
-	}
-
-	@Test
-	public void givenAstreamOfAuthors_whenProcessedInParallelWithCustomSpliterator_coubtProducessRightOutput() {
-		Stream<Author> stream2 = StreamSupport.stream(spliterator, true);
-		assertThat(Executor.countAutors(stream2.parallel())).isEqualTo(9);
-	}
-
-	@Test
-	public void givenSpliterator_whenAppliedToAListOfArticle_thenSplittedInHalf() {
-		assertThat(new Task(split1).call()).containsSequence(Executor.generateElements().size() / 2 + "");
-		assertThat(new Task(split2).call()).containsSequence(Executor.generateElements().size() / 2 + "");
-	}
-}
+package com.baeldung.spliteratorAPI;
+
+import java.util.Arrays;
+import java.util.Spliterator;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import static org.assertj.core.api.Assertions.*;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ExecutorUnitTest {
+	Article article;
+	Stream<Author> stream;
+	Spliterator<Author> spliterator;
+	Spliterator<Article> split1;
+	Spliterator<Article> split2;
+
+	@Before
+	public void init() {
+		article = new Article(Arrays.asList(new Author("Ahmad", 0), new Author("Eugen", 0), new Author("Alice", 1),
+				new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0),
+				new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0),
+				new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1),
+				new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1),
+				new Author("Mike", 0), new Author("Michał", 0), new Author("Loredana", 1)), 0);
+		stream = article.getListOfAuthors().stream();
+		split1 = Executor.generateElements().spliterator();
+		split2 = split1.trySplit();
+		spliterator = new RelatedAuthorSpliterator(article.getListOfAuthors());
+	}
+
+	@Test
+	public void givenAstreamOfAuthors_whenProcessedInParallelWithCustomSpliterator_coubtProducessRightOutput() {
+		Stream<Author> stream2 = StreamSupport.stream(spliterator, true);
+		assertThat(Executor.countAutors(stream2.parallel())).isEqualTo(9);
+	}
+
+	@Test
+	public void givenSpliterator_whenAppliedToAListOfArticle_thenSplittedInHalf() {
+		assertThat(new Task(split1).call()).containsSequence(Executor.generateElements().size() / 2 + "");
+		assertThat(new Task(split2).call()).containsSequence(Executor.generateElements().size() / 2 + "");
+	}
+}
diff --git a/core-java-8/src/test/java/com/baeldung/strategy/StrategyDesignPatternUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/strategy/StrategyDesignPatternUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/strategy/StrategyDesignPatternUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/strategy/StrategyDesignPatternUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/stream/conditional/StreamForEachIfElseUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/stream/conditional/StreamForEachIfElseUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/stream/conditional/StreamForEachIfElseUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/stream/conditional/StreamForEachIfElseUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/streamreduce/tests/StreamReduceManualTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/streamreduce/tests/StreamReduceManualTest.java
similarity index 97%
rename from core-java-8/src/test/java/com/baeldung/streamreduce/tests/StreamReduceManualTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/streamreduce/tests/StreamReduceManualTest.java
index 9222cbb689..0bf1a5837e 100644
--- a/core-java-8/src/test/java/com/baeldung/streamreduce/tests/StreamReduceManualTest.java
+++ b/core-java-modules/core-java-8/src/test/java/com/baeldung/streamreduce/tests/StreamReduceManualTest.java
@@ -1,126 +1,126 @@
-package com.baeldung.streamreduce.tests;
-
-import com.baeldung.streamreduce.entities.User;
-import com.baeldung.streamreduce.utilities.NumberUtils;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
-
-public class StreamReduceManualTest {
-
-    @Test
-    public void givenIntegerList_whenReduceWithSumAccumulatorLambda_thenCorrect() {
-        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
-        
-        int result = numbers.stream().reduce(0, (a, b) -> a + b);
-        
-        assertThat(result).isEqualTo(21);
-    }
-
-    @Test
-    public void givenIntegerList_whenReduceWithSumAccumulatorMethodReference_thenCorrect() {
-        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
-        
-        int result = numbers.stream().reduce(0, Integer::sum);
-        
-        assertThat(result).isEqualTo(21);
-    }
-
-    @Test
-    public void givenStringList_whenReduceWithConcatenatorAccumulatorLambda_thenCorrect() {
-        List<String> letters = Arrays.asList("a", "b", "c", "d", "e");
-        
-        String result = letters.stream().reduce("", (a, b) -> a + b);
-        
-        assertThat(result).isEqualTo("abcde");
-    }
-
-    @Test
-    public void givenStringList_whenReduceWithConcatenatorAccumulatorMethodReference_thenCorrect() {
-        List<String> letters = Arrays.asList("a", "b", "c", "d", "e");
-        
-        String result = letters.stream().reduce("", String::concat);
-        
-        assertThat(result).isEqualTo("abcde");
-    }
-
-    @Test
-    public void givenStringList_whenReduceWithUppercaseConcatenatorAccumulator_thenCorrect() {
-        List<String> letters = Arrays.asList("a", "b", "c", "d", "e");
-        
-        String result = letters.stream().reduce("", (a, b) -> a.toUpperCase() + b.toUpperCase());
-        
-        assertThat(result).isEqualTo("ABCDE");
-    }
-
-    @Test
-    public void givenUserList_whenReduceWithAgeAccumulatorAndSumCombiner_thenCorrect() {
-        List<User> users = Arrays.asList(new User("John", 30), new User("Julie", 35));
-        
-        int result = users.stream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
-        
-        assertThat(result).isEqualTo(65);
-    }
-
-    @Test
-    public void givenStringList_whenReduceWithParallelStream_thenCorrect() {
-        List<String> letters = Arrays.asList("a", "b", "c", "d", "e");
-        
-        String result = letters.parallelStream().reduce("", String::concat);
-        
-        assertThat(result).isEqualTo("abcde");
-    }
-
-    @Test
-    public void givenNumberUtilsClass_whenCalledDivideListElements_thenCorrect() {
-        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
-        
-        assertThat(NumberUtils.divideListElements(numbers, 1)).isEqualTo(21);
-    }
-
-    @Test
-    public void givenNumberUtilsClass_whenCalledDivideListElementsWithExtractedTryCatchBlock_thenCorrect() {
-        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
-        
-        assertThat(NumberUtils.divideListElementsWithExtractedTryCatchBlock(numbers, 1)).isEqualTo(21);
-    }
-
-    @Test
-    public void givenNumberUtilsClass_whenCalledDivideListElementsWithExtractedTryCatchBlockAndListContainsZero_thenCorrect() {
-        List<Integer> numbers = Arrays.asList(0, 1, 2, 3, 4, 5, 6);
-        
-        assertThat(NumberUtils.divideListElementsWithExtractedTryCatchBlock(numbers, 1)).isEqualTo(21);
-    }
-    
-    @Test
-    public void givenNumberUtilsClass_whenCalledDivideListElementsWithExtractedTryCatchBlockAndDividerIsZero_thenCorrect() {
-        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
-        
-        assertThat(NumberUtils.divideListElementsWithExtractedTryCatchBlock(numbers, 0)).isEqualTo(0);
-    }
-    
-    @Test
-    public void givenStream_whneCalleddivideListElementsWithApplyFunctionMethod_thenCorrect() {
-        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
-        
-        assertThat(NumberUtils.divideListElementsWithApplyFunctionMethod(numbers, 1)).isEqualTo(21);
-    }
-    
-    @Test
-    public void givenTwoStreams_whenCalledReduceOnParallelizedStream_thenFasterExecutionTime() {
-        List<User> userList = new ArrayList<>();
-        for (int i = 0; i <= 1000000; i++) {
-            userList.add(new User("John" + i, i));
-        }
-        long currentTime1 = System.currentTimeMillis();
-        userList.stream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
-        long sequentialExecutionTime = System.currentTimeMillis() -currentTime1;
-        long currentTime2 = System.currentTimeMillis();
-        userList.parallelStream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
-        long parallelizedExecutionTime = System.currentTimeMillis() - currentTime2;
-        
-        assertThat(parallelizedExecutionTime).isLessThan(sequentialExecutionTime);
-    }
-}
+package com.baeldung.streamreduce.tests;
+
+import com.baeldung.streamreduce.entities.User;
+import com.baeldung.streamreduce.utilities.NumberUtils;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class StreamReduceManualTest {
+
+    @Test
+    public void givenIntegerList_whenReduceWithSumAccumulatorLambda_thenCorrect() {
+        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
+        
+        int result = numbers.stream().reduce(0, (a, b) -> a + b);
+        
+        assertThat(result).isEqualTo(21);
+    }
+
+    @Test
+    public void givenIntegerList_whenReduceWithSumAccumulatorMethodReference_thenCorrect() {
+        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
+        
+        int result = numbers.stream().reduce(0, Integer::sum);
+        
+        assertThat(result).isEqualTo(21);
+    }
+
+    @Test
+    public void givenStringList_whenReduceWithConcatenatorAccumulatorLambda_thenCorrect() {
+        List<String> letters = Arrays.asList("a", "b", "c", "d", "e");
+        
+        String result = letters.stream().reduce("", (a, b) -> a + b);
+        
+        assertThat(result).isEqualTo("abcde");
+    }
+
+    @Test
+    public void givenStringList_whenReduceWithConcatenatorAccumulatorMethodReference_thenCorrect() {
+        List<String> letters = Arrays.asList("a", "b", "c", "d", "e");
+        
+        String result = letters.stream().reduce("", String::concat);
+        
+        assertThat(result).isEqualTo("abcde");
+    }
+
+    @Test
+    public void givenStringList_whenReduceWithUppercaseConcatenatorAccumulator_thenCorrect() {
+        List<String> letters = Arrays.asList("a", "b", "c", "d", "e");
+        
+        String result = letters.stream().reduce("", (a, b) -> a.toUpperCase() + b.toUpperCase());
+        
+        assertThat(result).isEqualTo("ABCDE");
+    }
+
+    @Test
+    public void givenUserList_whenReduceWithAgeAccumulatorAndSumCombiner_thenCorrect() {
+        List<User> users = Arrays.asList(new User("John", 30), new User("Julie", 35));
+        
+        int result = users.stream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
+        
+        assertThat(result).isEqualTo(65);
+    }
+
+    @Test
+    public void givenStringList_whenReduceWithParallelStream_thenCorrect() {
+        List<String> letters = Arrays.asList("a", "b", "c", "d", "e");
+        
+        String result = letters.parallelStream().reduce("", String::concat);
+        
+        assertThat(result).isEqualTo("abcde");
+    }
+
+    @Test
+    public void givenNumberUtilsClass_whenCalledDivideListElements_thenCorrect() {
+        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
+        
+        assertThat(NumberUtils.divideListElements(numbers, 1)).isEqualTo(21);
+    }
+
+    @Test
+    public void givenNumberUtilsClass_whenCalledDivideListElementsWithExtractedTryCatchBlock_thenCorrect() {
+        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
+        
+        assertThat(NumberUtils.divideListElementsWithExtractedTryCatchBlock(numbers, 1)).isEqualTo(21);
+    }
+
+    @Test
+    public void givenNumberUtilsClass_whenCalledDivideListElementsWithExtractedTryCatchBlockAndListContainsZero_thenCorrect() {
+        List<Integer> numbers = Arrays.asList(0, 1, 2, 3, 4, 5, 6);
+        
+        assertThat(NumberUtils.divideListElementsWithExtractedTryCatchBlock(numbers, 1)).isEqualTo(21);
+    }
+    
+    @Test
+    public void givenNumberUtilsClass_whenCalledDivideListElementsWithExtractedTryCatchBlockAndDividerIsZero_thenCorrect() {
+        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
+        
+        assertThat(NumberUtils.divideListElementsWithExtractedTryCatchBlock(numbers, 0)).isEqualTo(0);
+    }
+    
+    @Test
+    public void givenStream_whneCalleddivideListElementsWithApplyFunctionMethod_thenCorrect() {
+        List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
+        
+        assertThat(NumberUtils.divideListElementsWithApplyFunctionMethod(numbers, 1)).isEqualTo(21);
+    }
+    
+    @Test
+    public void givenTwoStreams_whenCalledReduceOnParallelizedStream_thenFasterExecutionTime() {
+        List<User> userList = new ArrayList<>();
+        for (int i = 0; i <= 1000000; i++) {
+            userList.add(new User("John" + i, i));
+        }
+        long currentTime1 = System.currentTimeMillis();
+        userList.stream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
+        long sequentialExecutionTime = System.currentTimeMillis() -currentTime1;
+        long currentTime2 = System.currentTimeMillis();
+        userList.parallelStream().reduce(0, (partialAgeResult, user) -> partialAgeResult + user.getAge(), Integer::sum);
+        long parallelizedExecutionTime = System.currentTimeMillis() - currentTime2;
+        
+        assertThat(parallelizedExecutionTime).isLessThan(sequentialExecutionTime);
+    }
+}
diff --git a/core-java-8/src/test/java/com/baeldung/time/InstantUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/time/InstantUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/time/InstantUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/time/InstantUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/time/InstantWithJMockUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/time/InstantWithJMockUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/time/InstantWithJMockUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/time/InstantWithJMockUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/time/LocalDateTimeUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/time/LocalDateTimeUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/time/LocalDateTimeUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/time/LocalDateTimeUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/time/LocalDateTimeWithJMockUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/time/LocalDateTimeWithJMockUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/time/LocalDateTimeWithJMockUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/time/LocalDateTimeWithJMockUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/typeinference/TypeInferenceUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/typeinference/TypeInferenceUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/typeinference/TypeInferenceUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/typeinference/TypeInferenceUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/util/CurrentDateTimeUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/util/CurrentDateTimeUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/util/CurrentDateTimeUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/baeldung/util/CurrentDateTimeUnitTest.java
diff --git a/core-java-8/src/test/resources/.gitignore b/core-java-modules/core-java-8/src/test/resources/.gitignore
similarity index 100%
rename from core-java-8/src/test/resources/.gitignore
rename to core-java-modules/core-java-8/src/test/resources/.gitignore
diff --git a/core-java-9/.gitignore b/core-java-modules/core-java-9/.gitignore
similarity index 100%
rename from core-java-9/.gitignore
rename to core-java-modules/core-java-9/.gitignore
diff --git a/core-java-9/README.md b/core-java-modules/core-java-9/README.md
similarity index 100%
rename from core-java-9/README.md
rename to core-java-modules/core-java-9/README.md
diff --git a/core-java-9/compile-aot.sh b/core-java-modules/core-java-9/compile-aot.sh
old mode 100755
new mode 100644
similarity index 100%
rename from core-java-9/compile-aot.sh
rename to core-java-modules/core-java-9/compile-aot.sh
diff --git a/core-java-9/compile-httpclient.bat b/core-java-modules/core-java-9/compile-httpclient.bat
similarity index 100%
rename from core-java-9/compile-httpclient.bat
rename to core-java-modules/core-java-9/compile-httpclient.bat
diff --git a/core-java-9/compile-modules.sh b/core-java-modules/core-java-9/compile-modules.sh
old mode 100755
new mode 100644
similarity index 100%
rename from core-java-9/compile-modules.sh
rename to core-java-modules/core-java-9/compile-modules.sh
diff --git a/core-java-9/compile-simple-modules.sh b/core-java-modules/core-java-9/compile-simple-modules.sh
old mode 100755
new mode 100644
similarity index 100%
rename from core-java-9/compile-simple-modules.sh
rename to core-java-modules/core-java-9/compile-simple-modules.sh
diff --git a/core-java-9/compile-student-client.bat b/core-java-modules/core-java-9/compile-student-client.bat
similarity index 100%
rename from core-java-9/compile-student-client.bat
rename to core-java-modules/core-java-9/compile-student-client.bat
diff --git a/core-java-9/compile-student-model.bat b/core-java-modules/core-java-9/compile-student-model.bat
similarity index 100%
rename from core-java-9/compile-student-model.bat
rename to core-java-modules/core-java-9/compile-student-model.bat
diff --git a/core-java-9/compile-student-service-dbimpl.bat b/core-java-modules/core-java-9/compile-student-service-dbimpl.bat
similarity index 100%
rename from core-java-9/compile-student-service-dbimpl.bat
rename to core-java-modules/core-java-9/compile-student-service-dbimpl.bat
diff --git a/core-java-9/compile-student-service.bat b/core-java-modules/core-java-9/compile-student-service.bat
similarity index 100%
rename from core-java-9/compile-student-service.bat
rename to core-java-modules/core-java-9/compile-student-service.bat
diff --git a/core-java-9/logging.sh b/core-java-modules/core-java-9/logging.sh
old mode 100755
new mode 100644
similarity index 100%
rename from core-java-9/logging.sh
rename to core-java-modules/core-java-9/logging.sh
diff --git a/core-java-9/mods/logback.xml b/core-java-modules/core-java-9/mods/logback.xml
similarity index 100%
rename from core-java-9/mods/logback.xml
rename to core-java-modules/core-java-9/mods/logback.xml
diff --git a/core-java-9/pom.xml b/core-java-modules/core-java-9/pom.xml
similarity index 98%
rename from core-java-9/pom.xml
rename to core-java-modules/core-java-9/pom.xml
index cd1fa74dbb..aee289c79f 100644
--- a/core-java-9/pom.xml
+++ b/core-java-modules/core-java-9/pom.xml
@@ -9,6 +9,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-9/run-aot.sh b/core-java-modules/core-java-9/run-aot.sh
old mode 100755
new mode 100644
similarity index 100%
rename from core-java-9/run-aot.sh
rename to core-java-modules/core-java-9/run-aot.sh
diff --git a/core-java-9/run-httpclient.bat b/core-java-modules/core-java-9/run-httpclient.bat
similarity index 100%
rename from core-java-9/run-httpclient.bat
rename to core-java-modules/core-java-9/run-httpclient.bat
diff --git a/core-java-9/run-simple-module-app.sh b/core-java-modules/core-java-9/run-simple-module-app.sh
old mode 100755
new mode 100644
similarity index 100%
rename from core-java-9/run-simple-module-app.sh
rename to core-java-modules/core-java-9/run-simple-module-app.sh
diff --git a/core-java-9/run-student-client.bat b/core-java-modules/core-java-9/run-student-client.bat
similarity index 100%
rename from core-java-9/run-student-client.bat
rename to core-java-modules/core-java-9/run-student-client.bat
diff --git a/core-java-9/run-student-client.sh b/core-java-modules/core-java-9/run-student-client.sh
old mode 100755
new mode 100644
similarity index 100%
rename from core-java-9/run-student-client.sh
rename to core-java-modules/core-java-9/run-student-client.sh
diff --git a/core-java-9/src/main/java/.gitignore b/core-java-modules/core-java-9/src/main/java/.gitignore
similarity index 100%
rename from core-java-9/src/main/java/.gitignore
rename to core-java-modules/core-java-9/src/main/java/.gitignore
diff --git a/core-java-9/src/main/java/com/baeldung/java9/aot/JaotCompilation.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/aot/JaotCompilation.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/java9/aot/JaotCompilation.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/java9/aot/JaotCompilation.java
diff --git a/core-java-9/src/main/java/com/baeldung/java9/language/PrivateInterface.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/language/PrivateInterface.java
similarity index 96%
rename from core-java-9/src/main/java/com/baeldung/java9/language/PrivateInterface.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/java9/language/PrivateInterface.java
index f7b2fad891..3055f82fdb 100644
--- a/core-java-9/src/main/java/com/baeldung/java9/language/PrivateInterface.java
+++ b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/language/PrivateInterface.java
@@ -1,23 +1,23 @@
-package com.baeldung.java9.language;
-
-public interface PrivateInterface {
-
-    private static String staticPrivate() {
-        return "static private";
-    }
-
-    private String instancePrivate() {
-        return "instance private";
-    }
-
-    public default void check() {
-        String result = staticPrivate();
-        if (!result.equals("static private"))
-            throw new AssertionError("Incorrect result for static private interface method");
-        PrivateInterface pvt = new PrivateInterface() {
-        };
-        result = pvt.instancePrivate();
-        if (!result.equals("instance private"))
-            throw new AssertionError("Incorrect result for instance private interface method");
-    }
-}
+package com.baeldung.java9.language;
+
+public interface PrivateInterface {
+
+    private static String staticPrivate() {
+        return "static private";
+    }
+
+    private String instancePrivate() {
+        return "instance private";
+    }
+
+    public default void check() {
+        String result = staticPrivate();
+        if (!result.equals("static private"))
+            throw new AssertionError("Incorrect result for static private interface method");
+        PrivateInterface pvt = new PrivateInterface() {
+        };
+        result = pvt.instancePrivate();
+        if (!result.equals("instance private"))
+            throw new AssertionError("Incorrect result for instance private interface method");
+    }
+}
diff --git a/core-java-9/src/main/java/com/baeldung/java9/language/stream/StreamsGroupingCollectionFilter.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/language/stream/StreamsGroupingCollectionFilter.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/java9/language/stream/StreamsGroupingCollectionFilter.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/java9/language/stream/StreamsGroupingCollectionFilter.java
diff --git a/core-java-9/src/main/java/com/baeldung/java9/maps/initialize/MapsInitializer.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/maps/initialize/MapsInitializer.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/java9/maps/initialize/MapsInitializer.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/java9/maps/initialize/MapsInitializer.java
diff --git a/core-java-9/src/main/java/com/baeldung/java9/methodhandles/Book.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/methodhandles/Book.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/java9/methodhandles/Book.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/java9/methodhandles/Book.java
diff --git a/core-java-9/src/main/java/com/baeldung/java9/rangedates/DatesCollectionIteration.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/rangedates/DatesCollectionIteration.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/java9/rangedates/DatesCollectionIteration.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/java9/rangedates/DatesCollectionIteration.java
diff --git a/core-java-9/src/main/java/com/baeldung/java9/rangedates/RangeDatesIteration.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/rangedates/RangeDatesIteration.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/java9/rangedates/RangeDatesIteration.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/java9/rangedates/RangeDatesIteration.java
diff --git a/core-java-9/src/main/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImpl.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImpl.java
similarity index 96%
rename from core-java-9/src/main/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImpl.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImpl.java
index 46eee4883a..962df447b6 100644
--- a/core-java-9/src/main/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImpl.java
+++ b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImpl.java
@@ -1,82 +1,82 @@
-package com.baeldung.java9.reactive;
-
-import java.util.ArrayList;
-import java.util.concurrent.Flow.Subscriber;
-import java.util.concurrent.Flow.Subscription;
-
-public class BaeldungBatchSubscriberImpl<T> implements Subscriber<String> {
-    private Subscription subscription;
-    private boolean completed = false;
-    private int counter;
-    private ArrayList<String> buffer;
-    public static final int BUFFER_SIZE = 5;
-
-    public BaeldungBatchSubscriberImpl() {
-        buffer = new ArrayList<String>();
-    }
-
-    public boolean isCompleted() {
-        return completed;
-    }
-
-    public void setCompleted(boolean completed) {
-        this.completed = completed;
-    }
-
-    public int getCounter() {
-        return counter;
-    }
-
-    public void setCounter(int counter) {
-        this.counter = counter;
-    }
-
-    @Override
-    public void onSubscribe(Subscription subscription) {
-        this.subscription = subscription;
-        subscription.request(BUFFER_SIZE);
-    }
-
-    @Override
-    public void onNext(String item) {
-        buffer.add(item);
-        // if buffer is full, process the items.
-        if (buffer.size() >= BUFFER_SIZE) {
-            processBuffer();
-        }
-        //request more items.
-        subscription.request(1);
-    }
-
-    private void processBuffer() {
-        if (buffer.isEmpty())
-            return;
-        // Process all items in the buffer. Here, we just print it and sleep for 1 second.
-        System.out.print("Processed items: ");
-        buffer.stream()
-            .forEach(item -> {
-                System.out.print(" " + item);
-            });
-        System.out.println();
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        counter = counter + buffer.size();
-        buffer.clear();
-    }
-
-    @Override
-    public void onError(Throwable t) {
-        t.printStackTrace();
-    }
-
-    @Override
-    public void onComplete() {
-        completed = true;
-        // process any remaining items in buffer before
-        processBuffer();
-        subscription.cancel();
-    }
-}
+package com.baeldung.java9.reactive;
+
+import java.util.ArrayList;
+import java.util.concurrent.Flow.Subscriber;
+import java.util.concurrent.Flow.Subscription;
+
+public class BaeldungBatchSubscriberImpl<T> implements Subscriber<String> {
+    private Subscription subscription;
+    private boolean completed = false;
+    private int counter;
+    private ArrayList<String> buffer;
+    public static final int BUFFER_SIZE = 5;
+
+    public BaeldungBatchSubscriberImpl() {
+        buffer = new ArrayList<String>();
+    }
+
+    public boolean isCompleted() {
+        return completed;
+    }
+
+    public void setCompleted(boolean completed) {
+        this.completed = completed;
+    }
+
+    public int getCounter() {
+        return counter;
+    }
+
+    public void setCounter(int counter) {
+        this.counter = counter;
+    }
+
+    @Override
+    public void onSubscribe(Subscription subscription) {
+        this.subscription = subscription;
+        subscription.request(BUFFER_SIZE);
+    }
+
+    @Override
+    public void onNext(String item) {
+        buffer.add(item);
+        // if buffer is full, process the items.
+        if (buffer.size() >= BUFFER_SIZE) {
+            processBuffer();
+        }
+        //request more items.
+        subscription.request(1);
+    }
+
+    private void processBuffer() {
+        if (buffer.isEmpty())
+            return;
+        // Process all items in the buffer. Here, we just print it and sleep for 1 second.
+        System.out.print("Processed items: ");
+        buffer.stream()
+            .forEach(item -> {
+                System.out.print(" " + item);
+            });
+        System.out.println();
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        counter = counter + buffer.size();
+        buffer.clear();
+    }
+
+    @Override
+    public void onError(Throwable t) {
+        t.printStackTrace();
+    }
+
+    @Override
+    public void onComplete() {
+        completed = true;
+        // process any remaining items in buffer before
+        processBuffer();
+        subscription.cancel();
+    }
+}
diff --git a/core-java-9/src/main/java/com/baeldung/java9/reactive/BaeldungSubscriberImpl.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/reactive/BaeldungSubscriberImpl.java
similarity index 95%
rename from core-java-9/src/main/java/com/baeldung/java9/reactive/BaeldungSubscriberImpl.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/java9/reactive/BaeldungSubscriberImpl.java
index bacd777255..3534324675 100644
--- a/core-java-9/src/main/java/com/baeldung/java9/reactive/BaeldungSubscriberImpl.java
+++ b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/reactive/BaeldungSubscriberImpl.java
@@ -1,55 +1,55 @@
-package com.baeldung.java9.reactive;
-
-import java.util.concurrent.Flow.Subscriber;
-import java.util.concurrent.Flow.Subscription;
-
-public class BaeldungSubscriberImpl<T> implements Subscriber<String> {
-    private Subscription subscription;
-    private boolean completed = false;
-    private int counter;
-
-    public boolean isCompleted() {
-        return completed;
-    }
-
-    public void setCompleted(boolean completed) {
-        this.completed = completed;
-    }
-
-    public int getCounter() {
-        return counter;
-    }
-
-    public void setCounter(int counter) {
-        this.counter = counter;
-    }
-
-    @Override
-    public void onSubscribe(Subscription subscription) {
-        this.subscription = subscription;
-        subscription.request(1);
-    }
-
-    @Override
-    public void onNext(String item) {
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        counter++;
-        System.out.println("Processed item : " + item);
-        subscription.request(1);
-    }
-
-    @Override
-    public void onError(Throwable t) {
-        t.printStackTrace();
-    }
-
-    @Override
-    public void onComplete() {
-        completed = true;
-        subscription.cancel();
-    }
-}
+package com.baeldung.java9.reactive;
+
+import java.util.concurrent.Flow.Subscriber;
+import java.util.concurrent.Flow.Subscription;
+
+public class BaeldungSubscriberImpl<T> implements Subscriber<String> {
+    private Subscription subscription;
+    private boolean completed = false;
+    private int counter;
+
+    public boolean isCompleted() {
+        return completed;
+    }
+
+    public void setCompleted(boolean completed) {
+        this.completed = completed;
+    }
+
+    public int getCounter() {
+        return counter;
+    }
+
+    public void setCounter(int counter) {
+        this.counter = counter;
+    }
+
+    @Override
+    public void onSubscribe(Subscription subscription) {
+        this.subscription = subscription;
+        subscription.request(1);
+    }
+
+    @Override
+    public void onNext(String item) {
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        counter++;
+        System.out.println("Processed item : " + item);
+        subscription.request(1);
+    }
+
+    @Override
+    public void onError(Throwable t) {
+        t.printStackTrace();
+    }
+
+    @Override
+    public void onComplete() {
+        completed = true;
+        subscription.cancel();
+    }
+}
diff --git a/core-java-9/src/main/java/com/baeldung/java9/set/UnmodifiableSet.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/set/UnmodifiableSet.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/java9/set/UnmodifiableSet.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/java9/set/UnmodifiableSet.java
diff --git a/core-java-9/src/main/java/com/baeldung/java9/stackwalker/StackWalkerDemo.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/stackwalker/StackWalkerDemo.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/java9/stackwalker/StackWalkerDemo.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/java9/stackwalker/StackWalkerDemo.java
diff --git a/core-java-9/src/main/java/com/baeldung/java9/streams.reactive/EndSubscriber.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/streams.reactive/EndSubscriber.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/java9/streams.reactive/EndSubscriber.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/java9/streams.reactive/EndSubscriber.java
diff --git a/core-java-9/src/main/java/com/baeldung/java9/streams.reactive/TransformProcessor.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/streams.reactive/TransformProcessor.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/java9/streams.reactive/TransformProcessor.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/java9/streams.reactive/TransformProcessor.java
diff --git a/core-java-9/src/main/java/com/baeldung/multireleaseapp/App.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/multireleaseapp/App.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/multireleaseapp/App.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/multireleaseapp/App.java
diff --git a/core-java-9/src/main/java/com/baeldung/multireleaseapp/DateHelper.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/multireleaseapp/DateHelper.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/multireleaseapp/DateHelper.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/multireleaseapp/DateHelper.java
diff --git a/core-java-9/src/main/java/com/baeldung/optionals/Optionals.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/optionals/Optionals.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/optionals/Optionals.java
rename to core-java-modules/core-java-9/src/main/java/com/baeldung/optionals/Optionals.java
diff --git a/core-java-9/src/main/java9/com/baeldung/multireleaseapp/DateHelper.java b/core-java-modules/core-java-9/src/main/java9/com/baeldung/multireleaseapp/DateHelper.java
similarity index 100%
rename from core-java-9/src/main/java9/com/baeldung/multireleaseapp/DateHelper.java
rename to core-java-modules/core-java-9/src/main/java9/com/baeldung/multireleaseapp/DateHelper.java
diff --git a/core-java-9/src/main/resources/logback.xml b/core-java-modules/core-java-9/src/main/resources/logback.xml
similarity index 100%
rename from core-java-9/src/main/resources/logback.xml
rename to core-java-modules/core-java-9/src/main/resources/logback.xml
diff --git a/core-java-9/src/modules/com.baeldung.httpclient/com/baeldung/httpclient/HttpClientExample.java b/core-java-modules/core-java-9/src/modules/com.baeldung.httpclient/com/baeldung/httpclient/HttpClientExample.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.httpclient/com/baeldung/httpclient/HttpClientExample.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.httpclient/com/baeldung/httpclient/HttpClientExample.java
diff --git a/core-java-9/src/modules/com.baeldung.httpclient/module-info.java b/core-java-modules/core-java-9/src/modules/com.baeldung.httpclient/module-info.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.httpclient/module-info.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.httpclient/module-info.java
diff --git a/core-java-9/src/modules/com.baeldung.logging.app/com/baeldung/logging/app/MainApp.java b/core-java-modules/core-java-9/src/modules/com.baeldung.logging.app/com/baeldung/logging/app/MainApp.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.logging.app/com/baeldung/logging/app/MainApp.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.logging.app/com/baeldung/logging/app/MainApp.java
diff --git a/core-java-9/src/modules/com.baeldung.logging.app/module-info.java b/core-java-modules/core-java-9/src/modules/com.baeldung.logging.app/module-info.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.logging.app/module-info.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.logging.app/module-info.java
diff --git a/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java b/core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java
diff --git a/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLoggerFinder.java b/core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLoggerFinder.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLoggerFinder.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLoggerFinder.java
diff --git a/core-java-9/src/modules/com.baeldung.logging.slf4j/module-info.java b/core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/module-info.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.logging.slf4j/module-info.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/module-info.java
diff --git a/core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/ConsoleLogger.java b/core-java-modules/core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/ConsoleLogger.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/ConsoleLogger.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/ConsoleLogger.java
diff --git a/core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/CustomLoggerFinder.java b/core-java-modules/core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/CustomLoggerFinder.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/CustomLoggerFinder.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/CustomLoggerFinder.java
diff --git a/core-java-9/src/modules/com.baeldung.logging/module-info.java b/core-java-modules/core-java-9/src/modules/com.baeldung.logging/module-info.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.logging/module-info.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.logging/module-info.java
diff --git a/core-java-9/src/modules/com.baeldung.student.client/com/baeldung/student/client/StudentClient.java b/core-java-modules/core-java-9/src/modules/com.baeldung.student.client/com/baeldung/student/client/StudentClient.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.student.client/com/baeldung/student/client/StudentClient.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.student.client/com/baeldung/student/client/StudentClient.java
diff --git a/core-java-9/src/modules/com.baeldung.student.client/module-info.java b/core-java-modules/core-java-9/src/modules/com.baeldung.student.client/module-info.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.student.client/module-info.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.student.client/module-info.java
diff --git a/core-java-9/src/modules/com.baeldung.student.model/com/baeldung/student/model/Student.java b/core-java-modules/core-java-9/src/modules/com.baeldung.student.model/com/baeldung/student/model/Student.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.student.model/com/baeldung/student/model/Student.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.student.model/com/baeldung/student/model/Student.java
diff --git a/core-java-9/src/modules/com.baeldung.student.model/module-info.java b/core-java-modules/core-java-9/src/modules/com.baeldung.student.model/module-info.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.student.model/module-info.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.student.model/module-info.java
diff --git a/core-java-9/src/modules/com.baeldung.student.service.dbimpl/com/baeldung/student/service/dbimpl/StudentDbService.java b/core-java-modules/core-java-9/src/modules/com.baeldung.student.service.dbimpl/com/baeldung/student/service/dbimpl/StudentDbService.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.student.service.dbimpl/com/baeldung/student/service/dbimpl/StudentDbService.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.student.service.dbimpl/com/baeldung/student/service/dbimpl/StudentDbService.java
diff --git a/core-java-9/src/modules/com.baeldung.student.service.dbimpl/module-info.java b/core-java-modules/core-java-9/src/modules/com.baeldung.student.service.dbimpl/module-info.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.student.service.dbimpl/module-info.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.student.service.dbimpl/module-info.java
diff --git a/core-java-9/src/modules/com.baeldung.student.service/com/baeldung/student/service/StudentService.java b/core-java-modules/core-java-9/src/modules/com.baeldung.student.service/com/baeldung/student/service/StudentService.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.student.service/com/baeldung/student/service/StudentService.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.student.service/com/baeldung/student/service/StudentService.java
diff --git a/core-java-9/src/modules/com.baeldung.student.service/module-info.java b/core-java-modules/core-java-9/src/modules/com.baeldung.student.service/module-info.java
similarity index 100%
rename from core-java-9/src/modules/com.baeldung.student.service/module-info.java
rename to core-java-modules/core-java-9/src/modules/com.baeldung.student.service/module-info.java
diff --git a/core-java-9/src/simple-modules/hello.modules/com/baeldung/modules/hello/HelloInterface.java b/core-java-modules/core-java-9/src/simple-modules/hello.modules/com/baeldung/modules/hello/HelloInterface.java
similarity index 100%
rename from core-java-9/src/simple-modules/hello.modules/com/baeldung/modules/hello/HelloInterface.java
rename to core-java-modules/core-java-9/src/simple-modules/hello.modules/com/baeldung/modules/hello/HelloInterface.java
diff --git a/core-java-9/src/simple-modules/hello.modules/com/baeldung/modules/hello/HelloModules.java b/core-java-modules/core-java-9/src/simple-modules/hello.modules/com/baeldung/modules/hello/HelloModules.java
similarity index 100%
rename from core-java-9/src/simple-modules/hello.modules/com/baeldung/modules/hello/HelloModules.java
rename to core-java-modules/core-java-9/src/simple-modules/hello.modules/com/baeldung/modules/hello/HelloModules.java
diff --git a/core-java-9/src/simple-modules/hello.modules/module-info.java b/core-java-modules/core-java-9/src/simple-modules/hello.modules/module-info.java
similarity index 100%
rename from core-java-9/src/simple-modules/hello.modules/module-info.java
rename to core-java-modules/core-java-9/src/simple-modules/hello.modules/module-info.java
diff --git a/core-java-9/src/simple-modules/main.app/com/baeldung/modules/main/MainApp.java b/core-java-modules/core-java-9/src/simple-modules/main.app/com/baeldung/modules/main/MainApp.java
similarity index 100%
rename from core-java-9/src/simple-modules/main.app/com/baeldung/modules/main/MainApp.java
rename to core-java-modules/core-java-9/src/simple-modules/main.app/com/baeldung/modules/main/MainApp.java
diff --git a/core-java-9/src/simple-modules/main.app/module-info.java b/core-java-modules/core-java-9/src/simple-modules/main.app/module-info.java
similarity index 100%
rename from core-java-9/src/simple-modules/main.app/module-info.java
rename to core-java-modules/core-java-9/src/simple-modules/main.app/module-info.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/Java9OptionalTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/MultiResultionImageUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/MultiResultionImageUnitTest.java
similarity index 97%
rename from core-java-9/src/test/java/com/baeldung/java9/MultiResultionImageUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/MultiResultionImageUnitTest.java
index 2c383a44b4..442d85e3f2 100644
--- a/core-java-9/src/test/java/com/baeldung/java9/MultiResultionImageUnitTest.java
+++ b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/MultiResultionImageUnitTest.java
@@ -1,44 +1,44 @@
-package com.baeldung.java9;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
-import java.awt.Image;
-import java.awt.image.BaseMultiResolutionImage;
-import java.awt.image.BufferedImage;
-import java.awt.image.MultiResolutionImage;
-import java.util.List;
-
-import org.junit.Test;
-
-public class MultiResultionImageUnitTest {
-
-    @Test
-    public void baseMultiResImageTest() {
-        int baseIndex = 1;
-        int length = 4;
-        BufferedImage[] resolutionVariants = new BufferedImage[length];
-        for (int i = 0; i < length; i++) {
-            resolutionVariants[i] = createImage(i);
-        }
-        MultiResolutionImage bmrImage = new BaseMultiResolutionImage(baseIndex, resolutionVariants);
-        List<Image> rvImageList = bmrImage.getResolutionVariants();
-        assertEquals("MultiResoltion Image shoudl contain the same number of resolution variants!", rvImageList.size(), length);
-
-        for (int i = 0; i < length; i++) {
-            int imageSize = getSize(i);
-            Image testRVImage = bmrImage.getResolutionVariant(imageSize, imageSize);
-            assertSame("Images should be the same", testRVImage, resolutionVariants[i]);
-        }
-
-    }
-
-    private static int getSize(int i) {
-        return 8 * (i + 1);
-    }
-
-    private static BufferedImage createImage(int i) {
-        return new BufferedImage(getSize(i), getSize(i), BufferedImage.TYPE_INT_RGB);
-    }
-
-}
+package com.baeldung.java9;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+import java.awt.Image;
+import java.awt.image.BaseMultiResolutionImage;
+import java.awt.image.BufferedImage;
+import java.awt.image.MultiResolutionImage;
+import java.util.List;
+
+import org.junit.Test;
+
+public class MultiResultionImageUnitTest {
+
+    @Test
+    public void baseMultiResImageTest() {
+        int baseIndex = 1;
+        int length = 4;
+        BufferedImage[] resolutionVariants = new BufferedImage[length];
+        for (int i = 0; i < length; i++) {
+            resolutionVariants[i] = createImage(i);
+        }
+        MultiResolutionImage bmrImage = new BaseMultiResolutionImage(baseIndex, resolutionVariants);
+        List<Image> rvImageList = bmrImage.getResolutionVariants();
+        assertEquals("MultiResoltion Image shoudl contain the same number of resolution variants!", rvImageList.size(), length);
+
+        for (int i = 0; i < length; i++) {
+            int imageSize = getSize(i);
+            Image testRVImage = bmrImage.getResolutionVariant(imageSize, imageSize);
+            assertSame("Images should be the same", testRVImage, resolutionVariants[i]);
+        }
+
+    }
+
+    private static int getSize(int i) {
+        return 8 * (i + 1);
+    }
+
+    private static BufferedImage createImage(int i) {
+        return new BufferedImage(getSize(i), getSize(i), BufferedImage.TYPE_INT_RGB);
+    }
+
+}
diff --git a/core-java-9/src/test/java/com/baeldung/java9/OptionalToStreamUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/OptionalToStreamUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/OptionalToStreamUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/OptionalToStreamUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/README.MD b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/README.MD
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/README.MD
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/README.MD
diff --git a/core-java-9/src/test/java/com/baeldung/java9/SetExamplesUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/SetExamplesUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/SetExamplesUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/SetExamplesUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/concurrent/future/CompletableFutureUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/concurrent/future/CompletableFutureUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/concurrent/future/CompletableFutureUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/concurrent/future/CompletableFutureUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/httpclient/HttpClientTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/httpclient/HttpClientTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/httpclient/HttpClientTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/httpclient/HttpClientTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/httpclient/HttpRequestTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/httpclient/HttpRequestTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/httpclient/HttpRequestTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/httpclient/HttpRequestTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/httpclient/HttpResponseTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/httpclient/HttpResponseTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/httpclient/HttpResponseTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/httpclient/HttpResponseTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/DiamondUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/DiamondUnitTest.java
similarity index 95%
rename from core-java-9/src/test/java/com/baeldung/java9/language/DiamondUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/DiamondUnitTest.java
index 4868d37b6a..b1cb4ef63b 100644
--- a/core-java-9/src/test/java/com/baeldung/java9/language/DiamondUnitTest.java
+++ b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/DiamondUnitTest.java
@@ -1,36 +1,36 @@
-package com.baeldung.java9.language;
-
-import org.junit.Test;
-
-public class DiamondUnitTest {
-
-    static class FooClass<X> {
-        FooClass(X x) {
-        }
-
-        <Z> FooClass(X x, Z z) {
-        }
-    }
-
-    @Test
-    public void diamondTest() {
-        FooClass<Integer> fc = new FooClass<>(1) {
-        };
-        FooClass<? extends Integer> fc0 = new FooClass<>(1) {
-        };
-        FooClass<?> fc1 = new FooClass<>(1) {
-        };
-        FooClass<? super Integer> fc2 = new FooClass<>(1) {
-        };
-
-        FooClass<Integer> fc3 = new FooClass<>(1, "") {
-        };
-        FooClass<? extends Integer> fc4 = new FooClass<>(1, "") {
-        };
-        FooClass<?> fc5 = new FooClass<>(1, "") {
-        };
-        FooClass<? super Integer> fc6 = new FooClass<>(1, "") {
-        };
-
-    }
-}
+package com.baeldung.java9.language;
+
+import org.junit.Test;
+
+public class DiamondUnitTest {
+
+    static class FooClass<X> {
+        FooClass(X x) {
+        }
+
+        <Z> FooClass(X x, Z z) {
+        }
+    }
+
+    @Test
+    public void diamondTest() {
+        FooClass<Integer> fc = new FooClass<>(1) {
+        };
+        FooClass<? extends Integer> fc0 = new FooClass<>(1) {
+        };
+        FooClass<?> fc1 = new FooClass<>(1) {
+        };
+        FooClass<? super Integer> fc2 = new FooClass<>(1) {
+        };
+
+        FooClass<Integer> fc3 = new FooClass<>(1, "") {
+        };
+        FooClass<? extends Integer> fc4 = new FooClass<>(1, "") {
+        };
+        FooClass<?> fc5 = new FooClass<>(1, "") {
+        };
+        FooClass<? super Integer> fc6 = new FooClass<>(1, "") {
+        };
+
+    }
+}
diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/Java9ObjectsAPIUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/Java9ObjectsAPIUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/language/Java9ObjectsAPIUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/Java9ObjectsAPIUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/PrivateInterfaceUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/PrivateInterfaceUnitTest.java
similarity index 95%
rename from core-java-9/src/test/java/com/baeldung/java9/language/PrivateInterfaceUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/PrivateInterfaceUnitTest.java
index fb00fe45c3..08aee72f6e 100644
--- a/core-java-9/src/test/java/com/baeldung/java9/language/PrivateInterfaceUnitTest.java
+++ b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/PrivateInterfaceUnitTest.java
@@ -1,15 +1,15 @@
-package com.baeldung.java9.language;
-
-import com.baeldung.java9.language.PrivateInterface;
-import org.junit.Test;
-
-public class PrivateInterfaceUnitTest {
-
-    @Test
-    public void test() {
-        PrivateInterface piClass = new PrivateInterface() {
-        };
-        piClass.check();
-    }
-
-}
+package com.baeldung.java9.language;
+
+import com.baeldung.java9.language.PrivateInterface;
+import org.junit.Test;
+
+public class PrivateInterfaceUnitTest {
+
+    @Test
+    public void test() {
+        PrivateInterface piClass = new PrivateInterface() {
+        };
+        piClass.check();
+    }
+
+}
diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/TryWithResourcesUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/TryWithResourcesUnitTest.java
similarity index 96%
rename from core-java-9/src/test/java/com/baeldung/java9/language/TryWithResourcesUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/TryWithResourcesUnitTest.java
index d623bd9965..9afa1c90dd 100644
--- a/core-java-9/src/test/java/com/baeldung/java9/language/TryWithResourcesUnitTest.java
+++ b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/TryWithResourcesUnitTest.java
@@ -1,67 +1,67 @@
-package com.baeldung.java9.language;
-
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-
-public class TryWithResourcesUnitTest {
-
-    static int closeCount = 0;
-
-    static class MyAutoCloseable implements AutoCloseable {
-        final FinalWrapper finalWrapper = new FinalWrapper();
-
-        public void close() {
-            closeCount++;
-        }
-
-        static class FinalWrapper {
-            public final AutoCloseable finalCloseable = new AutoCloseable() {
-                @Override
-                public void close() throws Exception {
-                    closeCount++;
-                }
-            };
-        }
-    }
-
-    @Test
-    public void tryWithResourcesTest() {
-        MyAutoCloseable mac = new MyAutoCloseable();
-
-        try (mac) {
-            assertEquals("Expected and Actual does not match", 0, closeCount);
-        }
-
-        try (mac.finalWrapper.finalCloseable) {
-            assertEquals("Expected and Actual does not match", 1, closeCount);
-        } catch (Exception ex) {
-        }
-
-        try (new MyAutoCloseable() { }.finalWrapper.finalCloseable) {
-            assertEquals("Expected and Actual does not match", 2, closeCount);
-        } catch (Exception ex) {
-        }
-
-        try ((closeCount > 0 ? mac : new MyAutoCloseable()).finalWrapper.finalCloseable) {
-            assertEquals("Expected and Actual does not match", 3, closeCount);
-        } catch (Exception ex) {
-        }
-
-        try {
-            throw new CloseableException();
-        } catch (CloseableException ex) {
-            try (ex) {
-                assertEquals("Expected and Actual does not match", 4, closeCount);
-            }
-        }
-        assertEquals("Expected and Actual does not match", 5, closeCount);
-    }
-
-    static class CloseableException extends Exception implements AutoCloseable {
-        @Override
-        public void close() {
-            closeCount++;
-        }
-    }
-
-}
+package com.baeldung.java9.language;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class TryWithResourcesUnitTest {
+
+    static int closeCount = 0;
+
+    static class MyAutoCloseable implements AutoCloseable {
+        final FinalWrapper finalWrapper = new FinalWrapper();
+
+        public void close() {
+            closeCount++;
+        }
+
+        static class FinalWrapper {
+            public final AutoCloseable finalCloseable = new AutoCloseable() {
+                @Override
+                public void close() throws Exception {
+                    closeCount++;
+                }
+            };
+        }
+    }
+
+    @Test
+    public void tryWithResourcesTest() {
+        MyAutoCloseable mac = new MyAutoCloseable();
+
+        try (mac) {
+            assertEquals("Expected and Actual does not match", 0, closeCount);
+        }
+
+        try (mac.finalWrapper.finalCloseable) {
+            assertEquals("Expected and Actual does not match", 1, closeCount);
+        } catch (Exception ex) {
+        }
+
+        try (new MyAutoCloseable() { }.finalWrapper.finalCloseable) {
+            assertEquals("Expected and Actual does not match", 2, closeCount);
+        } catch (Exception ex) {
+        }
+
+        try ((closeCount > 0 ? mac : new MyAutoCloseable()).finalWrapper.finalCloseable) {
+            assertEquals("Expected and Actual does not match", 3, closeCount);
+        } catch (Exception ex) {
+        }
+
+        try {
+            throw new CloseableException();
+        } catch (CloseableException ex) {
+            try (ex) {
+                assertEquals("Expected and Actual does not match", 4, closeCount);
+            }
+        }
+        assertEquals("Expected and Actual does not match", 5, closeCount);
+    }
+
+    static class CloseableException extends Exception implements AutoCloseable {
+        @Override
+        public void close() {
+            closeCount++;
+        }
+    }
+
+}
diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/collections/ListFactoryMethodsUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/collections/ListFactoryMethodsUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/language/collections/ListFactoryMethodsUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/collections/ListFactoryMethodsUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/collections/MapFactoryMethodsUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/collections/MapFactoryMethodsUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/language/collections/MapFactoryMethodsUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/collections/MapFactoryMethodsUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/collections/SetFactoryMethodsUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/collections/SetFactoryMethodsUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/language/collections/SetFactoryMethodsUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/collections/SetFactoryMethodsUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectionFilterUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectionFilterUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectionFilterUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectionFilterUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectorImprovementUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectorImprovementUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectorImprovementUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectorImprovementUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/stream/StreamFeaturesUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/stream/StreamFeaturesUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/language/stream/StreamFeaturesUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/language/stream/StreamFeaturesUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/methodhandles/MethodHandlesTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/methodhandles/MethodHandlesTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/methodhandles/MethodHandlesTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/methodhandles/MethodHandlesTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/modules/ModuleAPIUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/modules/ModuleAPIUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/modules/ModuleAPIUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/modules/ModuleAPIUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/rangedates/DatesCollectionIterationUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/rangedates/DatesCollectionIterationUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/rangedates/DatesCollectionIterationUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/rangedates/DatesCollectionIterationUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/rangedates/RangeDatesIterationUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/rangedates/RangeDatesIterationUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/rangedates/RangeDatesIterationUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/rangedates/RangeDatesIterationUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplIntegrationTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplIntegrationTest.java
similarity index 96%
rename from core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplIntegrationTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplIntegrationTest.java
index cbc3946999..15dc13ec71 100644
--- a/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplIntegrationTest.java
+++ b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplIntegrationTest.java
@@ -1,75 +1,75 @@
-package com.baeldung.java9.reactive;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.SubmissionPublisher;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.IntStream;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Stopwatch;
-
-public class BaeldungBatchSubscriberImplIntegrationTest {
-
-    private static final int ITEM_SIZE = 10;
-    private SubmissionPublisher<String> publisher;
-    private BaeldungBatchSubscriberImpl<String> subscriber;
-
-    @Before
-    public void initialize() {
-        this.publisher = new SubmissionPublisher<String>(ForkJoinPool.commonPool(), 6);
-        this.subscriber = new BaeldungBatchSubscriberImpl<String>();
-        publisher.subscribe(subscriber);
-    }
-
-    @Rule
-    public Stopwatch stopwatch = new Stopwatch() {
-
-    };
-
-    @Test
-    public void testReactiveStreamCount() {
-        IntStream.range(0, ITEM_SIZE)
-            .forEach(item -> publisher.submit(item + ""));
-        publisher.close();
-
-        do {
-            // wait for subscribers to complete all processing.
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        } while (!subscriber.isCompleted());
-
-        int count = subscriber.getCounter();
-
-        assertEquals(ITEM_SIZE, count);
-    }
-
-    @Test
-    public void testReactiveStreamTime() {
-        IntStream.range(0, ITEM_SIZE)
-            .forEach(item -> publisher.submit(item + ""));
-        publisher.close();
-
-        do {
-            // wait for subscribers to complete all processing.
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        } while (!subscriber.isCompleted());
-
-        // The runtime in seconds should be equal to the number of items in each batch.
-        assertTrue(stopwatch.runtime(TimeUnit.SECONDS) >= (ITEM_SIZE / subscriber.BUFFER_SIZE));
-    }
-
-}
+package com.baeldung.java9.reactive;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.SubmissionPublisher;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.Stopwatch;
+
+public class BaeldungBatchSubscriberImplIntegrationTest {
+
+    private static final int ITEM_SIZE = 10;
+    private SubmissionPublisher<String> publisher;
+    private BaeldungBatchSubscriberImpl<String> subscriber;
+
+    @Before
+    public void initialize() {
+        this.publisher = new SubmissionPublisher<String>(ForkJoinPool.commonPool(), 6);
+        this.subscriber = new BaeldungBatchSubscriberImpl<String>();
+        publisher.subscribe(subscriber);
+    }
+
+    @Rule
+    public Stopwatch stopwatch = new Stopwatch() {
+
+    };
+
+    @Test
+    public void testReactiveStreamCount() {
+        IntStream.range(0, ITEM_SIZE)
+            .forEach(item -> publisher.submit(item + ""));
+        publisher.close();
+
+        do {
+            // wait for subscribers to complete all processing.
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        } while (!subscriber.isCompleted());
+
+        int count = subscriber.getCounter();
+
+        assertEquals(ITEM_SIZE, count);
+    }
+
+    @Test
+    public void testReactiveStreamTime() {
+        IntStream.range(0, ITEM_SIZE)
+            .forEach(item -> publisher.submit(item + ""));
+        publisher.close();
+
+        do {
+            // wait for subscribers to complete all processing.
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        } while (!subscriber.isCompleted());
+
+        // The runtime in seconds should be equal to the number of items in each batch.
+        assertTrue(stopwatch.runtime(TimeUnit.SECONDS) >= (ITEM_SIZE / subscriber.BUFFER_SIZE));
+    }
+
+}
diff --git a/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplIntegrationTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplIntegrationTest.java
similarity index 96%
rename from core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplIntegrationTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplIntegrationTest.java
index 6fd093b362..84877db500 100644
--- a/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplIntegrationTest.java
+++ b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplIntegrationTest.java
@@ -1,100 +1,100 @@
-package com.baeldung.java9.reactive;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.SubmissionPublisher;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.IntStream;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Stopwatch;
-
-public class BaeldungSubscriberImplIntegrationTest {
-
-    private static final int ITEM_SIZE = 10;
-    private SubmissionPublisher<String> publisher;
-    private BaeldungSubscriberImpl<String> subscriber;
-
-    @Before
-    public void initialize() {
-        // create Publisher with max buffer capacity 3.
-        this.publisher = new SubmissionPublisher<String>(ForkJoinPool.commonPool(), 3);
-        this.subscriber = new BaeldungSubscriberImpl<String>();
-        publisher.subscribe(subscriber);
-    }
-
-    @Rule
-    public Stopwatch stopwatch = new Stopwatch() {
-
-    };
-
-    @Test
-    public void testReactiveStreamCount() {
-        IntStream.range(0, ITEM_SIZE)
-            .forEach(item -> publisher.submit(item + ""));
-        publisher.close();
-
-        do {
-            // wait for subscribers to complete all processing.
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        } while (!subscriber.isCompleted());
-
-        int count = subscriber.getCounter();
-
-        assertEquals(ITEM_SIZE, count);
-    }
-
-    @Test
-    public void testReactiveStreamTime() {
-        IntStream.range(0, ITEM_SIZE)
-            .forEach(item -> publisher.submit(item + ""));
-        publisher.close();
-
-        do {
-            // wait for subscribers to complete all processing.
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        } while (!subscriber.isCompleted());
-
-        // The runtime in seconds should be equal to the number of items.
-        assertTrue(stopwatch.runtime(TimeUnit.SECONDS) >= ITEM_SIZE);
-    }
-
-    @Test
-    public void testReactiveStreamOffer() {
-        IntStream.range(0, ITEM_SIZE)
-            .forEach(item -> publisher.offer(item + "", (subscriber, string) -> {
-                // Returning false means this item will be dropped (no retry), if blocked.
-                return false;
-            }));
-        publisher.close();
-
-        do {
-            // wait for subscribers to complete all processing.
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        } while (!subscriber.isCompleted());
-
-        int count = subscriber.getCounter();
-        // Because 10 items were offered and the buffer capacity was 3, few items will not be processed.
-        assertTrue(ITEM_SIZE > count);
-    }
-
-}
+package com.baeldung.java9.reactive;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.SubmissionPublisher;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.Stopwatch;
+
+public class BaeldungSubscriberImplIntegrationTest {
+
+    private static final int ITEM_SIZE = 10;
+    private SubmissionPublisher<String> publisher;
+    private BaeldungSubscriberImpl<String> subscriber;
+
+    @Before
+    public void initialize() {
+        // create Publisher with max buffer capacity 3.
+        this.publisher = new SubmissionPublisher<String>(ForkJoinPool.commonPool(), 3);
+        this.subscriber = new BaeldungSubscriberImpl<String>();
+        publisher.subscribe(subscriber);
+    }
+
+    @Rule
+    public Stopwatch stopwatch = new Stopwatch() {
+
+    };
+
+    @Test
+    public void testReactiveStreamCount() {
+        IntStream.range(0, ITEM_SIZE)
+            .forEach(item -> publisher.submit(item + ""));
+        publisher.close();
+
+        do {
+            // wait for subscribers to complete all processing.
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        } while (!subscriber.isCompleted());
+
+        int count = subscriber.getCounter();
+
+        assertEquals(ITEM_SIZE, count);
+    }
+
+    @Test
+    public void testReactiveStreamTime() {
+        IntStream.range(0, ITEM_SIZE)
+            .forEach(item -> publisher.submit(item + ""));
+        publisher.close();
+
+        do {
+            // wait for subscribers to complete all processing.
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        } while (!subscriber.isCompleted());
+
+        // The runtime in seconds should be equal to the number of items.
+        assertTrue(stopwatch.runtime(TimeUnit.SECONDS) >= ITEM_SIZE);
+    }
+
+    @Test
+    public void testReactiveStreamOffer() {
+        IntStream.range(0, ITEM_SIZE)
+            .forEach(item -> publisher.offer(item + "", (subscriber, string) -> {
+                // Returning false means this item will be dropped (no retry), if blocked.
+                return false;
+            }));
+        publisher.close();
+
+        do {
+            // wait for subscribers to complete all processing.
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        } while (!subscriber.isCompleted());
+
+        int count = subscriber.getCounter();
+        // Because 10 items were offered and the buffer capacity was 3, few items will not be processed.
+        assertTrue(ITEM_SIZE > count);
+    }
+
+}
diff --git a/core-java-9/src/test/java/com/baeldung/java9/stackwalker/StackWalkerDemoUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/stackwalker/StackWalkerDemoUnitTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/stackwalker/StackWalkerDemoUnitTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/stackwalker/StackWalkerDemoUnitTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/streams.reactive/ReactiveStreamsTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/streams.reactive/ReactiveStreamsTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/streams.reactive/ReactiveStreamsTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/streams.reactive/ReactiveStreamsTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/java9/varhandles/VariableHandlesTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/varhandles/VariableHandlesTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/java9/varhandles/VariableHandlesTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/java9/varhandles/VariableHandlesTest.java
diff --git a/core-java-9/src/test/java/com/baeldung/optionals/OptionalsTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/optionals/OptionalsTest.java
similarity index 100%
rename from core-java-9/src/test/java/com/baeldung/optionals/OptionalsTest.java
rename to core-java-modules/core-java-9/src/test/java/com/baeldung/optionals/OptionalsTest.java
diff --git a/core-java-9/src/test/resources/.gitignore b/core-java-modules/core-java-9/src/test/resources/.gitignore
similarity index 100%
rename from core-java-9/src/test/resources/.gitignore
rename to core-java-modules/core-java-9/src/test/resources/.gitignore
diff --git a/core-java-arrays/.gitignore b/core-java-modules/core-java-arrays/.gitignore
similarity index 100%
rename from core-java-arrays/.gitignore
rename to core-java-modules/core-java-arrays/.gitignore
diff --git a/core-java-arrays/README.md b/core-java-modules/core-java-arrays/README.md
similarity index 100%
rename from core-java-arrays/README.md
rename to core-java-modules/core-java-arrays/README.md
diff --git a/core-java-arrays/pom.xml b/core-java-modules/core-java-arrays/pom.xml
similarity index 99%
rename from core-java-arrays/pom.xml
rename to core-java-modules/core-java-arrays/pom.xml
index ac9f7d08f0..b713c196b5 100644
--- a/core-java-arrays/pom.xml
+++ b/core-java-modules/core-java-arrays/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-arrays/src/main/java/com/baeldung/array/AddElementToEndOfArray.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/AddElementToEndOfArray.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/array/AddElementToEndOfArray.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/AddElementToEndOfArray.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/array/ArrayBenchmarkRunner.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/ArrayBenchmarkRunner.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/array/ArrayBenchmarkRunner.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/ArrayBenchmarkRunner.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/array/ArrayInitializer.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/ArrayInitializer.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/array/ArrayInitializer.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/ArrayInitializer.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/array/ArrayInverter.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/ArrayInverter.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/array/ArrayInverter.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/ArrayInverter.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/array/ArrayReferenceGuide.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/ArrayReferenceGuide.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/array/ArrayReferenceGuide.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/ArrayReferenceGuide.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/array/Find2ndLargestInArray.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/Find2ndLargestInArray.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/array/Find2ndLargestInArray.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/Find2ndLargestInArray.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/array/FindElementInArray.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/FindElementInArray.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/array/FindElementInArray.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/FindElementInArray.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/array/JaggedArray.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/JaggedArray.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/array/JaggedArray.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/JaggedArray.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/array/SearchArrayUnitTest.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/SearchArrayUnitTest.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/array/SearchArrayUnitTest.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/SearchArrayUnitTest.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/array/SumAndAverageInArray.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/SumAndAverageInArray.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/array/SumAndAverageInArray.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/SumAndAverageInArray.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/array/conversions/FloatToByteArray.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/conversions/FloatToByteArray.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/array/conversions/FloatToByteArray.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/conversions/FloatToByteArray.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/array/operations/ArrayOperations.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/operations/ArrayOperations.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/array/operations/ArrayOperations.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/operations/ArrayOperations.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Address.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Address.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Address.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Address.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Employee.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Employee.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Employee.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Employee.java
diff --git a/core-java-arrays/src/main/java/com/baeldung/arrays/ParallelPrefixBenchmark.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/arrays/ParallelPrefixBenchmark.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/arrays/ParallelPrefixBenchmark.java
rename to core-java-modules/core-java-arrays/src/main/java/com/baeldung/arrays/ParallelPrefixBenchmark.java
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/AddElementToEndOfArrayUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/AddElementToEndOfArrayUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/array/AddElementToEndOfArrayUnitTest.java
rename to core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/AddElementToEndOfArrayUnitTest.java
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/ArrayInitializerUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/ArrayInitializerUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/array/ArrayInitializerUnitTest.java
rename to core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/ArrayInitializerUnitTest.java
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/ArrayInverterUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/ArrayInverterUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/array/ArrayInverterUnitTest.java
rename to core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/ArrayInverterUnitTest.java
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/Find2ndLargestInArrayUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/Find2ndLargestInArrayUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/array/Find2ndLargestInArrayUnitTest.java
rename to core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/Find2ndLargestInArrayUnitTest.java
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/FindElementInArrayUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/FindElementInArrayUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/array/FindElementInArrayUnitTest.java
rename to core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/FindElementInArrayUnitTest.java
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/JaggedArrayUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/JaggedArrayUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/array/JaggedArrayUnitTest.java
rename to core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/JaggedArrayUnitTest.java
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/SumAndAverageInArrayUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/SumAndAverageInArrayUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/array/SumAndAverageInArrayUnitTest.java
rename to core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/SumAndAverageInArrayUnitTest.java
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/conversions/FloatToByteArrayUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/conversions/FloatToByteArrayUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/array/conversions/FloatToByteArrayUnitTest.java
rename to core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/conversions/FloatToByteArrayUnitTest.java
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/operations/ArrayOperationsUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/operations/ArrayOperationsUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/array/operations/ArrayOperationsUnitTest.java
rename to core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/operations/ArrayOperationsUnitTest.java
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/operations/IntersectionUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/operations/IntersectionUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/array/operations/IntersectionUnitTest.java
rename to core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/operations/IntersectionUnitTest.java
diff --git a/core-java-arrays/src/test/java/com/baeldung/arraycopy/ArrayCopyUtilUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/arraycopy/ArrayCopyUtilUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/arraycopy/ArrayCopyUtilUnitTest.java
rename to core-java-modules/core-java-arrays/src/test/java/com/baeldung/arraycopy/ArrayCopyUtilUnitTest.java
diff --git a/core-java-arrays/src/test/java/com/baeldung/arrays/ArraysUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/arrays/ArraysUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/arrays/ArraysUnitTest.java
rename to core-java-modules/core-java-arrays/src/test/java/com/baeldung/arrays/ArraysUnitTest.java
diff --git a/core-java-arrays/src/test/java/com/baeldung/sort/ArraySortUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/sort/ArraySortUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/sort/ArraySortUnitTest.java
rename to core-java-modules/core-java-arrays/src/test/java/com/baeldung/sort/ArraySortUnitTest.java
diff --git a/core-java-collections-list/README.md b/core-java-modules/core-java-collections-list/README.md
similarity index 100%
rename from core-java-collections-list/README.md
rename to core-java-modules/core-java-collections-list/README.md
diff --git a/core-java-collections-list/pom.xml b/core-java-modules/core-java-collections-list/pom.xml
similarity index 98%
rename from core-java-collections-list/pom.xml
rename to core-java-modules/core-java-collections-list/pom.xml
index 217278bdf6..1a0b1615c8 100644
--- a/core-java-collections-list/pom.xml
+++ b/core-java-modules/core-java-collections-list/pom.xml
@@ -10,7 +10,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-collections-list/src/main/java/com/baeldung/allequalelements/VerifyAllEqualListElements.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/allequalelements/VerifyAllEqualListElements.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/allequalelements/VerifyAllEqualListElements.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/allequalelements/VerifyAllEqualListElements.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/classcastexception/ClassCastException.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/classcastexception/ClassCastException.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/classcastexception/ClassCastException.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/classcastexception/ClassCastException.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/collection/filtering/Employee.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/collection/filtering/Employee.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/collection/filtering/Employee.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/collection/filtering/Employee.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/findanelement/Customer.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/findanelement/Customer.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/findanelement/Customer.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/findanelement/Customer.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/findanelement/FindACustomerInGivenList.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/findanelement/FindACustomerInGivenList.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/findanelement/FindACustomerInGivenList.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/findanelement/FindACustomerInGivenList.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/java/list/CopyListService.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java/list/CopyListService.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/java/list/CopyListService.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java/list/CopyListService.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/java/list/CustomList.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java/list/CustomList.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/java/list/CustomList.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java/list/CustomList.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/java/list/Flower.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java/list/Flower.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/java/list/Flower.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java/list/Flower.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/java/list/ReverseIterator.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java/list/ReverseIterator.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/java/list/ReverseIterator.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java/list/ReverseIterator.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/java/list/WaysToIterate.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java/list/WaysToIterate.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/java/list/WaysToIterate.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java/list/WaysToIterate.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/java_8_features/Car.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java_8_features/Car.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/java_8_features/Car.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java_8_features/Car.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/java_8_features/Person.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java_8_features/Person.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/java_8_features/Person.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/java_8_features/Person.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/list/Flower.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/Flower.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/list/Flower.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/Flower.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Pen.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Pen.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Pen.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Pen.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Pencil.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Pencil.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Pencil.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Pencil.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Rubber.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Rubber.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Rubber.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Rubber.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Stationery.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Stationery.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Stationery.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/listoflist/Stationery.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/list/multidimensional/ArrayListOfArrayList.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/multidimensional/ArrayListOfArrayList.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/list/multidimensional/ArrayListOfArrayList.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/multidimensional/ArrayListOfArrayList.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/list/multidimensional/ThreeDimensionalArrayList.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/multidimensional/ThreeDimensionalArrayList.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/list/multidimensional/ThreeDimensionalArrayList.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/multidimensional/ThreeDimensionalArrayList.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/list/primitive/PrimitiveCollections.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/primitive/PrimitiveCollections.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/list/primitive/PrimitiveCollections.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/primitive/PrimitiveCollections.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/list/primitive/PrimitivesListPerformance.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/primitive/PrimitivesListPerformance.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/list/primitive/PrimitivesListPerformance.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/primitive/PrimitivesListPerformance.java
diff --git a/core-java-collections-list/src/main/java/com/baeldung/list/removeall/RemoveAll.java b/core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/removeall/RemoveAll.java
similarity index 100%
rename from core-java-collections-list/src/main/java/com/baeldung/list/removeall/RemoveAll.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/baeldung/list/removeall/RemoveAll.java
diff --git a/core-java-collections-list/src/main/resources/logback.xml b/core-java-modules/core-java-collections-list/src/main/resources/logback.xml
similarity index 100%
rename from core-java-collections-list/src/main/resources/logback.xml
rename to core-java-modules/core-java-collections-list/src/main/resources/logback.xml
diff --git a/core-java-collections-list/src/test/java/com/baeldung/allequalelements/VerifyAllEqualListElementsUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/allequalelements/VerifyAllEqualListElementsUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/allequalelements/VerifyAllEqualListElementsUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/allequalelements/VerifyAllEqualListElementsUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/array/converter/ArrayConvertToListUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/array/converter/ArrayConvertToListUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/array/converter/ArrayConvertToListUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/array/converter/ArrayConvertToListUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/collection/ClearVsRemoveAllUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/collection/ClearVsRemoveAllUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/collection/ClearVsRemoveAllUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/collection/ClearVsRemoveAllUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/collection/CollectionsEmpty.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/collection/CollectionsEmpty.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/collection/CollectionsEmpty.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/collection/CollectionsEmpty.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/collection/filtering/CollectionFilteringUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/collection/filtering/CollectionFilteringUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/collection/filtering/CollectionFilteringUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/collection/filtering/CollectionFilteringUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/findItems/FindItemsBasedOnOtherStreamUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/findItems/FindItemsBasedOnOtherStreamUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/findItems/FindItemsBasedOnOtherStreamUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/findItems/FindItemsBasedOnOtherStreamUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/findanelement/FindACustomerInGivenListUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/findanelement/FindACustomerInGivenListUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/findanelement/FindACustomerInGivenListUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/findanelement/FindACustomerInGivenListUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/java/list/CopyListServiceUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java/list/CopyListServiceUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/java/list/CopyListServiceUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java/list/CopyListServiceUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/java/list/CustomListUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java/list/CustomListUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/java/list/CustomListUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java/list/CustomListUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/java/list/ReverseIteratorUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java/list/ReverseIteratorUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/java/list/ReverseIteratorUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java/list/ReverseIteratorUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/java/list/WaysToIterateUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java/list/WaysToIterateUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/java/list/WaysToIterateUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java/list/WaysToIterateUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/java/listInitialization/ListInitializationUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java/listInitialization/ListInitializationUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/java/listInitialization/ListInitializationUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java/listInitialization/ListInitializationUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/java8/Java8CollectionCleanupUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java8/Java8CollectionCleanupUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/java8/Java8CollectionCleanupUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java8/Java8CollectionCleanupUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/java8/Java8MaxMinUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java8/Java8MaxMinUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/java8/Java8MaxMinUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java8/Java8MaxMinUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/list/AddElementsUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/AddElementsUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/list/AddElementsUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/AddElementsUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/list/flattennestedlist/FlattenNestedListUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/flattennestedlist/FlattenNestedListUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/list/flattennestedlist/FlattenNestedListUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/flattennestedlist/FlattenNestedListUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/list/listoflist/AddElementsToListUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/listoflist/AddElementsToListUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/list/listoflist/AddElementsToListUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/listoflist/AddElementsToListUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/list/listoflist/ListOfListsUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/listoflist/ListOfListsUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/list/listoflist/ListOfListsUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/listoflist/ListOfListsUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/list/removeall/RemoveAllUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/removeall/RemoveAllUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/list/removeall/RemoveAllUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/removeall/RemoveAllUnitTest.java
diff --git a/core-java-collections-list/src/test/java/com/baeldung/list/removefirst/RemoveFirstElementUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/removefirst/RemoveFirstElementUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/com/baeldung/list/removefirst/RemoveFirstElementUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/removefirst/RemoveFirstElementUnitTest.java
diff --git a/core-java-collections-list/src/test/java/org/baeldung/RandomListElementUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/org/baeldung/RandomListElementUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/org/baeldung/RandomListElementUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/org/baeldung/RandomListElementUnitTest.java
diff --git a/core-java-collections-list/src/test/java/org/baeldung/java/collections/ArrayListUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/collections/ArrayListUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/org/baeldung/java/collections/ArrayListUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/collections/ArrayListUnitTest.java
diff --git a/core-java-collections-list/src/test/java/org/baeldung/java/collections/CoreJavaCollectionsUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/collections/CoreJavaCollectionsUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/org/baeldung/java/collections/CoreJavaCollectionsUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/collections/CoreJavaCollectionsUnitTest.java
diff --git a/core-java-collections-list/src/test/java/org/baeldung/java/collections/JavaCollectionCleanupUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/collections/JavaCollectionCleanupUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/org/baeldung/java/collections/JavaCollectionCleanupUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/collections/JavaCollectionCleanupUnitTest.java
diff --git a/core-java-collections-list/src/test/java/org/baeldung/java/lists/ListAssertJUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/lists/ListAssertJUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/org/baeldung/java/lists/ListAssertJUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/lists/ListAssertJUnitTest.java
diff --git a/core-java-collections-list/src/test/java/org/baeldung/java/lists/ListJUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/lists/ListJUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/org/baeldung/java/lists/ListJUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/lists/ListJUnitTest.java
diff --git a/core-java-collections-list/src/test/java/org/baeldung/java/lists/ListTestNgUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/lists/ListTestNgUnitTest.java
similarity index 100%
rename from core-java-collections-list/src/test/java/org/baeldung/java/lists/ListTestNgUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/lists/ListTestNgUnitTest.java
diff --git a/core-java-collections-list/src/test/java/org/baeldung/java/lists/README.md b/core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/lists/README.md
similarity index 100%
rename from core-java-collections-list/src/test/java/org/baeldung/java/lists/README.md
rename to core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/lists/README.md
diff --git a/core-java-collections-set/README.md b/core-java-modules/core-java-collections-set/README.md
similarity index 100%
rename from core-java-collections-set/README.md
rename to core-java-modules/core-java-collections-set/README.md
diff --git a/core-java-collections-set/pom.xml b/core-java-modules/core-java-collections-set/pom.xml
similarity index 93%
rename from core-java-collections-set/pom.xml
rename to core-java-modules/core-java-collections-set/pom.xml
index d5f7937645..2a930efde8 100644
--- a/core-java-collections-set/pom.xml
+++ b/core-java-modules/core-java-collections-set/pom.xml
@@ -1,33 +1,33 @@
-<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>core-java-collections-set</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>core-java-collections-set</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
-    </parent>
-
-    <dependencies>
-    <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>${guava.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-collections4</artifactId>
-        <version>${commons-collections4.version}</version>
-    </dependency>
-    </dependencies>
-
-    <properties>
-        <commons-collections4.version>4.3</commons-collections4.version>
-        <guava.version>27.1-jre</guava.version>
-    </properties>
-</project>
+<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>core-java-collections-set</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-collections-set</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+    <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-collections4</artifactId>
+        <version>${commons-collections4.version}</version>
+    </dependency>
+    </dependencies>
+
+    <properties>
+        <commons-collections4.version>4.3</commons-collections4.version>
+        <guava.version>27.1-jre</guava.version>
+    </properties>
+</project>
diff --git a/core-java-collections-set/src/main/java/com/baeldung/enumset/EnumSets.java b/core-java-modules/core-java-collections-set/src/main/java/com/baeldung/enumset/EnumSets.java
similarity index 100%
rename from core-java-collections-set/src/main/java/com/baeldung/enumset/EnumSets.java
rename to core-java-modules/core-java-collections-set/src/main/java/com/baeldung/enumset/EnumSets.java
diff --git a/core-java-collections-set/src/test/java/com/baeldung/collection/WhenUsingHashSet.java b/core-java-modules/core-java-collections-set/src/test/java/com/baeldung/collection/WhenUsingHashSet.java
similarity index 100%
rename from core-java-collections-set/src/test/java/com/baeldung/collection/WhenUsingHashSet.java
rename to core-java-modules/core-java-collections-set/src/test/java/com/baeldung/collection/WhenUsingHashSet.java
diff --git a/core-java-collections-set/src/test/java/com/baeldung/collection/WhenUsingTreeSet.java b/core-java-modules/core-java-collections-set/src/test/java/com/baeldung/collection/WhenUsingTreeSet.java
similarity index 100%
rename from core-java-collections-set/src/test/java/com/baeldung/collection/WhenUsingTreeSet.java
rename to core-java-modules/core-java-collections-set/src/test/java/com/baeldung/collection/WhenUsingTreeSet.java
diff --git a/core-java-collections-set/src/test/java/com/baeldung/java/set/HashSetInitalizingUnitTest.java b/core-java-modules/core-java-collections-set/src/test/java/com/baeldung/java/set/HashSetInitalizingUnitTest.java
similarity index 100%
rename from core-java-collections-set/src/test/java/com/baeldung/java/set/HashSetInitalizingUnitTest.java
rename to core-java-modules/core-java-collections-set/src/test/java/com/baeldung/java/set/HashSetInitalizingUnitTest.java
diff --git a/core-java-collections-set/src/test/java/com/baeldung/java/set/SetUnitTest.java b/core-java-modules/core-java-collections-set/src/test/java/com/baeldung/java/set/SetUnitTest.java
similarity index 100%
rename from core-java-collections-set/src/test/java/com/baeldung/java/set/SetUnitTest.java
rename to core-java-modules/core-java-collections-set/src/test/java/com/baeldung/java/set/SetUnitTest.java
diff --git a/core-java-collections-set/src/test/java/com/baeldung/set/SetOperationsUnitTest.java b/core-java-modules/core-java-collections-set/src/test/java/com/baeldung/set/SetOperationsUnitTest.java
similarity index 100%
rename from core-java-collections-set/src/test/java/com/baeldung/set/SetOperationsUnitTest.java
rename to core-java-modules/core-java-collections-set/src/test/java/com/baeldung/set/SetOperationsUnitTest.java
diff --git a/core-java-collections/README.md b/core-java-modules/core-java-collections/README.md
similarity index 100%
rename from core-java-collections/README.md
rename to core-java-modules/core-java-collections/README.md
diff --git a/core-java-collections/pom.xml b/core-java-modules/core-java-collections/pom.xml
similarity index 95%
rename from core-java-collections/pom.xml
rename to core-java-modules/core-java-collections/pom.xml
index b791f38b24..e5b89c3d16 100644
--- a/core-java-collections/pom.xml
+++ b/core-java-modules/core-java-collections/pom.xml
@@ -1,78 +1,78 @@
-<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>core-java-collections</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>core-java-collections</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>${commons-collections4.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.collections</groupId>
-            <artifactId>eclipse-collections</artifactId>
-            <version>${eclipse.collections.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-            <version>${openjdk.jmh.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${openjdk.jmh.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-exec</artifactId>
-            <version>${commons-exec.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <openjdk.jmh.version>1.19</openjdk.jmh.version>
-        <junit.platform.version>1.2.0</junit.platform.version>
-        <commons-lang3.version>3.8.1</commons-lang3.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
-        <collections-generic.version>4.01</collections-generic.version>
-        <avaitility.version>1.7.0</avaitility.version>
-        <assertj.version>3.11.1</assertj.version>
-        <eclipse.collections.version>7.1.0</eclipse.collections.version>
-		<commons-exec.version>1.3</commons-exec.version>
-    </properties>
-</project>
+<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>core-java-collections</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-collections</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>${commons-collections4.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.collections</groupId>
+            <artifactId>eclipse-collections</artifactId>
+            <version>${eclipse.collections.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${openjdk.jmh.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${openjdk.jmh.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-exec</artifactId>
+            <version>${commons-exec.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <openjdk.jmh.version>1.19</openjdk.jmh.version>
+        <junit.platform.version>1.2.0</junit.platform.version>
+        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <commons-collections4.version>4.1</commons-collections4.version>
+        <collections-generic.version>4.01</collections-generic.version>
+        <avaitility.version>1.7.0</avaitility.version>
+        <assertj.version>3.11.1</assertj.version>
+        <eclipse.collections.version>7.1.0</eclipse.collections.version>
+		<commons-exec.version>1.3</commons-exec.version>
+    </properties>
+</project>
diff --git a/core-java-collections/src/main/java/com/baeldung/charstack/CharStack.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/charstack/CharStack.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/charstack/CharStack.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/charstack/CharStack.java
diff --git a/core-java-collections/src/main/java/com/baeldung/charstack/CharStackWithArray.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/charstack/CharStackWithArray.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/charstack/CharStackWithArray.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/charstack/CharStackWithArray.java
diff --git a/core-java-collections/src/main/java/com/baeldung/charstack/EmptyStackException.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/charstack/EmptyStackException.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/charstack/EmptyStackException.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/charstack/EmptyStackException.java
diff --git a/core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningArrays.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningArrays.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningArrays.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningArrays.java
diff --git a/core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningLists.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningLists.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningLists.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningLists.java
diff --git a/core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningMaps.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningMaps.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningMaps.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningMaps.java
diff --git a/core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningSets.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningSets.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningSets.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/combiningcollections/CombiningSets.java
diff --git a/core-java-collections/src/main/java/com/baeldung/hashtable/Word.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/hashtable/Word.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/hashtable/Word.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/hashtable/Word.java
diff --git a/core-java-collections/src/main/java/com/baeldung/iteratorguide/IteratorGuide.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/iteratorguide/IteratorGuide.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/iteratorguide/IteratorGuide.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/iteratorguide/IteratorGuide.java
diff --git a/core-java-collections/src/main/java/com/baeldung/iterators/Iterators.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/iterators/Iterators.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/iterators/Iterators.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/iterators/Iterators.java
diff --git a/core-java-collections/src/main/java/com/baeldung/java/filtering/CollectionUtilsCollectionFilter.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/java/filtering/CollectionUtilsCollectionFilter.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/java/filtering/CollectionUtilsCollectionFilter.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/java/filtering/CollectionUtilsCollectionFilter.java
diff --git a/core-java-collections/src/main/java/com/baeldung/java/filtering/EclipseCollectionsCollectionFilter.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/java/filtering/EclipseCollectionsCollectionFilter.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/java/filtering/EclipseCollectionsCollectionFilter.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/java/filtering/EclipseCollectionsCollectionFilter.java
diff --git a/core-java-collections/src/main/java/com/baeldung/java/filtering/GuavaCollectionFilter.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/java/filtering/GuavaCollectionFilter.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/java/filtering/GuavaCollectionFilter.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/java/filtering/GuavaCollectionFilter.java
diff --git a/core-java-collections/src/main/java/com/baeldung/java/filtering/StreamsCollectionFilter.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/java/filtering/StreamsCollectionFilter.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/java/filtering/StreamsCollectionFilter.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/java/filtering/StreamsCollectionFilter.java
diff --git a/core-java-collections/src/main/java/com/baeldung/java/iterable/IterableSize.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/java/iterable/IterableSize.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/java/iterable/IterableSize.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/java/iterable/IterableSize.java
diff --git a/core-java-collections/src/main/java/com/baeldung/java/list/VectorExample.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/java/list/VectorExample.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/java/list/VectorExample.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/java/list/VectorExample.java
diff --git a/core-java-collections/src/main/java/com/baeldung/java/sort/CollectionsSortCompare.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/java/sort/CollectionsSortCompare.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/java/sort/CollectionsSortCompare.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/java/sort/CollectionsSortCompare.java
diff --git a/core-java-collections/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNull.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNull.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNull.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNull.java
diff --git a/core-java-collections/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainer.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainer.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainer.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainer.java
diff --git a/core-java-collections/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheck.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheck.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheck.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheck.java
diff --git a/core-java-collections/src/main/java/com/baeldung/performance/ArrayListBenchmark.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/ArrayListBenchmark.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/performance/ArrayListBenchmark.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/ArrayListBenchmark.java
diff --git a/core-java-collections/src/main/java/com/baeldung/performance/ArraySortBenchmark.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/ArraySortBenchmark.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/performance/ArraySortBenchmark.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/ArraySortBenchmark.java
diff --git a/core-java-collections/src/main/java/com/baeldung/performance/CollectionsBenchmark.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/CollectionsBenchmark.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/performance/CollectionsBenchmark.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/CollectionsBenchmark.java
diff --git a/core-java-collections/src/main/java/com/baeldung/performance/CopyOnWriteBenchmark.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/CopyOnWriteBenchmark.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/performance/CopyOnWriteBenchmark.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/CopyOnWriteBenchmark.java
diff --git a/core-java-collections/src/main/java/com/baeldung/performance/Employee.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/Employee.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/performance/Employee.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/Employee.java
diff --git a/core-java-collections/src/main/java/com/baeldung/performance/HashMapBenchmark.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/HashMapBenchmark.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/performance/HashMapBenchmark.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/HashMapBenchmark.java
diff --git a/core-java-collections/src/main/java/com/baeldung/performance/SetBenchMark.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/SetBenchMark.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/performance/SetBenchMark.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/performance/SetBenchMark.java
diff --git a/core-java-collections/src/main/java/com/baeldung/queueInterface/CustomBaeldungQueue.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/queueInterface/CustomBaeldungQueue.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/queueInterface/CustomBaeldungQueue.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/queueInterface/CustomBaeldungQueue.java
diff --git a/core-java-collections/src/main/java/com/baeldung/removal/CollectionRemoveIf.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/removal/CollectionRemoveIf.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/removal/CollectionRemoveIf.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/removal/CollectionRemoveIf.java
diff --git a/core-java-collections/src/main/java/com/baeldung/removal/Iterators.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/removal/Iterators.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/removal/Iterators.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/removal/Iterators.java
diff --git a/core-java-collections/src/main/java/com/baeldung/removal/StreamFilterAndCollector.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/removal/StreamFilterAndCollector.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/removal/StreamFilterAndCollector.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/removal/StreamFilterAndCollector.java
diff --git a/core-java-collections/src/main/java/com/baeldung/removal/StreamPartitioningBy.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/removal/StreamPartitioningBy.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/removal/StreamPartitioningBy.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/removal/StreamPartitioningBy.java
diff --git a/core-java-collections/src/main/java/com/baeldung/synchronizedcollections/application/Application.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/synchronizedcollections/application/Application.java
similarity index 97%
rename from core-java-collections/src/main/java/com/baeldung/synchronizedcollections/application/Application.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/synchronizedcollections/application/Application.java
index 1840c125d0..093308a34a 100644
--- a/core-java-collections/src/main/java/com/baeldung/synchronizedcollections/application/Application.java
+++ b/core-java-modules/core-java-collections/src/main/java/com/baeldung/synchronizedcollections/application/Application.java
@@ -1,18 +1,18 @@
-package com.baeldung.synchronizedcollections.application;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Logger;
-
-public class Application {
-
-    private static final Logger LOGGER = Logger.getLogger(Application.class.getName());
-    
-    public static void main(String[] args) throws InterruptedException {
-        List<Integer> syncCollection = Collections.synchronizedList(Arrays.asList(1, 2, 3, 4, 5, 6));
-        synchronized (syncCollection) {
-            syncCollection.forEach((e) -> {LOGGER.info(e.toString());});
-        }
-    }
-}
+package com.baeldung.synchronizedcollections.application;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Logger;
+
+public class Application {
+
+    private static final Logger LOGGER = Logger.getLogger(Application.class.getName());
+    
+    public static void main(String[] args) throws InterruptedException {
+        List<Integer> syncCollection = Collections.synchronizedList(Arrays.asList(1, 2, 3, 4, 5, 6));
+        synchronized (syncCollection) {
+            syncCollection.forEach((e) -> {LOGGER.info(e.toString());});
+        }
+    }
+}
diff --git a/core-java-collections/src/main/java/com/baeldung/thread_safe_lifo/DequeBasedSynchronizedStack.java b/core-java-modules/core-java-collections/src/main/java/com/baeldung/thread_safe_lifo/DequeBasedSynchronizedStack.java
similarity index 100%
rename from core-java-collections/src/main/java/com/baeldung/thread_safe_lifo/DequeBasedSynchronizedStack.java
rename to core-java-modules/core-java-collections/src/main/java/com/baeldung/thread_safe_lifo/DequeBasedSynchronizedStack.java
diff --git a/core-java-collections/src/main/resources/logback.xml b/core-java-modules/core-java-collections/src/main/resources/logback.xml
similarity index 100%
rename from core-java-collections/src/main/resources/logback.xml
rename to core-java-modules/core-java-collections/src/main/resources/logback.xml
diff --git a/core-java-collections/src/test/java/com/baeldung/arraydeque/ArrayDequeUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/arraydeque/ArrayDequeUnitTest.java
similarity index 95%
rename from core-java-collections/src/test/java/com/baeldung/arraydeque/ArrayDequeUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/arraydeque/ArrayDequeUnitTest.java
index 71930eda97..5a76eb5402 100644
--- a/core-java-collections/src/test/java/com/baeldung/arraydeque/ArrayDequeUnitTest.java
+++ b/core-java-modules/core-java-collections/src/test/java/com/baeldung/arraydeque/ArrayDequeUnitTest.java
@@ -1,50 +1,50 @@
-package com.baeldung.arraydeque;
-
-import java.util.ArrayDeque;
-import java.util.Deque;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-public class ArrayDequeUnitTest {
-
-    @Test
-    public void whenOffer_addsAtLast() {
-        final Deque<String> deque = new ArrayDeque<>();
-
-        deque.offer("first");
-        deque.offer("second");
-
-        assertEquals("second", deque.getLast());
-    }
-
-    @Test
-    public void whenPoll_removesFirst() {
-        final Deque<String> deque = new ArrayDeque<>();
-
-        deque.offer("first");
-        deque.offer("second");
-
-        assertEquals("first", deque.poll());
-    }
-
-    @Test
-    public void whenPush_addsAtFirst() {
-        final Deque<String> deque = new ArrayDeque<>();
-
-        deque.push("first");
-        deque.push("second");
-
-        assertEquals("second", deque.getFirst());
-    }
-
-    @Test
-    public void whenPop_removesLast() {
-        final Deque<String> deque = new ArrayDeque<>();
-
-        deque.push("first");
-        deque.push("second");
-
-        assertEquals("second", deque.pop());
-    }
-}
+package com.baeldung.arraydeque;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class ArrayDequeUnitTest {
+
+    @Test
+    public void whenOffer_addsAtLast() {
+        final Deque<String> deque = new ArrayDeque<>();
+
+        deque.offer("first");
+        deque.offer("second");
+
+        assertEquals("second", deque.getLast());
+    }
+
+    @Test
+    public void whenPoll_removesFirst() {
+        final Deque<String> deque = new ArrayDeque<>();
+
+        deque.offer("first");
+        deque.offer("second");
+
+        assertEquals("first", deque.poll());
+    }
+
+    @Test
+    public void whenPush_addsAtFirst() {
+        final Deque<String> deque = new ArrayDeque<>();
+
+        deque.push("first");
+        deque.push("second");
+
+        assertEquals("second", deque.getFirst());
+    }
+
+    @Test
+    public void whenPop_removesLast() {
+        final Deque<String> deque = new ArrayDeque<>();
+
+        deque.push("first");
+        deque.push("second");
+
+        assertEquals("second", deque.pop());
+    }
+}
diff --git a/core-java-collections/src/test/java/com/baeldung/charstack/CharStackUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/charstack/CharStackUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/charstack/CharStackUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/charstack/CharStackUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/charstack/CharStackUsingJavaUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/charstack/CharStackUsingJavaUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/charstack/CharStackUsingJavaUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/charstack/CharStackUsingJavaUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/charstack/CharStackWithArrayUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/charstack/CharStackWithArrayUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/charstack/CharStackWithArrayUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/charstack/CharStackWithArrayUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningArraysUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningArraysUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningArraysUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningArraysUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningListsUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningListsUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningListsUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningListsUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningMapsUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningMapsUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningMapsUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningMapsUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningSetsUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningSetsUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningSetsUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/combiningcollections/CombiningSetsUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/enummap/DummyEnum.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/enummap/DummyEnum.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/enummap/DummyEnum.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/enummap/DummyEnum.java
diff --git a/core-java-collections/src/test/java/com/baeldung/enummap/EnumMapBenchmarkLiveTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/enummap/EnumMapBenchmarkLiveTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/enummap/EnumMapBenchmarkLiveTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/enummap/EnumMapBenchmarkLiveTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/enummap/EnumMapUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/enummap/EnumMapUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/enummap/EnumMapUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/enummap/EnumMapUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/hashmapvshashtable/HashmapVsHashtableDifferenceUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/hashmapvshashtable/HashmapVsHashtableDifferenceUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/hashmapvshashtable/HashmapVsHashtableDifferenceUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/hashmapvshashtable/HashmapVsHashtableDifferenceUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/hashtable/HashtableUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/hashtable/HashtableUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/hashtable/HashtableUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/hashtable/HashtableUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/iterators/IteratorsUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/iterators/IteratorsUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/iterators/IteratorsUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/iterators/IteratorsUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/java/collections/ConcurrentModificationExceptionUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/java/collections/ConcurrentModificationExceptionUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/java/collections/ConcurrentModificationExceptionUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/java/collections/ConcurrentModificationExceptionUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/java/filtering/CollectionFiltersUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/java/filtering/CollectionFiltersUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/java/filtering/CollectionFiltersUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/java/filtering/CollectionFiltersUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/java/iterable/IterableSizeUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/java/iterable/IterableSizeUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/java/iterable/IterableSizeUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/java/iterable/IterableSizeUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNullUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNullUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNullUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingCommonsEmptyIfNullUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainerUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainerUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainerUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingJava8OptionalContainerUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheckUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheckUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheckUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/nullsafecollectionstreams/NullSafeCollectionStreamsUsingNullDereferenceCheckUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/queueInterface/CustomBaeldungQueueUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/queueInterface/CustomBaeldungQueueUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/queueInterface/CustomBaeldungQueueUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/queueInterface/CustomBaeldungQueueUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/queueInterface/PriorityQueueUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/queueInterface/PriorityQueueUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/queueInterface/PriorityQueueUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/queueInterface/PriorityQueueUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/removal/RemovalUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/removal/RemovalUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/removal/RemovalUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/removal/RemovalUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/shufflingcollections/ShufflingCollectionsUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/shufflingcollections/ShufflingCollectionsUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/shufflingcollections/ShufflingCollectionsUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/shufflingcollections/ShufflingCollectionsUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/stack_tests/MultithreadingCorrectnessStackUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/stack_tests/MultithreadingCorrectnessStackUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/stack_tests/MultithreadingCorrectnessStackUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/stack_tests/MultithreadingCorrectnessStackUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/stack_tests/StackUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/stack_tests/StackUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/com/baeldung/stack_tests/StackUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/stack_tests/StackUnitTest.java
diff --git a/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedCollectionUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedCollectionUnitTest.java
similarity index 97%
rename from core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedCollectionUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedCollectionUnitTest.java
index 84feeb6eaa..fd84503226 100644
--- a/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedCollectionUnitTest.java
+++ b/core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedCollectionUnitTest.java
@@ -1,28 +1,28 @@
-package com.baeldung.synchronizedcollections.test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
-
-public class SynchronizedCollectionUnitTest {
-
-    @Test
-    public void givenSynchronizedCollection_whenTwoThreadsAddElements_thenCorrectCollectionSize() throws InterruptedException {
-        Collection<Integer> syncCollection = Collections.synchronizedCollection(new ArrayList<>());
-
-        Runnable listOperations = () -> {
-            syncCollection.addAll(Arrays.asList(1, 2, 3, 4, 5, 6));
-        };
-        Thread thread1 = new Thread(listOperations);
-        Thread thread2 = new Thread(listOperations);
-        thread1.start();
-        thread2.start();
-        thread1.join();
-        thread2.join();
-
-        assertThat(syncCollection.size()).isEqualTo(12);
-    }
-}
+package com.baeldung.synchronizedcollections.test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class SynchronizedCollectionUnitTest {
+
+    @Test
+    public void givenSynchronizedCollection_whenTwoThreadsAddElements_thenCorrectCollectionSize() throws InterruptedException {
+        Collection<Integer> syncCollection = Collections.synchronizedCollection(new ArrayList<>());
+
+        Runnable listOperations = () -> {
+            syncCollection.addAll(Arrays.asList(1, 2, 3, 4, 5, 6));
+        };
+        Thread thread1 = new Thread(listOperations);
+        Thread thread2 = new Thread(listOperations);
+        thread1.start();
+        thread2.start();
+        thread1.join();
+        thread2.join();
+
+        assertThat(syncCollection.size()).isEqualTo(12);
+    }
+}
diff --git a/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedListUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedListUnitTest.java
similarity index 97%
rename from core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedListUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedListUnitTest.java
index 68fc3becd4..72354622ae 100644
--- a/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedListUnitTest.java
+++ b/core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedListUnitTest.java
@@ -1,51 +1,51 @@
-package com.baeldung.synchronizedcollections.test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Test;
-import static org.assertj.core.api.Assertions.*;
-
-public class SynchronizedListUnitTest {
-
-    @Test
-    public void givenSynchronizedList_whenTwoThreadsAddElements_thenCorrectListSize() throws InterruptedException {
-        List<Integer> syncList = Collections.synchronizedList(new ArrayList<>());
-
-        Runnable listOperations = () -> {
-            syncList.addAll(Arrays.asList(1, 2, 3, 4, 5, 6));
-        };
-        Thread thread1 = new Thread(listOperations);
-        Thread thread2 = new Thread(listOperations);
-        thread1.start();
-        thread2.start();
-        thread1.join();
-        thread2.join();
-        
-        assertThat(syncList.size()).isEqualTo(12);
-    }
-    
-    @Test
-    public void givenStringList_whenTwoThreadsIterateOnSynchronizedList_thenCorrectResult() throws InterruptedException {
-        List<String> syncCollection = Collections.synchronizedList(Arrays.asList("a", "b", "c"));
-        List<String> uppercasedCollection = new ArrayList<>();
-
-        Runnable listOperations = () -> {
-            synchronized (syncCollection) {
-                syncCollection.forEach((e) -> {
-                    uppercasedCollection.add(e.toUpperCase());
-                });
-            }
-        };
-        
-        Thread thread1 = new Thread(listOperations);
-        Thread thread2 = new Thread(listOperations);
-        thread1.start();
-        thread2.start();
-        thread1.join();
-        thread2.join();
-        
-        assertThat(uppercasedCollection.get(0)).isEqualTo("A");
-    }
-}
+package com.baeldung.synchronizedcollections.test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Test;
+import static org.assertj.core.api.Assertions.*;
+
+public class SynchronizedListUnitTest {
+
+    @Test
+    public void givenSynchronizedList_whenTwoThreadsAddElements_thenCorrectListSize() throws InterruptedException {
+        List<Integer> syncList = Collections.synchronizedList(new ArrayList<>());
+
+        Runnable listOperations = () -> {
+            syncList.addAll(Arrays.asList(1, 2, 3, 4, 5, 6));
+        };
+        Thread thread1 = new Thread(listOperations);
+        Thread thread2 = new Thread(listOperations);
+        thread1.start();
+        thread2.start();
+        thread1.join();
+        thread2.join();
+        
+        assertThat(syncList.size()).isEqualTo(12);
+    }
+    
+    @Test
+    public void givenStringList_whenTwoThreadsIterateOnSynchronizedList_thenCorrectResult() throws InterruptedException {
+        List<String> syncCollection = Collections.synchronizedList(Arrays.asList("a", "b", "c"));
+        List<String> uppercasedCollection = new ArrayList<>();
+
+        Runnable listOperations = () -> {
+            synchronized (syncCollection) {
+                syncCollection.forEach((e) -> {
+                    uppercasedCollection.add(e.toUpperCase());
+                });
+            }
+        };
+        
+        Thread thread1 = new Thread(listOperations);
+        Thread thread2 = new Thread(listOperations);
+        thread1.start();
+        thread2.start();
+        thread1.join();
+        thread2.join();
+        
+        assertThat(uppercasedCollection.get(0)).isEqualTo("A");
+    }
+}
diff --git a/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedMapUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedMapUnitTest.java
similarity index 96%
rename from core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedMapUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedMapUnitTest.java
index abfb866e9c..842e253e9e 100644
--- a/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedMapUnitTest.java
+++ b/core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedMapUnitTest.java
@@ -1,30 +1,30 @@
-package com.baeldung.synchronizedcollections.test;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Test;
-import static org.assertj.core.api.Assertions.*;
-
-public class SynchronizedMapUnitTest {
-
-    @Test
-    public void givenSynchronizedMap_whenTwoThreadsAddElements_thenCorrectMapSize() throws InterruptedException {
-        Map<Integer, String> syncMap = Collections.synchronizedMap(new HashMap<>());
-
-        Runnable mapOperations = () -> {
-            syncMap.put(1, "one");
-            syncMap.put(2, "two");
-            syncMap.put(3, "three");
-            
-        };
-        Thread thread1 = new Thread(mapOperations);
-        Thread thread2 = new Thread(mapOperations);
-        thread1.start();
-        thread2.start();
-        thread1.join();
-        thread2.join();
-        
-        assertThat(syncMap.size()).isEqualTo(3);
-    }
-}
+package com.baeldung.synchronizedcollections.test;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+import static org.assertj.core.api.Assertions.*;
+
+public class SynchronizedMapUnitTest {
+
+    @Test
+    public void givenSynchronizedMap_whenTwoThreadsAddElements_thenCorrectMapSize() throws InterruptedException {
+        Map<Integer, String> syncMap = Collections.synchronizedMap(new HashMap<>());
+
+        Runnable mapOperations = () -> {
+            syncMap.put(1, "one");
+            syncMap.put(2, "two");
+            syncMap.put(3, "three");
+            
+        };
+        Thread thread1 = new Thread(mapOperations);
+        Thread thread2 = new Thread(mapOperations);
+        thread1.start();
+        thread2.start();
+        thread1.join();
+        thread2.join();
+        
+        assertThat(syncMap.size()).isEqualTo(3);
+    }
+}
diff --git a/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSetUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSetUnitTest.java
similarity index 97%
rename from core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSetUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSetUnitTest.java
index 58a33b207d..f88f58a55b 100644
--- a/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSetUnitTest.java
+++ b/core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSetUnitTest.java
@@ -1,26 +1,26 @@
-package com.baeldung.synchronizedcollections.test;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import org.junit.Test;
-import static org.assertj.core.api.Assertions.*;
-
-public class SynchronizedSetUnitTest {
-    
-    @Test
-    public void givenSynchronizedSet_whenTwoThreadsAddElements_thenCorrectSetSize() throws InterruptedException {
-        Set<Integer> syncSet = Collections.synchronizedSet(new HashSet<>());
-        
-        Runnable setOperations = () -> {syncSet.addAll(Arrays.asList(1, 2, 3, 4, 5, 6));};
-        Thread thread1 = new Thread(setOperations);
-        Thread thread2 = new Thread(setOperations);
-        thread1.start();
-        thread2.start();
-        thread1.join();
-        thread2.join();
-        
-        assertThat(syncSet.size()).isEqualTo(6);
-    }
-}
+package com.baeldung.synchronizedcollections.test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import org.junit.Test;
+import static org.assertj.core.api.Assertions.*;
+
+public class SynchronizedSetUnitTest {
+    
+    @Test
+    public void givenSynchronizedSet_whenTwoThreadsAddElements_thenCorrectSetSize() throws InterruptedException {
+        Set<Integer> syncSet = Collections.synchronizedSet(new HashSet<>());
+        
+        Runnable setOperations = () -> {syncSet.addAll(Arrays.asList(1, 2, 3, 4, 5, 6));};
+        Thread thread1 = new Thread(setOperations);
+        Thread thread2 = new Thread(setOperations);
+        thread1.start();
+        thread2.start();
+        thread1.join();
+        thread2.join();
+        
+        assertThat(syncSet.size()).isEqualTo(6);
+    }
+}
diff --git a/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedMapUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedMapUnitTest.java
similarity index 97%
rename from core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedMapUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedMapUnitTest.java
index 4b0ed6d8c8..23933b2b4b 100644
--- a/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedMapUnitTest.java
+++ b/core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedMapUnitTest.java
@@ -1,29 +1,29 @@
-package com.baeldung.synchronizedcollections.test;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.TreeMap;
-import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
-
-public class SynchronizedSortedMapUnitTest {
-    
-    @Test
-    public void givenSynchronizedSorteMap_whenTwoThreadsAddElements_thenCorrectSortedMapSize() throws InterruptedException {
-        Map<Integer, String> syncSortedMap = Collections.synchronizedSortedMap(new TreeMap<>());
-        
-        Runnable sortedMapOperations = () -> {
-            syncSortedMap.put(1, "One");
-            syncSortedMap.put(2, "Two");
-            syncSortedMap.put(3, "Three");
-        };
-        Thread thread1 = new Thread(sortedMapOperations);
-        Thread thread2 = new Thread(sortedMapOperations);
-        thread1.start();
-        thread2.start();
-        thread1.join();
-        thread2.join();
-        
-        assertThat(syncSortedMap.size()).isEqualTo(3);
-    }
-}
+package com.baeldung.synchronizedcollections.test;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.TreeMap;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class SynchronizedSortedMapUnitTest {
+    
+    @Test
+    public void givenSynchronizedSorteMap_whenTwoThreadsAddElements_thenCorrectSortedMapSize() throws InterruptedException {
+        Map<Integer, String> syncSortedMap = Collections.synchronizedSortedMap(new TreeMap<>());
+        
+        Runnable sortedMapOperations = () -> {
+            syncSortedMap.put(1, "One");
+            syncSortedMap.put(2, "Two");
+            syncSortedMap.put(3, "Three");
+        };
+        Thread thread1 = new Thread(sortedMapOperations);
+        Thread thread2 = new Thread(sortedMapOperations);
+        thread1.start();
+        thread2.start();
+        thread1.join();
+        thread2.join();
+        
+        assertThat(syncSortedMap.size()).isEqualTo(3);
+    }
+}
diff --git a/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedSetUnitTest.java b/core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedSetUnitTest.java
similarity index 97%
rename from core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedSetUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedSetUnitTest.java
index 0e26c6eb1c..3ce1e6ed26 100644
--- a/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedSetUnitTest.java
+++ b/core-java-modules/core-java-collections/src/test/java/com/baeldung/synchronizedcollections/test/SynchronizedSortedSetUnitTest.java
@@ -1,28 +1,28 @@
-package com.baeldung.synchronizedcollections.test;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
-
-public class SynchronizedSortedSetUnitTest {
-    
-    @Test
-    public void givenSynchronizedSortedSet_whenTwoThreadsAddElements_thenCorrectSortedSetSize() throws InterruptedException {
-        SortedSet<Integer> syncSortedSet = Collections.synchronizedSortedSet(new TreeSet<>());
-        
-        Runnable sortedSetOperations = () -> {syncSortedSet.addAll(Arrays.asList(1, 2, 3, 4, 5, 6));};
-        sortedSetOperations.run();
-        sortedSetOperations.run();
-        Thread thread1 = new Thread(sortedSetOperations);
-        Thread thread2 = new Thread(sortedSetOperations);
-        thread1.start();
-        thread2.start();
-        thread1.join();
-        thread2.join();
-        
-        assertThat(syncSortedSet.size()).isEqualTo(6);
-    }
-}
+package com.baeldung.synchronizedcollections.test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class SynchronizedSortedSetUnitTest {
+    
+    @Test
+    public void givenSynchronizedSortedSet_whenTwoThreadsAddElements_thenCorrectSortedSetSize() throws InterruptedException {
+        SortedSet<Integer> syncSortedSet = Collections.synchronizedSortedSet(new TreeSet<>());
+        
+        Runnable sortedSetOperations = () -> {syncSortedSet.addAll(Arrays.asList(1, 2, 3, 4, 5, 6));};
+        sortedSetOperations.run();
+        sortedSetOperations.run();
+        Thread thread1 = new Thread(sortedSetOperations);
+        Thread thread2 = new Thread(sortedSetOperations);
+        thread1.start();
+        thread2.start();
+        thread1.join();
+        thread2.join();
+        
+        assertThat(syncSortedSet.size()).isEqualTo(6);
+    }
+}
diff --git a/core-java-collections/src/test/java/org/baeldung/java/collections/CollectionsConcatenateUnitTest.java b/core-java-modules/core-java-collections/src/test/java/org/baeldung/java/collections/CollectionsConcatenateUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/org/baeldung/java/collections/CollectionsConcatenateUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/org/baeldung/java/collections/CollectionsConcatenateUnitTest.java
diff --git a/core-java-collections/src/test/java/org/baeldung/java/collections/CollectionsJoinAndSplitJUnitTest.java b/core-java-modules/core-java-collections/src/test/java/org/baeldung/java/collections/CollectionsJoinAndSplitJUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/org/baeldung/java/collections/CollectionsJoinAndSplitJUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/org/baeldung/java/collections/CollectionsJoinAndSplitJUnitTest.java
diff --git a/core-java-collections/src/test/java/org/baeldung/java/collections/JoinSplitCollectionsUnitTest.java b/core-java-modules/core-java-collections/src/test/java/org/baeldung/java/collections/JoinSplitCollectionsUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/org/baeldung/java/collections/JoinSplitCollectionsUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/org/baeldung/java/collections/JoinSplitCollectionsUnitTest.java
diff --git a/core-java-collections/src/test/java/org/baeldung/java/collections/README.md b/core-java-modules/core-java-collections/src/test/java/org/baeldung/java/collections/README.md
similarity index 100%
rename from core-java-collections/src/test/java/org/baeldung/java/collections/README.md
rename to core-java-modules/core-java-collections/src/test/java/org/baeldung/java/collections/README.md
diff --git a/core-java-collections/src/test/java/org/baeldung/java/sorting/Employee.java b/core-java-modules/core-java-collections/src/test/java/org/baeldung/java/sorting/Employee.java
similarity index 100%
rename from core-java-collections/src/test/java/org/baeldung/java/sorting/Employee.java
rename to core-java-modules/core-java-collections/src/test/java/org/baeldung/java/sorting/Employee.java
diff --git a/core-java-collections/src/test/java/org/baeldung/java/sorting/JavaSortingUnitTest.java b/core-java-modules/core-java-collections/src/test/java/org/baeldung/java/sorting/JavaSortingUnitTest.java
similarity index 100%
rename from core-java-collections/src/test/java/org/baeldung/java/sorting/JavaSortingUnitTest.java
rename to core-java-modules/core-java-collections/src/test/java/org/baeldung/java/sorting/JavaSortingUnitTest.java
diff --git a/core-java-concurrency-advanced/.gitignore b/core-java-modules/core-java-concurrency-advanced/.gitignore
similarity index 100%
rename from core-java-concurrency-advanced/.gitignore
rename to core-java-modules/core-java-concurrency-advanced/.gitignore
diff --git a/core-java-concurrency-advanced/README.md b/core-java-modules/core-java-concurrency-advanced/README.md
similarity index 100%
rename from core-java-concurrency-advanced/README.md
rename to core-java-modules/core-java-concurrency-advanced/README.md
diff --git a/core-java-concurrency-advanced/pom.xml b/core-java-modules/core-java-concurrency-advanced/pom.xml
similarity index 98%
rename from core-java-concurrency-advanced/pom.xml
rename to core-java-modules/core-java-concurrency-advanced/pom.xml
index 23032fb2e1..a3ac7aa88a 100644
--- a/core-java-concurrency-advanced/pom.xml
+++ b/core-java-modules/core-java-concurrency-advanced/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/SafeCounterWithLock.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/SafeCounterWithLock.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/SafeCounterWithLock.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/SafeCounterWithLock.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/SafeCounterWithoutLock.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/SafeCounterWithoutLock.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/SafeCounterWithoutLock.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/SafeCounterWithoutLock.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/UnsafeCounter.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/UnsafeCounter.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/UnsafeCounter.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/UnsafeCounter.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/BrokenWorker.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/BrokenWorker.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/BrokenWorker.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/BrokenWorker.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExample.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExample.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExample.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExample.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExample.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExample.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExample.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExample.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/WaitingWorker.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/WaitingWorker.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/WaitingWorker.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/WaitingWorker.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/Worker.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/Worker.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/Worker.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/Worker.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExample.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExample.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExample.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExample.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExample.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExample.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExample.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExample.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierDemo.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierDemo.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierDemo.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierDemo.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExample.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExample.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExample.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExample.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/daemon/MultipleThreadsExample.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/daemon/MultipleThreadsExample.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/daemon/MultipleThreadsExample.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/daemon/MultipleThreadsExample.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/daemon/NewThread.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/daemon/NewThread.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/daemon/NewThread.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/daemon/NewThread.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/daemon/SingleThreadExample.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/daemon/SingleThreadExample.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/daemon/SingleThreadExample.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/daemon/SingleThreadExample.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/diningphilosophers/DiningPhilosophers.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/diningphilosophers/DiningPhilosophers.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/diningphilosophers/DiningPhilosophers.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/diningphilosophers/DiningPhilosophers.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/diningphilosophers/Philosopher.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/diningphilosophers/Philosopher.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/diningphilosophers/Philosopher.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/diningphilosophers/Philosopher.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddSemaphore.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddSemaphore.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddSemaphore.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddSemaphore.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddWaitNotify.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddWaitNotify.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddWaitNotify.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddWaitNotify.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/ReentrantLockWithCondition.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/ReentrantLockWithCondition.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/ReentrantLockWithCondition.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/ReentrantLockWithCondition.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/SharedObjectWithLock.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/SharedObjectWithLock.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/SharedObjectWithLock.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/SharedObjectWithLock.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/StampedLockDemo.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/StampedLockDemo.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/StampedLockDemo.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/StampedLockDemo.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/SynchronizedHashMapWithRWLock.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/SynchronizedHashMapWithRWLock.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/SynchronizedHashMapWithRWLock.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/locks/SynchronizedHashMapWithRWLock.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/AverageCalculator.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/AverageCalculator.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/AverageCalculator.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/AverageCalculator.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/ParameterizedThreadExample.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/ParameterizedThreadExample.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/ParameterizedThreadExample.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/ParameterizedThreadExample.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/phaser/LongRunningAction.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/phaser/LongRunningAction.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/phaser/LongRunningAction.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/phaser/LongRunningAction.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/Job.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/Job.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/Job.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/Job.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/JobPriority.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/JobPriority.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/JobPriority.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/JobPriority.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobScheduler.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobScheduler.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobScheduler.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobScheduler.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/CounterUsingMutex.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/CounterUsingMutex.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/CounterUsingMutex.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/CounterUsingMutex.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/DelayQueueUsingTimedSemaphore.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/DelayQueueUsingTimedSemaphore.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/DelayQueueUsingTimedSemaphore.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/DelayQueueUsingTimedSemaphore.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/LoginQueueUsingSemaphore.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/LoginQueueUsingSemaphore.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/LoginQueueUsingSemaphore.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/LoginQueueUsingSemaphore.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/volatilekeyword/SharedObject.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/volatilekeyword/SharedObject.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/volatilekeyword/SharedObject.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/volatilekeyword/SharedObject.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/yield/ThreadYield.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/yield/ThreadYield.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/yield/ThreadYield.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/yield/ThreadYield.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/CustomRecursiveAction.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/CustomRecursiveAction.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/CustomRecursiveAction.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/CustomRecursiveAction.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/CustomRecursiveTask.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/CustomRecursiveTask.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/CustomRecursiveTask.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/CustomRecursiveTask.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/util/PoolUtil.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/util/PoolUtil.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/util/PoolUtil.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/util/PoolUtil.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/Context.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/Context.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/Context.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/Context.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/SharedMapWithUserContext.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/SharedMapWithUserContext.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/SharedMapWithUserContext.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/SharedMapWithUserContext.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/ThreadLocalWithUserContext.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/ThreadLocalWithUserContext.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/ThreadLocalWithUserContext.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/ThreadLocalWithUserContext.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/UserRepository.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/UserRepository.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/UserRepository.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocal/UserRepository.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarkRunner.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarkRunner.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarkRunner.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarkRunner.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarker.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarker.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarker.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarker.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/threadpool/CountingTask.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadpool/CountingTask.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/threadpool/CountingTask.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadpool/CountingTask.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java
diff --git a/core-java-concurrency-advanced/src/main/java/com/baeldung/threadpool/TreeNode.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadpool/TreeNode.java
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/com/baeldung/threadpool/TreeNode.java
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadpool/TreeNode.java
diff --git a/core-java-concurrency-advanced/src/main/java/log4j.properties b/core-java-modules/core-java-concurrency-advanced/src/main/java/log4j.properties
similarity index 100%
rename from core-java-concurrency-advanced/src/main/java/log4j.properties
rename to core-java-modules/core-java-concurrency-advanced/src/main/java/log4j.properties
diff --git a/core-java-concurrency-advanced/src/main/resources/logback.xml b/core-java-modules/core-java-concurrency-advanced/src/main/resources/logback.xml
similarity index 100%
rename from core-java-concurrency-advanced/src/main/resources/logback.xml
rename to core-java-modules/core-java-concurrency-advanced/src/main/resources/logback.xml
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/accumulator/LongAccumulatorUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/accumulator/LongAccumulatorUnitTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/accumulator/LongAccumulatorUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/accumulator/LongAccumulatorUnitTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/adder/LongAdderUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/adder/LongAdderUnitTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/adder/LongAdderUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/adder/LongAdderUnitTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeCounterIntegrationTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeCounterIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeCounterIntegrationTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeCounterIntegrationTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/atomic/ThreadUnsafeCounterManualTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/atomic/ThreadUnsafeCounterManualTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/atomic/ThreadUnsafeCounterManualTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/atomic/ThreadUnsafeCounterManualTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExampleUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExampleUnitTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExampleUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExampleUnitTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchExampleIntegrationTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchExampleIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchExampleIntegrationTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchExampleIntegrationTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExampleUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExampleUnitTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExampleUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExampleUnitTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExampleUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExampleUnitTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExampleUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExampleUnitTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExampleUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExampleUnitTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExampleUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExampleUnitTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExampleUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExampleUnitTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExampleUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExampleUnitTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadUnitTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadUnitTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/locks/SharedObjectWithLockManualTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/locks/SharedObjectWithLockManualTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/locks/SharedObjectWithLockManualTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/locks/SharedObjectWithLockManualTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/locks/SynchronizedHashMapWithRWLockManualTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/locks/SynchronizedHashMapWithRWLockManualTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/locks/SynchronizedHashMapWithRWLockManualTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/locks/SynchronizedHashMapWithRWLockManualTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerUnitTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerUnitTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/semaphores/SemaphoresManualTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/semaphores/SemaphoresManualTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/semaphores/SemaphoresManualTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/semaphores/SemaphoresManualTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/volatilekeyword/SharedObjectManualTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/volatilekeyword/SharedObjectManualTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/volatilekeyword/SharedObjectManualTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/volatilekeyword/SharedObjectManualTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/java8/Java8ForkJoinIntegrationTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/java8/Java8ForkJoinIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/java8/Java8ForkJoinIntegrationTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/java8/Java8ForkJoinIntegrationTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/parameters/ParameterizedThreadUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/parameters/ParameterizedThreadUnitTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/parameters/ParameterizedThreadUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/parameters/ParameterizedThreadUnitTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/thread/join/ThreadJoinUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/thread/join/ThreadJoinUnitTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/thread/join/ThreadJoinUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/thread/join/ThreadJoinUnitTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/threadlocal/ThreadLocalIntegrationTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/threadlocal/ThreadLocalIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/threadlocal/ThreadLocalIntegrationTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/threadlocal/ThreadLocalIntegrationTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/threadlocalrandom/ThreadLocalRandomIntegrationTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/threadlocalrandom/ThreadLocalRandomIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/threadlocalrandom/ThreadLocalRandomIntegrationTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/threadlocalrandom/ThreadLocalRandomIntegrationTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/threadpool/CoreThreadPoolIntegrationTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/threadpool/CoreThreadPoolIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/threadpool/CoreThreadPoolIntegrationTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/threadpool/CoreThreadPoolIntegrationTest.java
diff --git a/core-java-concurrency-advanced/src/test/java/com/baeldung/threadpool/GuavaThreadPoolIntegrationTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/threadpool/GuavaThreadPoolIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-advanced/src/test/java/com/baeldung/threadpool/GuavaThreadPoolIntegrationTest.java
rename to core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/threadpool/GuavaThreadPoolIntegrationTest.java
diff --git a/core-java-concurrency-advanced/src/test/resources/.gitignore b/core-java-modules/core-java-concurrency-advanced/src/test/resources/.gitignore
similarity index 100%
rename from core-java-concurrency-advanced/src/test/resources/.gitignore
rename to core-java-modules/core-java-concurrency-advanced/src/test/resources/.gitignore
diff --git a/core-java-concurrency-basic/.gitignore b/core-java-modules/core-java-concurrency-basic/.gitignore
similarity index 100%
rename from core-java-concurrency-basic/.gitignore
rename to core-java-modules/core-java-concurrency-basic/.gitignore
diff --git a/core-java-concurrency-basic/README.md b/core-java-modules/core-java-concurrency-basic/README.md
similarity index 100%
rename from core-java-concurrency-basic/README.md
rename to core-java-modules/core-java-concurrency-basic/README.md
diff --git a/core-java-concurrency-basic/pom.xml b/core-java-modules/core-java-concurrency-basic/pom.xml
similarity index 97%
rename from core-java-concurrency-basic/pom.xml
rename to core-java-modules/core-java-concurrency-basic/pom.xml
index 35c360769b..aea4bef6a7 100644
--- a/core-java-concurrency-basic/pom.xml
+++ b/core-java-modules/core-java-concurrency-basic/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/Scheduledexecutorservice/ScheduledExecutorServiceDemo.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/Scheduledexecutorservice/ScheduledExecutorServiceDemo.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/Scheduledexecutorservice/ScheduledExecutorServiceDemo.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/Scheduledexecutorservice/ScheduledExecutorServiceDemo.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/callable/FactorialTask.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/callable/FactorialTask.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/callable/FactorialTask.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/callable/FactorialTask.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierExample.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierExample.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierExample.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierExample.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/cyclicbarrier/Task.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/cyclicbarrier/Task.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/cyclicbarrier/Task.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/cyclicbarrier/Task.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executor/ExecutorDemo.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executor/ExecutorDemo.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executor/ExecutorDemo.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executor/ExecutorDemo.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executor/Invoker.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executor/Invoker.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executor/Invoker.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executor/Invoker.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executorservice/DelayedCallable.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executorservice/DelayedCallable.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executorservice/DelayedCallable.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executorservice/DelayedCallable.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executorservice/ExecutorServiceDemo.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executorservice/ExecutorServiceDemo.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executorservice/ExecutorServiceDemo.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executorservice/ExecutorServiceDemo.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executorservice/Task.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executorservice/Task.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executorservice/Task.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/executorservice/Task.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/future/FactorialSquareCalculator.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/future/FactorialSquareCalculator.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/future/FactorialSquareCalculator.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/future/FactorialSquareCalculator.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/future/FutureDemo.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/future/FutureDemo.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/future/FutureDemo.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/future/FutureDemo.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/future/SquareCalculator.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/future/SquareCalculator.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/future/SquareCalculator.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/future/SquareCalculator.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/runnable/EventLoggingTask.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/runnable/EventLoggingTask.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/runnable/EventLoggingTask.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/runnable/EventLoggingTask.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/runnable/TaskRunner.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/runnable/TaskRunner.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/runnable/TaskRunner.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/runnable/TaskRunner.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/semaphore/SemaPhoreDemo.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/semaphore/SemaPhoreDemo.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/semaphore/SemaPhoreDemo.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/semaphore/SemaPhoreDemo.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/sleepwait/ThreadA.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/sleepwait/ThreadA.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/sleepwait/ThreadA.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/sleepwait/ThreadA.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/sleepwait/ThreadB.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/sleepwait/ThreadB.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/sleepwait/ThreadB.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/sleepwait/ThreadB.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/sleepwait/WaitSleepExample.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/sleepwait/WaitSleepExample.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/sleepwait/WaitSleepExample.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/sleepwait/WaitSleepExample.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/stopping/ControlSubThread.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/stopping/ControlSubThread.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/stopping/ControlSubThread.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/stopping/ControlSubThread.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedBlocks.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedBlocks.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedBlocks.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedBlocks.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedMethods.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedMethods.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedMethods.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedMethods.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadfactory/BaeldungThreadFactory.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadfactory/BaeldungThreadFactory.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadfactory/BaeldungThreadFactory.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadfactory/BaeldungThreadFactory.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadfactory/Demo.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadfactory/Demo.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadfactory/Demo.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadfactory/Demo.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadfactory/Task.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadfactory/Task.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadfactory/Task.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadfactory/Task.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/BlockedState.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/BlockedState.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/BlockedState.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/BlockedState.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/NewState.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/NewState.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/NewState.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/NewState.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/RunnableState.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/RunnableState.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/RunnableState.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/RunnableState.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/TerminatedState.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/TerminatedState.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/TerminatedState.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/TerminatedState.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/TimedWaitingState.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/TimedWaitingState.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/TimedWaitingState.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/TimedWaitingState.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/WaitingState.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/WaitingState.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/WaitingState.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadlifecycle/WaitingState.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/application/Application.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/application/Application.java
similarity index 98%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/application/Application.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/application/Application.java
index 0c5caba8a0..5fcb28cd2a 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/application/Application.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/application/Application.java
@@ -1,86 +1,86 @@
-package com.baeldung.concurrent.threadsafety.application;
-
-import com.baeldung.concurrent.threadsafety.callables.AtomicCounterCallable;
-import com.baeldung.concurrent.threadsafety.mathutils.MathUtils;
-import com.baeldung.concurrent.threadsafety.callables.CounterCallable;
-import com.baeldung.concurrent.threadsafety.callables.ExtrinsicLockCounterCallable;
-import com.baeldung.concurrent.threadsafety.callables.MessageServiceCallable;
-import com.baeldung.concurrent.threadsafety.callables.ReentranReadWriteLockCounterCallable;
-import com.baeldung.concurrent.threadsafety.callables.ReentrantLockCounterCallable;
-import com.baeldung.concurrent.threadsafety.services.AtomicCounter;
-import com.baeldung.concurrent.threadsafety.services.Counter;
-import com.baeldung.concurrent.threadsafety.services.ExtrinsicLockCounter;
-import com.baeldung.concurrent.threadsafety.services.MessageService;
-import com.baeldung.concurrent.threadsafety.services.ReentrantLockCounter;
-import com.baeldung.concurrent.threadsafety.services.ReentrantReadWriteLockCounter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-public class Application {
-    
-    public static void main(String[] args) throws InterruptedException, ExecutionException {
-
-        new Thread(() -> {
-            System.out.println(MathUtils.factorial(10));
-        }).start();
-        new Thread(() -> {
-            System.out.println(MathUtils.factorial(5));
-        }).start();
-        
-        ExecutorService executorService = Executors.newFixedThreadPool(10);
-        MessageService messageService = new MessageService("Welcome to Baeldung!");
-        Future<String> future1 = (Future<String>) executorService.submit(new MessageServiceCallable(messageService));
-        Future<String> future2 = (Future<String>) executorService.submit(new MessageServiceCallable(messageService));
-        System.out.println(future1.get());
-        System.out.println(future2.get());
-        
-        Counter counter = new Counter();
-        Future<Integer> future3 = (Future<Integer>) executorService.submit(new CounterCallable(counter));
-        Future<Integer> future4 = (Future<Integer>) executorService.submit(new CounterCallable(counter));
-        System.out.println(future3.get());
-        System.out.println(future4.get());
-        
-        ExtrinsicLockCounter extrinsicLockCounter = new ExtrinsicLockCounter();
-        Future<Integer> future5 = (Future<Integer>) executorService.submit(new ExtrinsicLockCounterCallable(extrinsicLockCounter));
-        Future<Integer> future6 = (Future<Integer>) executorService.submit(new ExtrinsicLockCounterCallable(extrinsicLockCounter));
-        System.out.println(future5.get());
-        System.out.println(future6.get());
-        
-        ReentrantLockCounter reentrantLockCounter = new ReentrantLockCounter();
-        Future<Integer> future7 = (Future<Integer>) executorService.submit(new ReentrantLockCounterCallable(reentrantLockCounter));
-        Future<Integer> future8 = (Future<Integer>) executorService.submit(new ReentrantLockCounterCallable(reentrantLockCounter));
-        System.out.println(future7.get());
-        System.out.println(future8.get());
-        
-        ReentrantReadWriteLockCounter reentrantReadWriteLockCounter = new ReentrantReadWriteLockCounter();
-        Future<Integer> future9 = (Future<Integer>) executorService.submit(new ReentranReadWriteLockCounterCallable(reentrantReadWriteLockCounter));
-        Future<Integer> future10 = (Future<Integer>) executorService.submit(new ReentranReadWriteLockCounterCallable(reentrantReadWriteLockCounter));
-        System.out.println(future9.get());
-        System.out.println(future10.get());
-        
-        AtomicCounter atomicCounter = new AtomicCounter();
-        Future<Integer> future11 = (Future<Integer>) executorService.submit(new AtomicCounterCallable(atomicCounter));
-        Future<Integer> future12 = (Future<Integer>) executorService.submit(new AtomicCounterCallable(atomicCounter));
-        System.out.println(future11.get());
-        System.out.println(future12.get());
-        
-        Collection<Integer> syncCollection = Collections.synchronizedCollection(new ArrayList<>());
-        Thread thread11 = new Thread(() -> syncCollection.addAll(Arrays.asList(1, 2, 3, 4, 5, 6)));
-        Thread thread12 = new Thread(() -> syncCollection.addAll(Arrays.asList(1, 2, 3, 4, 5, 6)));
-        thread11.start();
-        thread12.start();
-        
-        Map<String,String> concurrentMap = new ConcurrentHashMap<>();
-        concurrentMap.put("1", "one");
-        concurrentMap.put("2", "two");
-        concurrentMap.put("3", "three");
-    }
-}
+package com.baeldung.concurrent.threadsafety.application;
+
+import com.baeldung.concurrent.threadsafety.callables.AtomicCounterCallable;
+import com.baeldung.concurrent.threadsafety.mathutils.MathUtils;
+import com.baeldung.concurrent.threadsafety.callables.CounterCallable;
+import com.baeldung.concurrent.threadsafety.callables.ExtrinsicLockCounterCallable;
+import com.baeldung.concurrent.threadsafety.callables.MessageServiceCallable;
+import com.baeldung.concurrent.threadsafety.callables.ReentranReadWriteLockCounterCallable;
+import com.baeldung.concurrent.threadsafety.callables.ReentrantLockCounterCallable;
+import com.baeldung.concurrent.threadsafety.services.AtomicCounter;
+import com.baeldung.concurrent.threadsafety.services.Counter;
+import com.baeldung.concurrent.threadsafety.services.ExtrinsicLockCounter;
+import com.baeldung.concurrent.threadsafety.services.MessageService;
+import com.baeldung.concurrent.threadsafety.services.ReentrantLockCounter;
+import com.baeldung.concurrent.threadsafety.services.ReentrantReadWriteLockCounter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+public class Application {
+    
+    public static void main(String[] args) throws InterruptedException, ExecutionException {
+
+        new Thread(() -> {
+            System.out.println(MathUtils.factorial(10));
+        }).start();
+        new Thread(() -> {
+            System.out.println(MathUtils.factorial(5));
+        }).start();
+        
+        ExecutorService executorService = Executors.newFixedThreadPool(10);
+        MessageService messageService = new MessageService("Welcome to Baeldung!");
+        Future<String> future1 = (Future<String>) executorService.submit(new MessageServiceCallable(messageService));
+        Future<String> future2 = (Future<String>) executorService.submit(new MessageServiceCallable(messageService));
+        System.out.println(future1.get());
+        System.out.println(future2.get());
+        
+        Counter counter = new Counter();
+        Future<Integer> future3 = (Future<Integer>) executorService.submit(new CounterCallable(counter));
+        Future<Integer> future4 = (Future<Integer>) executorService.submit(new CounterCallable(counter));
+        System.out.println(future3.get());
+        System.out.println(future4.get());
+        
+        ExtrinsicLockCounter extrinsicLockCounter = new ExtrinsicLockCounter();
+        Future<Integer> future5 = (Future<Integer>) executorService.submit(new ExtrinsicLockCounterCallable(extrinsicLockCounter));
+        Future<Integer> future6 = (Future<Integer>) executorService.submit(new ExtrinsicLockCounterCallable(extrinsicLockCounter));
+        System.out.println(future5.get());
+        System.out.println(future6.get());
+        
+        ReentrantLockCounter reentrantLockCounter = new ReentrantLockCounter();
+        Future<Integer> future7 = (Future<Integer>) executorService.submit(new ReentrantLockCounterCallable(reentrantLockCounter));
+        Future<Integer> future8 = (Future<Integer>) executorService.submit(new ReentrantLockCounterCallable(reentrantLockCounter));
+        System.out.println(future7.get());
+        System.out.println(future8.get());
+        
+        ReentrantReadWriteLockCounter reentrantReadWriteLockCounter = new ReentrantReadWriteLockCounter();
+        Future<Integer> future9 = (Future<Integer>) executorService.submit(new ReentranReadWriteLockCounterCallable(reentrantReadWriteLockCounter));
+        Future<Integer> future10 = (Future<Integer>) executorService.submit(new ReentranReadWriteLockCounterCallable(reentrantReadWriteLockCounter));
+        System.out.println(future9.get());
+        System.out.println(future10.get());
+        
+        AtomicCounter atomicCounter = new AtomicCounter();
+        Future<Integer> future11 = (Future<Integer>) executorService.submit(new AtomicCounterCallable(atomicCounter));
+        Future<Integer> future12 = (Future<Integer>) executorService.submit(new AtomicCounterCallable(atomicCounter));
+        System.out.println(future11.get());
+        System.out.println(future12.get());
+        
+        Collection<Integer> syncCollection = Collections.synchronizedCollection(new ArrayList<>());
+        Thread thread11 = new Thread(() -> syncCollection.addAll(Arrays.asList(1, 2, 3, 4, 5, 6)));
+        Thread thread12 = new Thread(() -> syncCollection.addAll(Arrays.asList(1, 2, 3, 4, 5, 6)));
+        thread11.start();
+        thread12.start();
+        
+        Map<String,String> concurrentMap = new ConcurrentHashMap<>();
+        concurrentMap.put("1", "one");
+        concurrentMap.put("2", "two");
+        concurrentMap.put("3", "three");
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/AtomicCounterCallable.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/AtomicCounterCallable.java
similarity index 96%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/AtomicCounterCallable.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/AtomicCounterCallable.java
index d711299b5c..27f7bf598e 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/AtomicCounterCallable.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/AtomicCounterCallable.java
@@ -1,19 +1,19 @@
-package com.baeldung.concurrent.threadsafety.callables;
-
-import com.baeldung.concurrent.threadsafety.services.AtomicCounter;
-import java.util.concurrent.Callable;
-
-public class AtomicCounterCallable implements Callable<Integer> {
-
-    private final AtomicCounter counter;
-    
-    public AtomicCounterCallable(AtomicCounter counter) {
-        this.counter = counter;
-    }
-
-    @Override
-    public Integer call() throws Exception {
-        counter.incrementCounter();
-        return counter.getCounter();
-    }
-}
+package com.baeldung.concurrent.threadsafety.callables;
+
+import com.baeldung.concurrent.threadsafety.services.AtomicCounter;
+import java.util.concurrent.Callable;
+
+public class AtomicCounterCallable implements Callable<Integer> {
+
+    private final AtomicCounter counter;
+    
+    public AtomicCounterCallable(AtomicCounter counter) {
+        this.counter = counter;
+    }
+
+    @Override
+    public Integer call() throws Exception {
+        counter.incrementCounter();
+        return counter.getCounter();
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/CounterCallable.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/CounterCallable.java
similarity index 96%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/CounterCallable.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/CounterCallable.java
index cdcd84a17b..feca4d7db5 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/CounterCallable.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/CounterCallable.java
@@ -1,19 +1,19 @@
-package com.baeldung.concurrent.threadsafety.callables;
-
-import com.baeldung.concurrent.threadsafety.services.Counter;
-import java.util.concurrent.Callable;
-
-public class CounterCallable implements Callable<Integer> {
-
-    private final Counter counter;
-    
-    public CounterCallable(Counter counter) {
-        this.counter = counter;
-    }
-
-    @Override
-    public Integer call() throws Exception {
-        counter.incrementCounter();
-        return counter.getCounter();
-    }
-}
+package com.baeldung.concurrent.threadsafety.callables;
+
+import com.baeldung.concurrent.threadsafety.services.Counter;
+import java.util.concurrent.Callable;
+
+public class CounterCallable implements Callable<Integer> {
+
+    private final Counter counter;
+    
+    public CounterCallable(Counter counter) {
+        this.counter = counter;
+    }
+
+    @Override
+    public Integer call() throws Exception {
+        counter.incrementCounter();
+        return counter.getCounter();
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ExtrinsicLockCounterCallable.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ExtrinsicLockCounterCallable.java
similarity index 96%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ExtrinsicLockCounterCallable.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ExtrinsicLockCounterCallable.java
index 29533e7630..370e5d1f00 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ExtrinsicLockCounterCallable.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ExtrinsicLockCounterCallable.java
@@ -1,19 +1,19 @@
-package com.baeldung.concurrent.threadsafety.callables;
-
-import com.baeldung.concurrent.threadsafety.services.ExtrinsicLockCounter;
-import java.util.concurrent.Callable;
-
-public class ExtrinsicLockCounterCallable implements Callable<Integer> {
-
-    private final ExtrinsicLockCounter counter;
-    
-    public ExtrinsicLockCounterCallable(ExtrinsicLockCounter counter) {
-        this.counter = counter;
-    }
-    
-    @Override
-    public Integer call() throws Exception {
-        counter.incrementCounter();
-        return counter.getCounter();
-    }
-}
+package com.baeldung.concurrent.threadsafety.callables;
+
+import com.baeldung.concurrent.threadsafety.services.ExtrinsicLockCounter;
+import java.util.concurrent.Callable;
+
+public class ExtrinsicLockCounterCallable implements Callable<Integer> {
+
+    private final ExtrinsicLockCounter counter;
+    
+    public ExtrinsicLockCounterCallable(ExtrinsicLockCounter counter) {
+        this.counter = counter;
+    }
+    
+    @Override
+    public Integer call() throws Exception {
+        counter.incrementCounter();
+        return counter.getCounter();
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/MessageServiceCallable.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/MessageServiceCallable.java
similarity index 96%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/MessageServiceCallable.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/MessageServiceCallable.java
index 84e8c7bb51..5fff2de0c8 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/MessageServiceCallable.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/MessageServiceCallable.java
@@ -1,19 +1,19 @@
-package com.baeldung.concurrent.threadsafety.callables;
-
-import com.baeldung.concurrent.threadsafety.services.MessageService;
-import java.util.concurrent.Callable;
-
-public class MessageServiceCallable implements Callable<String> {
-    
-    private final MessageService messageService;
-    
-    public MessageServiceCallable(MessageService messageService) {
-        this.messageService = messageService;
-    
-    }
-    
-    @Override
-    public String call() {
-        return messageService.getMesssage();
-    }
-}
+package com.baeldung.concurrent.threadsafety.callables;
+
+import com.baeldung.concurrent.threadsafety.services.MessageService;
+import java.util.concurrent.Callable;
+
+public class MessageServiceCallable implements Callable<String> {
+    
+    private final MessageService messageService;
+    
+    public MessageServiceCallable(MessageService messageService) {
+        this.messageService = messageService;
+    
+    }
+    
+    @Override
+    public String call() {
+        return messageService.getMesssage();
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentranReadWriteLockCounterCallable.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentranReadWriteLockCounterCallable.java
similarity index 96%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentranReadWriteLockCounterCallable.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentranReadWriteLockCounterCallable.java
index e806460d50..f0948daa09 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentranReadWriteLockCounterCallable.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentranReadWriteLockCounterCallable.java
@@ -1,20 +1,20 @@
-package com.baeldung.concurrent.threadsafety.callables;
-
-import com.baeldung.concurrent.threadsafety.services.ReentrantReadWriteLockCounter;
-import java.util.concurrent.Callable;
-
-public class ReentranReadWriteLockCounterCallable implements Callable<Integer> {
-
-    private final ReentrantReadWriteLockCounter counter;
-
-    public ReentranReadWriteLockCounterCallable(ReentrantReadWriteLockCounter counter) {
-        this.counter = counter;
-    }
-    
-    @Override
-    public Integer call() throws Exception {
-        counter.incrementCounter();
-        return counter.getCounter();
-    }
-
-}
+package com.baeldung.concurrent.threadsafety.callables;
+
+import com.baeldung.concurrent.threadsafety.services.ReentrantReadWriteLockCounter;
+import java.util.concurrent.Callable;
+
+public class ReentranReadWriteLockCounterCallable implements Callable<Integer> {
+
+    private final ReentrantReadWriteLockCounter counter;
+
+    public ReentranReadWriteLockCounterCallable(ReentrantReadWriteLockCounter counter) {
+        this.counter = counter;
+    }
+    
+    @Override
+    public Integer call() throws Exception {
+        counter.incrementCounter();
+        return counter.getCounter();
+    }
+
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentrantLockCounterCallable.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentrantLockCounterCallable.java
similarity index 96%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentrantLockCounterCallable.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentrantLockCounterCallable.java
index 3511a98c60..572d6ad22f 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentrantLockCounterCallable.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/callables/ReentrantLockCounterCallable.java
@@ -1,19 +1,19 @@
-package com.baeldung.concurrent.threadsafety.callables;
-
-import com.baeldung.concurrent.threadsafety.services.ReentrantLockCounter;
-import java.util.concurrent.Callable;
-
-public class ReentrantLockCounterCallable implements Callable<Integer> {
-
-    private final ReentrantLockCounter counter;
-    
-    public ReentrantLockCounterCallable(ReentrantLockCounter counter) {
-        this.counter = counter;
-    }
-    
-    @Override
-    public Integer call() throws Exception {
-        counter.incrementCounter();
-        return counter.getCounter();
-    }
-}
+package com.baeldung.concurrent.threadsafety.callables;
+
+import com.baeldung.concurrent.threadsafety.services.ReentrantLockCounter;
+import java.util.concurrent.Callable;
+
+public class ReentrantLockCounterCallable implements Callable<Integer> {
+
+    private final ReentrantLockCounter counter;
+    
+    public ReentrantLockCounterCallable(ReentrantLockCounter counter) {
+        this.counter = counter;
+    }
+    
+    @Override
+    public Integer call() throws Exception {
+        counter.incrementCounter();
+        return counter.getCounter();
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/mathutils/MathUtils.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/mathutils/MathUtils.java
similarity index 96%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/mathutils/MathUtils.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/mathutils/MathUtils.java
index f560cd4281..fa84c9c04d 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/mathutils/MathUtils.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/mathutils/MathUtils.java
@@ -1,14 +1,14 @@
-package com.baeldung.concurrent.threadsafety.mathutils;
-
-import java.math.BigInteger;
-
-public class MathUtils {
-    
-    public static BigInteger factorial(int number) {
-        BigInteger f = new BigInteger("1");
-        for (int i = 2; i <= number; i++) {
-            f = f.multiply(BigInteger.valueOf(i));
-        }
-        return f;
-    }
-}
+package com.baeldung.concurrent.threadsafety.mathutils;
+
+import java.math.BigInteger;
+
+public class MathUtils {
+    
+    public static BigInteger factorial(int number) {
+        BigInteger f = new BigInteger("1");
+        for (int i = 2; i <= number; i++) {
+            f = f.multiply(BigInteger.valueOf(i));
+        }
+        return f;
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/AtomicCounter.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/AtomicCounter.java
similarity index 95%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/AtomicCounter.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/AtomicCounter.java
index 32a373495c..0e95859265 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/AtomicCounter.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/AtomicCounter.java
@@ -1,18 +1,18 @@
-package com.baeldung.concurrent.threadsafety.services;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class AtomicCounter {
-    
-    private final AtomicInteger counter = new AtomicInteger();
-    
-    public AtomicCounter() {}
-    
-    public void incrementCounter() {
-        counter.incrementAndGet();
-    }
-    
-    public synchronized int getCounter() {
-        return counter.get();
-    }
-}
+package com.baeldung.concurrent.threadsafety.services;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class AtomicCounter {
+    
+    private final AtomicInteger counter = new AtomicInteger();
+    
+    public AtomicCounter() {}
+    
+    public void incrementCounter() {
+        counter.incrementAndGet();
+    }
+    
+    public synchronized int getCounter() {
+        return counter.get();
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/Counter.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/Counter.java
similarity index 94%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/Counter.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/Counter.java
index f7dbc05639..52122ae049 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/Counter.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/Counter.java
@@ -1,18 +1,18 @@
-package com.baeldung.concurrent.threadsafety.services;
-
-public class Counter {
-    
-    private volatile int counter;
-    
-    public Counter() {
-        this.counter = 0;
-    }
-    
-    public synchronized void incrementCounter() {
-        counter += 1;
-    }
-    
-    public int getCounter() {
-        return counter;
-    }
-}
+package com.baeldung.concurrent.threadsafety.services;
+
+public class Counter {
+    
+    private volatile int counter;
+    
+    public Counter() {
+        this.counter = 0;
+    }
+    
+    public synchronized void incrementCounter() {
+        counter += 1;
+    }
+    
+    public int getCounter() {
+        return counter;
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ExtrinsicLockCounter.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ExtrinsicLockCounter.java
similarity index 95%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ExtrinsicLockCounter.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ExtrinsicLockCounter.java
index 8ab431fbc3..0a6ff3f60e 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ExtrinsicLockCounter.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ExtrinsicLockCounter.java
@@ -1,23 +1,23 @@
-package com.baeldung.concurrent.threadsafety.services;
-
-public class ExtrinsicLockCounter {
-
-    private int counter;
-    private final Object lock = new Object();
-
-    public ExtrinsicLockCounter() {
-        this.counter = 0;
-    }
-
-    public void incrementCounter() {
-        synchronized (lock) {
-            counter += 1;
-        }
-    }
-
-    public int getCounter() {
-        synchronized (lock) {
-            return counter;
-        }
-    }
-}
+package com.baeldung.concurrent.threadsafety.services;
+
+public class ExtrinsicLockCounter {
+
+    private int counter;
+    private final Object lock = new Object();
+
+    public ExtrinsicLockCounter() {
+        this.counter = 0;
+    }
+
+    public void incrementCounter() {
+        synchronized (lock) {
+            counter += 1;
+        }
+    }
+
+    public int getCounter() {
+        synchronized (lock) {
+            return counter;
+        }
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/MessageService.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/MessageService.java
similarity index 95%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/MessageService.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/MessageService.java
index 33981381ea..a2b5174a9b 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/MessageService.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/MessageService.java
@@ -1,14 +1,14 @@
-package com.baeldung.concurrent.threadsafety.services;
-
-public class MessageService {
-    
-    private final String message;
-    
-    public MessageService(String message) {
-        this.message = message;
-    }
-    
-    public String getMesssage() {
-        return message;
-    }
-}
+package com.baeldung.concurrent.threadsafety.services;
+
+public class MessageService {
+    
+    private final String message;
+    
+    public MessageService(String message) {
+        this.message = message;
+    }
+    
+    public String getMesssage() {
+        return message;
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantLockCounter.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantLockCounter.java
similarity index 95%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantLockCounter.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantLockCounter.java
index 717f0717af..346cb14c35 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantLockCounter.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantLockCounter.java
@@ -1,26 +1,26 @@
-package com.baeldung.concurrent.threadsafety.services;
-
-import java.util.concurrent.locks.ReentrantLock;
-
-public class ReentrantLockCounter {
-
-    private int counter;
-    private final ReentrantLock reLock = new ReentrantLock(true);
-
-    public ReentrantLockCounter() {
-        this.counter = 0;
-    }
-
-    public void incrementCounter() {
-        reLock.lock();
-        try {
-            counter += 1;
-        } finally {
-            reLock.unlock();
-        }
-    }
-
-    public int getCounter() {
-        return counter;
-    }
-}
+package com.baeldung.concurrent.threadsafety.services;
+
+import java.util.concurrent.locks.ReentrantLock;
+
+public class ReentrantLockCounter {
+
+    private int counter;
+    private final ReentrantLock reLock = new ReentrantLock(true);
+
+    public ReentrantLockCounter() {
+        this.counter = 0;
+    }
+
+    public void incrementCounter() {
+        reLock.lock();
+        try {
+            counter += 1;
+        } finally {
+            reLock.unlock();
+        }
+    }
+
+    public int getCounter() {
+        return counter;
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantReadWriteLockCounter.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantReadWriteLockCounter.java
similarity index 96%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantReadWriteLockCounter.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantReadWriteLockCounter.java
index f740c938b1..5e251441b5 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantReadWriteLockCounter.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/ReentrantReadWriteLockCounter.java
@@ -1,34 +1,34 @@
-package com.baeldung.concurrent.threadsafety.services;
-
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-public class ReentrantReadWriteLockCounter {
-    
-    private int counter;
-    private final ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock();
-    private final Lock readLock = rwLock.readLock();
-    private final Lock writeLock = rwLock.writeLock();
-    
-    public ReentrantReadWriteLockCounter() {
-        this.counter = 0;
-    }
-    
-    public void incrementCounter() {
-        writeLock.lock();
-        try {
-            counter += 1;
-        } finally {
-            writeLock.unlock();
-        }
-    }
-    
-    public int getCounter() {
-        readLock.lock();
-        try {
-            return counter;
-        } finally {
-            readLock.unlock();
-        }
-    }
-}
+package com.baeldung.concurrent.threadsafety.services;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+public class ReentrantReadWriteLockCounter {
+    
+    private int counter;
+    private final ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock();
+    private final Lock readLock = rwLock.readLock();
+    private final Lock writeLock = rwLock.writeLock();
+    
+    public ReentrantReadWriteLockCounter() {
+        this.counter = 0;
+    }
+    
+    public void incrementCounter() {
+        writeLock.lock();
+        try {
+            counter += 1;
+        } finally {
+            writeLock.unlock();
+        }
+    }
+    
+    public int getCounter() {
+        readLock.lock();
+        try {
+            return counter;
+        } finally {
+            readLock.unlock();
+        }
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/StateHolder.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/StateHolder.java
similarity index 94%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/StateHolder.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/StateHolder.java
index 5bbff9f39c..7e87214590 100644
--- a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/StateHolder.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/threadsafety/services/StateHolder.java
@@ -1,14 +1,14 @@
-package com.baeldung.concurrent.threadsafety.services;
-
-public class StateHolder {
-    
-    private final String state;
-
-    public StateHolder(String state) {
-        this.state = state;
-    }
-    
-    public String getState() {
-        return state;
-    }
-}
+package com.baeldung.concurrent.threadsafety.services;
+
+public class StateHolder {
+    
+    private final String state;
+
+    public StateHolder(String state) {
+        this.state = state;
+    }
+    
+    public String getState() {
+        return state;
+    }
+}
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/Data.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/Data.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/Data.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/Data.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/NetworkDriver.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/NetworkDriver.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/NetworkDriver.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/NetworkDriver.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/Receiver.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/Receiver.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/Receiver.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/Receiver.java
diff --git a/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/Sender.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/Sender.java
similarity index 100%
rename from core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/Sender.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/waitandnotify/Sender.java
diff --git a/core-java-concurrency-basic/src/main/resources/logback.xml b/core-java-modules/core-java-concurrency-basic/src/main/resources/logback.xml
similarity index 100%
rename from core-java-concurrency-basic/src/main/resources/logback.xml
rename to core-java-modules/core-java-concurrency-basic/src/main/resources/logback.xml
diff --git a/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/CounterTest.java b/core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/CounterTest.java
similarity index 97%
rename from core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/CounterTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/CounterTest.java
index 3abbb1bdad..176151083c 100644
--- a/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/CounterTest.java
+++ b/core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/CounterTest.java
@@ -1,23 +1,23 @@
-package com.baeldung.concurrent.threadsafety.tests;
-
-import org.junit.Test;
-import static org.assertj.core.api.Assertions.assertThat;
-import com.baeldung.concurrent.threadsafety.callables.CounterCallable;
-import com.baeldung.concurrent.threadsafety.services.Counter;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-public class CounterTest {
-
-    @Test
-    public void whenCalledIncrementCounter_thenCorrect() throws Exception {
-        ExecutorService executorService = Executors.newFixedThreadPool(2);
-        Counter counter = new Counter();
-        Future<Integer> future1 = (Future<Integer>) executorService.submit(new CounterCallable(counter));
-        Future<Integer> future2 = (Future<Integer>) executorService.submit(new CounterCallable(counter));
-        
-        assertThat(future1.get()).isEqualTo(1);
-        assertThat(future2.get()).isEqualTo(2);
-    }
-}
+package com.baeldung.concurrent.threadsafety.tests;
+
+import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import com.baeldung.concurrent.threadsafety.callables.CounterCallable;
+import com.baeldung.concurrent.threadsafety.services.Counter;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+public class CounterTest {
+
+    @Test
+    public void whenCalledIncrementCounter_thenCorrect() throws Exception {
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+        Counter counter = new Counter();
+        Future<Integer> future1 = (Future<Integer>) executorService.submit(new CounterCallable(counter));
+        Future<Integer> future2 = (Future<Integer>) executorService.submit(new CounterCallable(counter));
+        
+        assertThat(future1.get()).isEqualTo(1);
+        assertThat(future2.get()).isEqualTo(2);
+    }
+}
diff --git a/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ExtrinsicLockCounterTest.java b/core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ExtrinsicLockCounterTest.java
similarity index 97%
rename from core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ExtrinsicLockCounterTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ExtrinsicLockCounterTest.java
index dba90f5b74..e34eb250bf 100644
--- a/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ExtrinsicLockCounterTest.java
+++ b/core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ExtrinsicLockCounterTest.java
@@ -1,23 +1,23 @@
-package com.baeldung.concurrent.threadsafety.tests;
-
-import org.junit.Test;
-import static org.assertj.core.api.Assertions.assertThat;
-import com.baeldung.concurrent.threadsafety.callables.ExtrinsicLockCounterCallable;
-import com.baeldung.concurrent.threadsafety.services.ExtrinsicLockCounter;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-public class ExtrinsicLockCounterTest {
-
-    @Test
-    public void whenCalledIncrementCounter_thenCorrect() throws Exception {
-        ExecutorService executorService = Executors.newFixedThreadPool(2);
-        ExtrinsicLockCounter counter = new ExtrinsicLockCounter();
-        Future<Integer> future1 = (Future<Integer>) executorService.submit(new ExtrinsicLockCounterCallable(counter));
-        Future<Integer> future2 = (Future<Integer>) executorService.submit(new ExtrinsicLockCounterCallable(counter));
-        
-        assertThat(future1.get()).isEqualTo(1);
-        assertThat(future2.get()).isEqualTo(2);
-    }
-}
+package com.baeldung.concurrent.threadsafety.tests;
+
+import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import com.baeldung.concurrent.threadsafety.callables.ExtrinsicLockCounterCallable;
+import com.baeldung.concurrent.threadsafety.services.ExtrinsicLockCounter;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+public class ExtrinsicLockCounterTest {
+
+    @Test
+    public void whenCalledIncrementCounter_thenCorrect() throws Exception {
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+        ExtrinsicLockCounter counter = new ExtrinsicLockCounter();
+        Future<Integer> future1 = (Future<Integer>) executorService.submit(new ExtrinsicLockCounterCallable(counter));
+        Future<Integer> future2 = (Future<Integer>) executorService.submit(new ExtrinsicLockCounterCallable(counter));
+        
+        assertThat(future1.get()).isEqualTo(1);
+        assertThat(future2.get()).isEqualTo(2);
+    }
+}
diff --git a/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/MathUtilsTest.java b/core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/MathUtilsTest.java
similarity index 96%
rename from core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/MathUtilsTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/MathUtilsTest.java
index 8f3f574b03..2708152906 100644
--- a/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/MathUtilsTest.java
+++ b/core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/MathUtilsTest.java
@@ -1,13 +1,13 @@
-package com.baeldung.concurrent.threadsafety.tests;
-
-import com.baeldung.concurrent.threadsafety.mathutils.MathUtils;
-import org.junit.Test;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class MathUtilsTest {
-    
-    @Test
-    public void whenCalledFactorialMethod_thenCorrect() {
-        assertThat(MathUtils.factorial(2)).isEqualTo(2);
-    }
-}
+package com.baeldung.concurrent.threadsafety.tests;
+
+import com.baeldung.concurrent.threadsafety.mathutils.MathUtils;
+import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MathUtilsTest {
+    
+    @Test
+    public void whenCalledFactorialMethod_thenCorrect() {
+        assertThat(MathUtils.factorial(2)).isEqualTo(2);
+    }
+}
diff --git a/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/MessageServiceTest.java b/core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/MessageServiceTest.java
similarity index 97%
rename from core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/MessageServiceTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/MessageServiceTest.java
index 8f1f1a8754..e62206c09a 100644
--- a/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/MessageServiceTest.java
+++ b/core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/MessageServiceTest.java
@@ -1,23 +1,23 @@
-package com.baeldung.concurrent.threadsafety.tests;
-
-import org.junit.Test;
-import static org.assertj.core.api.Assertions.assertThat;
-import com.baeldung.concurrent.threadsafety.callables.MessageServiceCallable;
-import com.baeldung.concurrent.threadsafety.services.MessageService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-public class MessageServiceTest {
-
-    @Test
-    public void whenCalledgetMessage_thenCorrect() throws Exception {
-        ExecutorService executorService = Executors.newFixedThreadPool(2);
-        MessageService messageService = new MessageService("Welcome to Baeldung!");
-        Future<String> future1 = (Future<String>) executorService.submit(new MessageServiceCallable(messageService));
-        Future<String> future2 = (Future<String>) executorService.submit(new MessageServiceCallable(messageService));
-
-        assertThat(future1.get()).isEqualTo("Welcome to Baeldung!");
-        assertThat(future2.get()).isEqualTo("Welcome to Baeldung!");
-    }
-}
+package com.baeldung.concurrent.threadsafety.tests;
+
+import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import com.baeldung.concurrent.threadsafety.callables.MessageServiceCallable;
+import com.baeldung.concurrent.threadsafety.services.MessageService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+public class MessageServiceTest {
+
+    @Test
+    public void whenCalledgetMessage_thenCorrect() throws Exception {
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+        MessageService messageService = new MessageService("Welcome to Baeldung!");
+        Future<String> future1 = (Future<String>) executorService.submit(new MessageServiceCallable(messageService));
+        Future<String> future2 = (Future<String>) executorService.submit(new MessageServiceCallable(messageService));
+
+        assertThat(future1.get()).isEqualTo("Welcome to Baeldung!");
+        assertThat(future2.get()).isEqualTo("Welcome to Baeldung!");
+    }
+}
diff --git a/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantLockCounterTest.java b/core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantLockCounterTest.java
similarity index 97%
rename from core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantLockCounterTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantLockCounterTest.java
index 05c721ab26..20fa2c74da 100644
--- a/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantLockCounterTest.java
+++ b/core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantLockCounterTest.java
@@ -1,23 +1,23 @@
-package com.baeldung.concurrent.threadsafety.tests;
-
-import com.baeldung.concurrent.threadsafety.callables.ReentrantLockCounterCallable;
-import com.baeldung.concurrent.threadsafety.services.ReentrantLockCounter;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
-
-public class ReentrantLockCounterTest {
-    
-    @Test
-    public void whenCalledIncrementCounter_thenCorrect() throws Exception {
-        ExecutorService executorService = Executors.newFixedThreadPool(2);
-        ReentrantLockCounter counter = new ReentrantLockCounter();
-        Future<Integer> future1 = (Future<Integer>) executorService.submit(new ReentrantLockCounterCallable(counter));
-        Future<Integer> future2 = (Future<Integer>) executorService.submit(new ReentrantLockCounterCallable(counter));
-        
-        assertThat(future1.get()).isEqualTo(1);
-        assertThat(future2.get()).isEqualTo(2);
-    }
-}
+package com.baeldung.concurrent.threadsafety.tests;
+
+import com.baeldung.concurrent.threadsafety.callables.ReentrantLockCounterCallable;
+import com.baeldung.concurrent.threadsafety.services.ReentrantLockCounter;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class ReentrantLockCounterTest {
+    
+    @Test
+    public void whenCalledIncrementCounter_thenCorrect() throws Exception {
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+        ReentrantLockCounter counter = new ReentrantLockCounter();
+        Future<Integer> future1 = (Future<Integer>) executorService.submit(new ReentrantLockCounterCallable(counter));
+        Future<Integer> future2 = (Future<Integer>) executorService.submit(new ReentrantLockCounterCallable(counter));
+        
+        assertThat(future1.get()).isEqualTo(1);
+        assertThat(future2.get()).isEqualTo(2);
+    }
+}
diff --git a/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantReadWriteLockCounterTest.java b/core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantReadWriteLockCounterTest.java
similarity index 97%
rename from core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantReadWriteLockCounterTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantReadWriteLockCounterTest.java
index c56137ce04..6113473cac 100644
--- a/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantReadWriteLockCounterTest.java
+++ b/core-java-modules/core-java-concurrency-basic/src/test/com/baeldung/concurrent/threadsafety/tests/ReentrantReadWriteLockCounterTest.java
@@ -1,24 +1,24 @@
-package com.baeldung.concurrent.threadsafety.tests;
-
-import com.baeldung.concurrent.threadsafety.callables.ReentranReadWriteLockCounterCallable;
-import com.baeldung.concurrent.threadsafety.services.ReentrantReadWriteLockCounter;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
-
-public class ReentrantReadWriteLockCounterTest {
-    
-    @Test
-    public void whenCalledIncrementCounter_thenCorrect() throws Exception {
-        ExecutorService executorService = Executors.newFixedThreadPool(2);
-        ReentrantReadWriteLockCounter counter = new ReentrantReadWriteLockCounter();
-        Future<Integer> future1 = (Future<Integer>) executorService.submit(new  ReentranReadWriteLockCounterCallable(counter));
-        Future<Integer> future2 = (Future<Integer>) executorService.submit(new  ReentranReadWriteLockCounterCallable(counter));
-        
-        assertThat(future1.get()).isEqualTo(1);
-        assertThat(future2.get()).isEqualTo(2);
-    }
-    
-}
+package com.baeldung.concurrent.threadsafety.tests;
+
+import com.baeldung.concurrent.threadsafety.callables.ReentranReadWriteLockCounterCallable;
+import com.baeldung.concurrent.threadsafety.services.ReentrantReadWriteLockCounter;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class ReentrantReadWriteLockCounterTest {
+    
+    @Test
+    public void whenCalledIncrementCounter_thenCorrect() throws Exception {
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+        ReentrantReadWriteLockCounter counter = new ReentrantReadWriteLockCounter();
+        Future<Integer> future1 = (Future<Integer>) executorService.submit(new  ReentranReadWriteLockCounterCallable(counter));
+        Future<Integer> future2 = (Future<Integer>) executorService.submit(new  ReentranReadWriteLockCounterCallable(counter));
+        
+        assertThat(future1.get()).isEqualTo(1);
+        assertThat(future2.get()).isEqualTo(2);
+    }
+    
+}
diff --git a/core-java-concurrency-basic/src/test/java/com/baeldung/completablefuture/CompletableFutureLongRunningUnitTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/completablefuture/CompletableFutureLongRunningUnitTest.java
similarity index 100%
rename from core-java-concurrency-basic/src/test/java/com/baeldung/completablefuture/CompletableFutureLongRunningUnitTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/completablefuture/CompletableFutureLongRunningUnitTest.java
diff --git a/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/callable/FactorialTaskManualTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/callable/FactorialTaskManualTest.java
similarity index 100%
rename from core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/callable/FactorialTaskManualTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/callable/FactorialTaskManualTest.java
diff --git a/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/executorservice/WaitingForThreadsToFinishManualTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/executorservice/WaitingForThreadsToFinishManualTest.java
similarity index 100%
rename from core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/executorservice/WaitingForThreadsToFinishManualTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/executorservice/WaitingForThreadsToFinishManualTest.java
diff --git a/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/future/FactorialSquareCalculatorUnitTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/future/FactorialSquareCalculatorUnitTest.java
similarity index 100%
rename from core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/future/FactorialSquareCalculatorUnitTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/future/FactorialSquareCalculatorUnitTest.java
diff --git a/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/future/SquareCalculatorIntegrationTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/future/SquareCalculatorIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/future/SquareCalculatorIntegrationTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/future/SquareCalculatorIntegrationTest.java
diff --git a/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadLiveTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadLiveTest.java
similarity index 100%
rename from core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadLiveTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadLiveTest.java
diff --git a/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/stopping/StopThreadManualTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/stopping/StopThreadManualTest.java
similarity index 100%
rename from core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/stopping/StopThreadManualTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/stopping/StopThreadManualTest.java
diff --git a/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockUnitTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockUnitTest.java
similarity index 100%
rename from core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockUnitTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockUnitTest.java
diff --git a/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsUnitTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsUnitTest.java
similarity index 100%
rename from core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsUnitTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsUnitTest.java
diff --git a/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/waitandnotify/NetworkIntegrationTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/waitandnotify/NetworkIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/waitandnotify/NetworkIntegrationTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/waitandnotify/NetworkIntegrationTest.java
diff --git a/core-java-concurrency-basic/src/test/java/com/baeldung/java8/Java8ExecutorServiceIntegrationTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/java8/Java8ExecutorServiceIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-basic/src/test/java/com/baeldung/java8/Java8ExecutorServiceIntegrationTest.java
rename to core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/java8/Java8ExecutorServiceIntegrationTest.java
diff --git a/core-java-concurrency-basic/src/test/resources/.gitignore b/core-java-modules/core-java-concurrency-basic/src/test/resources/.gitignore
similarity index 100%
rename from core-java-concurrency-basic/src/test/resources/.gitignore
rename to core-java-modules/core-java-concurrency-basic/src/test/resources/.gitignore
diff --git a/core-java-concurrency-collections/.gitignore b/core-java-modules/core-java-concurrency-collections/.gitignore
similarity index 100%
rename from core-java-concurrency-collections/.gitignore
rename to core-java-modules/core-java-concurrency-collections/.gitignore
diff --git a/core-java-concurrency-collections/README.md b/core-java-modules/core-java-concurrency-collections/README.md
similarity index 100%
rename from core-java-concurrency-collections/README.md
rename to core-java-modules/core-java-concurrency-collections/README.md
diff --git a/core-java-concurrency-collections/pom.xml b/core-java-modules/core-java-concurrency-collections/pom.xml
similarity index 98%
rename from core-java-concurrency-collections/pom.xml
rename to core-java-modules/core-java-concurrency-collections/pom.xml
index e192bbe46f..27aae4ea6c 100644
--- a/core-java-concurrency-collections/pom.xml
+++ b/core-java-modules/core-java-concurrency-collections/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/BlockingQueueUsage.java b/core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/BlockingQueueUsage.java
similarity index 100%
rename from core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/BlockingQueueUsage.java
rename to core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/BlockingQueueUsage.java
diff --git a/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersConsumer.java b/core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersConsumer.java
similarity index 100%
rename from core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersConsumer.java
rename to core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersConsumer.java
diff --git a/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersProducer.java b/core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersProducer.java
similarity index 100%
rename from core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersProducer.java
rename to core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersProducer.java
diff --git a/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayObject.java b/core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayObject.java
similarity index 100%
rename from core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayObject.java
rename to core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayObject.java
diff --git a/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueConsumer.java b/core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueConsumer.java
similarity index 100%
rename from core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueConsumer.java
rename to core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueConsumer.java
diff --git a/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueProducer.java b/core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueProducer.java
similarity index 100%
rename from core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueProducer.java
rename to core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueProducer.java
diff --git a/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/skiplist/Event.java b/core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/skiplist/Event.java
similarity index 100%
rename from core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/skiplist/Event.java
rename to core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/skiplist/Event.java
diff --git a/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/skiplist/EventWindowSort.java b/core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/skiplist/EventWindowSort.java
similarity index 100%
rename from core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/skiplist/EventWindowSort.java
rename to core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/skiplist/EventWindowSort.java
diff --git a/core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Consumer.java b/core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Consumer.java
similarity index 100%
rename from core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Consumer.java
rename to core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Consumer.java
diff --git a/core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Producer.java b/core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Producer.java
similarity index 100%
rename from core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Producer.java
rename to core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Producer.java
diff --git a/core-java-concurrency-collections/src/main/resources/logback.xml b/core-java-modules/core-java-concurrency-collections/src/main/resources/logback.xml
similarity index 100%
rename from core-java-concurrency-collections/src/main/resources/logback.xml
rename to core-java-modules/core-java-concurrency-collections/src/main/resources/logback.xml
diff --git a/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListUnitTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListUnitTest.java
similarity index 100%
rename from core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListUnitTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListUnitTest.java
diff --git a/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/delayqueue/DelayQueueIntegrationTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/delayqueue/DelayQueueIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/delayqueue/DelayQueueIntegrationTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/delayqueue/DelayQueueIntegrationTest.java
diff --git a/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/priorityblockingqueue/PriorityBlockingQueueIntegrationTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/priorityblockingqueue/PriorityBlockingQueueIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/priorityblockingqueue/PriorityBlockingQueueIntegrationTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/priorityblockingqueue/PriorityBlockingQueueIntegrationTest.java
diff --git a/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/skiplist/ConcurrentSkipListSetIntegrationTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/skiplist/ConcurrentSkipListSetIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/skiplist/ConcurrentSkipListSetIntegrationTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/skiplist/ConcurrentSkipListSetIntegrationTest.java
diff --git a/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapAggregateStatusManualTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapAggregateStatusManualTest.java
similarity index 100%
rename from core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapAggregateStatusManualTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapAggregateStatusManualTest.java
diff --git a/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapNullKeyValueManualTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapNullKeyValueManualTest.java
similarity index 100%
rename from core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapNullKeyValueManualTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapNullKeyValueManualTest.java
diff --git a/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapPerformanceManualTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapPerformanceManualTest.java
similarity index 100%
rename from core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapPerformanceManualTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapPerformanceManualTest.java
diff --git a/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTest.java
similarity index 100%
rename from core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTest.java
diff --git a/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurretMapMemoryConsistencyManualTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurretMapMemoryConsistencyManualTest.java
similarity index 100%
rename from core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurretMapMemoryConsistencyManualTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurretMapMemoryConsistencyManualTest.java
diff --git a/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmodification/ConcurrentModificationUnitTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmodification/ConcurrentModificationUnitTest.java
similarity index 100%
rename from core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmodification/ConcurrentModificationUnitTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmodification/ConcurrentModificationUnitTest.java
diff --git a/core-java-concurrency-collections/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueIntegrationTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-collections/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueIntegrationTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueIntegrationTest.java
diff --git a/core-java-concurrency-collections/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-collections/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java
diff --git a/core-java-concurrency-collections/src/test/java/org/baeldung/java/streams/ThreadPoolInParallelStreamIntegrationTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/org/baeldung/java/streams/ThreadPoolInParallelStreamIntegrationTest.java
similarity index 100%
rename from core-java-concurrency-collections/src/test/java/org/baeldung/java/streams/ThreadPoolInParallelStreamIntegrationTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/org/baeldung/java/streams/ThreadPoolInParallelStreamIntegrationTest.java
diff --git a/core-java-concurrency-collections/src/test/resources/.gitignore b/core-java-modules/core-java-concurrency-collections/src/test/resources/.gitignore
similarity index 100%
rename from core-java-concurrency-collections/src/test/resources/.gitignore
rename to core-java-modules/core-java-concurrency-collections/src/test/resources/.gitignore
diff --git a/core-java-io/.gitignore b/core-java-modules/core-java-io/.gitignore
similarity index 100%
rename from core-java-io/.gitignore
rename to core-java-modules/core-java-io/.gitignore
diff --git a/core-java-io/README.md b/core-java-modules/core-java-io/README.md
similarity index 100%
rename from core-java-io/README.md
rename to core-java-modules/core-java-io/README.md
diff --git a/core-java-modules/core-java-io/hard_link.txt b/core-java-modules/core-java-io/hard_link.txt
new file mode 100644
index 0000000000..931a810b8d
--- /dev/null
+++ b/core-java-modules/core-java-io/hard_link.txt
@@ -0,0 +1,10000 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272
+273
+274
+275
+276
+277
+278
+279
+280
+281
+282
+283
+284
+285
+286
+287
+288
+289
+290
+291
+292
+293
+294
+295
+296
+297
+298
+299
+300
+301
+302
+303
+304
+305
+306
+307
+308
+309
+310
+311
+312
+313
+314
+315
+316
+317
+318
+319
+320
+321
+322
+323
+324
+325
+326
+327
+328
+329
+330
+331
+332
+333
+334
+335
+336
+337
+338
+339
+340
+341
+342
+343
+344
+345
+346
+347
+348
+349
+350
+351
+352
+353
+354
+355
+356
+357
+358
+359
+360
+361
+362
+363
+364
+365
+366
+367
+368
+369
+370
+371
+372
+373
+374
+375
+376
+377
+378
+379
+380
+381
+382
+383
+384
+385
+386
+387
+388
+389
+390
+391
+392
+393
+394
+395
+396
+397
+398
+399
+400
+401
+402
+403
+404
+405
+406
+407
+408
+409
+410
+411
+412
+413
+414
+415
+416
+417
+418
+419
+420
+421
+422
+423
+424
+425
+426
+427
+428
+429
+430
+431
+432
+433
+434
+435
+436
+437
+438
+439
+440
+441
+442
+443
+444
+445
+446
+447
+448
+449
+450
+451
+452
+453
+454
+455
+456
+457
+458
+459
+460
+461
+462
+463
+464
+465
+466
+467
+468
+469
+470
+471
+472
+473
+474
+475
+476
+477
+478
+479
+480
+481
+482
+483
+484
+485
+486
+487
+488
+489
+490
+491
+492
+493
+494
+495
+496
+497
+498
+499
+500
+501
+502
+503
+504
+505
+506
+507
+508
+509
+510
+511
+512
+513
+514
+515
+516
+517
+518
+519
+520
+521
+522
+523
+524
+525
+526
+527
+528
+529
+530
+531
+532
+533
+534
+535
+536
+537
+538
+539
+540
+541
+542
+543
+544
+545
+546
+547
+548
+549
+550
+551
+552
+553
+554
+555
+556
+557
+558
+559
+560
+561
+562
+563
+564
+565
+566
+567
+568
+569
+570
+571
+572
+573
+574
+575
+576
+577
+578
+579
+580
+581
+582
+583
+584
+585
+586
+587
+588
+589
+590
+591
+592
+593
+594
+595
+596
+597
+598
+599
+600
+601
+602
+603
+604
+605
+606
+607
+608
+609
+610
+611
+612
+613
+614
+615
+616
+617
+618
+619
+620
+621
+622
+623
+624
+625
+626
+627
+628
+629
+630
+631
+632
+633
+634
+635
+636
+637
+638
+639
+640
+641
+642
+643
+644
+645
+646
+647
+648
+649
+650
+651
+652
+653
+654
+655
+656
+657
+658
+659
+660
+661
+662
+663
+664
+665
+666
+667
+668
+669
+670
+671
+672
+673
+674
+675
+676
+677
+678
+679
+680
+681
+682
+683
+684
+685
+686
+687
+688
+689
+690
+691
+692
+693
+694
+695
+696
+697
+698
+699
+700
+701
+702
+703
+704
+705
+706
+707
+708
+709
+710
+711
+712
+713
+714
+715
+716
+717
+718
+719
+720
+721
+722
+723
+724
+725
+726
+727
+728
+729
+730
+731
+732
+733
+734
+735
+736
+737
+738
+739
+740
+741
+742
+743
+744
+745
+746
+747
+748
+749
+750
+751
+752
+753
+754
+755
+756
+757
+758
+759
+760
+761
+762
+763
+764
+765
+766
+767
+768
+769
+770
+771
+772
+773
+774
+775
+776
+777
+778
+779
+780
+781
+782
+783
+784
+785
+786
+787
+788
+789
+790
+791
+792
+793
+794
+795
+796
+797
+798
+799
+800
+801
+802
+803
+804
+805
+806
+807
+808
+809
+810
+811
+812
+813
+814
+815
+816
+817
+818
+819
+820
+821
+822
+823
+824
+825
+826
+827
+828
+829
+830
+831
+832
+833
+834
+835
+836
+837
+838
+839
+840
+841
+842
+843
+844
+845
+846
+847
+848
+849
+850
+851
+852
+853
+854
+855
+856
+857
+858
+859
+860
+861
+862
+863
+864
+865
+866
+867
+868
+869
+870
+871
+872
+873
+874
+875
+876
+877
+878
+879
+880
+881
+882
+883
+884
+885
+886
+887
+888
+889
+890
+891
+892
+893
+894
+895
+896
+897
+898
+899
+900
+901
+902
+903
+904
+905
+906
+907
+908
+909
+910
+911
+912
+913
+914
+915
+916
+917
+918
+919
+920
+921
+922
+923
+924
+925
+926
+927
+928
+929
+930
+931
+932
+933
+934
+935
+936
+937
+938
+939
+940
+941
+942
+943
+944
+945
+946
+947
+948
+949
+950
+951
+952
+953
+954
+955
+956
+957
+958
+959
+960
+961
+962
+963
+964
+965
+966
+967
+968
+969
+970
+971
+972
+973
+974
+975
+976
+977
+978
+979
+980
+981
+982
+983
+984
+985
+986
+987
+988
+989
+990
+991
+992
+993
+994
+995
+996
+997
+998
+999
+1000
+1001
+1002
+1003
+1004
+1005
+1006
+1007
+1008
+1009
+1010
+1011
+1012
+1013
+1014
+1015
+1016
+1017
+1018
+1019
+1020
+1021
+1022
+1023
+1024
+1025
+1026
+1027
+1028
+1029
+1030
+1031
+1032
+1033
+1034
+1035
+1036
+1037
+1038
+1039
+1040
+1041
+1042
+1043
+1044
+1045
+1046
+1047
+1048
+1049
+1050
+1051
+1052
+1053
+1054
+1055
+1056
+1057
+1058
+1059
+1060
+1061
+1062
+1063
+1064
+1065
+1066
+1067
+1068
+1069
+1070
+1071
+1072
+1073
+1074
+1075
+1076
+1077
+1078
+1079
+1080
+1081
+1082
+1083
+1084
+1085
+1086
+1087
+1088
+1089
+1090
+1091
+1092
+1093
+1094
+1095
+1096
+1097
+1098
+1099
+1100
+1101
+1102
+1103
+1104
+1105
+1106
+1107
+1108
+1109
+1110
+1111
+1112
+1113
+1114
+1115
+1116
+1117
+1118
+1119
+1120
+1121
+1122
+1123
+1124
+1125
+1126
+1127
+1128
+1129
+1130
+1131
+1132
+1133
+1134
+1135
+1136
+1137
+1138
+1139
+1140
+1141
+1142
+1143
+1144
+1145
+1146
+1147
+1148
+1149
+1150
+1151
+1152
+1153
+1154
+1155
+1156
+1157
+1158
+1159
+1160
+1161
+1162
+1163
+1164
+1165
+1166
+1167
+1168
+1169
+1170
+1171
+1172
+1173
+1174
+1175
+1176
+1177
+1178
+1179
+1180
+1181
+1182
+1183
+1184
+1185
+1186
+1187
+1188
+1189
+1190
+1191
+1192
+1193
+1194
+1195
+1196
+1197
+1198
+1199
+1200
+1201
+1202
+1203
+1204
+1205
+1206
+1207
+1208
+1209
+1210
+1211
+1212
+1213
+1214
+1215
+1216
+1217
+1218
+1219
+1220
+1221
+1222
+1223
+1224
+1225
+1226
+1227
+1228
+1229
+1230
+1231
+1232
+1233
+1234
+1235
+1236
+1237
+1238
+1239
+1240
+1241
+1242
+1243
+1244
+1245
+1246
+1247
+1248
+1249
+1250
+1251
+1252
+1253
+1254
+1255
+1256
+1257
+1258
+1259
+1260
+1261
+1262
+1263
+1264
+1265
+1266
+1267
+1268
+1269
+1270
+1271
+1272
+1273
+1274
+1275
+1276
+1277
+1278
+1279
+1280
+1281
+1282
+1283
+1284
+1285
+1286
+1287
+1288
+1289
+1290
+1291
+1292
+1293
+1294
+1295
+1296
+1297
+1298
+1299
+1300
+1301
+1302
+1303
+1304
+1305
+1306
+1307
+1308
+1309
+1310
+1311
+1312
+1313
+1314
+1315
+1316
+1317
+1318
+1319
+1320
+1321
+1322
+1323
+1324
+1325
+1326
+1327
+1328
+1329
+1330
+1331
+1332
+1333
+1334
+1335
+1336
+1337
+1338
+1339
+1340
+1341
+1342
+1343
+1344
+1345
+1346
+1347
+1348
+1349
+1350
+1351
+1352
+1353
+1354
+1355
+1356
+1357
+1358
+1359
+1360
+1361
+1362
+1363
+1364
+1365
+1366
+1367
+1368
+1369
+1370
+1371
+1372
+1373
+1374
+1375
+1376
+1377
+1378
+1379
+1380
+1381
+1382
+1383
+1384
+1385
+1386
+1387
+1388
+1389
+1390
+1391
+1392
+1393
+1394
+1395
+1396
+1397
+1398
+1399
+1400
+1401
+1402
+1403
+1404
+1405
+1406
+1407
+1408
+1409
+1410
+1411
+1412
+1413
+1414
+1415
+1416
+1417
+1418
+1419
+1420
+1421
+1422
+1423
+1424
+1425
+1426
+1427
+1428
+1429
+1430
+1431
+1432
+1433
+1434
+1435
+1436
+1437
+1438
+1439
+1440
+1441
+1442
+1443
+1444
+1445
+1446
+1447
+1448
+1449
+1450
+1451
+1452
+1453
+1454
+1455
+1456
+1457
+1458
+1459
+1460
+1461
+1462
+1463
+1464
+1465
+1466
+1467
+1468
+1469
+1470
+1471
+1472
+1473
+1474
+1475
+1476
+1477
+1478
+1479
+1480
+1481
+1482
+1483
+1484
+1485
+1486
+1487
+1488
+1489
+1490
+1491
+1492
+1493
+1494
+1495
+1496
+1497
+1498
+1499
+1500
+1501
+1502
+1503
+1504
+1505
+1506
+1507
+1508
+1509
+1510
+1511
+1512
+1513
+1514
+1515
+1516
+1517
+1518
+1519
+1520
+1521
+1522
+1523
+1524
+1525
+1526
+1527
+1528
+1529
+1530
+1531
+1532
+1533
+1534
+1535
+1536
+1537
+1538
+1539
+1540
+1541
+1542
+1543
+1544
+1545
+1546
+1547
+1548
+1549
+1550
+1551
+1552
+1553
+1554
+1555
+1556
+1557
+1558
+1559
+1560
+1561
+1562
+1563
+1564
+1565
+1566
+1567
+1568
+1569
+1570
+1571
+1572
+1573
+1574
+1575
+1576
+1577
+1578
+1579
+1580
+1581
+1582
+1583
+1584
+1585
+1586
+1587
+1588
+1589
+1590
+1591
+1592
+1593
+1594
+1595
+1596
+1597
+1598
+1599
+1600
+1601
+1602
+1603
+1604
+1605
+1606
+1607
+1608
+1609
+1610
+1611
+1612
+1613
+1614
+1615
+1616
+1617
+1618
+1619
+1620
+1621
+1622
+1623
+1624
+1625
+1626
+1627
+1628
+1629
+1630
+1631
+1632
+1633
+1634
+1635
+1636
+1637
+1638
+1639
+1640
+1641
+1642
+1643
+1644
+1645
+1646
+1647
+1648
+1649
+1650
+1651
+1652
+1653
+1654
+1655
+1656
+1657
+1658
+1659
+1660
+1661
+1662
+1663
+1664
+1665
+1666
+1667
+1668
+1669
+1670
+1671
+1672
+1673
+1674
+1675
+1676
+1677
+1678
+1679
+1680
+1681
+1682
+1683
+1684
+1685
+1686
+1687
+1688
+1689
+1690
+1691
+1692
+1693
+1694
+1695
+1696
+1697
+1698
+1699
+1700
+1701
+1702
+1703
+1704
+1705
+1706
+1707
+1708
+1709
+1710
+1711
+1712
+1713
+1714
+1715
+1716
+1717
+1718
+1719
+1720
+1721
+1722
+1723
+1724
+1725
+1726
+1727
+1728
+1729
+1730
+1731
+1732
+1733
+1734
+1735
+1736
+1737
+1738
+1739
+1740
+1741
+1742
+1743
+1744
+1745
+1746
+1747
+1748
+1749
+1750
+1751
+1752
+1753
+1754
+1755
+1756
+1757
+1758
+1759
+1760
+1761
+1762
+1763
+1764
+1765
+1766
+1767
+1768
+1769
+1770
+1771
+1772
+1773
+1774
+1775
+1776
+1777
+1778
+1779
+1780
+1781
+1782
+1783
+1784
+1785
+1786
+1787
+1788
+1789
+1790
+1791
+1792
+1793
+1794
+1795
+1796
+1797
+1798
+1799
+1800
+1801
+1802
+1803
+1804
+1805
+1806
+1807
+1808
+1809
+1810
+1811
+1812
+1813
+1814
+1815
+1816
+1817
+1818
+1819
+1820
+1821
+1822
+1823
+1824
+1825
+1826
+1827
+1828
+1829
+1830
+1831
+1832
+1833
+1834
+1835
+1836
+1837
+1838
+1839
+1840
+1841
+1842
+1843
+1844
+1845
+1846
+1847
+1848
+1849
+1850
+1851
+1852
+1853
+1854
+1855
+1856
+1857
+1858
+1859
+1860
+1861
+1862
+1863
+1864
+1865
+1866
+1867
+1868
+1869
+1870
+1871
+1872
+1873
+1874
+1875
+1876
+1877
+1878
+1879
+1880
+1881
+1882
+1883
+1884
+1885
+1886
+1887
+1888
+1889
+1890
+1891
+1892
+1893
+1894
+1895
+1896
+1897
+1898
+1899
+1900
+1901
+1902
+1903
+1904
+1905
+1906
+1907
+1908
+1909
+1910
+1911
+1912
+1913
+1914
+1915
+1916
+1917
+1918
+1919
+1920
+1921
+1922
+1923
+1924
+1925
+1926
+1927
+1928
+1929
+1930
+1931
+1932
+1933
+1934
+1935
+1936
+1937
+1938
+1939
+1940
+1941
+1942
+1943
+1944
+1945
+1946
+1947
+1948
+1949
+1950
+1951
+1952
+1953
+1954
+1955
+1956
+1957
+1958
+1959
+1960
+1961
+1962
+1963
+1964
+1965
+1966
+1967
+1968
+1969
+1970
+1971
+1972
+1973
+1974
+1975
+1976
+1977
+1978
+1979
+1980
+1981
+1982
+1983
+1984
+1985
+1986
+1987
+1988
+1989
+1990
+1991
+1992
+1993
+1994
+1995
+1996
+1997
+1998
+1999
+2000
+2001
+2002
+2003
+2004
+2005
+2006
+2007
+2008
+2009
+2010
+2011
+2012
+2013
+2014
+2015
+2016
+2017
+2018
+2019
+2020
+2021
+2022
+2023
+2024
+2025
+2026
+2027
+2028
+2029
+2030
+2031
+2032
+2033
+2034
+2035
+2036
+2037
+2038
+2039
+2040
+2041
+2042
+2043
+2044
+2045
+2046
+2047
+2048
+2049
+2050
+2051
+2052
+2053
+2054
+2055
+2056
+2057
+2058
+2059
+2060
+2061
+2062
+2063
+2064
+2065
+2066
+2067
+2068
+2069
+2070
+2071
+2072
+2073
+2074
+2075
+2076
+2077
+2078
+2079
+2080
+2081
+2082
+2083
+2084
+2085
+2086
+2087
+2088
+2089
+2090
+2091
+2092
+2093
+2094
+2095
+2096
+2097
+2098
+2099
+2100
+2101
+2102
+2103
+2104
+2105
+2106
+2107
+2108
+2109
+2110
+2111
+2112
+2113
+2114
+2115
+2116
+2117
+2118
+2119
+2120
+2121
+2122
+2123
+2124
+2125
+2126
+2127
+2128
+2129
+2130
+2131
+2132
+2133
+2134
+2135
+2136
+2137
+2138
+2139
+2140
+2141
+2142
+2143
+2144
+2145
+2146
+2147
+2148
+2149
+2150
+2151
+2152
+2153
+2154
+2155
+2156
+2157
+2158
+2159
+2160
+2161
+2162
+2163
+2164
+2165
+2166
+2167
+2168
+2169
+2170
+2171
+2172
+2173
+2174
+2175
+2176
+2177
+2178
+2179
+2180
+2181
+2182
+2183
+2184
+2185
+2186
+2187
+2188
+2189
+2190
+2191
+2192
+2193
+2194
+2195
+2196
+2197
+2198
+2199
+2200
+2201
+2202
+2203
+2204
+2205
+2206
+2207
+2208
+2209
+2210
+2211
+2212
+2213
+2214
+2215
+2216
+2217
+2218
+2219
+2220
+2221
+2222
+2223
+2224
+2225
+2226
+2227
+2228
+2229
+2230
+2231
+2232
+2233
+2234
+2235
+2236
+2237
+2238
+2239
+2240
+2241
+2242
+2243
+2244
+2245
+2246
+2247
+2248
+2249
+2250
+2251
+2252
+2253
+2254
+2255
+2256
+2257
+2258
+2259
+2260
+2261
+2262
+2263
+2264
+2265
+2266
+2267
+2268
+2269
+2270
+2271
+2272
+2273
+2274
+2275
+2276
+2277
+2278
+2279
+2280
+2281
+2282
+2283
+2284
+2285
+2286
+2287
+2288
+2289
+2290
+2291
+2292
+2293
+2294
+2295
+2296
+2297
+2298
+2299
+2300
+2301
+2302
+2303
+2304
+2305
+2306
+2307
+2308
+2309
+2310
+2311
+2312
+2313
+2314
+2315
+2316
+2317
+2318
+2319
+2320
+2321
+2322
+2323
+2324
+2325
+2326
+2327
+2328
+2329
+2330
+2331
+2332
+2333
+2334
+2335
+2336
+2337
+2338
+2339
+2340
+2341
+2342
+2343
+2344
+2345
+2346
+2347
+2348
+2349
+2350
+2351
+2352
+2353
+2354
+2355
+2356
+2357
+2358
+2359
+2360
+2361
+2362
+2363
+2364
+2365
+2366
+2367
+2368
+2369
+2370
+2371
+2372
+2373
+2374
+2375
+2376
+2377
+2378
+2379
+2380
+2381
+2382
+2383
+2384
+2385
+2386
+2387
+2388
+2389
+2390
+2391
+2392
+2393
+2394
+2395
+2396
+2397
+2398
+2399
+2400
+2401
+2402
+2403
+2404
+2405
+2406
+2407
+2408
+2409
+2410
+2411
+2412
+2413
+2414
+2415
+2416
+2417
+2418
+2419
+2420
+2421
+2422
+2423
+2424
+2425
+2426
+2427
+2428
+2429
+2430
+2431
+2432
+2433
+2434
+2435
+2436
+2437
+2438
+2439
+2440
+2441
+2442
+2443
+2444
+2445
+2446
+2447
+2448
+2449
+2450
+2451
+2452
+2453
+2454
+2455
+2456
+2457
+2458
+2459
+2460
+2461
+2462
+2463
+2464
+2465
+2466
+2467
+2468
+2469
+2470
+2471
+2472
+2473
+2474
+2475
+2476
+2477
+2478
+2479
+2480
+2481
+2482
+2483
+2484
+2485
+2486
+2487
+2488
+2489
+2490
+2491
+2492
+2493
+2494
+2495
+2496
+2497
+2498
+2499
+2500
+2501
+2502
+2503
+2504
+2505
+2506
+2507
+2508
+2509
+2510
+2511
+2512
+2513
+2514
+2515
+2516
+2517
+2518
+2519
+2520
+2521
+2522
+2523
+2524
+2525
+2526
+2527
+2528
+2529
+2530
+2531
+2532
+2533
+2534
+2535
+2536
+2537
+2538
+2539
+2540
+2541
+2542
+2543
+2544
+2545
+2546
+2547
+2548
+2549
+2550
+2551
+2552
+2553
+2554
+2555
+2556
+2557
+2558
+2559
+2560
+2561
+2562
+2563
+2564
+2565
+2566
+2567
+2568
+2569
+2570
+2571
+2572
+2573
+2574
+2575
+2576
+2577
+2578
+2579
+2580
+2581
+2582
+2583
+2584
+2585
+2586
+2587
+2588
+2589
+2590
+2591
+2592
+2593
+2594
+2595
+2596
+2597
+2598
+2599
+2600
+2601
+2602
+2603
+2604
+2605
+2606
+2607
+2608
+2609
+2610
+2611
+2612
+2613
+2614
+2615
+2616
+2617
+2618
+2619
+2620
+2621
+2622
+2623
+2624
+2625
+2626
+2627
+2628
+2629
+2630
+2631
+2632
+2633
+2634
+2635
+2636
+2637
+2638
+2639
+2640
+2641
+2642
+2643
+2644
+2645
+2646
+2647
+2648
+2649
+2650
+2651
+2652
+2653
+2654
+2655
+2656
+2657
+2658
+2659
+2660
+2661
+2662
+2663
+2664
+2665
+2666
+2667
+2668
+2669
+2670
+2671
+2672
+2673
+2674
+2675
+2676
+2677
+2678
+2679
+2680
+2681
+2682
+2683
+2684
+2685
+2686
+2687
+2688
+2689
+2690
+2691
+2692
+2693
+2694
+2695
+2696
+2697
+2698
+2699
+2700
+2701
+2702
+2703
+2704
+2705
+2706
+2707
+2708
+2709
+2710
+2711
+2712
+2713
+2714
+2715
+2716
+2717
+2718
+2719
+2720
+2721
+2722
+2723
+2724
+2725
+2726
+2727
+2728
+2729
+2730
+2731
+2732
+2733
+2734
+2735
+2736
+2737
+2738
+2739
+2740
+2741
+2742
+2743
+2744
+2745
+2746
+2747
+2748
+2749
+2750
+2751
+2752
+2753
+2754
+2755
+2756
+2757
+2758
+2759
+2760
+2761
+2762
+2763
+2764
+2765
+2766
+2767
+2768
+2769
+2770
+2771
+2772
+2773
+2774
+2775
+2776
+2777
+2778
+2779
+2780
+2781
+2782
+2783
+2784
+2785
+2786
+2787
+2788
+2789
+2790
+2791
+2792
+2793
+2794
+2795
+2796
+2797
+2798
+2799
+2800
+2801
+2802
+2803
+2804
+2805
+2806
+2807
+2808
+2809
+2810
+2811
+2812
+2813
+2814
+2815
+2816
+2817
+2818
+2819
+2820
+2821
+2822
+2823
+2824
+2825
+2826
+2827
+2828
+2829
+2830
+2831
+2832
+2833
+2834
+2835
+2836
+2837
+2838
+2839
+2840
+2841
+2842
+2843
+2844
+2845
+2846
+2847
+2848
+2849
+2850
+2851
+2852
+2853
+2854
+2855
+2856
+2857
+2858
+2859
+2860
+2861
+2862
+2863
+2864
+2865
+2866
+2867
+2868
+2869
+2870
+2871
+2872
+2873
+2874
+2875
+2876
+2877
+2878
+2879
+2880
+2881
+2882
+2883
+2884
+2885
+2886
+2887
+2888
+2889
+2890
+2891
+2892
+2893
+2894
+2895
+2896
+2897
+2898
+2899
+2900
+2901
+2902
+2903
+2904
+2905
+2906
+2907
+2908
+2909
+2910
+2911
+2912
+2913
+2914
+2915
+2916
+2917
+2918
+2919
+2920
+2921
+2922
+2923
+2924
+2925
+2926
+2927
+2928
+2929
+2930
+2931
+2932
+2933
+2934
+2935
+2936
+2937
+2938
+2939
+2940
+2941
+2942
+2943
+2944
+2945
+2946
+2947
+2948
+2949
+2950
+2951
+2952
+2953
+2954
+2955
+2956
+2957
+2958
+2959
+2960
+2961
+2962
+2963
+2964
+2965
+2966
+2967
+2968
+2969
+2970
+2971
+2972
+2973
+2974
+2975
+2976
+2977
+2978
+2979
+2980
+2981
+2982
+2983
+2984
+2985
+2986
+2987
+2988
+2989
+2990
+2991
+2992
+2993
+2994
+2995
+2996
+2997
+2998
+2999
+3000
+3001
+3002
+3003
+3004
+3005
+3006
+3007
+3008
+3009
+3010
+3011
+3012
+3013
+3014
+3015
+3016
+3017
+3018
+3019
+3020
+3021
+3022
+3023
+3024
+3025
+3026
+3027
+3028
+3029
+3030
+3031
+3032
+3033
+3034
+3035
+3036
+3037
+3038
+3039
+3040
+3041
+3042
+3043
+3044
+3045
+3046
+3047
+3048
+3049
+3050
+3051
+3052
+3053
+3054
+3055
+3056
+3057
+3058
+3059
+3060
+3061
+3062
+3063
+3064
+3065
+3066
+3067
+3068
+3069
+3070
+3071
+3072
+3073
+3074
+3075
+3076
+3077
+3078
+3079
+3080
+3081
+3082
+3083
+3084
+3085
+3086
+3087
+3088
+3089
+3090
+3091
+3092
+3093
+3094
+3095
+3096
+3097
+3098
+3099
+3100
+3101
+3102
+3103
+3104
+3105
+3106
+3107
+3108
+3109
+3110
+3111
+3112
+3113
+3114
+3115
+3116
+3117
+3118
+3119
+3120
+3121
+3122
+3123
+3124
+3125
+3126
+3127
+3128
+3129
+3130
+3131
+3132
+3133
+3134
+3135
+3136
+3137
+3138
+3139
+3140
+3141
+3142
+3143
+3144
+3145
+3146
+3147
+3148
+3149
+3150
+3151
+3152
+3153
+3154
+3155
+3156
+3157
+3158
+3159
+3160
+3161
+3162
+3163
+3164
+3165
+3166
+3167
+3168
+3169
+3170
+3171
+3172
+3173
+3174
+3175
+3176
+3177
+3178
+3179
+3180
+3181
+3182
+3183
+3184
+3185
+3186
+3187
+3188
+3189
+3190
+3191
+3192
+3193
+3194
+3195
+3196
+3197
+3198
+3199
+3200
+3201
+3202
+3203
+3204
+3205
+3206
+3207
+3208
+3209
+3210
+3211
+3212
+3213
+3214
+3215
+3216
+3217
+3218
+3219
+3220
+3221
+3222
+3223
+3224
+3225
+3226
+3227
+3228
+3229
+3230
+3231
+3232
+3233
+3234
+3235
+3236
+3237
+3238
+3239
+3240
+3241
+3242
+3243
+3244
+3245
+3246
+3247
+3248
+3249
+3250
+3251
+3252
+3253
+3254
+3255
+3256
+3257
+3258
+3259
+3260
+3261
+3262
+3263
+3264
+3265
+3266
+3267
+3268
+3269
+3270
+3271
+3272
+3273
+3274
+3275
+3276
+3277
+3278
+3279
+3280
+3281
+3282
+3283
+3284
+3285
+3286
+3287
+3288
+3289
+3290
+3291
+3292
+3293
+3294
+3295
+3296
+3297
+3298
+3299
+3300
+3301
+3302
+3303
+3304
+3305
+3306
+3307
+3308
+3309
+3310
+3311
+3312
+3313
+3314
+3315
+3316
+3317
+3318
+3319
+3320
+3321
+3322
+3323
+3324
+3325
+3326
+3327
+3328
+3329
+3330
+3331
+3332
+3333
+3334
+3335
+3336
+3337
+3338
+3339
+3340
+3341
+3342
+3343
+3344
+3345
+3346
+3347
+3348
+3349
+3350
+3351
+3352
+3353
+3354
+3355
+3356
+3357
+3358
+3359
+3360
+3361
+3362
+3363
+3364
+3365
+3366
+3367
+3368
+3369
+3370
+3371
+3372
+3373
+3374
+3375
+3376
+3377
+3378
+3379
+3380
+3381
+3382
+3383
+3384
+3385
+3386
+3387
+3388
+3389
+3390
+3391
+3392
+3393
+3394
+3395
+3396
+3397
+3398
+3399
+3400
+3401
+3402
+3403
+3404
+3405
+3406
+3407
+3408
+3409
+3410
+3411
+3412
+3413
+3414
+3415
+3416
+3417
+3418
+3419
+3420
+3421
+3422
+3423
+3424
+3425
+3426
+3427
+3428
+3429
+3430
+3431
+3432
+3433
+3434
+3435
+3436
+3437
+3438
+3439
+3440
+3441
+3442
+3443
+3444
+3445
+3446
+3447
+3448
+3449
+3450
+3451
+3452
+3453
+3454
+3455
+3456
+3457
+3458
+3459
+3460
+3461
+3462
+3463
+3464
+3465
+3466
+3467
+3468
+3469
+3470
+3471
+3472
+3473
+3474
+3475
+3476
+3477
+3478
+3479
+3480
+3481
+3482
+3483
+3484
+3485
+3486
+3487
+3488
+3489
+3490
+3491
+3492
+3493
+3494
+3495
+3496
+3497
+3498
+3499
+3500
+3501
+3502
+3503
+3504
+3505
+3506
+3507
+3508
+3509
+3510
+3511
+3512
+3513
+3514
+3515
+3516
+3517
+3518
+3519
+3520
+3521
+3522
+3523
+3524
+3525
+3526
+3527
+3528
+3529
+3530
+3531
+3532
+3533
+3534
+3535
+3536
+3537
+3538
+3539
+3540
+3541
+3542
+3543
+3544
+3545
+3546
+3547
+3548
+3549
+3550
+3551
+3552
+3553
+3554
+3555
+3556
+3557
+3558
+3559
+3560
+3561
+3562
+3563
+3564
+3565
+3566
+3567
+3568
+3569
+3570
+3571
+3572
+3573
+3574
+3575
+3576
+3577
+3578
+3579
+3580
+3581
+3582
+3583
+3584
+3585
+3586
+3587
+3588
+3589
+3590
+3591
+3592
+3593
+3594
+3595
+3596
+3597
+3598
+3599
+3600
+3601
+3602
+3603
+3604
+3605
+3606
+3607
+3608
+3609
+3610
+3611
+3612
+3613
+3614
+3615
+3616
+3617
+3618
+3619
+3620
+3621
+3622
+3623
+3624
+3625
+3626
+3627
+3628
+3629
+3630
+3631
+3632
+3633
+3634
+3635
+3636
+3637
+3638
+3639
+3640
+3641
+3642
+3643
+3644
+3645
+3646
+3647
+3648
+3649
+3650
+3651
+3652
+3653
+3654
+3655
+3656
+3657
+3658
+3659
+3660
+3661
+3662
+3663
+3664
+3665
+3666
+3667
+3668
+3669
+3670
+3671
+3672
+3673
+3674
+3675
+3676
+3677
+3678
+3679
+3680
+3681
+3682
+3683
+3684
+3685
+3686
+3687
+3688
+3689
+3690
+3691
+3692
+3693
+3694
+3695
+3696
+3697
+3698
+3699
+3700
+3701
+3702
+3703
+3704
+3705
+3706
+3707
+3708
+3709
+3710
+3711
+3712
+3713
+3714
+3715
+3716
+3717
+3718
+3719
+3720
+3721
+3722
+3723
+3724
+3725
+3726
+3727
+3728
+3729
+3730
+3731
+3732
+3733
+3734
+3735
+3736
+3737
+3738
+3739
+3740
+3741
+3742
+3743
+3744
+3745
+3746
+3747
+3748
+3749
+3750
+3751
+3752
+3753
+3754
+3755
+3756
+3757
+3758
+3759
+3760
+3761
+3762
+3763
+3764
+3765
+3766
+3767
+3768
+3769
+3770
+3771
+3772
+3773
+3774
+3775
+3776
+3777
+3778
+3779
+3780
+3781
+3782
+3783
+3784
+3785
+3786
+3787
+3788
+3789
+3790
+3791
+3792
+3793
+3794
+3795
+3796
+3797
+3798
+3799
+3800
+3801
+3802
+3803
+3804
+3805
+3806
+3807
+3808
+3809
+3810
+3811
+3812
+3813
+3814
+3815
+3816
+3817
+3818
+3819
+3820
+3821
+3822
+3823
+3824
+3825
+3826
+3827
+3828
+3829
+3830
+3831
+3832
+3833
+3834
+3835
+3836
+3837
+3838
+3839
+3840
+3841
+3842
+3843
+3844
+3845
+3846
+3847
+3848
+3849
+3850
+3851
+3852
+3853
+3854
+3855
+3856
+3857
+3858
+3859
+3860
+3861
+3862
+3863
+3864
+3865
+3866
+3867
+3868
+3869
+3870
+3871
+3872
+3873
+3874
+3875
+3876
+3877
+3878
+3879
+3880
+3881
+3882
+3883
+3884
+3885
+3886
+3887
+3888
+3889
+3890
+3891
+3892
+3893
+3894
+3895
+3896
+3897
+3898
+3899
+3900
+3901
+3902
+3903
+3904
+3905
+3906
+3907
+3908
+3909
+3910
+3911
+3912
+3913
+3914
+3915
+3916
+3917
+3918
+3919
+3920
+3921
+3922
+3923
+3924
+3925
+3926
+3927
+3928
+3929
+3930
+3931
+3932
+3933
+3934
+3935
+3936
+3937
+3938
+3939
+3940
+3941
+3942
+3943
+3944
+3945
+3946
+3947
+3948
+3949
+3950
+3951
+3952
+3953
+3954
+3955
+3956
+3957
+3958
+3959
+3960
+3961
+3962
+3963
+3964
+3965
+3966
+3967
+3968
+3969
+3970
+3971
+3972
+3973
+3974
+3975
+3976
+3977
+3978
+3979
+3980
+3981
+3982
+3983
+3984
+3985
+3986
+3987
+3988
+3989
+3990
+3991
+3992
+3993
+3994
+3995
+3996
+3997
+3998
+3999
+4000
+4001
+4002
+4003
+4004
+4005
+4006
+4007
+4008
+4009
+4010
+4011
+4012
+4013
+4014
+4015
+4016
+4017
+4018
+4019
+4020
+4021
+4022
+4023
+4024
+4025
+4026
+4027
+4028
+4029
+4030
+4031
+4032
+4033
+4034
+4035
+4036
+4037
+4038
+4039
+4040
+4041
+4042
+4043
+4044
+4045
+4046
+4047
+4048
+4049
+4050
+4051
+4052
+4053
+4054
+4055
+4056
+4057
+4058
+4059
+4060
+4061
+4062
+4063
+4064
+4065
+4066
+4067
+4068
+4069
+4070
+4071
+4072
+4073
+4074
+4075
+4076
+4077
+4078
+4079
+4080
+4081
+4082
+4083
+4084
+4085
+4086
+4087
+4088
+4089
+4090
+4091
+4092
+4093
+4094
+4095
+4096
+4097
+4098
+4099
+4100
+4101
+4102
+4103
+4104
+4105
+4106
+4107
+4108
+4109
+4110
+4111
+4112
+4113
+4114
+4115
+4116
+4117
+4118
+4119
+4120
+4121
+4122
+4123
+4124
+4125
+4126
+4127
+4128
+4129
+4130
+4131
+4132
+4133
+4134
+4135
+4136
+4137
+4138
+4139
+4140
+4141
+4142
+4143
+4144
+4145
+4146
+4147
+4148
+4149
+4150
+4151
+4152
+4153
+4154
+4155
+4156
+4157
+4158
+4159
+4160
+4161
+4162
+4163
+4164
+4165
+4166
+4167
+4168
+4169
+4170
+4171
+4172
+4173
+4174
+4175
+4176
+4177
+4178
+4179
+4180
+4181
+4182
+4183
+4184
+4185
+4186
+4187
+4188
+4189
+4190
+4191
+4192
+4193
+4194
+4195
+4196
+4197
+4198
+4199
+4200
+4201
+4202
+4203
+4204
+4205
+4206
+4207
+4208
+4209
+4210
+4211
+4212
+4213
+4214
+4215
+4216
+4217
+4218
+4219
+4220
+4221
+4222
+4223
+4224
+4225
+4226
+4227
+4228
+4229
+4230
+4231
+4232
+4233
+4234
+4235
+4236
+4237
+4238
+4239
+4240
+4241
+4242
+4243
+4244
+4245
+4246
+4247
+4248
+4249
+4250
+4251
+4252
+4253
+4254
+4255
+4256
+4257
+4258
+4259
+4260
+4261
+4262
+4263
+4264
+4265
+4266
+4267
+4268
+4269
+4270
+4271
+4272
+4273
+4274
+4275
+4276
+4277
+4278
+4279
+4280
+4281
+4282
+4283
+4284
+4285
+4286
+4287
+4288
+4289
+4290
+4291
+4292
+4293
+4294
+4295
+4296
+4297
+4298
+4299
+4300
+4301
+4302
+4303
+4304
+4305
+4306
+4307
+4308
+4309
+4310
+4311
+4312
+4313
+4314
+4315
+4316
+4317
+4318
+4319
+4320
+4321
+4322
+4323
+4324
+4325
+4326
+4327
+4328
+4329
+4330
+4331
+4332
+4333
+4334
+4335
+4336
+4337
+4338
+4339
+4340
+4341
+4342
+4343
+4344
+4345
+4346
+4347
+4348
+4349
+4350
+4351
+4352
+4353
+4354
+4355
+4356
+4357
+4358
+4359
+4360
+4361
+4362
+4363
+4364
+4365
+4366
+4367
+4368
+4369
+4370
+4371
+4372
+4373
+4374
+4375
+4376
+4377
+4378
+4379
+4380
+4381
+4382
+4383
+4384
+4385
+4386
+4387
+4388
+4389
+4390
+4391
+4392
+4393
+4394
+4395
+4396
+4397
+4398
+4399
+4400
+4401
+4402
+4403
+4404
+4405
+4406
+4407
+4408
+4409
+4410
+4411
+4412
+4413
+4414
+4415
+4416
+4417
+4418
+4419
+4420
+4421
+4422
+4423
+4424
+4425
+4426
+4427
+4428
+4429
+4430
+4431
+4432
+4433
+4434
+4435
+4436
+4437
+4438
+4439
+4440
+4441
+4442
+4443
+4444
+4445
+4446
+4447
+4448
+4449
+4450
+4451
+4452
+4453
+4454
+4455
+4456
+4457
+4458
+4459
+4460
+4461
+4462
+4463
+4464
+4465
+4466
+4467
+4468
+4469
+4470
+4471
+4472
+4473
+4474
+4475
+4476
+4477
+4478
+4479
+4480
+4481
+4482
+4483
+4484
+4485
+4486
+4487
+4488
+4489
+4490
+4491
+4492
+4493
+4494
+4495
+4496
+4497
+4498
+4499
+4500
+4501
+4502
+4503
+4504
+4505
+4506
+4507
+4508
+4509
+4510
+4511
+4512
+4513
+4514
+4515
+4516
+4517
+4518
+4519
+4520
+4521
+4522
+4523
+4524
+4525
+4526
+4527
+4528
+4529
+4530
+4531
+4532
+4533
+4534
+4535
+4536
+4537
+4538
+4539
+4540
+4541
+4542
+4543
+4544
+4545
+4546
+4547
+4548
+4549
+4550
+4551
+4552
+4553
+4554
+4555
+4556
+4557
+4558
+4559
+4560
+4561
+4562
+4563
+4564
+4565
+4566
+4567
+4568
+4569
+4570
+4571
+4572
+4573
+4574
+4575
+4576
+4577
+4578
+4579
+4580
+4581
+4582
+4583
+4584
+4585
+4586
+4587
+4588
+4589
+4590
+4591
+4592
+4593
+4594
+4595
+4596
+4597
+4598
+4599
+4600
+4601
+4602
+4603
+4604
+4605
+4606
+4607
+4608
+4609
+4610
+4611
+4612
+4613
+4614
+4615
+4616
+4617
+4618
+4619
+4620
+4621
+4622
+4623
+4624
+4625
+4626
+4627
+4628
+4629
+4630
+4631
+4632
+4633
+4634
+4635
+4636
+4637
+4638
+4639
+4640
+4641
+4642
+4643
+4644
+4645
+4646
+4647
+4648
+4649
+4650
+4651
+4652
+4653
+4654
+4655
+4656
+4657
+4658
+4659
+4660
+4661
+4662
+4663
+4664
+4665
+4666
+4667
+4668
+4669
+4670
+4671
+4672
+4673
+4674
+4675
+4676
+4677
+4678
+4679
+4680
+4681
+4682
+4683
+4684
+4685
+4686
+4687
+4688
+4689
+4690
+4691
+4692
+4693
+4694
+4695
+4696
+4697
+4698
+4699
+4700
+4701
+4702
+4703
+4704
+4705
+4706
+4707
+4708
+4709
+4710
+4711
+4712
+4713
+4714
+4715
+4716
+4717
+4718
+4719
+4720
+4721
+4722
+4723
+4724
+4725
+4726
+4727
+4728
+4729
+4730
+4731
+4732
+4733
+4734
+4735
+4736
+4737
+4738
+4739
+4740
+4741
+4742
+4743
+4744
+4745
+4746
+4747
+4748
+4749
+4750
+4751
+4752
+4753
+4754
+4755
+4756
+4757
+4758
+4759
+4760
+4761
+4762
+4763
+4764
+4765
+4766
+4767
+4768
+4769
+4770
+4771
+4772
+4773
+4774
+4775
+4776
+4777
+4778
+4779
+4780
+4781
+4782
+4783
+4784
+4785
+4786
+4787
+4788
+4789
+4790
+4791
+4792
+4793
+4794
+4795
+4796
+4797
+4798
+4799
+4800
+4801
+4802
+4803
+4804
+4805
+4806
+4807
+4808
+4809
+4810
+4811
+4812
+4813
+4814
+4815
+4816
+4817
+4818
+4819
+4820
+4821
+4822
+4823
+4824
+4825
+4826
+4827
+4828
+4829
+4830
+4831
+4832
+4833
+4834
+4835
+4836
+4837
+4838
+4839
+4840
+4841
+4842
+4843
+4844
+4845
+4846
+4847
+4848
+4849
+4850
+4851
+4852
+4853
+4854
+4855
+4856
+4857
+4858
+4859
+4860
+4861
+4862
+4863
+4864
+4865
+4866
+4867
+4868
+4869
+4870
+4871
+4872
+4873
+4874
+4875
+4876
+4877
+4878
+4879
+4880
+4881
+4882
+4883
+4884
+4885
+4886
+4887
+4888
+4889
+4890
+4891
+4892
+4893
+4894
+4895
+4896
+4897
+4898
+4899
+4900
+4901
+4902
+4903
+4904
+4905
+4906
+4907
+4908
+4909
+4910
+4911
+4912
+4913
+4914
+4915
+4916
+4917
+4918
+4919
+4920
+4921
+4922
+4923
+4924
+4925
+4926
+4927
+4928
+4929
+4930
+4931
+4932
+4933
+4934
+4935
+4936
+4937
+4938
+4939
+4940
+4941
+4942
+4943
+4944
+4945
+4946
+4947
+4948
+4949
+4950
+4951
+4952
+4953
+4954
+4955
+4956
+4957
+4958
+4959
+4960
+4961
+4962
+4963
+4964
+4965
+4966
+4967
+4968
+4969
+4970
+4971
+4972
+4973
+4974
+4975
+4976
+4977
+4978
+4979
+4980
+4981
+4982
+4983
+4984
+4985
+4986
+4987
+4988
+4989
+4990
+4991
+4992
+4993
+4994
+4995
+4996
+4997
+4998
+4999
+5000
+5001
+5002
+5003
+5004
+5005
+5006
+5007
+5008
+5009
+5010
+5011
+5012
+5013
+5014
+5015
+5016
+5017
+5018
+5019
+5020
+5021
+5022
+5023
+5024
+5025
+5026
+5027
+5028
+5029
+5030
+5031
+5032
+5033
+5034
+5035
+5036
+5037
+5038
+5039
+5040
+5041
+5042
+5043
+5044
+5045
+5046
+5047
+5048
+5049
+5050
+5051
+5052
+5053
+5054
+5055
+5056
+5057
+5058
+5059
+5060
+5061
+5062
+5063
+5064
+5065
+5066
+5067
+5068
+5069
+5070
+5071
+5072
+5073
+5074
+5075
+5076
+5077
+5078
+5079
+5080
+5081
+5082
+5083
+5084
+5085
+5086
+5087
+5088
+5089
+5090
+5091
+5092
+5093
+5094
+5095
+5096
+5097
+5098
+5099
+5100
+5101
+5102
+5103
+5104
+5105
+5106
+5107
+5108
+5109
+5110
+5111
+5112
+5113
+5114
+5115
+5116
+5117
+5118
+5119
+5120
+5121
+5122
+5123
+5124
+5125
+5126
+5127
+5128
+5129
+5130
+5131
+5132
+5133
+5134
+5135
+5136
+5137
+5138
+5139
+5140
+5141
+5142
+5143
+5144
+5145
+5146
+5147
+5148
+5149
+5150
+5151
+5152
+5153
+5154
+5155
+5156
+5157
+5158
+5159
+5160
+5161
+5162
+5163
+5164
+5165
+5166
+5167
+5168
+5169
+5170
+5171
+5172
+5173
+5174
+5175
+5176
+5177
+5178
+5179
+5180
+5181
+5182
+5183
+5184
+5185
+5186
+5187
+5188
+5189
+5190
+5191
+5192
+5193
+5194
+5195
+5196
+5197
+5198
+5199
+5200
+5201
+5202
+5203
+5204
+5205
+5206
+5207
+5208
+5209
+5210
+5211
+5212
+5213
+5214
+5215
+5216
+5217
+5218
+5219
+5220
+5221
+5222
+5223
+5224
+5225
+5226
+5227
+5228
+5229
+5230
+5231
+5232
+5233
+5234
+5235
+5236
+5237
+5238
+5239
+5240
+5241
+5242
+5243
+5244
+5245
+5246
+5247
+5248
+5249
+5250
+5251
+5252
+5253
+5254
+5255
+5256
+5257
+5258
+5259
+5260
+5261
+5262
+5263
+5264
+5265
+5266
+5267
+5268
+5269
+5270
+5271
+5272
+5273
+5274
+5275
+5276
+5277
+5278
+5279
+5280
+5281
+5282
+5283
+5284
+5285
+5286
+5287
+5288
+5289
+5290
+5291
+5292
+5293
+5294
+5295
+5296
+5297
+5298
+5299
+5300
+5301
+5302
+5303
+5304
+5305
+5306
+5307
+5308
+5309
+5310
+5311
+5312
+5313
+5314
+5315
+5316
+5317
+5318
+5319
+5320
+5321
+5322
+5323
+5324
+5325
+5326
+5327
+5328
+5329
+5330
+5331
+5332
+5333
+5334
+5335
+5336
+5337
+5338
+5339
+5340
+5341
+5342
+5343
+5344
+5345
+5346
+5347
+5348
+5349
+5350
+5351
+5352
+5353
+5354
+5355
+5356
+5357
+5358
+5359
+5360
+5361
+5362
+5363
+5364
+5365
+5366
+5367
+5368
+5369
+5370
+5371
+5372
+5373
+5374
+5375
+5376
+5377
+5378
+5379
+5380
+5381
+5382
+5383
+5384
+5385
+5386
+5387
+5388
+5389
+5390
+5391
+5392
+5393
+5394
+5395
+5396
+5397
+5398
+5399
+5400
+5401
+5402
+5403
+5404
+5405
+5406
+5407
+5408
+5409
+5410
+5411
+5412
+5413
+5414
+5415
+5416
+5417
+5418
+5419
+5420
+5421
+5422
+5423
+5424
+5425
+5426
+5427
+5428
+5429
+5430
+5431
+5432
+5433
+5434
+5435
+5436
+5437
+5438
+5439
+5440
+5441
+5442
+5443
+5444
+5445
+5446
+5447
+5448
+5449
+5450
+5451
+5452
+5453
+5454
+5455
+5456
+5457
+5458
+5459
+5460
+5461
+5462
+5463
+5464
+5465
+5466
+5467
+5468
+5469
+5470
+5471
+5472
+5473
+5474
+5475
+5476
+5477
+5478
+5479
+5480
+5481
+5482
+5483
+5484
+5485
+5486
+5487
+5488
+5489
+5490
+5491
+5492
+5493
+5494
+5495
+5496
+5497
+5498
+5499
+5500
+5501
+5502
+5503
+5504
+5505
+5506
+5507
+5508
+5509
+5510
+5511
+5512
+5513
+5514
+5515
+5516
+5517
+5518
+5519
+5520
+5521
+5522
+5523
+5524
+5525
+5526
+5527
+5528
+5529
+5530
+5531
+5532
+5533
+5534
+5535
+5536
+5537
+5538
+5539
+5540
+5541
+5542
+5543
+5544
+5545
+5546
+5547
+5548
+5549
+5550
+5551
+5552
+5553
+5554
+5555
+5556
+5557
+5558
+5559
+5560
+5561
+5562
+5563
+5564
+5565
+5566
+5567
+5568
+5569
+5570
+5571
+5572
+5573
+5574
+5575
+5576
+5577
+5578
+5579
+5580
+5581
+5582
+5583
+5584
+5585
+5586
+5587
+5588
+5589
+5590
+5591
+5592
+5593
+5594
+5595
+5596
+5597
+5598
+5599
+5600
+5601
+5602
+5603
+5604
+5605
+5606
+5607
+5608
+5609
+5610
+5611
+5612
+5613
+5614
+5615
+5616
+5617
+5618
+5619
+5620
+5621
+5622
+5623
+5624
+5625
+5626
+5627
+5628
+5629
+5630
+5631
+5632
+5633
+5634
+5635
+5636
+5637
+5638
+5639
+5640
+5641
+5642
+5643
+5644
+5645
+5646
+5647
+5648
+5649
+5650
+5651
+5652
+5653
+5654
+5655
+5656
+5657
+5658
+5659
+5660
+5661
+5662
+5663
+5664
+5665
+5666
+5667
+5668
+5669
+5670
+5671
+5672
+5673
+5674
+5675
+5676
+5677
+5678
+5679
+5680
+5681
+5682
+5683
+5684
+5685
+5686
+5687
+5688
+5689
+5690
+5691
+5692
+5693
+5694
+5695
+5696
+5697
+5698
+5699
+5700
+5701
+5702
+5703
+5704
+5705
+5706
+5707
+5708
+5709
+5710
+5711
+5712
+5713
+5714
+5715
+5716
+5717
+5718
+5719
+5720
+5721
+5722
+5723
+5724
+5725
+5726
+5727
+5728
+5729
+5730
+5731
+5732
+5733
+5734
+5735
+5736
+5737
+5738
+5739
+5740
+5741
+5742
+5743
+5744
+5745
+5746
+5747
+5748
+5749
+5750
+5751
+5752
+5753
+5754
+5755
+5756
+5757
+5758
+5759
+5760
+5761
+5762
+5763
+5764
+5765
+5766
+5767
+5768
+5769
+5770
+5771
+5772
+5773
+5774
+5775
+5776
+5777
+5778
+5779
+5780
+5781
+5782
+5783
+5784
+5785
+5786
+5787
+5788
+5789
+5790
+5791
+5792
+5793
+5794
+5795
+5796
+5797
+5798
+5799
+5800
+5801
+5802
+5803
+5804
+5805
+5806
+5807
+5808
+5809
+5810
+5811
+5812
+5813
+5814
+5815
+5816
+5817
+5818
+5819
+5820
+5821
+5822
+5823
+5824
+5825
+5826
+5827
+5828
+5829
+5830
+5831
+5832
+5833
+5834
+5835
+5836
+5837
+5838
+5839
+5840
+5841
+5842
+5843
+5844
+5845
+5846
+5847
+5848
+5849
+5850
+5851
+5852
+5853
+5854
+5855
+5856
+5857
+5858
+5859
+5860
+5861
+5862
+5863
+5864
+5865
+5866
+5867
+5868
+5869
+5870
+5871
+5872
+5873
+5874
+5875
+5876
+5877
+5878
+5879
+5880
+5881
+5882
+5883
+5884
+5885
+5886
+5887
+5888
+5889
+5890
+5891
+5892
+5893
+5894
+5895
+5896
+5897
+5898
+5899
+5900
+5901
+5902
+5903
+5904
+5905
+5906
+5907
+5908
+5909
+5910
+5911
+5912
+5913
+5914
+5915
+5916
+5917
+5918
+5919
+5920
+5921
+5922
+5923
+5924
+5925
+5926
+5927
+5928
+5929
+5930
+5931
+5932
+5933
+5934
+5935
+5936
+5937
+5938
+5939
+5940
+5941
+5942
+5943
+5944
+5945
+5946
+5947
+5948
+5949
+5950
+5951
+5952
+5953
+5954
+5955
+5956
+5957
+5958
+5959
+5960
+5961
+5962
+5963
+5964
+5965
+5966
+5967
+5968
+5969
+5970
+5971
+5972
+5973
+5974
+5975
+5976
+5977
+5978
+5979
+5980
+5981
+5982
+5983
+5984
+5985
+5986
+5987
+5988
+5989
+5990
+5991
+5992
+5993
+5994
+5995
+5996
+5997
+5998
+5999
+6000
+6001
+6002
+6003
+6004
+6005
+6006
+6007
+6008
+6009
+6010
+6011
+6012
+6013
+6014
+6015
+6016
+6017
+6018
+6019
+6020
+6021
+6022
+6023
+6024
+6025
+6026
+6027
+6028
+6029
+6030
+6031
+6032
+6033
+6034
+6035
+6036
+6037
+6038
+6039
+6040
+6041
+6042
+6043
+6044
+6045
+6046
+6047
+6048
+6049
+6050
+6051
+6052
+6053
+6054
+6055
+6056
+6057
+6058
+6059
+6060
+6061
+6062
+6063
+6064
+6065
+6066
+6067
+6068
+6069
+6070
+6071
+6072
+6073
+6074
+6075
+6076
+6077
+6078
+6079
+6080
+6081
+6082
+6083
+6084
+6085
+6086
+6087
+6088
+6089
+6090
+6091
+6092
+6093
+6094
+6095
+6096
+6097
+6098
+6099
+6100
+6101
+6102
+6103
+6104
+6105
+6106
+6107
+6108
+6109
+6110
+6111
+6112
+6113
+6114
+6115
+6116
+6117
+6118
+6119
+6120
+6121
+6122
+6123
+6124
+6125
+6126
+6127
+6128
+6129
+6130
+6131
+6132
+6133
+6134
+6135
+6136
+6137
+6138
+6139
+6140
+6141
+6142
+6143
+6144
+6145
+6146
+6147
+6148
+6149
+6150
+6151
+6152
+6153
+6154
+6155
+6156
+6157
+6158
+6159
+6160
+6161
+6162
+6163
+6164
+6165
+6166
+6167
+6168
+6169
+6170
+6171
+6172
+6173
+6174
+6175
+6176
+6177
+6178
+6179
+6180
+6181
+6182
+6183
+6184
+6185
+6186
+6187
+6188
+6189
+6190
+6191
+6192
+6193
+6194
+6195
+6196
+6197
+6198
+6199
+6200
+6201
+6202
+6203
+6204
+6205
+6206
+6207
+6208
+6209
+6210
+6211
+6212
+6213
+6214
+6215
+6216
+6217
+6218
+6219
+6220
+6221
+6222
+6223
+6224
+6225
+6226
+6227
+6228
+6229
+6230
+6231
+6232
+6233
+6234
+6235
+6236
+6237
+6238
+6239
+6240
+6241
+6242
+6243
+6244
+6245
+6246
+6247
+6248
+6249
+6250
+6251
+6252
+6253
+6254
+6255
+6256
+6257
+6258
+6259
+6260
+6261
+6262
+6263
+6264
+6265
+6266
+6267
+6268
+6269
+6270
+6271
+6272
+6273
+6274
+6275
+6276
+6277
+6278
+6279
+6280
+6281
+6282
+6283
+6284
+6285
+6286
+6287
+6288
+6289
+6290
+6291
+6292
+6293
+6294
+6295
+6296
+6297
+6298
+6299
+6300
+6301
+6302
+6303
+6304
+6305
+6306
+6307
+6308
+6309
+6310
+6311
+6312
+6313
+6314
+6315
+6316
+6317
+6318
+6319
+6320
+6321
+6322
+6323
+6324
+6325
+6326
+6327
+6328
+6329
+6330
+6331
+6332
+6333
+6334
+6335
+6336
+6337
+6338
+6339
+6340
+6341
+6342
+6343
+6344
+6345
+6346
+6347
+6348
+6349
+6350
+6351
+6352
+6353
+6354
+6355
+6356
+6357
+6358
+6359
+6360
+6361
+6362
+6363
+6364
+6365
+6366
+6367
+6368
+6369
+6370
+6371
+6372
+6373
+6374
+6375
+6376
+6377
+6378
+6379
+6380
+6381
+6382
+6383
+6384
+6385
+6386
+6387
+6388
+6389
+6390
+6391
+6392
+6393
+6394
+6395
+6396
+6397
+6398
+6399
+6400
+6401
+6402
+6403
+6404
+6405
+6406
+6407
+6408
+6409
+6410
+6411
+6412
+6413
+6414
+6415
+6416
+6417
+6418
+6419
+6420
+6421
+6422
+6423
+6424
+6425
+6426
+6427
+6428
+6429
+6430
+6431
+6432
+6433
+6434
+6435
+6436
+6437
+6438
+6439
+6440
+6441
+6442
+6443
+6444
+6445
+6446
+6447
+6448
+6449
+6450
+6451
+6452
+6453
+6454
+6455
+6456
+6457
+6458
+6459
+6460
+6461
+6462
+6463
+6464
+6465
+6466
+6467
+6468
+6469
+6470
+6471
+6472
+6473
+6474
+6475
+6476
+6477
+6478
+6479
+6480
+6481
+6482
+6483
+6484
+6485
+6486
+6487
+6488
+6489
+6490
+6491
+6492
+6493
+6494
+6495
+6496
+6497
+6498
+6499
+6500
+6501
+6502
+6503
+6504
+6505
+6506
+6507
+6508
+6509
+6510
+6511
+6512
+6513
+6514
+6515
+6516
+6517
+6518
+6519
+6520
+6521
+6522
+6523
+6524
+6525
+6526
+6527
+6528
+6529
+6530
+6531
+6532
+6533
+6534
+6535
+6536
+6537
+6538
+6539
+6540
+6541
+6542
+6543
+6544
+6545
+6546
+6547
+6548
+6549
+6550
+6551
+6552
+6553
+6554
+6555
+6556
+6557
+6558
+6559
+6560
+6561
+6562
+6563
+6564
+6565
+6566
+6567
+6568
+6569
+6570
+6571
+6572
+6573
+6574
+6575
+6576
+6577
+6578
+6579
+6580
+6581
+6582
+6583
+6584
+6585
+6586
+6587
+6588
+6589
+6590
+6591
+6592
+6593
+6594
+6595
+6596
+6597
+6598
+6599
+6600
+6601
+6602
+6603
+6604
+6605
+6606
+6607
+6608
+6609
+6610
+6611
+6612
+6613
+6614
+6615
+6616
+6617
+6618
+6619
+6620
+6621
+6622
+6623
+6624
+6625
+6626
+6627
+6628
+6629
+6630
+6631
+6632
+6633
+6634
+6635
+6636
+6637
+6638
+6639
+6640
+6641
+6642
+6643
+6644
+6645
+6646
+6647
+6648
+6649
+6650
+6651
+6652
+6653
+6654
+6655
+6656
+6657
+6658
+6659
+6660
+6661
+6662
+6663
+6664
+6665
+6666
+6667
+6668
+6669
+6670
+6671
+6672
+6673
+6674
+6675
+6676
+6677
+6678
+6679
+6680
+6681
+6682
+6683
+6684
+6685
+6686
+6687
+6688
+6689
+6690
+6691
+6692
+6693
+6694
+6695
+6696
+6697
+6698
+6699
+6700
+6701
+6702
+6703
+6704
+6705
+6706
+6707
+6708
+6709
+6710
+6711
+6712
+6713
+6714
+6715
+6716
+6717
+6718
+6719
+6720
+6721
+6722
+6723
+6724
+6725
+6726
+6727
+6728
+6729
+6730
+6731
+6732
+6733
+6734
+6735
+6736
+6737
+6738
+6739
+6740
+6741
+6742
+6743
+6744
+6745
+6746
+6747
+6748
+6749
+6750
+6751
+6752
+6753
+6754
+6755
+6756
+6757
+6758
+6759
+6760
+6761
+6762
+6763
+6764
+6765
+6766
+6767
+6768
+6769
+6770
+6771
+6772
+6773
+6774
+6775
+6776
+6777
+6778
+6779
+6780
+6781
+6782
+6783
+6784
+6785
+6786
+6787
+6788
+6789
+6790
+6791
+6792
+6793
+6794
+6795
+6796
+6797
+6798
+6799
+6800
+6801
+6802
+6803
+6804
+6805
+6806
+6807
+6808
+6809
+6810
+6811
+6812
+6813
+6814
+6815
+6816
+6817
+6818
+6819
+6820
+6821
+6822
+6823
+6824
+6825
+6826
+6827
+6828
+6829
+6830
+6831
+6832
+6833
+6834
+6835
+6836
+6837
+6838
+6839
+6840
+6841
+6842
+6843
+6844
+6845
+6846
+6847
+6848
+6849
+6850
+6851
+6852
+6853
+6854
+6855
+6856
+6857
+6858
+6859
+6860
+6861
+6862
+6863
+6864
+6865
+6866
+6867
+6868
+6869
+6870
+6871
+6872
+6873
+6874
+6875
+6876
+6877
+6878
+6879
+6880
+6881
+6882
+6883
+6884
+6885
+6886
+6887
+6888
+6889
+6890
+6891
+6892
+6893
+6894
+6895
+6896
+6897
+6898
+6899
+6900
+6901
+6902
+6903
+6904
+6905
+6906
+6907
+6908
+6909
+6910
+6911
+6912
+6913
+6914
+6915
+6916
+6917
+6918
+6919
+6920
+6921
+6922
+6923
+6924
+6925
+6926
+6927
+6928
+6929
+6930
+6931
+6932
+6933
+6934
+6935
+6936
+6937
+6938
+6939
+6940
+6941
+6942
+6943
+6944
+6945
+6946
+6947
+6948
+6949
+6950
+6951
+6952
+6953
+6954
+6955
+6956
+6957
+6958
+6959
+6960
+6961
+6962
+6963
+6964
+6965
+6966
+6967
+6968
+6969
+6970
+6971
+6972
+6973
+6974
+6975
+6976
+6977
+6978
+6979
+6980
+6981
+6982
+6983
+6984
+6985
+6986
+6987
+6988
+6989
+6990
+6991
+6992
+6993
+6994
+6995
+6996
+6997
+6998
+6999
+7000
+7001
+7002
+7003
+7004
+7005
+7006
+7007
+7008
+7009
+7010
+7011
+7012
+7013
+7014
+7015
+7016
+7017
+7018
+7019
+7020
+7021
+7022
+7023
+7024
+7025
+7026
+7027
+7028
+7029
+7030
+7031
+7032
+7033
+7034
+7035
+7036
+7037
+7038
+7039
+7040
+7041
+7042
+7043
+7044
+7045
+7046
+7047
+7048
+7049
+7050
+7051
+7052
+7053
+7054
+7055
+7056
+7057
+7058
+7059
+7060
+7061
+7062
+7063
+7064
+7065
+7066
+7067
+7068
+7069
+7070
+7071
+7072
+7073
+7074
+7075
+7076
+7077
+7078
+7079
+7080
+7081
+7082
+7083
+7084
+7085
+7086
+7087
+7088
+7089
+7090
+7091
+7092
+7093
+7094
+7095
+7096
+7097
+7098
+7099
+7100
+7101
+7102
+7103
+7104
+7105
+7106
+7107
+7108
+7109
+7110
+7111
+7112
+7113
+7114
+7115
+7116
+7117
+7118
+7119
+7120
+7121
+7122
+7123
+7124
+7125
+7126
+7127
+7128
+7129
+7130
+7131
+7132
+7133
+7134
+7135
+7136
+7137
+7138
+7139
+7140
+7141
+7142
+7143
+7144
+7145
+7146
+7147
+7148
+7149
+7150
+7151
+7152
+7153
+7154
+7155
+7156
+7157
+7158
+7159
+7160
+7161
+7162
+7163
+7164
+7165
+7166
+7167
+7168
+7169
+7170
+7171
+7172
+7173
+7174
+7175
+7176
+7177
+7178
+7179
+7180
+7181
+7182
+7183
+7184
+7185
+7186
+7187
+7188
+7189
+7190
+7191
+7192
+7193
+7194
+7195
+7196
+7197
+7198
+7199
+7200
+7201
+7202
+7203
+7204
+7205
+7206
+7207
+7208
+7209
+7210
+7211
+7212
+7213
+7214
+7215
+7216
+7217
+7218
+7219
+7220
+7221
+7222
+7223
+7224
+7225
+7226
+7227
+7228
+7229
+7230
+7231
+7232
+7233
+7234
+7235
+7236
+7237
+7238
+7239
+7240
+7241
+7242
+7243
+7244
+7245
+7246
+7247
+7248
+7249
+7250
+7251
+7252
+7253
+7254
+7255
+7256
+7257
+7258
+7259
+7260
+7261
+7262
+7263
+7264
+7265
+7266
+7267
+7268
+7269
+7270
+7271
+7272
+7273
+7274
+7275
+7276
+7277
+7278
+7279
+7280
+7281
+7282
+7283
+7284
+7285
+7286
+7287
+7288
+7289
+7290
+7291
+7292
+7293
+7294
+7295
+7296
+7297
+7298
+7299
+7300
+7301
+7302
+7303
+7304
+7305
+7306
+7307
+7308
+7309
+7310
+7311
+7312
+7313
+7314
+7315
+7316
+7317
+7318
+7319
+7320
+7321
+7322
+7323
+7324
+7325
+7326
+7327
+7328
+7329
+7330
+7331
+7332
+7333
+7334
+7335
+7336
+7337
+7338
+7339
+7340
+7341
+7342
+7343
+7344
+7345
+7346
+7347
+7348
+7349
+7350
+7351
+7352
+7353
+7354
+7355
+7356
+7357
+7358
+7359
+7360
+7361
+7362
+7363
+7364
+7365
+7366
+7367
+7368
+7369
+7370
+7371
+7372
+7373
+7374
+7375
+7376
+7377
+7378
+7379
+7380
+7381
+7382
+7383
+7384
+7385
+7386
+7387
+7388
+7389
+7390
+7391
+7392
+7393
+7394
+7395
+7396
+7397
+7398
+7399
+7400
+7401
+7402
+7403
+7404
+7405
+7406
+7407
+7408
+7409
+7410
+7411
+7412
+7413
+7414
+7415
+7416
+7417
+7418
+7419
+7420
+7421
+7422
+7423
+7424
+7425
+7426
+7427
+7428
+7429
+7430
+7431
+7432
+7433
+7434
+7435
+7436
+7437
+7438
+7439
+7440
+7441
+7442
+7443
+7444
+7445
+7446
+7447
+7448
+7449
+7450
+7451
+7452
+7453
+7454
+7455
+7456
+7457
+7458
+7459
+7460
+7461
+7462
+7463
+7464
+7465
+7466
+7467
+7468
+7469
+7470
+7471
+7472
+7473
+7474
+7475
+7476
+7477
+7478
+7479
+7480
+7481
+7482
+7483
+7484
+7485
+7486
+7487
+7488
+7489
+7490
+7491
+7492
+7493
+7494
+7495
+7496
+7497
+7498
+7499
+7500
+7501
+7502
+7503
+7504
+7505
+7506
+7507
+7508
+7509
+7510
+7511
+7512
+7513
+7514
+7515
+7516
+7517
+7518
+7519
+7520
+7521
+7522
+7523
+7524
+7525
+7526
+7527
+7528
+7529
+7530
+7531
+7532
+7533
+7534
+7535
+7536
+7537
+7538
+7539
+7540
+7541
+7542
+7543
+7544
+7545
+7546
+7547
+7548
+7549
+7550
+7551
+7552
+7553
+7554
+7555
+7556
+7557
+7558
+7559
+7560
+7561
+7562
+7563
+7564
+7565
+7566
+7567
+7568
+7569
+7570
+7571
+7572
+7573
+7574
+7575
+7576
+7577
+7578
+7579
+7580
+7581
+7582
+7583
+7584
+7585
+7586
+7587
+7588
+7589
+7590
+7591
+7592
+7593
+7594
+7595
+7596
+7597
+7598
+7599
+7600
+7601
+7602
+7603
+7604
+7605
+7606
+7607
+7608
+7609
+7610
+7611
+7612
+7613
+7614
+7615
+7616
+7617
+7618
+7619
+7620
+7621
+7622
+7623
+7624
+7625
+7626
+7627
+7628
+7629
+7630
+7631
+7632
+7633
+7634
+7635
+7636
+7637
+7638
+7639
+7640
+7641
+7642
+7643
+7644
+7645
+7646
+7647
+7648
+7649
+7650
+7651
+7652
+7653
+7654
+7655
+7656
+7657
+7658
+7659
+7660
+7661
+7662
+7663
+7664
+7665
+7666
+7667
+7668
+7669
+7670
+7671
+7672
+7673
+7674
+7675
+7676
+7677
+7678
+7679
+7680
+7681
+7682
+7683
+7684
+7685
+7686
+7687
+7688
+7689
+7690
+7691
+7692
+7693
+7694
+7695
+7696
+7697
+7698
+7699
+7700
+7701
+7702
+7703
+7704
+7705
+7706
+7707
+7708
+7709
+7710
+7711
+7712
+7713
+7714
+7715
+7716
+7717
+7718
+7719
+7720
+7721
+7722
+7723
+7724
+7725
+7726
+7727
+7728
+7729
+7730
+7731
+7732
+7733
+7734
+7735
+7736
+7737
+7738
+7739
+7740
+7741
+7742
+7743
+7744
+7745
+7746
+7747
+7748
+7749
+7750
+7751
+7752
+7753
+7754
+7755
+7756
+7757
+7758
+7759
+7760
+7761
+7762
+7763
+7764
+7765
+7766
+7767
+7768
+7769
+7770
+7771
+7772
+7773
+7774
+7775
+7776
+7777
+7778
+7779
+7780
+7781
+7782
+7783
+7784
+7785
+7786
+7787
+7788
+7789
+7790
+7791
+7792
+7793
+7794
+7795
+7796
+7797
+7798
+7799
+7800
+7801
+7802
+7803
+7804
+7805
+7806
+7807
+7808
+7809
+7810
+7811
+7812
+7813
+7814
+7815
+7816
+7817
+7818
+7819
+7820
+7821
+7822
+7823
+7824
+7825
+7826
+7827
+7828
+7829
+7830
+7831
+7832
+7833
+7834
+7835
+7836
+7837
+7838
+7839
+7840
+7841
+7842
+7843
+7844
+7845
+7846
+7847
+7848
+7849
+7850
+7851
+7852
+7853
+7854
+7855
+7856
+7857
+7858
+7859
+7860
+7861
+7862
+7863
+7864
+7865
+7866
+7867
+7868
+7869
+7870
+7871
+7872
+7873
+7874
+7875
+7876
+7877
+7878
+7879
+7880
+7881
+7882
+7883
+7884
+7885
+7886
+7887
+7888
+7889
+7890
+7891
+7892
+7893
+7894
+7895
+7896
+7897
+7898
+7899
+7900
+7901
+7902
+7903
+7904
+7905
+7906
+7907
+7908
+7909
+7910
+7911
+7912
+7913
+7914
+7915
+7916
+7917
+7918
+7919
+7920
+7921
+7922
+7923
+7924
+7925
+7926
+7927
+7928
+7929
+7930
+7931
+7932
+7933
+7934
+7935
+7936
+7937
+7938
+7939
+7940
+7941
+7942
+7943
+7944
+7945
+7946
+7947
+7948
+7949
+7950
+7951
+7952
+7953
+7954
+7955
+7956
+7957
+7958
+7959
+7960
+7961
+7962
+7963
+7964
+7965
+7966
+7967
+7968
+7969
+7970
+7971
+7972
+7973
+7974
+7975
+7976
+7977
+7978
+7979
+7980
+7981
+7982
+7983
+7984
+7985
+7986
+7987
+7988
+7989
+7990
+7991
+7992
+7993
+7994
+7995
+7996
+7997
+7998
+7999
+8000
+8001
+8002
+8003
+8004
+8005
+8006
+8007
+8008
+8009
+8010
+8011
+8012
+8013
+8014
+8015
+8016
+8017
+8018
+8019
+8020
+8021
+8022
+8023
+8024
+8025
+8026
+8027
+8028
+8029
+8030
+8031
+8032
+8033
+8034
+8035
+8036
+8037
+8038
+8039
+8040
+8041
+8042
+8043
+8044
+8045
+8046
+8047
+8048
+8049
+8050
+8051
+8052
+8053
+8054
+8055
+8056
+8057
+8058
+8059
+8060
+8061
+8062
+8063
+8064
+8065
+8066
+8067
+8068
+8069
+8070
+8071
+8072
+8073
+8074
+8075
+8076
+8077
+8078
+8079
+8080
+8081
+8082
+8083
+8084
+8085
+8086
+8087
+8088
+8089
+8090
+8091
+8092
+8093
+8094
+8095
+8096
+8097
+8098
+8099
+8100
+8101
+8102
+8103
+8104
+8105
+8106
+8107
+8108
+8109
+8110
+8111
+8112
+8113
+8114
+8115
+8116
+8117
+8118
+8119
+8120
+8121
+8122
+8123
+8124
+8125
+8126
+8127
+8128
+8129
+8130
+8131
+8132
+8133
+8134
+8135
+8136
+8137
+8138
+8139
+8140
+8141
+8142
+8143
+8144
+8145
+8146
+8147
+8148
+8149
+8150
+8151
+8152
+8153
+8154
+8155
+8156
+8157
+8158
+8159
+8160
+8161
+8162
+8163
+8164
+8165
+8166
+8167
+8168
+8169
+8170
+8171
+8172
+8173
+8174
+8175
+8176
+8177
+8178
+8179
+8180
+8181
+8182
+8183
+8184
+8185
+8186
+8187
+8188
+8189
+8190
+8191
+8192
+8193
+8194
+8195
+8196
+8197
+8198
+8199
+8200
+8201
+8202
+8203
+8204
+8205
+8206
+8207
+8208
+8209
+8210
+8211
+8212
+8213
+8214
+8215
+8216
+8217
+8218
+8219
+8220
+8221
+8222
+8223
+8224
+8225
+8226
+8227
+8228
+8229
+8230
+8231
+8232
+8233
+8234
+8235
+8236
+8237
+8238
+8239
+8240
+8241
+8242
+8243
+8244
+8245
+8246
+8247
+8248
+8249
+8250
+8251
+8252
+8253
+8254
+8255
+8256
+8257
+8258
+8259
+8260
+8261
+8262
+8263
+8264
+8265
+8266
+8267
+8268
+8269
+8270
+8271
+8272
+8273
+8274
+8275
+8276
+8277
+8278
+8279
+8280
+8281
+8282
+8283
+8284
+8285
+8286
+8287
+8288
+8289
+8290
+8291
+8292
+8293
+8294
+8295
+8296
+8297
+8298
+8299
+8300
+8301
+8302
+8303
+8304
+8305
+8306
+8307
+8308
+8309
+8310
+8311
+8312
+8313
+8314
+8315
+8316
+8317
+8318
+8319
+8320
+8321
+8322
+8323
+8324
+8325
+8326
+8327
+8328
+8329
+8330
+8331
+8332
+8333
+8334
+8335
+8336
+8337
+8338
+8339
+8340
+8341
+8342
+8343
+8344
+8345
+8346
+8347
+8348
+8349
+8350
+8351
+8352
+8353
+8354
+8355
+8356
+8357
+8358
+8359
+8360
+8361
+8362
+8363
+8364
+8365
+8366
+8367
+8368
+8369
+8370
+8371
+8372
+8373
+8374
+8375
+8376
+8377
+8378
+8379
+8380
+8381
+8382
+8383
+8384
+8385
+8386
+8387
+8388
+8389
+8390
+8391
+8392
+8393
+8394
+8395
+8396
+8397
+8398
+8399
+8400
+8401
+8402
+8403
+8404
+8405
+8406
+8407
+8408
+8409
+8410
+8411
+8412
+8413
+8414
+8415
+8416
+8417
+8418
+8419
+8420
+8421
+8422
+8423
+8424
+8425
+8426
+8427
+8428
+8429
+8430
+8431
+8432
+8433
+8434
+8435
+8436
+8437
+8438
+8439
+8440
+8441
+8442
+8443
+8444
+8445
+8446
+8447
+8448
+8449
+8450
+8451
+8452
+8453
+8454
+8455
+8456
+8457
+8458
+8459
+8460
+8461
+8462
+8463
+8464
+8465
+8466
+8467
+8468
+8469
+8470
+8471
+8472
+8473
+8474
+8475
+8476
+8477
+8478
+8479
+8480
+8481
+8482
+8483
+8484
+8485
+8486
+8487
+8488
+8489
+8490
+8491
+8492
+8493
+8494
+8495
+8496
+8497
+8498
+8499
+8500
+8501
+8502
+8503
+8504
+8505
+8506
+8507
+8508
+8509
+8510
+8511
+8512
+8513
+8514
+8515
+8516
+8517
+8518
+8519
+8520
+8521
+8522
+8523
+8524
+8525
+8526
+8527
+8528
+8529
+8530
+8531
+8532
+8533
+8534
+8535
+8536
+8537
+8538
+8539
+8540
+8541
+8542
+8543
+8544
+8545
+8546
+8547
+8548
+8549
+8550
+8551
+8552
+8553
+8554
+8555
+8556
+8557
+8558
+8559
+8560
+8561
+8562
+8563
+8564
+8565
+8566
+8567
+8568
+8569
+8570
+8571
+8572
+8573
+8574
+8575
+8576
+8577
+8578
+8579
+8580
+8581
+8582
+8583
+8584
+8585
+8586
+8587
+8588
+8589
+8590
+8591
+8592
+8593
+8594
+8595
+8596
+8597
+8598
+8599
+8600
+8601
+8602
+8603
+8604
+8605
+8606
+8607
+8608
+8609
+8610
+8611
+8612
+8613
+8614
+8615
+8616
+8617
+8618
+8619
+8620
+8621
+8622
+8623
+8624
+8625
+8626
+8627
+8628
+8629
+8630
+8631
+8632
+8633
+8634
+8635
+8636
+8637
+8638
+8639
+8640
+8641
+8642
+8643
+8644
+8645
+8646
+8647
+8648
+8649
+8650
+8651
+8652
+8653
+8654
+8655
+8656
+8657
+8658
+8659
+8660
+8661
+8662
+8663
+8664
+8665
+8666
+8667
+8668
+8669
+8670
+8671
+8672
+8673
+8674
+8675
+8676
+8677
+8678
+8679
+8680
+8681
+8682
+8683
+8684
+8685
+8686
+8687
+8688
+8689
+8690
+8691
+8692
+8693
+8694
+8695
+8696
+8697
+8698
+8699
+8700
+8701
+8702
+8703
+8704
+8705
+8706
+8707
+8708
+8709
+8710
+8711
+8712
+8713
+8714
+8715
+8716
+8717
+8718
+8719
+8720
+8721
+8722
+8723
+8724
+8725
+8726
+8727
+8728
+8729
+8730
+8731
+8732
+8733
+8734
+8735
+8736
+8737
+8738
+8739
+8740
+8741
+8742
+8743
+8744
+8745
+8746
+8747
+8748
+8749
+8750
+8751
+8752
+8753
+8754
+8755
+8756
+8757
+8758
+8759
+8760
+8761
+8762
+8763
+8764
+8765
+8766
+8767
+8768
+8769
+8770
+8771
+8772
+8773
+8774
+8775
+8776
+8777
+8778
+8779
+8780
+8781
+8782
+8783
+8784
+8785
+8786
+8787
+8788
+8789
+8790
+8791
+8792
+8793
+8794
+8795
+8796
+8797
+8798
+8799
+8800
+8801
+8802
+8803
+8804
+8805
+8806
+8807
+8808
+8809
+8810
+8811
+8812
+8813
+8814
+8815
+8816
+8817
+8818
+8819
+8820
+8821
+8822
+8823
+8824
+8825
+8826
+8827
+8828
+8829
+8830
+8831
+8832
+8833
+8834
+8835
+8836
+8837
+8838
+8839
+8840
+8841
+8842
+8843
+8844
+8845
+8846
+8847
+8848
+8849
+8850
+8851
+8852
+8853
+8854
+8855
+8856
+8857
+8858
+8859
+8860
+8861
+8862
+8863
+8864
+8865
+8866
+8867
+8868
+8869
+8870
+8871
+8872
+8873
+8874
+8875
+8876
+8877
+8878
+8879
+8880
+8881
+8882
+8883
+8884
+8885
+8886
+8887
+8888
+8889
+8890
+8891
+8892
+8893
+8894
+8895
+8896
+8897
+8898
+8899
+8900
+8901
+8902
+8903
+8904
+8905
+8906
+8907
+8908
+8909
+8910
+8911
+8912
+8913
+8914
+8915
+8916
+8917
+8918
+8919
+8920
+8921
+8922
+8923
+8924
+8925
+8926
+8927
+8928
+8929
+8930
+8931
+8932
+8933
+8934
+8935
+8936
+8937
+8938
+8939
+8940
+8941
+8942
+8943
+8944
+8945
+8946
+8947
+8948
+8949
+8950
+8951
+8952
+8953
+8954
+8955
+8956
+8957
+8958
+8959
+8960
+8961
+8962
+8963
+8964
+8965
+8966
+8967
+8968
+8969
+8970
+8971
+8972
+8973
+8974
+8975
+8976
+8977
+8978
+8979
+8980
+8981
+8982
+8983
+8984
+8985
+8986
+8987
+8988
+8989
+8990
+8991
+8992
+8993
+8994
+8995
+8996
+8997
+8998
+8999
+9000
+9001
+9002
+9003
+9004
+9005
+9006
+9007
+9008
+9009
+9010
+9011
+9012
+9013
+9014
+9015
+9016
+9017
+9018
+9019
+9020
+9021
+9022
+9023
+9024
+9025
+9026
+9027
+9028
+9029
+9030
+9031
+9032
+9033
+9034
+9035
+9036
+9037
+9038
+9039
+9040
+9041
+9042
+9043
+9044
+9045
+9046
+9047
+9048
+9049
+9050
+9051
+9052
+9053
+9054
+9055
+9056
+9057
+9058
+9059
+9060
+9061
+9062
+9063
+9064
+9065
+9066
+9067
+9068
+9069
+9070
+9071
+9072
+9073
+9074
+9075
+9076
+9077
+9078
+9079
+9080
+9081
+9082
+9083
+9084
+9085
+9086
+9087
+9088
+9089
+9090
+9091
+9092
+9093
+9094
+9095
+9096
+9097
+9098
+9099
+9100
+9101
+9102
+9103
+9104
+9105
+9106
+9107
+9108
+9109
+9110
+9111
+9112
+9113
+9114
+9115
+9116
+9117
+9118
+9119
+9120
+9121
+9122
+9123
+9124
+9125
+9126
+9127
+9128
+9129
+9130
+9131
+9132
+9133
+9134
+9135
+9136
+9137
+9138
+9139
+9140
+9141
+9142
+9143
+9144
+9145
+9146
+9147
+9148
+9149
+9150
+9151
+9152
+9153
+9154
+9155
+9156
+9157
+9158
+9159
+9160
+9161
+9162
+9163
+9164
+9165
+9166
+9167
+9168
+9169
+9170
+9171
+9172
+9173
+9174
+9175
+9176
+9177
+9178
+9179
+9180
+9181
+9182
+9183
+9184
+9185
+9186
+9187
+9188
+9189
+9190
+9191
+9192
+9193
+9194
+9195
+9196
+9197
+9198
+9199
+9200
+9201
+9202
+9203
+9204
+9205
+9206
+9207
+9208
+9209
+9210
+9211
+9212
+9213
+9214
+9215
+9216
+9217
+9218
+9219
+9220
+9221
+9222
+9223
+9224
+9225
+9226
+9227
+9228
+9229
+9230
+9231
+9232
+9233
+9234
+9235
+9236
+9237
+9238
+9239
+9240
+9241
+9242
+9243
+9244
+9245
+9246
+9247
+9248
+9249
+9250
+9251
+9252
+9253
+9254
+9255
+9256
+9257
+9258
+9259
+9260
+9261
+9262
+9263
+9264
+9265
+9266
+9267
+9268
+9269
+9270
+9271
+9272
+9273
+9274
+9275
+9276
+9277
+9278
+9279
+9280
+9281
+9282
+9283
+9284
+9285
+9286
+9287
+9288
+9289
+9290
+9291
+9292
+9293
+9294
+9295
+9296
+9297
+9298
+9299
+9300
+9301
+9302
+9303
+9304
+9305
+9306
+9307
+9308
+9309
+9310
+9311
+9312
+9313
+9314
+9315
+9316
+9317
+9318
+9319
+9320
+9321
+9322
+9323
+9324
+9325
+9326
+9327
+9328
+9329
+9330
+9331
+9332
+9333
+9334
+9335
+9336
+9337
+9338
+9339
+9340
+9341
+9342
+9343
+9344
+9345
+9346
+9347
+9348
+9349
+9350
+9351
+9352
+9353
+9354
+9355
+9356
+9357
+9358
+9359
+9360
+9361
+9362
+9363
+9364
+9365
+9366
+9367
+9368
+9369
+9370
+9371
+9372
+9373
+9374
+9375
+9376
+9377
+9378
+9379
+9380
+9381
+9382
+9383
+9384
+9385
+9386
+9387
+9388
+9389
+9390
+9391
+9392
+9393
+9394
+9395
+9396
+9397
+9398
+9399
+9400
+9401
+9402
+9403
+9404
+9405
+9406
+9407
+9408
+9409
+9410
+9411
+9412
+9413
+9414
+9415
+9416
+9417
+9418
+9419
+9420
+9421
+9422
+9423
+9424
+9425
+9426
+9427
+9428
+9429
+9430
+9431
+9432
+9433
+9434
+9435
+9436
+9437
+9438
+9439
+9440
+9441
+9442
+9443
+9444
+9445
+9446
+9447
+9448
+9449
+9450
+9451
+9452
+9453
+9454
+9455
+9456
+9457
+9458
+9459
+9460
+9461
+9462
+9463
+9464
+9465
+9466
+9467
+9468
+9469
+9470
+9471
+9472
+9473
+9474
+9475
+9476
+9477
+9478
+9479
+9480
+9481
+9482
+9483
+9484
+9485
+9486
+9487
+9488
+9489
+9490
+9491
+9492
+9493
+9494
+9495
+9496
+9497
+9498
+9499
+9500
+9501
+9502
+9503
+9504
+9505
+9506
+9507
+9508
+9509
+9510
+9511
+9512
+9513
+9514
+9515
+9516
+9517
+9518
+9519
+9520
+9521
+9522
+9523
+9524
+9525
+9526
+9527
+9528
+9529
+9530
+9531
+9532
+9533
+9534
+9535
+9536
+9537
+9538
+9539
+9540
+9541
+9542
+9543
+9544
+9545
+9546
+9547
+9548
+9549
+9550
+9551
+9552
+9553
+9554
+9555
+9556
+9557
+9558
+9559
+9560
+9561
+9562
+9563
+9564
+9565
+9566
+9567
+9568
+9569
+9570
+9571
+9572
+9573
+9574
+9575
+9576
+9577
+9578
+9579
+9580
+9581
+9582
+9583
+9584
+9585
+9586
+9587
+9588
+9589
+9590
+9591
+9592
+9593
+9594
+9595
+9596
+9597
+9598
+9599
+9600
+9601
+9602
+9603
+9604
+9605
+9606
+9607
+9608
+9609
+9610
+9611
+9612
+9613
+9614
+9615
+9616
+9617
+9618
+9619
+9620
+9621
+9622
+9623
+9624
+9625
+9626
+9627
+9628
+9629
+9630
+9631
+9632
+9633
+9634
+9635
+9636
+9637
+9638
+9639
+9640
+9641
+9642
+9643
+9644
+9645
+9646
+9647
+9648
+9649
+9650
+9651
+9652
+9653
+9654
+9655
+9656
+9657
+9658
+9659
+9660
+9661
+9662
+9663
+9664
+9665
+9666
+9667
+9668
+9669
+9670
+9671
+9672
+9673
+9674
+9675
+9676
+9677
+9678
+9679
+9680
+9681
+9682
+9683
+9684
+9685
+9686
+9687
+9688
+9689
+9690
+9691
+9692
+9693
+9694
+9695
+9696
+9697
+9698
+9699
+9700
+9701
+9702
+9703
+9704
+9705
+9706
+9707
+9708
+9709
+9710
+9711
+9712
+9713
+9714
+9715
+9716
+9717
+9718
+9719
+9720
+9721
+9722
+9723
+9724
+9725
+9726
+9727
+9728
+9729
+9730
+9731
+9732
+9733
+9734
+9735
+9736
+9737
+9738
+9739
+9740
+9741
+9742
+9743
+9744
+9745
+9746
+9747
+9748
+9749
+9750
+9751
+9752
+9753
+9754
+9755
+9756
+9757
+9758
+9759
+9760
+9761
+9762
+9763
+9764
+9765
+9766
+9767
+9768
+9769
+9770
+9771
+9772
+9773
+9774
+9775
+9776
+9777
+9778
+9779
+9780
+9781
+9782
+9783
+9784
+9785
+9786
+9787
+9788
+9789
+9790
+9791
+9792
+9793
+9794
+9795
+9796
+9797
+9798
+9799
+9800
+9801
+9802
+9803
+9804
+9805
+9806
+9807
+9808
+9809
+9810
+9811
+9812
+9813
+9814
+9815
+9816
+9817
+9818
+9819
+9820
+9821
+9822
+9823
+9824
+9825
+9826
+9827
+9828
+9829
+9830
+9831
+9832
+9833
+9834
+9835
+9836
+9837
+9838
+9839
+9840
+9841
+9842
+9843
+9844
+9845
+9846
+9847
+9848
+9849
+9850
+9851
+9852
+9853
+9854
+9855
+9856
+9857
+9858
+9859
+9860
+9861
+9862
+9863
+9864
+9865
+9866
+9867
+9868
+9869
+9870
+9871
+9872
+9873
+9874
+9875
+9876
+9877
+9878
+9879
+9880
+9881
+9882
+9883
+9884
+9885
+9886
+9887
+9888
+9889
+9890
+9891
+9892
+9893
+9894
+9895
+9896
+9897
+9898
+9899
+9900
+9901
+9902
+9903
+9904
+9905
+9906
+9907
+9908
+9909
+9910
+9911
+9912
+9913
+9914
+9915
+9916
+9917
+9918
+9919
+9920
+9921
+9922
+9923
+9924
+9925
+9926
+9927
+9928
+9929
+9930
+9931
+9932
+9933
+9934
+9935
+9936
+9937
+9938
+9939
+9940
+9941
+9942
+9943
+9944
+9945
+9946
+9947
+9948
+9949
+9950
+9951
+9952
+9953
+9954
+9955
+9956
+9957
+9958
+9959
+9960
+9961
+9962
+9963
+9964
+9965
+9966
+9967
+9968
+9969
+9970
+9971
+9972
+9973
+9974
+9975
+9976
+9977
+9978
+9979
+9980
+9981
+9982
+9983
+9984
+9985
+9986
+9987
+9988
+9989
+9990
+9991
+9992
+9993
+9994
+9995
+9996
+9997
+9998
+9999
diff --git a/core-java-io/pom.xml b/core-java-modules/core-java-io/pom.xml
similarity index 99%
rename from core-java-io/pom.xml
rename to core-java-modules/core-java-io/pom.xml
index b6f8a317f6..44c703ee68 100644
--- a/core-java-io/pom.xml
+++ b/core-java-modules/core-java-io/pom.xml
@@ -10,7 +10,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-io/src/main/java/com/baeldung/bufferedreader/BufferedReaderExample.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/bufferedreader/BufferedReaderExample.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/bufferedreader/BufferedReaderExample.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/bufferedreader/BufferedReaderExample.java
diff --git a/core-java-io/src/main/java/com/baeldung/csv/WriteCsvFileExample.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/csv/WriteCsvFileExample.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/csv/WriteCsvFileExample.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/csv/WriteCsvFileExample.java
diff --git a/core-java-io/src/main/java/com/baeldung/dirmonitoring/DirectoryMonitoringExample.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/dirmonitoring/DirectoryMonitoringExample.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/dirmonitoring/DirectoryMonitoringExample.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/dirmonitoring/DirectoryMonitoringExample.java
diff --git a/core-java-io/src/main/java/com/baeldung/download/FileDownload.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/download/FileDownload.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/download/FileDownload.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/download/FileDownload.java
diff --git a/core-java-io/src/main/java/com/baeldung/download/ResumableDownload.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/download/ResumableDownload.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/download/ResumableDownload.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/download/ResumableDownload.java
diff --git a/core-java-io/src/main/java/com/baeldung/extension/Extension.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/extension/Extension.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/extension/Extension.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/extension/Extension.java
diff --git a/core-java-io/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java
diff --git a/core-java-io/src/main/java/com/baeldung/fileparser/FileReaderExample.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/fileparser/FileReaderExample.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/fileparser/FileReaderExample.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/fileparser/FileReaderExample.java
diff --git a/core-java-io/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java
diff --git a/core-java-io/src/main/java/com/baeldung/fileparser/ScannerIntExample.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/fileparser/ScannerIntExample.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/fileparser/ScannerIntExample.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/fileparser/ScannerIntExample.java
diff --git a/core-java-io/src/main/java/com/baeldung/fileparser/ScannerStringExample.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/fileparser/ScannerStringExample.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/fileparser/ScannerStringExample.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/fileparser/ScannerStringExample.java
diff --git a/core-java-io/src/main/java/com/baeldung/files/ListFiles.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/files/ListFiles.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/files/ListFiles.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/files/ListFiles.java
diff --git a/core-java-io/src/main/java/com/baeldung/filesystem/jndi/LookupFSJNDI.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/filesystem/jndi/LookupFSJNDI.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/filesystem/jndi/LookupFSJNDI.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/filesystem/jndi/LookupFSJNDI.java
diff --git a/core-java-io/src/main/java/com/baeldung/java/nio/selector/EchoClient.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/java/nio/selector/EchoClient.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/java/nio/selector/EchoClient.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/java/nio/selector/EchoClient.java
diff --git a/core-java-io/src/main/java/com/baeldung/java/nio/selector/EchoServer.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/java/nio/selector/EchoServer.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/java/nio/selector/EchoServer.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/java/nio/selector/EchoServer.java
diff --git a/core-java-io/src/main/java/com/baeldung/java/nio/selector/README.md b/core-java-modules/core-java-io/src/main/java/com/baeldung/java/nio/selector/README.md
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/java/nio/selector/README.md
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/java/nio/selector/README.md
diff --git a/core-java-io/src/main/java/com/baeldung/java/nio2/visitor/FileSearchExample.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/java/nio2/visitor/FileSearchExample.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/java/nio2/visitor/FileSearchExample.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/java/nio2/visitor/FileSearchExample.java
diff --git a/core-java-io/src/main/java/com/baeldung/java/nio2/visitor/FileVisitorImpl.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/java/nio2/visitor/FileVisitorImpl.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/java/nio2/visitor/FileVisitorImpl.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/java/nio2/visitor/FileVisitorImpl.java
diff --git a/core-java-io/src/main/java/com/baeldung/java/nio2/watcher/DirectoryWatcherExample.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/java/nio2/watcher/DirectoryWatcherExample.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/java/nio2/watcher/DirectoryWatcherExample.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/java/nio2/watcher/DirectoryWatcherExample.java
diff --git a/core-java-io/src/main/java/com/baeldung/stream/FileCopy.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/stream/FileCopy.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/stream/FileCopy.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/stream/FileCopy.java
diff --git a/core-java-io/src/main/java/com/baeldung/stream/OutputStreamExamples.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/stream/OutputStreamExamples.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/stream/OutputStreamExamples.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/stream/OutputStreamExamples.java
diff --git a/core-java-io/src/main/java/com/baeldung/symlink/SymLinkExample.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/symlink/SymLinkExample.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/symlink/SymLinkExample.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/symlink/SymLinkExample.java
diff --git a/core-java-io/src/main/java/com/baeldung/unzip/UnzipFile.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/unzip/UnzipFile.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/unzip/UnzipFile.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/unzip/UnzipFile.java
diff --git a/core-java-io/src/main/java/com/baeldung/util/StreamUtils.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/util/StreamUtils.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/util/StreamUtils.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/util/StreamUtils.java
diff --git a/core-java-io/src/main/java/com/baeldung/zip/ZipDirectory.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/zip/ZipDirectory.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/zip/ZipDirectory.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/zip/ZipDirectory.java
diff --git a/core-java-io/src/main/java/com/baeldung/zip/ZipFile.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/zip/ZipFile.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/zip/ZipFile.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/zip/ZipFile.java
diff --git a/core-java-io/src/main/java/com/baeldung/zip/ZipMultipleFiles.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/zip/ZipMultipleFiles.java
similarity index 100%
rename from core-java-io/src/main/java/com/baeldung/zip/ZipMultipleFiles.java
rename to core-java-modules/core-java-io/src/main/java/com/baeldung/zip/ZipMultipleFiles.java
diff --git a/core-java-io/src/main/resources/ESAPI.properties b/core-java-modules/core-java-io/src/main/resources/ESAPI.properties
similarity index 100%
rename from core-java-io/src/main/resources/ESAPI.properties
rename to core-java-modules/core-java-io/src/main/resources/ESAPI.properties
diff --git a/core-java-io/src/main/resources/META-INF/BenchmarkList b/core-java-modules/core-java-io/src/main/resources/META-INF/BenchmarkList
old mode 100755
new mode 100644
similarity index 100%
rename from core-java-io/src/main/resources/META-INF/BenchmarkList
rename to core-java-modules/core-java-io/src/main/resources/META-INF/BenchmarkList
diff --git a/core-java-io/src/main/resources/META-INF/persistence.xml b/core-java-modules/core-java-io/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from core-java-io/src/main/resources/META-INF/persistence.xml
rename to core-java-modules/core-java-io/src/main/resources/META-INF/persistence.xml
diff --git a/core-java-io/src/main/resources/META-INF/services/com.sun.source.util.Plugin b/core-java-modules/core-java-io/src/main/resources/META-INF/services/com.sun.source.util.Plugin
similarity index 100%
rename from core-java-io/src/main/resources/META-INF/services/com.sun.source.util.Plugin
rename to core-java-modules/core-java-io/src/main/resources/META-INF/services/com.sun.source.util.Plugin
diff --git a/core-java-io/src/main/resources/countries.properties b/core-java-modules/core-java-io/src/main/resources/countries.properties
similarity index 82%
rename from core-java-io/src/main/resources/countries.properties
rename to core-java-modules/core-java-io/src/main/resources/countries.properties
index e743b5a40b..3c1f53aded 100644
--- a/core-java-io/src/main/resources/countries.properties
+++ b/core-java-modules/core-java-io/src/main/resources/countries.properties
@@ -1,3 +1,3 @@
-UK
-US
-Germany
+UK
+US
+Germany
diff --git a/core-java-io/src/main/resources/data.csv b/core-java-modules/core-java-io/src/main/resources/data.csv
similarity index 100%
rename from core-java-io/src/main/resources/data.csv
rename to core-java-modules/core-java-io/src/main/resources/data.csv
diff --git a/core-java-io/src/main/resources/datasource.properties b/core-java-modules/core-java-io/src/main/resources/datasource.properties
similarity index 100%
rename from core-java-io/src/main/resources/datasource.properties
rename to core-java-modules/core-java-io/src/main/resources/datasource.properties
diff --git a/core-java-io/src/main/resources/dirCompressed.zip b/core-java-modules/core-java-io/src/main/resources/dirCompressed.zip
similarity index 100%
rename from core-java-io/src/main/resources/dirCompressed.zip
rename to core-java-modules/core-java-io/src/main/resources/dirCompressed.zip
diff --git a/core-java-io/src/main/resources/input.txt b/core-java-modules/core-java-io/src/main/resources/input.txt
similarity index 100%
rename from core-java-io/src/main/resources/input.txt
rename to core-java-modules/core-java-io/src/main/resources/input.txt
diff --git a/core-java-io/src/main/resources/js/bind.js b/core-java-modules/core-java-io/src/main/resources/js/bind.js
similarity index 100%
rename from core-java-io/src/main/resources/js/bind.js
rename to core-java-modules/core-java-io/src/main/resources/js/bind.js
diff --git a/core-java-io/src/main/resources/js/locations.js b/core-java-modules/core-java-io/src/main/resources/js/locations.js
similarity index 100%
rename from core-java-io/src/main/resources/js/locations.js
rename to core-java-modules/core-java-io/src/main/resources/js/locations.js
diff --git a/core-java-io/src/main/resources/js/math_module.js b/core-java-modules/core-java-io/src/main/resources/js/math_module.js
similarity index 100%
rename from core-java-io/src/main/resources/js/math_module.js
rename to core-java-modules/core-java-io/src/main/resources/js/math_module.js
diff --git a/core-java-io/src/main/resources/js/no_such.js b/core-java-modules/core-java-io/src/main/resources/js/no_such.js
similarity index 100%
rename from core-java-io/src/main/resources/js/no_such.js
rename to core-java-modules/core-java-io/src/main/resources/js/no_such.js
diff --git a/core-java-io/src/main/resources/js/script.js b/core-java-modules/core-java-io/src/main/resources/js/script.js
similarity index 100%
rename from core-java-io/src/main/resources/js/script.js
rename to core-java-modules/core-java-io/src/main/resources/js/script.js
diff --git a/core-java-io/src/main/resources/js/trim.js b/core-java-modules/core-java-io/src/main/resources/js/trim.js
similarity index 100%
rename from core-java-io/src/main/resources/js/trim.js
rename to core-java-modules/core-java-io/src/main/resources/js/trim.js
diff --git a/core-java-io/src/main/resources/js/typed_arrays.js b/core-java-modules/core-java-io/src/main/resources/js/typed_arrays.js
similarity index 100%
rename from core-java-io/src/main/resources/js/typed_arrays.js
rename to core-java-modules/core-java-io/src/main/resources/js/typed_arrays.js
diff --git a/core-java-io/src/main/resources/log4j.properties b/core-java-modules/core-java-io/src/main/resources/log4j.properties
similarity index 100%
rename from core-java-io/src/main/resources/log4j.properties
rename to core-java-modules/core-java-io/src/main/resources/log4j.properties
diff --git a/core-java-io/src/main/resources/log4jstructuraldp.properties b/core-java-modules/core-java-io/src/main/resources/log4jstructuraldp.properties
similarity index 100%
rename from core-java-io/src/main/resources/log4jstructuraldp.properties
rename to core-java-modules/core-java-io/src/main/resources/log4jstructuraldp.properties
diff --git a/core-java-io/src/main/resources/logback.xml b/core-java-modules/core-java-io/src/main/resources/logback.xml
similarity index 100%
rename from core-java-io/src/main/resources/logback.xml
rename to core-java-modules/core-java-io/src/main/resources/logback.xml
diff --git a/core-java-io/src/main/resources/multiCompressed.zip b/core-java-modules/core-java-io/src/main/resources/multiCompressed.zip
similarity index 100%
rename from core-java-io/src/main/resources/multiCompressed.zip
rename to core-java-modules/core-java-io/src/main/resources/multiCompressed.zip
diff --git a/core-java-io/src/main/resources/unzipTest/compressed.zip b/core-java-modules/core-java-io/src/main/resources/unzipTest/compressed.zip
similarity index 100%
rename from core-java-io/src/main/resources/unzipTest/compressed.zip
rename to core-java-modules/core-java-io/src/main/resources/unzipTest/compressed.zip
diff --git a/core-java-io/src/main/resources/zipTest/test1.txt b/core-java-modules/core-java-io/src/main/resources/zipTest/test1.txt
similarity index 100%
rename from core-java-io/src/main/resources/zipTest/test1.txt
rename to core-java-modules/core-java-io/src/main/resources/zipTest/test1.txt
diff --git a/core-java-io/src/main/resources/zipTest/test2.txt b/core-java-modules/core-java-io/src/main/resources/zipTest/test2.txt
similarity index 100%
rename from core-java-io/src/main/resources/zipTest/test2.txt
rename to core-java-modules/core-java-io/src/main/resources/zipTest/test2.txt
diff --git a/core-java-io/src/test/java/com/baeldung/bufferedreader/BufferedReaderExampleUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/bufferedreader/BufferedReaderExampleUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/bufferedreader/BufferedReaderExampleUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/bufferedreader/BufferedReaderExampleUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/bufferedreader/BufferedReaderUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/bufferedreader/BufferedReaderUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/bufferedreader/BufferedReaderUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/bufferedreader/BufferedReaderUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/copyfiles/FileCopierIntegrationTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/copyfiles/FileCopierIntegrationTest.java
similarity index 97%
rename from core-java-io/src/test/java/com/baeldung/copyfiles/FileCopierIntegrationTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/copyfiles/FileCopierIntegrationTest.java
index 4603644bf5..2b4a15ed59 100644
--- a/core-java-io/src/test/java/com/baeldung/copyfiles/FileCopierIntegrationTest.java
+++ b/core-java-modules/core-java-io/src/test/java/com/baeldung/copyfiles/FileCopierIntegrationTest.java
@@ -1,69 +1,69 @@
-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.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 FileCopierIntegrationTest {
-    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");
-        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())));
-    }
-}
+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.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 FileCopierIntegrationTest {
+    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");
+        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())));
+    }
+}
diff --git a/core-java-io/src/test/java/com/baeldung/csv/ReadCSVInArrayUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/csv/ReadCSVInArrayUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/csv/ReadCSVInArrayUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/csv/ReadCSVInArrayUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/csv/WriteCsvFileExampleUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/csv/WriteCsvFileExampleUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/csv/WriteCsvFileExampleUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/csv/WriteCsvFileExampleUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/directories/NewDirectoryUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/directories/NewDirectoryUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/directories/NewDirectoryUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/directories/NewDirectoryUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/download/FileDownloadIntegrationTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/download/FileDownloadIntegrationTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/download/FileDownloadIntegrationTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/download/FileDownloadIntegrationTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/extension/ExtensionUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/extension/ExtensionUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/extension/ExtensionUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/extension/ExtensionUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/file/FileOperationsManualTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/file/FileOperationsManualTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/file/FileOperationsManualTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/file/FileOperationsManualTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/file/FilenameFilterManualTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/file/FilenameFilterManualTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/file/FilenameFilterManualTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/file/FilenameFilterManualTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/file/FilesClearDataUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/file/FilesClearDataUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/file/FilesClearDataUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/file/FilesClearDataUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/file/FilesManualTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/file/FilesManualTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/file/FilesManualTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/file/FilesManualTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/file/ListFilesUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/file/ListFilesUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/file/ListFilesUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/file/ListFilesUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/filechannel/FileChannelUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/filechannel/FileChannelUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/filechannel/FileChannelUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/filechannel/FileChannelUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/filesystem/jndi/test/LookupFSJNDIIntegrationTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/filesystem/jndi/test/LookupFSJNDIIntegrationTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/filesystem/jndi/test/LookupFSJNDIIntegrationTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/filesystem/jndi/test/LookupFSJNDIIntegrationTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/java/mimetype/MimeTypeUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/java/mimetype/MimeTypeUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/java/mimetype/MimeTypeUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/java/mimetype/MimeTypeUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/java/nio/selector/NioEchoLiveTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio/selector/NioEchoLiveTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/java/nio/selector/NioEchoLiveTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio/selector/NioEchoLiveTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/java/nio2/FileIntegrationTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/FileIntegrationTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/java/nio2/FileIntegrationTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/FileIntegrationTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/java/nio2/PathManualTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/PathManualTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/java/nio2/PathManualTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/PathManualTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/java/nio2/README.md b/core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/README.md
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/java/nio2/README.md
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/README.md
diff --git a/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoClient.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoClient.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoClient.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoClient.java
diff --git a/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoIntegrationTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoIntegrationTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoIntegrationTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoIntegrationTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoServer.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoServer.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoServer.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoServer.java
diff --git a/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoServer2.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoServer2.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoServer2.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncEchoServer2.java
diff --git a/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncFileIntegrationTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncFileIntegrationTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncFileIntegrationTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/async/AsyncFileIntegrationTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/java/nio2/attributes/BasicAttribsIntegrationTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/attributes/BasicAttribsIntegrationTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/java/nio2/attributes/BasicAttribsIntegrationTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/java/nio2/attributes/BasicAttribsIntegrationTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/java8/JavaFileSizeUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/java8/JavaFileSizeUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/java8/JavaFileSizeUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/java8/JavaFileSizeUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/java8/JavaFolderSizeUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/java8/JavaFolderSizeUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/java8/JavaFolderSizeUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/java8/JavaFolderSizeUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/stream/FileCopyUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/stream/FileCopyUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/stream/FileCopyUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/stream/FileCopyUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/stream/OutputStreamExamplesUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/stream/OutputStreamExamplesUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/stream/OutputStreamExamplesUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/stream/OutputStreamExamplesUnitTest.java
diff --git a/core-java-io/src/test/java/com/baeldung/symlink/SymLinkExampleManualTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/symlink/SymLinkExampleManualTest.java
similarity index 100%
rename from core-java-io/src/test/java/com/baeldung/symlink/SymLinkExampleManualTest.java
rename to core-java-modules/core-java-io/src/test/java/com/baeldung/symlink/SymLinkExampleManualTest.java
diff --git a/core-java-io/src/test/java/org/baeldung/core/exceptions/FileNotFoundExceptionUnitTest.java b/core-java-modules/core-java-io/src/test/java/org/baeldung/core/exceptions/FileNotFoundExceptionUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/org/baeldung/core/exceptions/FileNotFoundExceptionUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/org/baeldung/core/exceptions/FileNotFoundExceptionUnitTest.java
diff --git a/core-java-io/src/test/java/org/baeldung/java/io/InputStreamToByteBufferUnitTest.java b/core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/InputStreamToByteBufferUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/org/baeldung/java/io/InputStreamToByteBufferUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/InputStreamToByteBufferUnitTest.java
diff --git a/core-java-io/src/test/java/org/baeldung/java/io/JavaFilePathUnitTest.java b/core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaFilePathUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/org/baeldung/java/io/JavaFilePathUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaFilePathUnitTest.java
diff --git a/core-java-io/src/test/java/org/baeldung/java/io/JavaFileUnitTest.java b/core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaFileUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/org/baeldung/java/io/JavaFileUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaFileUnitTest.java
diff --git a/core-java-io/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java b/core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java
diff --git a/core-java-io/src/test/java/org/baeldung/java/io/JavaReadFromFileUnitTest.java b/core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaReadFromFileUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/org/baeldung/java/io/JavaReadFromFileUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaReadFromFileUnitTest.java
diff --git a/core-java-io/src/test/java/org/baeldung/java/io/JavaReaderToXUnitTest.java b/core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaReaderToXUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/org/baeldung/java/io/JavaReaderToXUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaReaderToXUnitTest.java
diff --git a/core-java-io/src/test/java/org/baeldung/java/io/JavaScannerUnitTest.java b/core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaScannerUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/org/baeldung/java/io/JavaScannerUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaScannerUnitTest.java
diff --git a/core-java-io/src/test/java/org/baeldung/java/io/JavaWriteToFileUnitTest.java b/core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaWriteToFileUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/org/baeldung/java/io/JavaWriteToFileUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaWriteToFileUnitTest.java
diff --git a/core-java-io/src/test/java/org/baeldung/java/io/JavaXToByteArrayUnitTest.java b/core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaXToByteArrayUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/org/baeldung/java/io/JavaXToByteArrayUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaXToByteArrayUnitTest.java
diff --git a/core-java-io/src/test/java/org/baeldung/java/io/JavaXToInputStreamUnitTest.java b/core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaXToInputStreamUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/org/baeldung/java/io/JavaXToInputStreamUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaXToInputStreamUnitTest.java
diff --git a/core-java-io/src/test/java/org/baeldung/java/io/JavaXToReaderUnitTest.java b/core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaXToReaderUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/org/baeldung/java/io/JavaXToReaderUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaXToReaderUnitTest.java
diff --git a/core-java-io/src/test/java/org/baeldung/java/io/JavaXToWriterUnitTest.java b/core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaXToWriterUnitTest.java
similarity index 100%
rename from core-java-io/src/test/java/org/baeldung/java/io/JavaXToWriterUnitTest.java
rename to core-java-modules/core-java-io/src/test/java/org/baeldung/java/io/JavaXToWriterUnitTest.java
diff --git a/core-java-io/src/test/resources/.gitignore b/core-java-modules/core-java-io/src/test/resources/.gitignore
similarity index 100%
rename from core-java-io/src/test/resources/.gitignore
rename to core-java-modules/core-java-io/src/test/resources/.gitignore
diff --git a/core-java-io/src/test/resources/META-INF/mime.types b/core-java-modules/core-java-io/src/test/resources/META-INF/mime.types
similarity index 100%
rename from core-java-io/src/test/resources/META-INF/mime.types
rename to core-java-modules/core-java-io/src/test/resources/META-INF/mime.types
diff --git a/core-java-io/src/test/resources/anothersample.txt b/core-java-modules/core-java-io/src/test/resources/anothersample.txt
similarity index 100%
rename from core-java-io/src/test/resources/anothersample.txt
rename to core-java-modules/core-java-io/src/test/resources/anothersample.txt
diff --git a/core-java-io/src/test/resources/book.csv b/core-java-modules/core-java-io/src/test/resources/book.csv
similarity index 100%
rename from core-java-io/src/test/resources/book.csv
rename to core-java-modules/core-java-io/src/test/resources/book.csv
diff --git a/core-java-io/src/test/resources/configuration.properties b/core-java-modules/core-java-io/src/test/resources/configuration.properties
similarity index 100%
rename from core-java-io/src/test/resources/configuration.properties
rename to core-java-modules/core-java-io/src/test/resources/configuration.properties
diff --git a/core-java-io/src/test/resources/copiedWithApacheCommons.txt b/core-java-modules/core-java-io/src/test/resources/copiedWithApacheCommons.txt
similarity index 100%
rename from core-java-io/src/test/resources/copiedWithApacheCommons.txt
rename to core-java-modules/core-java-io/src/test/resources/copiedWithApacheCommons.txt
diff --git a/core-java-io/src/test/resources/copiedWithIo.txt b/core-java-modules/core-java-io/src/test/resources/copiedWithIo.txt
similarity index 100%
rename from core-java-io/src/test/resources/copiedWithIo.txt
rename to core-java-modules/core-java-io/src/test/resources/copiedWithIo.txt
diff --git a/core-java-io/src/test/resources/copiedWithNio.txt b/core-java-modules/core-java-io/src/test/resources/copiedWithNio.txt
similarity index 100%
rename from core-java-io/src/test/resources/copiedWithNio.txt
rename to core-java-modules/core-java-io/src/test/resources/copiedWithNio.txt
diff --git a/core-java-io/src/test/resources/copyTest/dest/readme.txt b/core-java-modules/core-java-io/src/test/resources/copyTest/dest/readme.txt
similarity index 100%
rename from core-java-io/src/test/resources/copyTest/dest/readme.txt
rename to core-java-modules/core-java-io/src/test/resources/copyTest/dest/readme.txt
diff --git a/core-java-io/src/test/resources/copyTest/src/test_apache.txt b/core-java-modules/core-java-io/src/test/resources/copyTest/src/test_apache.txt
similarity index 100%
rename from core-java-io/src/test/resources/copyTest/src/test_apache.txt
rename to core-java-modules/core-java-io/src/test/resources/copyTest/src/test_apache.txt
diff --git a/core-java-io/src/test/resources/copyTest/src/test_channel.txt b/core-java-modules/core-java-io/src/test/resources/copyTest/src/test_channel.txt
similarity index 100%
rename from core-java-io/src/test/resources/copyTest/src/test_channel.txt
rename to core-java-modules/core-java-io/src/test/resources/copyTest/src/test_channel.txt
diff --git a/core-java-io/src/test/resources/copyTest/src/test_files.txt b/core-java-modules/core-java-io/src/test/resources/copyTest/src/test_files.txt
similarity index 100%
rename from core-java-io/src/test/resources/copyTest/src/test_files.txt
rename to core-java-modules/core-java-io/src/test/resources/copyTest/src/test_files.txt
diff --git a/core-java-io/src/test/resources/copyTest/src/test_stream.txt b/core-java-modules/core-java-io/src/test/resources/copyTest/src/test_stream.txt
similarity index 100%
rename from core-java-io/src/test/resources/copyTest/src/test_stream.txt
rename to core-java-modules/core-java-io/src/test/resources/copyTest/src/test_stream.txt
diff --git a/core-java-io/src/test/resources/dictionary.in b/core-java-modules/core-java-io/src/test/resources/dictionary.in
similarity index 100%
rename from core-java-io/src/test/resources/dictionary.in
rename to core-java-modules/core-java-io/src/test/resources/dictionary.in
diff --git a/core-java-io/src/test/resources/file.txt b/core-java-modules/core-java-io/src/test/resources/file.txt
similarity index 100%
rename from core-java-io/src/test/resources/file.txt
rename to core-java-modules/core-java-io/src/test/resources/file.txt
diff --git a/core-java-io/src/test/resources/fileNameFilterManualTestFolder/people.json b/core-java-modules/core-java-io/src/test/resources/fileNameFilterManualTestFolder/people.json
similarity index 100%
rename from core-java-io/src/test/resources/fileNameFilterManualTestFolder/people.json
rename to core-java-modules/core-java-io/src/test/resources/fileNameFilterManualTestFolder/people.json
diff --git a/core-java-io/src/test/resources/fileNameFilterManualTestFolder/students.json b/core-java-modules/core-java-io/src/test/resources/fileNameFilterManualTestFolder/students.json
similarity index 100%
rename from core-java-io/src/test/resources/fileNameFilterManualTestFolder/students.json
rename to core-java-modules/core-java-io/src/test/resources/fileNameFilterManualTestFolder/students.json
diff --git a/core-java-io/src/test/resources/fileNameFilterManualTestFolder/teachers.xml b/core-java-modules/core-java-io/src/test/resources/fileNameFilterManualTestFolder/teachers.xml
similarity index 100%
rename from core-java-io/src/test/resources/fileNameFilterManualTestFolder/teachers.xml
rename to core-java-modules/core-java-io/src/test/resources/fileNameFilterManualTestFolder/teachers.xml
diff --git a/core-java-io/src/test/resources/fileNameFilterManualTestFolder/workers.xml b/core-java-modules/core-java-io/src/test/resources/fileNameFilterManualTestFolder/workers.xml
similarity index 100%
rename from core-java-io/src/test/resources/fileNameFilterManualTestFolder/workers.xml
rename to core-java-modules/core-java-io/src/test/resources/fileNameFilterManualTestFolder/workers.xml
diff --git a/core-java-io/src/test/resources/fileTest.txt b/core-java-modules/core-java-io/src/test/resources/fileTest.txt
similarity index 100%
rename from core-java-io/src/test/resources/fileTest.txt
rename to core-java-modules/core-java-io/src/test/resources/fileTest.txt
diff --git a/core-java-io/src/test/resources/fileToRead.txt b/core-java-modules/core-java-io/src/test/resources/fileToRead.txt
similarity index 100%
rename from core-java-io/src/test/resources/fileToRead.txt
rename to core-java-modules/core-java-io/src/test/resources/fileToRead.txt
diff --git a/core-java-io/src/test/resources/fileToWriteTo.txt b/core-java-modules/core-java-io/src/test/resources/fileToWriteTo.txt
similarity index 100%
rename from core-java-io/src/test/resources/fileToWriteTo.txt
rename to core-java-modules/core-java-io/src/test/resources/fileToWriteTo.txt
diff --git a/core-java-io/src/test/resources/fileexample.txt b/core-java-modules/core-java-io/src/test/resources/fileexample.txt
similarity index 100%
rename from core-java-io/src/test/resources/fileexample.txt
rename to core-java-modules/core-java-io/src/test/resources/fileexample.txt
diff --git a/core-java-io/src/test/resources/frontenac-2257154_960_720.jpg b/core-java-modules/core-java-io/src/test/resources/frontenac-2257154_960_720.jpg
similarity index 100%
rename from core-java-io/src/test/resources/frontenac-2257154_960_720.jpg
rename to core-java-modules/core-java-io/src/test/resources/frontenac-2257154_960_720.jpg
diff --git a/core-java-io/src/test/resources/initialFile.txt b/core-java-modules/core-java-io/src/test/resources/initialFile.txt
similarity index 100%
rename from core-java-io/src/test/resources/initialFile.txt
rename to core-java-modules/core-java-io/src/test/resources/initialFile.txt
diff --git a/core-java-io/src/test/resources/listFilesUnitTestFolder/country.txt b/core-java-modules/core-java-io/src/test/resources/listFilesUnitTestFolder/country.txt
similarity index 100%
rename from core-java-io/src/test/resources/listFilesUnitTestFolder/country.txt
rename to core-java-modules/core-java-io/src/test/resources/listFilesUnitTestFolder/country.txt
diff --git a/core-java-io/src/test/resources/listFilesUnitTestFolder/employee.json b/core-java-modules/core-java-io/src/test/resources/listFilesUnitTestFolder/employee.json
similarity index 100%
rename from core-java-io/src/test/resources/listFilesUnitTestFolder/employee.json
rename to core-java-modules/core-java-io/src/test/resources/listFilesUnitTestFolder/employee.json
diff --git a/core-java-io/src/test/resources/listFilesUnitTestFolder/students.json b/core-java-modules/core-java-io/src/test/resources/listFilesUnitTestFolder/students.json
similarity index 100%
rename from core-java-io/src/test/resources/listFilesUnitTestFolder/students.json
rename to core-java-modules/core-java-io/src/test/resources/listFilesUnitTestFolder/students.json
diff --git a/core-java-io/src/test/resources/listFilesUnitTestFolder/test.xml b/core-java-modules/core-java-io/src/test/resources/listFilesUnitTestFolder/test.xml
similarity index 100%
rename from core-java-io/src/test/resources/listFilesUnitTestFolder/test.xml
rename to core-java-modules/core-java-io/src/test/resources/listFilesUnitTestFolder/test.xml
diff --git a/core-java-io/src/test/resources/original.txt b/core-java-modules/core-java-io/src/test/resources/original.txt
similarity index 100%
rename from core-java-io/src/test/resources/original.txt
rename to core-java-modules/core-java-io/src/test/resources/original.txt
diff --git a/core-java-io/src/test/resources/product.png b/core-java-modules/core-java-io/src/test/resources/product.png
similarity index 100%
rename from core-java-io/src/test/resources/product.png
rename to core-java-modules/core-java-io/src/test/resources/product.png
diff --git a/core-java-io/src/test/resources/sample.txt b/core-java-modules/core-java-io/src/test/resources/sample.txt
similarity index 100%
rename from core-java-io/src/test/resources/sample.txt
rename to core-java-modules/core-java-io/src/test/resources/sample.txt
diff --git a/core-java-io/src/test/resources/sampleNumberFile.txt b/core-java-modules/core-java-io/src/test/resources/sampleNumberFile.txt
similarity index 100%
rename from core-java-io/src/test/resources/sampleNumberFile.txt
rename to core-java-modules/core-java-io/src/test/resources/sampleNumberFile.txt
diff --git a/core-java-io/src/test/resources/sampleTextFile.txt b/core-java-modules/core-java-io/src/test/resources/sampleTextFile.txt
similarity index 100%
rename from core-java-io/src/test/resources/sampleTextFile.txt
rename to core-java-modules/core-java-io/src/test/resources/sampleTextFile.txt
diff --git a/core-java-io/src/test/resources/targetFile.tmp b/core-java-modules/core-java-io/src/test/resources/targetFile.tmp
similarity index 100%
rename from core-java-io/src/test/resources/targetFile.tmp
rename to core-java-modules/core-java-io/src/test/resources/targetFile.tmp
diff --git a/core-java-io/src/test/resources/targetFile.txt b/core-java-modules/core-java-io/src/test/resources/targetFile.txt
similarity index 100%
rename from core-java-io/src/test/resources/targetFile.txt
rename to core-java-modules/core-java-io/src/test/resources/targetFile.txt
diff --git a/core-java-io/src/test/resources/test.find b/core-java-modules/core-java-io/src/test/resources/test.find
similarity index 100%
rename from core-java-io/src/test/resources/test.find
rename to core-java-modules/core-java-io/src/test/resources/test.find
diff --git a/core-java-io/src/test/resources/testFolder/sample_file_1.in b/core-java-modules/core-java-io/src/test/resources/testFolder/sample_file_1.in
similarity index 100%
rename from core-java-io/src/test/resources/testFolder/sample_file_1.in
rename to core-java-modules/core-java-io/src/test/resources/testFolder/sample_file_1.in
diff --git a/core-java-io/src/test/resources/testFolder/sample_file_2.in b/core-java-modules/core-java-io/src/test/resources/testFolder/sample_file_2.in
similarity index 100%
rename from core-java-io/src/test/resources/testFolder/sample_file_2.in
rename to core-java-modules/core-java-io/src/test/resources/testFolder/sample_file_2.in
diff --git a/core-java-io/src/test/resources/test_read.in b/core-java-modules/core-java-io/src/test/resources/test_read.in
similarity index 100%
rename from core-java-io/src/test/resources/test_read.in
rename to core-java-modules/core-java-io/src/test/resources/test_read.in
diff --git a/core-java-io/src/test/resources/test_read1.in b/core-java-modules/core-java-io/src/test/resources/test_read1.in
similarity index 100%
rename from core-java-io/src/test/resources/test_read1.in
rename to core-java-modules/core-java-io/src/test/resources/test_read1.in
diff --git a/core-java-io/src/test/resources/test_read2.in b/core-java-modules/core-java-io/src/test/resources/test_read2.in
similarity index 100%
rename from core-java-io/src/test/resources/test_read2.in
rename to core-java-modules/core-java-io/src/test/resources/test_read2.in
diff --git a/core-java-io/src/test/resources/test_read3.in b/core-java-modules/core-java-io/src/test/resources/test_read3.in
similarity index 100%
rename from core-java-io/src/test/resources/test_read3.in
rename to core-java-modules/core-java-io/src/test/resources/test_read3.in
diff --git a/core-java-io/src/test/resources/test_read4.in b/core-java-modules/core-java-io/src/test/resources/test_read4.in
similarity index 100%
rename from core-java-io/src/test/resources/test_read4.in
rename to core-java-modules/core-java-io/src/test/resources/test_read4.in
diff --git a/core-java-io/src/test/resources/test_read7.in b/core-java-modules/core-java-io/src/test/resources/test_read7.in
similarity index 100%
rename from core-java-io/src/test/resources/test_read7.in
rename to core-java-modules/core-java-io/src/test/resources/test_read7.in
diff --git a/core-java-io/src/test/resources/test_read8.in b/core-java-modules/core-java-io/src/test/resources/test_read8.in
similarity index 100%
rename from core-java-io/src/test/resources/test_read8.in
rename to core-java-modules/core-java-io/src/test/resources/test_read8.in
diff --git a/core-java-io/src/test/resources/test_read_d.in b/core-java-modules/core-java-io/src/test/resources/test_read_d.in
similarity index 100%
rename from core-java-io/src/test/resources/test_read_d.in
rename to core-java-modules/core-java-io/src/test/resources/test_read_d.in
diff --git a/core-java-io/src/test/resources/test_read_multiple.in b/core-java-modules/core-java-io/src/test/resources/test_read_multiple.in
similarity index 100%
rename from core-java-io/src/test/resources/test_read_multiple.in
rename to core-java-modules/core-java-io/src/test/resources/test_read_multiple.in
diff --git a/core-java-io/src/test/resources/test_truncate.txt b/core-java-modules/core-java-io/src/test/resources/test_truncate.txt
similarity index 100%
rename from core-java-io/src/test/resources/test_truncate.txt
rename to core-java-modules/core-java-io/src/test/resources/test_truncate.txt
diff --git a/core-java-io/src/test/resources/test_write.txt b/core-java-modules/core-java-io/src/test/resources/test_write.txt
similarity index 100%
rename from core-java-io/src/test/resources/test_write.txt
rename to core-java-modules/core-java-io/src/test/resources/test_write.txt
diff --git a/core-java-io/src/test/resources/test_write_1.txt b/core-java-modules/core-java-io/src/test/resources/test_write_1.txt
similarity index 100%
rename from core-java-io/src/test/resources/test_write_1.txt
rename to core-java-modules/core-java-io/src/test/resources/test_write_1.txt
diff --git a/core-java-io/src/test/resources/test_write_2.txt b/core-java-modules/core-java-io/src/test/resources/test_write_2.txt
similarity index 100%
rename from core-java-io/src/test/resources/test_write_2.txt
rename to core-java-modules/core-java-io/src/test/resources/test_write_2.txt
diff --git a/core-java-io/src/test/resources/test_write_3.txt b/core-java-modules/core-java-io/src/test/resources/test_write_3.txt
similarity index 100%
rename from core-java-io/src/test/resources/test_write_3.txt
rename to core-java-modules/core-java-io/src/test/resources/test_write_3.txt
diff --git a/core-java-io/src/test/resources/test_write_4.txt b/core-java-modules/core-java-io/src/test/resources/test_write_4.txt
similarity index 100%
rename from core-java-io/src/test/resources/test_write_4.txt
rename to core-java-modules/core-java-io/src/test/resources/test_write_4.txt
diff --git a/core-java-io/src/test/resources/test_write_5.txt b/core-java-modules/core-java-io/src/test/resources/test_write_5.txt
similarity index 100%
rename from core-java-io/src/test/resources/test_write_5.txt
rename to core-java-modules/core-java-io/src/test/resources/test_write_5.txt
diff --git a/core-java-io/src/test/resources/test_write_using_filechannel.txt b/core-java-modules/core-java-io/src/test/resources/test_write_using_filechannel.txt
similarity index 100%
rename from core-java-io/src/test/resources/test_write_using_filechannel.txt
rename to core-java-modules/core-java-io/src/test/resources/test_write_using_filechannel.txt
diff --git a/core-java-modules/core-java-io/target_link.txt b/core-java-modules/core-java-io/target_link.txt
new file mode 100644
index 0000000000..931a810b8d
--- /dev/null
+++ b/core-java-modules/core-java-io/target_link.txt
@@ -0,0 +1,10000 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272
+273
+274
+275
+276
+277
+278
+279
+280
+281
+282
+283
+284
+285
+286
+287
+288
+289
+290
+291
+292
+293
+294
+295
+296
+297
+298
+299
+300
+301
+302
+303
+304
+305
+306
+307
+308
+309
+310
+311
+312
+313
+314
+315
+316
+317
+318
+319
+320
+321
+322
+323
+324
+325
+326
+327
+328
+329
+330
+331
+332
+333
+334
+335
+336
+337
+338
+339
+340
+341
+342
+343
+344
+345
+346
+347
+348
+349
+350
+351
+352
+353
+354
+355
+356
+357
+358
+359
+360
+361
+362
+363
+364
+365
+366
+367
+368
+369
+370
+371
+372
+373
+374
+375
+376
+377
+378
+379
+380
+381
+382
+383
+384
+385
+386
+387
+388
+389
+390
+391
+392
+393
+394
+395
+396
+397
+398
+399
+400
+401
+402
+403
+404
+405
+406
+407
+408
+409
+410
+411
+412
+413
+414
+415
+416
+417
+418
+419
+420
+421
+422
+423
+424
+425
+426
+427
+428
+429
+430
+431
+432
+433
+434
+435
+436
+437
+438
+439
+440
+441
+442
+443
+444
+445
+446
+447
+448
+449
+450
+451
+452
+453
+454
+455
+456
+457
+458
+459
+460
+461
+462
+463
+464
+465
+466
+467
+468
+469
+470
+471
+472
+473
+474
+475
+476
+477
+478
+479
+480
+481
+482
+483
+484
+485
+486
+487
+488
+489
+490
+491
+492
+493
+494
+495
+496
+497
+498
+499
+500
+501
+502
+503
+504
+505
+506
+507
+508
+509
+510
+511
+512
+513
+514
+515
+516
+517
+518
+519
+520
+521
+522
+523
+524
+525
+526
+527
+528
+529
+530
+531
+532
+533
+534
+535
+536
+537
+538
+539
+540
+541
+542
+543
+544
+545
+546
+547
+548
+549
+550
+551
+552
+553
+554
+555
+556
+557
+558
+559
+560
+561
+562
+563
+564
+565
+566
+567
+568
+569
+570
+571
+572
+573
+574
+575
+576
+577
+578
+579
+580
+581
+582
+583
+584
+585
+586
+587
+588
+589
+590
+591
+592
+593
+594
+595
+596
+597
+598
+599
+600
+601
+602
+603
+604
+605
+606
+607
+608
+609
+610
+611
+612
+613
+614
+615
+616
+617
+618
+619
+620
+621
+622
+623
+624
+625
+626
+627
+628
+629
+630
+631
+632
+633
+634
+635
+636
+637
+638
+639
+640
+641
+642
+643
+644
+645
+646
+647
+648
+649
+650
+651
+652
+653
+654
+655
+656
+657
+658
+659
+660
+661
+662
+663
+664
+665
+666
+667
+668
+669
+670
+671
+672
+673
+674
+675
+676
+677
+678
+679
+680
+681
+682
+683
+684
+685
+686
+687
+688
+689
+690
+691
+692
+693
+694
+695
+696
+697
+698
+699
+700
+701
+702
+703
+704
+705
+706
+707
+708
+709
+710
+711
+712
+713
+714
+715
+716
+717
+718
+719
+720
+721
+722
+723
+724
+725
+726
+727
+728
+729
+730
+731
+732
+733
+734
+735
+736
+737
+738
+739
+740
+741
+742
+743
+744
+745
+746
+747
+748
+749
+750
+751
+752
+753
+754
+755
+756
+757
+758
+759
+760
+761
+762
+763
+764
+765
+766
+767
+768
+769
+770
+771
+772
+773
+774
+775
+776
+777
+778
+779
+780
+781
+782
+783
+784
+785
+786
+787
+788
+789
+790
+791
+792
+793
+794
+795
+796
+797
+798
+799
+800
+801
+802
+803
+804
+805
+806
+807
+808
+809
+810
+811
+812
+813
+814
+815
+816
+817
+818
+819
+820
+821
+822
+823
+824
+825
+826
+827
+828
+829
+830
+831
+832
+833
+834
+835
+836
+837
+838
+839
+840
+841
+842
+843
+844
+845
+846
+847
+848
+849
+850
+851
+852
+853
+854
+855
+856
+857
+858
+859
+860
+861
+862
+863
+864
+865
+866
+867
+868
+869
+870
+871
+872
+873
+874
+875
+876
+877
+878
+879
+880
+881
+882
+883
+884
+885
+886
+887
+888
+889
+890
+891
+892
+893
+894
+895
+896
+897
+898
+899
+900
+901
+902
+903
+904
+905
+906
+907
+908
+909
+910
+911
+912
+913
+914
+915
+916
+917
+918
+919
+920
+921
+922
+923
+924
+925
+926
+927
+928
+929
+930
+931
+932
+933
+934
+935
+936
+937
+938
+939
+940
+941
+942
+943
+944
+945
+946
+947
+948
+949
+950
+951
+952
+953
+954
+955
+956
+957
+958
+959
+960
+961
+962
+963
+964
+965
+966
+967
+968
+969
+970
+971
+972
+973
+974
+975
+976
+977
+978
+979
+980
+981
+982
+983
+984
+985
+986
+987
+988
+989
+990
+991
+992
+993
+994
+995
+996
+997
+998
+999
+1000
+1001
+1002
+1003
+1004
+1005
+1006
+1007
+1008
+1009
+1010
+1011
+1012
+1013
+1014
+1015
+1016
+1017
+1018
+1019
+1020
+1021
+1022
+1023
+1024
+1025
+1026
+1027
+1028
+1029
+1030
+1031
+1032
+1033
+1034
+1035
+1036
+1037
+1038
+1039
+1040
+1041
+1042
+1043
+1044
+1045
+1046
+1047
+1048
+1049
+1050
+1051
+1052
+1053
+1054
+1055
+1056
+1057
+1058
+1059
+1060
+1061
+1062
+1063
+1064
+1065
+1066
+1067
+1068
+1069
+1070
+1071
+1072
+1073
+1074
+1075
+1076
+1077
+1078
+1079
+1080
+1081
+1082
+1083
+1084
+1085
+1086
+1087
+1088
+1089
+1090
+1091
+1092
+1093
+1094
+1095
+1096
+1097
+1098
+1099
+1100
+1101
+1102
+1103
+1104
+1105
+1106
+1107
+1108
+1109
+1110
+1111
+1112
+1113
+1114
+1115
+1116
+1117
+1118
+1119
+1120
+1121
+1122
+1123
+1124
+1125
+1126
+1127
+1128
+1129
+1130
+1131
+1132
+1133
+1134
+1135
+1136
+1137
+1138
+1139
+1140
+1141
+1142
+1143
+1144
+1145
+1146
+1147
+1148
+1149
+1150
+1151
+1152
+1153
+1154
+1155
+1156
+1157
+1158
+1159
+1160
+1161
+1162
+1163
+1164
+1165
+1166
+1167
+1168
+1169
+1170
+1171
+1172
+1173
+1174
+1175
+1176
+1177
+1178
+1179
+1180
+1181
+1182
+1183
+1184
+1185
+1186
+1187
+1188
+1189
+1190
+1191
+1192
+1193
+1194
+1195
+1196
+1197
+1198
+1199
+1200
+1201
+1202
+1203
+1204
+1205
+1206
+1207
+1208
+1209
+1210
+1211
+1212
+1213
+1214
+1215
+1216
+1217
+1218
+1219
+1220
+1221
+1222
+1223
+1224
+1225
+1226
+1227
+1228
+1229
+1230
+1231
+1232
+1233
+1234
+1235
+1236
+1237
+1238
+1239
+1240
+1241
+1242
+1243
+1244
+1245
+1246
+1247
+1248
+1249
+1250
+1251
+1252
+1253
+1254
+1255
+1256
+1257
+1258
+1259
+1260
+1261
+1262
+1263
+1264
+1265
+1266
+1267
+1268
+1269
+1270
+1271
+1272
+1273
+1274
+1275
+1276
+1277
+1278
+1279
+1280
+1281
+1282
+1283
+1284
+1285
+1286
+1287
+1288
+1289
+1290
+1291
+1292
+1293
+1294
+1295
+1296
+1297
+1298
+1299
+1300
+1301
+1302
+1303
+1304
+1305
+1306
+1307
+1308
+1309
+1310
+1311
+1312
+1313
+1314
+1315
+1316
+1317
+1318
+1319
+1320
+1321
+1322
+1323
+1324
+1325
+1326
+1327
+1328
+1329
+1330
+1331
+1332
+1333
+1334
+1335
+1336
+1337
+1338
+1339
+1340
+1341
+1342
+1343
+1344
+1345
+1346
+1347
+1348
+1349
+1350
+1351
+1352
+1353
+1354
+1355
+1356
+1357
+1358
+1359
+1360
+1361
+1362
+1363
+1364
+1365
+1366
+1367
+1368
+1369
+1370
+1371
+1372
+1373
+1374
+1375
+1376
+1377
+1378
+1379
+1380
+1381
+1382
+1383
+1384
+1385
+1386
+1387
+1388
+1389
+1390
+1391
+1392
+1393
+1394
+1395
+1396
+1397
+1398
+1399
+1400
+1401
+1402
+1403
+1404
+1405
+1406
+1407
+1408
+1409
+1410
+1411
+1412
+1413
+1414
+1415
+1416
+1417
+1418
+1419
+1420
+1421
+1422
+1423
+1424
+1425
+1426
+1427
+1428
+1429
+1430
+1431
+1432
+1433
+1434
+1435
+1436
+1437
+1438
+1439
+1440
+1441
+1442
+1443
+1444
+1445
+1446
+1447
+1448
+1449
+1450
+1451
+1452
+1453
+1454
+1455
+1456
+1457
+1458
+1459
+1460
+1461
+1462
+1463
+1464
+1465
+1466
+1467
+1468
+1469
+1470
+1471
+1472
+1473
+1474
+1475
+1476
+1477
+1478
+1479
+1480
+1481
+1482
+1483
+1484
+1485
+1486
+1487
+1488
+1489
+1490
+1491
+1492
+1493
+1494
+1495
+1496
+1497
+1498
+1499
+1500
+1501
+1502
+1503
+1504
+1505
+1506
+1507
+1508
+1509
+1510
+1511
+1512
+1513
+1514
+1515
+1516
+1517
+1518
+1519
+1520
+1521
+1522
+1523
+1524
+1525
+1526
+1527
+1528
+1529
+1530
+1531
+1532
+1533
+1534
+1535
+1536
+1537
+1538
+1539
+1540
+1541
+1542
+1543
+1544
+1545
+1546
+1547
+1548
+1549
+1550
+1551
+1552
+1553
+1554
+1555
+1556
+1557
+1558
+1559
+1560
+1561
+1562
+1563
+1564
+1565
+1566
+1567
+1568
+1569
+1570
+1571
+1572
+1573
+1574
+1575
+1576
+1577
+1578
+1579
+1580
+1581
+1582
+1583
+1584
+1585
+1586
+1587
+1588
+1589
+1590
+1591
+1592
+1593
+1594
+1595
+1596
+1597
+1598
+1599
+1600
+1601
+1602
+1603
+1604
+1605
+1606
+1607
+1608
+1609
+1610
+1611
+1612
+1613
+1614
+1615
+1616
+1617
+1618
+1619
+1620
+1621
+1622
+1623
+1624
+1625
+1626
+1627
+1628
+1629
+1630
+1631
+1632
+1633
+1634
+1635
+1636
+1637
+1638
+1639
+1640
+1641
+1642
+1643
+1644
+1645
+1646
+1647
+1648
+1649
+1650
+1651
+1652
+1653
+1654
+1655
+1656
+1657
+1658
+1659
+1660
+1661
+1662
+1663
+1664
+1665
+1666
+1667
+1668
+1669
+1670
+1671
+1672
+1673
+1674
+1675
+1676
+1677
+1678
+1679
+1680
+1681
+1682
+1683
+1684
+1685
+1686
+1687
+1688
+1689
+1690
+1691
+1692
+1693
+1694
+1695
+1696
+1697
+1698
+1699
+1700
+1701
+1702
+1703
+1704
+1705
+1706
+1707
+1708
+1709
+1710
+1711
+1712
+1713
+1714
+1715
+1716
+1717
+1718
+1719
+1720
+1721
+1722
+1723
+1724
+1725
+1726
+1727
+1728
+1729
+1730
+1731
+1732
+1733
+1734
+1735
+1736
+1737
+1738
+1739
+1740
+1741
+1742
+1743
+1744
+1745
+1746
+1747
+1748
+1749
+1750
+1751
+1752
+1753
+1754
+1755
+1756
+1757
+1758
+1759
+1760
+1761
+1762
+1763
+1764
+1765
+1766
+1767
+1768
+1769
+1770
+1771
+1772
+1773
+1774
+1775
+1776
+1777
+1778
+1779
+1780
+1781
+1782
+1783
+1784
+1785
+1786
+1787
+1788
+1789
+1790
+1791
+1792
+1793
+1794
+1795
+1796
+1797
+1798
+1799
+1800
+1801
+1802
+1803
+1804
+1805
+1806
+1807
+1808
+1809
+1810
+1811
+1812
+1813
+1814
+1815
+1816
+1817
+1818
+1819
+1820
+1821
+1822
+1823
+1824
+1825
+1826
+1827
+1828
+1829
+1830
+1831
+1832
+1833
+1834
+1835
+1836
+1837
+1838
+1839
+1840
+1841
+1842
+1843
+1844
+1845
+1846
+1847
+1848
+1849
+1850
+1851
+1852
+1853
+1854
+1855
+1856
+1857
+1858
+1859
+1860
+1861
+1862
+1863
+1864
+1865
+1866
+1867
+1868
+1869
+1870
+1871
+1872
+1873
+1874
+1875
+1876
+1877
+1878
+1879
+1880
+1881
+1882
+1883
+1884
+1885
+1886
+1887
+1888
+1889
+1890
+1891
+1892
+1893
+1894
+1895
+1896
+1897
+1898
+1899
+1900
+1901
+1902
+1903
+1904
+1905
+1906
+1907
+1908
+1909
+1910
+1911
+1912
+1913
+1914
+1915
+1916
+1917
+1918
+1919
+1920
+1921
+1922
+1923
+1924
+1925
+1926
+1927
+1928
+1929
+1930
+1931
+1932
+1933
+1934
+1935
+1936
+1937
+1938
+1939
+1940
+1941
+1942
+1943
+1944
+1945
+1946
+1947
+1948
+1949
+1950
+1951
+1952
+1953
+1954
+1955
+1956
+1957
+1958
+1959
+1960
+1961
+1962
+1963
+1964
+1965
+1966
+1967
+1968
+1969
+1970
+1971
+1972
+1973
+1974
+1975
+1976
+1977
+1978
+1979
+1980
+1981
+1982
+1983
+1984
+1985
+1986
+1987
+1988
+1989
+1990
+1991
+1992
+1993
+1994
+1995
+1996
+1997
+1998
+1999
+2000
+2001
+2002
+2003
+2004
+2005
+2006
+2007
+2008
+2009
+2010
+2011
+2012
+2013
+2014
+2015
+2016
+2017
+2018
+2019
+2020
+2021
+2022
+2023
+2024
+2025
+2026
+2027
+2028
+2029
+2030
+2031
+2032
+2033
+2034
+2035
+2036
+2037
+2038
+2039
+2040
+2041
+2042
+2043
+2044
+2045
+2046
+2047
+2048
+2049
+2050
+2051
+2052
+2053
+2054
+2055
+2056
+2057
+2058
+2059
+2060
+2061
+2062
+2063
+2064
+2065
+2066
+2067
+2068
+2069
+2070
+2071
+2072
+2073
+2074
+2075
+2076
+2077
+2078
+2079
+2080
+2081
+2082
+2083
+2084
+2085
+2086
+2087
+2088
+2089
+2090
+2091
+2092
+2093
+2094
+2095
+2096
+2097
+2098
+2099
+2100
+2101
+2102
+2103
+2104
+2105
+2106
+2107
+2108
+2109
+2110
+2111
+2112
+2113
+2114
+2115
+2116
+2117
+2118
+2119
+2120
+2121
+2122
+2123
+2124
+2125
+2126
+2127
+2128
+2129
+2130
+2131
+2132
+2133
+2134
+2135
+2136
+2137
+2138
+2139
+2140
+2141
+2142
+2143
+2144
+2145
+2146
+2147
+2148
+2149
+2150
+2151
+2152
+2153
+2154
+2155
+2156
+2157
+2158
+2159
+2160
+2161
+2162
+2163
+2164
+2165
+2166
+2167
+2168
+2169
+2170
+2171
+2172
+2173
+2174
+2175
+2176
+2177
+2178
+2179
+2180
+2181
+2182
+2183
+2184
+2185
+2186
+2187
+2188
+2189
+2190
+2191
+2192
+2193
+2194
+2195
+2196
+2197
+2198
+2199
+2200
+2201
+2202
+2203
+2204
+2205
+2206
+2207
+2208
+2209
+2210
+2211
+2212
+2213
+2214
+2215
+2216
+2217
+2218
+2219
+2220
+2221
+2222
+2223
+2224
+2225
+2226
+2227
+2228
+2229
+2230
+2231
+2232
+2233
+2234
+2235
+2236
+2237
+2238
+2239
+2240
+2241
+2242
+2243
+2244
+2245
+2246
+2247
+2248
+2249
+2250
+2251
+2252
+2253
+2254
+2255
+2256
+2257
+2258
+2259
+2260
+2261
+2262
+2263
+2264
+2265
+2266
+2267
+2268
+2269
+2270
+2271
+2272
+2273
+2274
+2275
+2276
+2277
+2278
+2279
+2280
+2281
+2282
+2283
+2284
+2285
+2286
+2287
+2288
+2289
+2290
+2291
+2292
+2293
+2294
+2295
+2296
+2297
+2298
+2299
+2300
+2301
+2302
+2303
+2304
+2305
+2306
+2307
+2308
+2309
+2310
+2311
+2312
+2313
+2314
+2315
+2316
+2317
+2318
+2319
+2320
+2321
+2322
+2323
+2324
+2325
+2326
+2327
+2328
+2329
+2330
+2331
+2332
+2333
+2334
+2335
+2336
+2337
+2338
+2339
+2340
+2341
+2342
+2343
+2344
+2345
+2346
+2347
+2348
+2349
+2350
+2351
+2352
+2353
+2354
+2355
+2356
+2357
+2358
+2359
+2360
+2361
+2362
+2363
+2364
+2365
+2366
+2367
+2368
+2369
+2370
+2371
+2372
+2373
+2374
+2375
+2376
+2377
+2378
+2379
+2380
+2381
+2382
+2383
+2384
+2385
+2386
+2387
+2388
+2389
+2390
+2391
+2392
+2393
+2394
+2395
+2396
+2397
+2398
+2399
+2400
+2401
+2402
+2403
+2404
+2405
+2406
+2407
+2408
+2409
+2410
+2411
+2412
+2413
+2414
+2415
+2416
+2417
+2418
+2419
+2420
+2421
+2422
+2423
+2424
+2425
+2426
+2427
+2428
+2429
+2430
+2431
+2432
+2433
+2434
+2435
+2436
+2437
+2438
+2439
+2440
+2441
+2442
+2443
+2444
+2445
+2446
+2447
+2448
+2449
+2450
+2451
+2452
+2453
+2454
+2455
+2456
+2457
+2458
+2459
+2460
+2461
+2462
+2463
+2464
+2465
+2466
+2467
+2468
+2469
+2470
+2471
+2472
+2473
+2474
+2475
+2476
+2477
+2478
+2479
+2480
+2481
+2482
+2483
+2484
+2485
+2486
+2487
+2488
+2489
+2490
+2491
+2492
+2493
+2494
+2495
+2496
+2497
+2498
+2499
+2500
+2501
+2502
+2503
+2504
+2505
+2506
+2507
+2508
+2509
+2510
+2511
+2512
+2513
+2514
+2515
+2516
+2517
+2518
+2519
+2520
+2521
+2522
+2523
+2524
+2525
+2526
+2527
+2528
+2529
+2530
+2531
+2532
+2533
+2534
+2535
+2536
+2537
+2538
+2539
+2540
+2541
+2542
+2543
+2544
+2545
+2546
+2547
+2548
+2549
+2550
+2551
+2552
+2553
+2554
+2555
+2556
+2557
+2558
+2559
+2560
+2561
+2562
+2563
+2564
+2565
+2566
+2567
+2568
+2569
+2570
+2571
+2572
+2573
+2574
+2575
+2576
+2577
+2578
+2579
+2580
+2581
+2582
+2583
+2584
+2585
+2586
+2587
+2588
+2589
+2590
+2591
+2592
+2593
+2594
+2595
+2596
+2597
+2598
+2599
+2600
+2601
+2602
+2603
+2604
+2605
+2606
+2607
+2608
+2609
+2610
+2611
+2612
+2613
+2614
+2615
+2616
+2617
+2618
+2619
+2620
+2621
+2622
+2623
+2624
+2625
+2626
+2627
+2628
+2629
+2630
+2631
+2632
+2633
+2634
+2635
+2636
+2637
+2638
+2639
+2640
+2641
+2642
+2643
+2644
+2645
+2646
+2647
+2648
+2649
+2650
+2651
+2652
+2653
+2654
+2655
+2656
+2657
+2658
+2659
+2660
+2661
+2662
+2663
+2664
+2665
+2666
+2667
+2668
+2669
+2670
+2671
+2672
+2673
+2674
+2675
+2676
+2677
+2678
+2679
+2680
+2681
+2682
+2683
+2684
+2685
+2686
+2687
+2688
+2689
+2690
+2691
+2692
+2693
+2694
+2695
+2696
+2697
+2698
+2699
+2700
+2701
+2702
+2703
+2704
+2705
+2706
+2707
+2708
+2709
+2710
+2711
+2712
+2713
+2714
+2715
+2716
+2717
+2718
+2719
+2720
+2721
+2722
+2723
+2724
+2725
+2726
+2727
+2728
+2729
+2730
+2731
+2732
+2733
+2734
+2735
+2736
+2737
+2738
+2739
+2740
+2741
+2742
+2743
+2744
+2745
+2746
+2747
+2748
+2749
+2750
+2751
+2752
+2753
+2754
+2755
+2756
+2757
+2758
+2759
+2760
+2761
+2762
+2763
+2764
+2765
+2766
+2767
+2768
+2769
+2770
+2771
+2772
+2773
+2774
+2775
+2776
+2777
+2778
+2779
+2780
+2781
+2782
+2783
+2784
+2785
+2786
+2787
+2788
+2789
+2790
+2791
+2792
+2793
+2794
+2795
+2796
+2797
+2798
+2799
+2800
+2801
+2802
+2803
+2804
+2805
+2806
+2807
+2808
+2809
+2810
+2811
+2812
+2813
+2814
+2815
+2816
+2817
+2818
+2819
+2820
+2821
+2822
+2823
+2824
+2825
+2826
+2827
+2828
+2829
+2830
+2831
+2832
+2833
+2834
+2835
+2836
+2837
+2838
+2839
+2840
+2841
+2842
+2843
+2844
+2845
+2846
+2847
+2848
+2849
+2850
+2851
+2852
+2853
+2854
+2855
+2856
+2857
+2858
+2859
+2860
+2861
+2862
+2863
+2864
+2865
+2866
+2867
+2868
+2869
+2870
+2871
+2872
+2873
+2874
+2875
+2876
+2877
+2878
+2879
+2880
+2881
+2882
+2883
+2884
+2885
+2886
+2887
+2888
+2889
+2890
+2891
+2892
+2893
+2894
+2895
+2896
+2897
+2898
+2899
+2900
+2901
+2902
+2903
+2904
+2905
+2906
+2907
+2908
+2909
+2910
+2911
+2912
+2913
+2914
+2915
+2916
+2917
+2918
+2919
+2920
+2921
+2922
+2923
+2924
+2925
+2926
+2927
+2928
+2929
+2930
+2931
+2932
+2933
+2934
+2935
+2936
+2937
+2938
+2939
+2940
+2941
+2942
+2943
+2944
+2945
+2946
+2947
+2948
+2949
+2950
+2951
+2952
+2953
+2954
+2955
+2956
+2957
+2958
+2959
+2960
+2961
+2962
+2963
+2964
+2965
+2966
+2967
+2968
+2969
+2970
+2971
+2972
+2973
+2974
+2975
+2976
+2977
+2978
+2979
+2980
+2981
+2982
+2983
+2984
+2985
+2986
+2987
+2988
+2989
+2990
+2991
+2992
+2993
+2994
+2995
+2996
+2997
+2998
+2999
+3000
+3001
+3002
+3003
+3004
+3005
+3006
+3007
+3008
+3009
+3010
+3011
+3012
+3013
+3014
+3015
+3016
+3017
+3018
+3019
+3020
+3021
+3022
+3023
+3024
+3025
+3026
+3027
+3028
+3029
+3030
+3031
+3032
+3033
+3034
+3035
+3036
+3037
+3038
+3039
+3040
+3041
+3042
+3043
+3044
+3045
+3046
+3047
+3048
+3049
+3050
+3051
+3052
+3053
+3054
+3055
+3056
+3057
+3058
+3059
+3060
+3061
+3062
+3063
+3064
+3065
+3066
+3067
+3068
+3069
+3070
+3071
+3072
+3073
+3074
+3075
+3076
+3077
+3078
+3079
+3080
+3081
+3082
+3083
+3084
+3085
+3086
+3087
+3088
+3089
+3090
+3091
+3092
+3093
+3094
+3095
+3096
+3097
+3098
+3099
+3100
+3101
+3102
+3103
+3104
+3105
+3106
+3107
+3108
+3109
+3110
+3111
+3112
+3113
+3114
+3115
+3116
+3117
+3118
+3119
+3120
+3121
+3122
+3123
+3124
+3125
+3126
+3127
+3128
+3129
+3130
+3131
+3132
+3133
+3134
+3135
+3136
+3137
+3138
+3139
+3140
+3141
+3142
+3143
+3144
+3145
+3146
+3147
+3148
+3149
+3150
+3151
+3152
+3153
+3154
+3155
+3156
+3157
+3158
+3159
+3160
+3161
+3162
+3163
+3164
+3165
+3166
+3167
+3168
+3169
+3170
+3171
+3172
+3173
+3174
+3175
+3176
+3177
+3178
+3179
+3180
+3181
+3182
+3183
+3184
+3185
+3186
+3187
+3188
+3189
+3190
+3191
+3192
+3193
+3194
+3195
+3196
+3197
+3198
+3199
+3200
+3201
+3202
+3203
+3204
+3205
+3206
+3207
+3208
+3209
+3210
+3211
+3212
+3213
+3214
+3215
+3216
+3217
+3218
+3219
+3220
+3221
+3222
+3223
+3224
+3225
+3226
+3227
+3228
+3229
+3230
+3231
+3232
+3233
+3234
+3235
+3236
+3237
+3238
+3239
+3240
+3241
+3242
+3243
+3244
+3245
+3246
+3247
+3248
+3249
+3250
+3251
+3252
+3253
+3254
+3255
+3256
+3257
+3258
+3259
+3260
+3261
+3262
+3263
+3264
+3265
+3266
+3267
+3268
+3269
+3270
+3271
+3272
+3273
+3274
+3275
+3276
+3277
+3278
+3279
+3280
+3281
+3282
+3283
+3284
+3285
+3286
+3287
+3288
+3289
+3290
+3291
+3292
+3293
+3294
+3295
+3296
+3297
+3298
+3299
+3300
+3301
+3302
+3303
+3304
+3305
+3306
+3307
+3308
+3309
+3310
+3311
+3312
+3313
+3314
+3315
+3316
+3317
+3318
+3319
+3320
+3321
+3322
+3323
+3324
+3325
+3326
+3327
+3328
+3329
+3330
+3331
+3332
+3333
+3334
+3335
+3336
+3337
+3338
+3339
+3340
+3341
+3342
+3343
+3344
+3345
+3346
+3347
+3348
+3349
+3350
+3351
+3352
+3353
+3354
+3355
+3356
+3357
+3358
+3359
+3360
+3361
+3362
+3363
+3364
+3365
+3366
+3367
+3368
+3369
+3370
+3371
+3372
+3373
+3374
+3375
+3376
+3377
+3378
+3379
+3380
+3381
+3382
+3383
+3384
+3385
+3386
+3387
+3388
+3389
+3390
+3391
+3392
+3393
+3394
+3395
+3396
+3397
+3398
+3399
+3400
+3401
+3402
+3403
+3404
+3405
+3406
+3407
+3408
+3409
+3410
+3411
+3412
+3413
+3414
+3415
+3416
+3417
+3418
+3419
+3420
+3421
+3422
+3423
+3424
+3425
+3426
+3427
+3428
+3429
+3430
+3431
+3432
+3433
+3434
+3435
+3436
+3437
+3438
+3439
+3440
+3441
+3442
+3443
+3444
+3445
+3446
+3447
+3448
+3449
+3450
+3451
+3452
+3453
+3454
+3455
+3456
+3457
+3458
+3459
+3460
+3461
+3462
+3463
+3464
+3465
+3466
+3467
+3468
+3469
+3470
+3471
+3472
+3473
+3474
+3475
+3476
+3477
+3478
+3479
+3480
+3481
+3482
+3483
+3484
+3485
+3486
+3487
+3488
+3489
+3490
+3491
+3492
+3493
+3494
+3495
+3496
+3497
+3498
+3499
+3500
+3501
+3502
+3503
+3504
+3505
+3506
+3507
+3508
+3509
+3510
+3511
+3512
+3513
+3514
+3515
+3516
+3517
+3518
+3519
+3520
+3521
+3522
+3523
+3524
+3525
+3526
+3527
+3528
+3529
+3530
+3531
+3532
+3533
+3534
+3535
+3536
+3537
+3538
+3539
+3540
+3541
+3542
+3543
+3544
+3545
+3546
+3547
+3548
+3549
+3550
+3551
+3552
+3553
+3554
+3555
+3556
+3557
+3558
+3559
+3560
+3561
+3562
+3563
+3564
+3565
+3566
+3567
+3568
+3569
+3570
+3571
+3572
+3573
+3574
+3575
+3576
+3577
+3578
+3579
+3580
+3581
+3582
+3583
+3584
+3585
+3586
+3587
+3588
+3589
+3590
+3591
+3592
+3593
+3594
+3595
+3596
+3597
+3598
+3599
+3600
+3601
+3602
+3603
+3604
+3605
+3606
+3607
+3608
+3609
+3610
+3611
+3612
+3613
+3614
+3615
+3616
+3617
+3618
+3619
+3620
+3621
+3622
+3623
+3624
+3625
+3626
+3627
+3628
+3629
+3630
+3631
+3632
+3633
+3634
+3635
+3636
+3637
+3638
+3639
+3640
+3641
+3642
+3643
+3644
+3645
+3646
+3647
+3648
+3649
+3650
+3651
+3652
+3653
+3654
+3655
+3656
+3657
+3658
+3659
+3660
+3661
+3662
+3663
+3664
+3665
+3666
+3667
+3668
+3669
+3670
+3671
+3672
+3673
+3674
+3675
+3676
+3677
+3678
+3679
+3680
+3681
+3682
+3683
+3684
+3685
+3686
+3687
+3688
+3689
+3690
+3691
+3692
+3693
+3694
+3695
+3696
+3697
+3698
+3699
+3700
+3701
+3702
+3703
+3704
+3705
+3706
+3707
+3708
+3709
+3710
+3711
+3712
+3713
+3714
+3715
+3716
+3717
+3718
+3719
+3720
+3721
+3722
+3723
+3724
+3725
+3726
+3727
+3728
+3729
+3730
+3731
+3732
+3733
+3734
+3735
+3736
+3737
+3738
+3739
+3740
+3741
+3742
+3743
+3744
+3745
+3746
+3747
+3748
+3749
+3750
+3751
+3752
+3753
+3754
+3755
+3756
+3757
+3758
+3759
+3760
+3761
+3762
+3763
+3764
+3765
+3766
+3767
+3768
+3769
+3770
+3771
+3772
+3773
+3774
+3775
+3776
+3777
+3778
+3779
+3780
+3781
+3782
+3783
+3784
+3785
+3786
+3787
+3788
+3789
+3790
+3791
+3792
+3793
+3794
+3795
+3796
+3797
+3798
+3799
+3800
+3801
+3802
+3803
+3804
+3805
+3806
+3807
+3808
+3809
+3810
+3811
+3812
+3813
+3814
+3815
+3816
+3817
+3818
+3819
+3820
+3821
+3822
+3823
+3824
+3825
+3826
+3827
+3828
+3829
+3830
+3831
+3832
+3833
+3834
+3835
+3836
+3837
+3838
+3839
+3840
+3841
+3842
+3843
+3844
+3845
+3846
+3847
+3848
+3849
+3850
+3851
+3852
+3853
+3854
+3855
+3856
+3857
+3858
+3859
+3860
+3861
+3862
+3863
+3864
+3865
+3866
+3867
+3868
+3869
+3870
+3871
+3872
+3873
+3874
+3875
+3876
+3877
+3878
+3879
+3880
+3881
+3882
+3883
+3884
+3885
+3886
+3887
+3888
+3889
+3890
+3891
+3892
+3893
+3894
+3895
+3896
+3897
+3898
+3899
+3900
+3901
+3902
+3903
+3904
+3905
+3906
+3907
+3908
+3909
+3910
+3911
+3912
+3913
+3914
+3915
+3916
+3917
+3918
+3919
+3920
+3921
+3922
+3923
+3924
+3925
+3926
+3927
+3928
+3929
+3930
+3931
+3932
+3933
+3934
+3935
+3936
+3937
+3938
+3939
+3940
+3941
+3942
+3943
+3944
+3945
+3946
+3947
+3948
+3949
+3950
+3951
+3952
+3953
+3954
+3955
+3956
+3957
+3958
+3959
+3960
+3961
+3962
+3963
+3964
+3965
+3966
+3967
+3968
+3969
+3970
+3971
+3972
+3973
+3974
+3975
+3976
+3977
+3978
+3979
+3980
+3981
+3982
+3983
+3984
+3985
+3986
+3987
+3988
+3989
+3990
+3991
+3992
+3993
+3994
+3995
+3996
+3997
+3998
+3999
+4000
+4001
+4002
+4003
+4004
+4005
+4006
+4007
+4008
+4009
+4010
+4011
+4012
+4013
+4014
+4015
+4016
+4017
+4018
+4019
+4020
+4021
+4022
+4023
+4024
+4025
+4026
+4027
+4028
+4029
+4030
+4031
+4032
+4033
+4034
+4035
+4036
+4037
+4038
+4039
+4040
+4041
+4042
+4043
+4044
+4045
+4046
+4047
+4048
+4049
+4050
+4051
+4052
+4053
+4054
+4055
+4056
+4057
+4058
+4059
+4060
+4061
+4062
+4063
+4064
+4065
+4066
+4067
+4068
+4069
+4070
+4071
+4072
+4073
+4074
+4075
+4076
+4077
+4078
+4079
+4080
+4081
+4082
+4083
+4084
+4085
+4086
+4087
+4088
+4089
+4090
+4091
+4092
+4093
+4094
+4095
+4096
+4097
+4098
+4099
+4100
+4101
+4102
+4103
+4104
+4105
+4106
+4107
+4108
+4109
+4110
+4111
+4112
+4113
+4114
+4115
+4116
+4117
+4118
+4119
+4120
+4121
+4122
+4123
+4124
+4125
+4126
+4127
+4128
+4129
+4130
+4131
+4132
+4133
+4134
+4135
+4136
+4137
+4138
+4139
+4140
+4141
+4142
+4143
+4144
+4145
+4146
+4147
+4148
+4149
+4150
+4151
+4152
+4153
+4154
+4155
+4156
+4157
+4158
+4159
+4160
+4161
+4162
+4163
+4164
+4165
+4166
+4167
+4168
+4169
+4170
+4171
+4172
+4173
+4174
+4175
+4176
+4177
+4178
+4179
+4180
+4181
+4182
+4183
+4184
+4185
+4186
+4187
+4188
+4189
+4190
+4191
+4192
+4193
+4194
+4195
+4196
+4197
+4198
+4199
+4200
+4201
+4202
+4203
+4204
+4205
+4206
+4207
+4208
+4209
+4210
+4211
+4212
+4213
+4214
+4215
+4216
+4217
+4218
+4219
+4220
+4221
+4222
+4223
+4224
+4225
+4226
+4227
+4228
+4229
+4230
+4231
+4232
+4233
+4234
+4235
+4236
+4237
+4238
+4239
+4240
+4241
+4242
+4243
+4244
+4245
+4246
+4247
+4248
+4249
+4250
+4251
+4252
+4253
+4254
+4255
+4256
+4257
+4258
+4259
+4260
+4261
+4262
+4263
+4264
+4265
+4266
+4267
+4268
+4269
+4270
+4271
+4272
+4273
+4274
+4275
+4276
+4277
+4278
+4279
+4280
+4281
+4282
+4283
+4284
+4285
+4286
+4287
+4288
+4289
+4290
+4291
+4292
+4293
+4294
+4295
+4296
+4297
+4298
+4299
+4300
+4301
+4302
+4303
+4304
+4305
+4306
+4307
+4308
+4309
+4310
+4311
+4312
+4313
+4314
+4315
+4316
+4317
+4318
+4319
+4320
+4321
+4322
+4323
+4324
+4325
+4326
+4327
+4328
+4329
+4330
+4331
+4332
+4333
+4334
+4335
+4336
+4337
+4338
+4339
+4340
+4341
+4342
+4343
+4344
+4345
+4346
+4347
+4348
+4349
+4350
+4351
+4352
+4353
+4354
+4355
+4356
+4357
+4358
+4359
+4360
+4361
+4362
+4363
+4364
+4365
+4366
+4367
+4368
+4369
+4370
+4371
+4372
+4373
+4374
+4375
+4376
+4377
+4378
+4379
+4380
+4381
+4382
+4383
+4384
+4385
+4386
+4387
+4388
+4389
+4390
+4391
+4392
+4393
+4394
+4395
+4396
+4397
+4398
+4399
+4400
+4401
+4402
+4403
+4404
+4405
+4406
+4407
+4408
+4409
+4410
+4411
+4412
+4413
+4414
+4415
+4416
+4417
+4418
+4419
+4420
+4421
+4422
+4423
+4424
+4425
+4426
+4427
+4428
+4429
+4430
+4431
+4432
+4433
+4434
+4435
+4436
+4437
+4438
+4439
+4440
+4441
+4442
+4443
+4444
+4445
+4446
+4447
+4448
+4449
+4450
+4451
+4452
+4453
+4454
+4455
+4456
+4457
+4458
+4459
+4460
+4461
+4462
+4463
+4464
+4465
+4466
+4467
+4468
+4469
+4470
+4471
+4472
+4473
+4474
+4475
+4476
+4477
+4478
+4479
+4480
+4481
+4482
+4483
+4484
+4485
+4486
+4487
+4488
+4489
+4490
+4491
+4492
+4493
+4494
+4495
+4496
+4497
+4498
+4499
+4500
+4501
+4502
+4503
+4504
+4505
+4506
+4507
+4508
+4509
+4510
+4511
+4512
+4513
+4514
+4515
+4516
+4517
+4518
+4519
+4520
+4521
+4522
+4523
+4524
+4525
+4526
+4527
+4528
+4529
+4530
+4531
+4532
+4533
+4534
+4535
+4536
+4537
+4538
+4539
+4540
+4541
+4542
+4543
+4544
+4545
+4546
+4547
+4548
+4549
+4550
+4551
+4552
+4553
+4554
+4555
+4556
+4557
+4558
+4559
+4560
+4561
+4562
+4563
+4564
+4565
+4566
+4567
+4568
+4569
+4570
+4571
+4572
+4573
+4574
+4575
+4576
+4577
+4578
+4579
+4580
+4581
+4582
+4583
+4584
+4585
+4586
+4587
+4588
+4589
+4590
+4591
+4592
+4593
+4594
+4595
+4596
+4597
+4598
+4599
+4600
+4601
+4602
+4603
+4604
+4605
+4606
+4607
+4608
+4609
+4610
+4611
+4612
+4613
+4614
+4615
+4616
+4617
+4618
+4619
+4620
+4621
+4622
+4623
+4624
+4625
+4626
+4627
+4628
+4629
+4630
+4631
+4632
+4633
+4634
+4635
+4636
+4637
+4638
+4639
+4640
+4641
+4642
+4643
+4644
+4645
+4646
+4647
+4648
+4649
+4650
+4651
+4652
+4653
+4654
+4655
+4656
+4657
+4658
+4659
+4660
+4661
+4662
+4663
+4664
+4665
+4666
+4667
+4668
+4669
+4670
+4671
+4672
+4673
+4674
+4675
+4676
+4677
+4678
+4679
+4680
+4681
+4682
+4683
+4684
+4685
+4686
+4687
+4688
+4689
+4690
+4691
+4692
+4693
+4694
+4695
+4696
+4697
+4698
+4699
+4700
+4701
+4702
+4703
+4704
+4705
+4706
+4707
+4708
+4709
+4710
+4711
+4712
+4713
+4714
+4715
+4716
+4717
+4718
+4719
+4720
+4721
+4722
+4723
+4724
+4725
+4726
+4727
+4728
+4729
+4730
+4731
+4732
+4733
+4734
+4735
+4736
+4737
+4738
+4739
+4740
+4741
+4742
+4743
+4744
+4745
+4746
+4747
+4748
+4749
+4750
+4751
+4752
+4753
+4754
+4755
+4756
+4757
+4758
+4759
+4760
+4761
+4762
+4763
+4764
+4765
+4766
+4767
+4768
+4769
+4770
+4771
+4772
+4773
+4774
+4775
+4776
+4777
+4778
+4779
+4780
+4781
+4782
+4783
+4784
+4785
+4786
+4787
+4788
+4789
+4790
+4791
+4792
+4793
+4794
+4795
+4796
+4797
+4798
+4799
+4800
+4801
+4802
+4803
+4804
+4805
+4806
+4807
+4808
+4809
+4810
+4811
+4812
+4813
+4814
+4815
+4816
+4817
+4818
+4819
+4820
+4821
+4822
+4823
+4824
+4825
+4826
+4827
+4828
+4829
+4830
+4831
+4832
+4833
+4834
+4835
+4836
+4837
+4838
+4839
+4840
+4841
+4842
+4843
+4844
+4845
+4846
+4847
+4848
+4849
+4850
+4851
+4852
+4853
+4854
+4855
+4856
+4857
+4858
+4859
+4860
+4861
+4862
+4863
+4864
+4865
+4866
+4867
+4868
+4869
+4870
+4871
+4872
+4873
+4874
+4875
+4876
+4877
+4878
+4879
+4880
+4881
+4882
+4883
+4884
+4885
+4886
+4887
+4888
+4889
+4890
+4891
+4892
+4893
+4894
+4895
+4896
+4897
+4898
+4899
+4900
+4901
+4902
+4903
+4904
+4905
+4906
+4907
+4908
+4909
+4910
+4911
+4912
+4913
+4914
+4915
+4916
+4917
+4918
+4919
+4920
+4921
+4922
+4923
+4924
+4925
+4926
+4927
+4928
+4929
+4930
+4931
+4932
+4933
+4934
+4935
+4936
+4937
+4938
+4939
+4940
+4941
+4942
+4943
+4944
+4945
+4946
+4947
+4948
+4949
+4950
+4951
+4952
+4953
+4954
+4955
+4956
+4957
+4958
+4959
+4960
+4961
+4962
+4963
+4964
+4965
+4966
+4967
+4968
+4969
+4970
+4971
+4972
+4973
+4974
+4975
+4976
+4977
+4978
+4979
+4980
+4981
+4982
+4983
+4984
+4985
+4986
+4987
+4988
+4989
+4990
+4991
+4992
+4993
+4994
+4995
+4996
+4997
+4998
+4999
+5000
+5001
+5002
+5003
+5004
+5005
+5006
+5007
+5008
+5009
+5010
+5011
+5012
+5013
+5014
+5015
+5016
+5017
+5018
+5019
+5020
+5021
+5022
+5023
+5024
+5025
+5026
+5027
+5028
+5029
+5030
+5031
+5032
+5033
+5034
+5035
+5036
+5037
+5038
+5039
+5040
+5041
+5042
+5043
+5044
+5045
+5046
+5047
+5048
+5049
+5050
+5051
+5052
+5053
+5054
+5055
+5056
+5057
+5058
+5059
+5060
+5061
+5062
+5063
+5064
+5065
+5066
+5067
+5068
+5069
+5070
+5071
+5072
+5073
+5074
+5075
+5076
+5077
+5078
+5079
+5080
+5081
+5082
+5083
+5084
+5085
+5086
+5087
+5088
+5089
+5090
+5091
+5092
+5093
+5094
+5095
+5096
+5097
+5098
+5099
+5100
+5101
+5102
+5103
+5104
+5105
+5106
+5107
+5108
+5109
+5110
+5111
+5112
+5113
+5114
+5115
+5116
+5117
+5118
+5119
+5120
+5121
+5122
+5123
+5124
+5125
+5126
+5127
+5128
+5129
+5130
+5131
+5132
+5133
+5134
+5135
+5136
+5137
+5138
+5139
+5140
+5141
+5142
+5143
+5144
+5145
+5146
+5147
+5148
+5149
+5150
+5151
+5152
+5153
+5154
+5155
+5156
+5157
+5158
+5159
+5160
+5161
+5162
+5163
+5164
+5165
+5166
+5167
+5168
+5169
+5170
+5171
+5172
+5173
+5174
+5175
+5176
+5177
+5178
+5179
+5180
+5181
+5182
+5183
+5184
+5185
+5186
+5187
+5188
+5189
+5190
+5191
+5192
+5193
+5194
+5195
+5196
+5197
+5198
+5199
+5200
+5201
+5202
+5203
+5204
+5205
+5206
+5207
+5208
+5209
+5210
+5211
+5212
+5213
+5214
+5215
+5216
+5217
+5218
+5219
+5220
+5221
+5222
+5223
+5224
+5225
+5226
+5227
+5228
+5229
+5230
+5231
+5232
+5233
+5234
+5235
+5236
+5237
+5238
+5239
+5240
+5241
+5242
+5243
+5244
+5245
+5246
+5247
+5248
+5249
+5250
+5251
+5252
+5253
+5254
+5255
+5256
+5257
+5258
+5259
+5260
+5261
+5262
+5263
+5264
+5265
+5266
+5267
+5268
+5269
+5270
+5271
+5272
+5273
+5274
+5275
+5276
+5277
+5278
+5279
+5280
+5281
+5282
+5283
+5284
+5285
+5286
+5287
+5288
+5289
+5290
+5291
+5292
+5293
+5294
+5295
+5296
+5297
+5298
+5299
+5300
+5301
+5302
+5303
+5304
+5305
+5306
+5307
+5308
+5309
+5310
+5311
+5312
+5313
+5314
+5315
+5316
+5317
+5318
+5319
+5320
+5321
+5322
+5323
+5324
+5325
+5326
+5327
+5328
+5329
+5330
+5331
+5332
+5333
+5334
+5335
+5336
+5337
+5338
+5339
+5340
+5341
+5342
+5343
+5344
+5345
+5346
+5347
+5348
+5349
+5350
+5351
+5352
+5353
+5354
+5355
+5356
+5357
+5358
+5359
+5360
+5361
+5362
+5363
+5364
+5365
+5366
+5367
+5368
+5369
+5370
+5371
+5372
+5373
+5374
+5375
+5376
+5377
+5378
+5379
+5380
+5381
+5382
+5383
+5384
+5385
+5386
+5387
+5388
+5389
+5390
+5391
+5392
+5393
+5394
+5395
+5396
+5397
+5398
+5399
+5400
+5401
+5402
+5403
+5404
+5405
+5406
+5407
+5408
+5409
+5410
+5411
+5412
+5413
+5414
+5415
+5416
+5417
+5418
+5419
+5420
+5421
+5422
+5423
+5424
+5425
+5426
+5427
+5428
+5429
+5430
+5431
+5432
+5433
+5434
+5435
+5436
+5437
+5438
+5439
+5440
+5441
+5442
+5443
+5444
+5445
+5446
+5447
+5448
+5449
+5450
+5451
+5452
+5453
+5454
+5455
+5456
+5457
+5458
+5459
+5460
+5461
+5462
+5463
+5464
+5465
+5466
+5467
+5468
+5469
+5470
+5471
+5472
+5473
+5474
+5475
+5476
+5477
+5478
+5479
+5480
+5481
+5482
+5483
+5484
+5485
+5486
+5487
+5488
+5489
+5490
+5491
+5492
+5493
+5494
+5495
+5496
+5497
+5498
+5499
+5500
+5501
+5502
+5503
+5504
+5505
+5506
+5507
+5508
+5509
+5510
+5511
+5512
+5513
+5514
+5515
+5516
+5517
+5518
+5519
+5520
+5521
+5522
+5523
+5524
+5525
+5526
+5527
+5528
+5529
+5530
+5531
+5532
+5533
+5534
+5535
+5536
+5537
+5538
+5539
+5540
+5541
+5542
+5543
+5544
+5545
+5546
+5547
+5548
+5549
+5550
+5551
+5552
+5553
+5554
+5555
+5556
+5557
+5558
+5559
+5560
+5561
+5562
+5563
+5564
+5565
+5566
+5567
+5568
+5569
+5570
+5571
+5572
+5573
+5574
+5575
+5576
+5577
+5578
+5579
+5580
+5581
+5582
+5583
+5584
+5585
+5586
+5587
+5588
+5589
+5590
+5591
+5592
+5593
+5594
+5595
+5596
+5597
+5598
+5599
+5600
+5601
+5602
+5603
+5604
+5605
+5606
+5607
+5608
+5609
+5610
+5611
+5612
+5613
+5614
+5615
+5616
+5617
+5618
+5619
+5620
+5621
+5622
+5623
+5624
+5625
+5626
+5627
+5628
+5629
+5630
+5631
+5632
+5633
+5634
+5635
+5636
+5637
+5638
+5639
+5640
+5641
+5642
+5643
+5644
+5645
+5646
+5647
+5648
+5649
+5650
+5651
+5652
+5653
+5654
+5655
+5656
+5657
+5658
+5659
+5660
+5661
+5662
+5663
+5664
+5665
+5666
+5667
+5668
+5669
+5670
+5671
+5672
+5673
+5674
+5675
+5676
+5677
+5678
+5679
+5680
+5681
+5682
+5683
+5684
+5685
+5686
+5687
+5688
+5689
+5690
+5691
+5692
+5693
+5694
+5695
+5696
+5697
+5698
+5699
+5700
+5701
+5702
+5703
+5704
+5705
+5706
+5707
+5708
+5709
+5710
+5711
+5712
+5713
+5714
+5715
+5716
+5717
+5718
+5719
+5720
+5721
+5722
+5723
+5724
+5725
+5726
+5727
+5728
+5729
+5730
+5731
+5732
+5733
+5734
+5735
+5736
+5737
+5738
+5739
+5740
+5741
+5742
+5743
+5744
+5745
+5746
+5747
+5748
+5749
+5750
+5751
+5752
+5753
+5754
+5755
+5756
+5757
+5758
+5759
+5760
+5761
+5762
+5763
+5764
+5765
+5766
+5767
+5768
+5769
+5770
+5771
+5772
+5773
+5774
+5775
+5776
+5777
+5778
+5779
+5780
+5781
+5782
+5783
+5784
+5785
+5786
+5787
+5788
+5789
+5790
+5791
+5792
+5793
+5794
+5795
+5796
+5797
+5798
+5799
+5800
+5801
+5802
+5803
+5804
+5805
+5806
+5807
+5808
+5809
+5810
+5811
+5812
+5813
+5814
+5815
+5816
+5817
+5818
+5819
+5820
+5821
+5822
+5823
+5824
+5825
+5826
+5827
+5828
+5829
+5830
+5831
+5832
+5833
+5834
+5835
+5836
+5837
+5838
+5839
+5840
+5841
+5842
+5843
+5844
+5845
+5846
+5847
+5848
+5849
+5850
+5851
+5852
+5853
+5854
+5855
+5856
+5857
+5858
+5859
+5860
+5861
+5862
+5863
+5864
+5865
+5866
+5867
+5868
+5869
+5870
+5871
+5872
+5873
+5874
+5875
+5876
+5877
+5878
+5879
+5880
+5881
+5882
+5883
+5884
+5885
+5886
+5887
+5888
+5889
+5890
+5891
+5892
+5893
+5894
+5895
+5896
+5897
+5898
+5899
+5900
+5901
+5902
+5903
+5904
+5905
+5906
+5907
+5908
+5909
+5910
+5911
+5912
+5913
+5914
+5915
+5916
+5917
+5918
+5919
+5920
+5921
+5922
+5923
+5924
+5925
+5926
+5927
+5928
+5929
+5930
+5931
+5932
+5933
+5934
+5935
+5936
+5937
+5938
+5939
+5940
+5941
+5942
+5943
+5944
+5945
+5946
+5947
+5948
+5949
+5950
+5951
+5952
+5953
+5954
+5955
+5956
+5957
+5958
+5959
+5960
+5961
+5962
+5963
+5964
+5965
+5966
+5967
+5968
+5969
+5970
+5971
+5972
+5973
+5974
+5975
+5976
+5977
+5978
+5979
+5980
+5981
+5982
+5983
+5984
+5985
+5986
+5987
+5988
+5989
+5990
+5991
+5992
+5993
+5994
+5995
+5996
+5997
+5998
+5999
+6000
+6001
+6002
+6003
+6004
+6005
+6006
+6007
+6008
+6009
+6010
+6011
+6012
+6013
+6014
+6015
+6016
+6017
+6018
+6019
+6020
+6021
+6022
+6023
+6024
+6025
+6026
+6027
+6028
+6029
+6030
+6031
+6032
+6033
+6034
+6035
+6036
+6037
+6038
+6039
+6040
+6041
+6042
+6043
+6044
+6045
+6046
+6047
+6048
+6049
+6050
+6051
+6052
+6053
+6054
+6055
+6056
+6057
+6058
+6059
+6060
+6061
+6062
+6063
+6064
+6065
+6066
+6067
+6068
+6069
+6070
+6071
+6072
+6073
+6074
+6075
+6076
+6077
+6078
+6079
+6080
+6081
+6082
+6083
+6084
+6085
+6086
+6087
+6088
+6089
+6090
+6091
+6092
+6093
+6094
+6095
+6096
+6097
+6098
+6099
+6100
+6101
+6102
+6103
+6104
+6105
+6106
+6107
+6108
+6109
+6110
+6111
+6112
+6113
+6114
+6115
+6116
+6117
+6118
+6119
+6120
+6121
+6122
+6123
+6124
+6125
+6126
+6127
+6128
+6129
+6130
+6131
+6132
+6133
+6134
+6135
+6136
+6137
+6138
+6139
+6140
+6141
+6142
+6143
+6144
+6145
+6146
+6147
+6148
+6149
+6150
+6151
+6152
+6153
+6154
+6155
+6156
+6157
+6158
+6159
+6160
+6161
+6162
+6163
+6164
+6165
+6166
+6167
+6168
+6169
+6170
+6171
+6172
+6173
+6174
+6175
+6176
+6177
+6178
+6179
+6180
+6181
+6182
+6183
+6184
+6185
+6186
+6187
+6188
+6189
+6190
+6191
+6192
+6193
+6194
+6195
+6196
+6197
+6198
+6199
+6200
+6201
+6202
+6203
+6204
+6205
+6206
+6207
+6208
+6209
+6210
+6211
+6212
+6213
+6214
+6215
+6216
+6217
+6218
+6219
+6220
+6221
+6222
+6223
+6224
+6225
+6226
+6227
+6228
+6229
+6230
+6231
+6232
+6233
+6234
+6235
+6236
+6237
+6238
+6239
+6240
+6241
+6242
+6243
+6244
+6245
+6246
+6247
+6248
+6249
+6250
+6251
+6252
+6253
+6254
+6255
+6256
+6257
+6258
+6259
+6260
+6261
+6262
+6263
+6264
+6265
+6266
+6267
+6268
+6269
+6270
+6271
+6272
+6273
+6274
+6275
+6276
+6277
+6278
+6279
+6280
+6281
+6282
+6283
+6284
+6285
+6286
+6287
+6288
+6289
+6290
+6291
+6292
+6293
+6294
+6295
+6296
+6297
+6298
+6299
+6300
+6301
+6302
+6303
+6304
+6305
+6306
+6307
+6308
+6309
+6310
+6311
+6312
+6313
+6314
+6315
+6316
+6317
+6318
+6319
+6320
+6321
+6322
+6323
+6324
+6325
+6326
+6327
+6328
+6329
+6330
+6331
+6332
+6333
+6334
+6335
+6336
+6337
+6338
+6339
+6340
+6341
+6342
+6343
+6344
+6345
+6346
+6347
+6348
+6349
+6350
+6351
+6352
+6353
+6354
+6355
+6356
+6357
+6358
+6359
+6360
+6361
+6362
+6363
+6364
+6365
+6366
+6367
+6368
+6369
+6370
+6371
+6372
+6373
+6374
+6375
+6376
+6377
+6378
+6379
+6380
+6381
+6382
+6383
+6384
+6385
+6386
+6387
+6388
+6389
+6390
+6391
+6392
+6393
+6394
+6395
+6396
+6397
+6398
+6399
+6400
+6401
+6402
+6403
+6404
+6405
+6406
+6407
+6408
+6409
+6410
+6411
+6412
+6413
+6414
+6415
+6416
+6417
+6418
+6419
+6420
+6421
+6422
+6423
+6424
+6425
+6426
+6427
+6428
+6429
+6430
+6431
+6432
+6433
+6434
+6435
+6436
+6437
+6438
+6439
+6440
+6441
+6442
+6443
+6444
+6445
+6446
+6447
+6448
+6449
+6450
+6451
+6452
+6453
+6454
+6455
+6456
+6457
+6458
+6459
+6460
+6461
+6462
+6463
+6464
+6465
+6466
+6467
+6468
+6469
+6470
+6471
+6472
+6473
+6474
+6475
+6476
+6477
+6478
+6479
+6480
+6481
+6482
+6483
+6484
+6485
+6486
+6487
+6488
+6489
+6490
+6491
+6492
+6493
+6494
+6495
+6496
+6497
+6498
+6499
+6500
+6501
+6502
+6503
+6504
+6505
+6506
+6507
+6508
+6509
+6510
+6511
+6512
+6513
+6514
+6515
+6516
+6517
+6518
+6519
+6520
+6521
+6522
+6523
+6524
+6525
+6526
+6527
+6528
+6529
+6530
+6531
+6532
+6533
+6534
+6535
+6536
+6537
+6538
+6539
+6540
+6541
+6542
+6543
+6544
+6545
+6546
+6547
+6548
+6549
+6550
+6551
+6552
+6553
+6554
+6555
+6556
+6557
+6558
+6559
+6560
+6561
+6562
+6563
+6564
+6565
+6566
+6567
+6568
+6569
+6570
+6571
+6572
+6573
+6574
+6575
+6576
+6577
+6578
+6579
+6580
+6581
+6582
+6583
+6584
+6585
+6586
+6587
+6588
+6589
+6590
+6591
+6592
+6593
+6594
+6595
+6596
+6597
+6598
+6599
+6600
+6601
+6602
+6603
+6604
+6605
+6606
+6607
+6608
+6609
+6610
+6611
+6612
+6613
+6614
+6615
+6616
+6617
+6618
+6619
+6620
+6621
+6622
+6623
+6624
+6625
+6626
+6627
+6628
+6629
+6630
+6631
+6632
+6633
+6634
+6635
+6636
+6637
+6638
+6639
+6640
+6641
+6642
+6643
+6644
+6645
+6646
+6647
+6648
+6649
+6650
+6651
+6652
+6653
+6654
+6655
+6656
+6657
+6658
+6659
+6660
+6661
+6662
+6663
+6664
+6665
+6666
+6667
+6668
+6669
+6670
+6671
+6672
+6673
+6674
+6675
+6676
+6677
+6678
+6679
+6680
+6681
+6682
+6683
+6684
+6685
+6686
+6687
+6688
+6689
+6690
+6691
+6692
+6693
+6694
+6695
+6696
+6697
+6698
+6699
+6700
+6701
+6702
+6703
+6704
+6705
+6706
+6707
+6708
+6709
+6710
+6711
+6712
+6713
+6714
+6715
+6716
+6717
+6718
+6719
+6720
+6721
+6722
+6723
+6724
+6725
+6726
+6727
+6728
+6729
+6730
+6731
+6732
+6733
+6734
+6735
+6736
+6737
+6738
+6739
+6740
+6741
+6742
+6743
+6744
+6745
+6746
+6747
+6748
+6749
+6750
+6751
+6752
+6753
+6754
+6755
+6756
+6757
+6758
+6759
+6760
+6761
+6762
+6763
+6764
+6765
+6766
+6767
+6768
+6769
+6770
+6771
+6772
+6773
+6774
+6775
+6776
+6777
+6778
+6779
+6780
+6781
+6782
+6783
+6784
+6785
+6786
+6787
+6788
+6789
+6790
+6791
+6792
+6793
+6794
+6795
+6796
+6797
+6798
+6799
+6800
+6801
+6802
+6803
+6804
+6805
+6806
+6807
+6808
+6809
+6810
+6811
+6812
+6813
+6814
+6815
+6816
+6817
+6818
+6819
+6820
+6821
+6822
+6823
+6824
+6825
+6826
+6827
+6828
+6829
+6830
+6831
+6832
+6833
+6834
+6835
+6836
+6837
+6838
+6839
+6840
+6841
+6842
+6843
+6844
+6845
+6846
+6847
+6848
+6849
+6850
+6851
+6852
+6853
+6854
+6855
+6856
+6857
+6858
+6859
+6860
+6861
+6862
+6863
+6864
+6865
+6866
+6867
+6868
+6869
+6870
+6871
+6872
+6873
+6874
+6875
+6876
+6877
+6878
+6879
+6880
+6881
+6882
+6883
+6884
+6885
+6886
+6887
+6888
+6889
+6890
+6891
+6892
+6893
+6894
+6895
+6896
+6897
+6898
+6899
+6900
+6901
+6902
+6903
+6904
+6905
+6906
+6907
+6908
+6909
+6910
+6911
+6912
+6913
+6914
+6915
+6916
+6917
+6918
+6919
+6920
+6921
+6922
+6923
+6924
+6925
+6926
+6927
+6928
+6929
+6930
+6931
+6932
+6933
+6934
+6935
+6936
+6937
+6938
+6939
+6940
+6941
+6942
+6943
+6944
+6945
+6946
+6947
+6948
+6949
+6950
+6951
+6952
+6953
+6954
+6955
+6956
+6957
+6958
+6959
+6960
+6961
+6962
+6963
+6964
+6965
+6966
+6967
+6968
+6969
+6970
+6971
+6972
+6973
+6974
+6975
+6976
+6977
+6978
+6979
+6980
+6981
+6982
+6983
+6984
+6985
+6986
+6987
+6988
+6989
+6990
+6991
+6992
+6993
+6994
+6995
+6996
+6997
+6998
+6999
+7000
+7001
+7002
+7003
+7004
+7005
+7006
+7007
+7008
+7009
+7010
+7011
+7012
+7013
+7014
+7015
+7016
+7017
+7018
+7019
+7020
+7021
+7022
+7023
+7024
+7025
+7026
+7027
+7028
+7029
+7030
+7031
+7032
+7033
+7034
+7035
+7036
+7037
+7038
+7039
+7040
+7041
+7042
+7043
+7044
+7045
+7046
+7047
+7048
+7049
+7050
+7051
+7052
+7053
+7054
+7055
+7056
+7057
+7058
+7059
+7060
+7061
+7062
+7063
+7064
+7065
+7066
+7067
+7068
+7069
+7070
+7071
+7072
+7073
+7074
+7075
+7076
+7077
+7078
+7079
+7080
+7081
+7082
+7083
+7084
+7085
+7086
+7087
+7088
+7089
+7090
+7091
+7092
+7093
+7094
+7095
+7096
+7097
+7098
+7099
+7100
+7101
+7102
+7103
+7104
+7105
+7106
+7107
+7108
+7109
+7110
+7111
+7112
+7113
+7114
+7115
+7116
+7117
+7118
+7119
+7120
+7121
+7122
+7123
+7124
+7125
+7126
+7127
+7128
+7129
+7130
+7131
+7132
+7133
+7134
+7135
+7136
+7137
+7138
+7139
+7140
+7141
+7142
+7143
+7144
+7145
+7146
+7147
+7148
+7149
+7150
+7151
+7152
+7153
+7154
+7155
+7156
+7157
+7158
+7159
+7160
+7161
+7162
+7163
+7164
+7165
+7166
+7167
+7168
+7169
+7170
+7171
+7172
+7173
+7174
+7175
+7176
+7177
+7178
+7179
+7180
+7181
+7182
+7183
+7184
+7185
+7186
+7187
+7188
+7189
+7190
+7191
+7192
+7193
+7194
+7195
+7196
+7197
+7198
+7199
+7200
+7201
+7202
+7203
+7204
+7205
+7206
+7207
+7208
+7209
+7210
+7211
+7212
+7213
+7214
+7215
+7216
+7217
+7218
+7219
+7220
+7221
+7222
+7223
+7224
+7225
+7226
+7227
+7228
+7229
+7230
+7231
+7232
+7233
+7234
+7235
+7236
+7237
+7238
+7239
+7240
+7241
+7242
+7243
+7244
+7245
+7246
+7247
+7248
+7249
+7250
+7251
+7252
+7253
+7254
+7255
+7256
+7257
+7258
+7259
+7260
+7261
+7262
+7263
+7264
+7265
+7266
+7267
+7268
+7269
+7270
+7271
+7272
+7273
+7274
+7275
+7276
+7277
+7278
+7279
+7280
+7281
+7282
+7283
+7284
+7285
+7286
+7287
+7288
+7289
+7290
+7291
+7292
+7293
+7294
+7295
+7296
+7297
+7298
+7299
+7300
+7301
+7302
+7303
+7304
+7305
+7306
+7307
+7308
+7309
+7310
+7311
+7312
+7313
+7314
+7315
+7316
+7317
+7318
+7319
+7320
+7321
+7322
+7323
+7324
+7325
+7326
+7327
+7328
+7329
+7330
+7331
+7332
+7333
+7334
+7335
+7336
+7337
+7338
+7339
+7340
+7341
+7342
+7343
+7344
+7345
+7346
+7347
+7348
+7349
+7350
+7351
+7352
+7353
+7354
+7355
+7356
+7357
+7358
+7359
+7360
+7361
+7362
+7363
+7364
+7365
+7366
+7367
+7368
+7369
+7370
+7371
+7372
+7373
+7374
+7375
+7376
+7377
+7378
+7379
+7380
+7381
+7382
+7383
+7384
+7385
+7386
+7387
+7388
+7389
+7390
+7391
+7392
+7393
+7394
+7395
+7396
+7397
+7398
+7399
+7400
+7401
+7402
+7403
+7404
+7405
+7406
+7407
+7408
+7409
+7410
+7411
+7412
+7413
+7414
+7415
+7416
+7417
+7418
+7419
+7420
+7421
+7422
+7423
+7424
+7425
+7426
+7427
+7428
+7429
+7430
+7431
+7432
+7433
+7434
+7435
+7436
+7437
+7438
+7439
+7440
+7441
+7442
+7443
+7444
+7445
+7446
+7447
+7448
+7449
+7450
+7451
+7452
+7453
+7454
+7455
+7456
+7457
+7458
+7459
+7460
+7461
+7462
+7463
+7464
+7465
+7466
+7467
+7468
+7469
+7470
+7471
+7472
+7473
+7474
+7475
+7476
+7477
+7478
+7479
+7480
+7481
+7482
+7483
+7484
+7485
+7486
+7487
+7488
+7489
+7490
+7491
+7492
+7493
+7494
+7495
+7496
+7497
+7498
+7499
+7500
+7501
+7502
+7503
+7504
+7505
+7506
+7507
+7508
+7509
+7510
+7511
+7512
+7513
+7514
+7515
+7516
+7517
+7518
+7519
+7520
+7521
+7522
+7523
+7524
+7525
+7526
+7527
+7528
+7529
+7530
+7531
+7532
+7533
+7534
+7535
+7536
+7537
+7538
+7539
+7540
+7541
+7542
+7543
+7544
+7545
+7546
+7547
+7548
+7549
+7550
+7551
+7552
+7553
+7554
+7555
+7556
+7557
+7558
+7559
+7560
+7561
+7562
+7563
+7564
+7565
+7566
+7567
+7568
+7569
+7570
+7571
+7572
+7573
+7574
+7575
+7576
+7577
+7578
+7579
+7580
+7581
+7582
+7583
+7584
+7585
+7586
+7587
+7588
+7589
+7590
+7591
+7592
+7593
+7594
+7595
+7596
+7597
+7598
+7599
+7600
+7601
+7602
+7603
+7604
+7605
+7606
+7607
+7608
+7609
+7610
+7611
+7612
+7613
+7614
+7615
+7616
+7617
+7618
+7619
+7620
+7621
+7622
+7623
+7624
+7625
+7626
+7627
+7628
+7629
+7630
+7631
+7632
+7633
+7634
+7635
+7636
+7637
+7638
+7639
+7640
+7641
+7642
+7643
+7644
+7645
+7646
+7647
+7648
+7649
+7650
+7651
+7652
+7653
+7654
+7655
+7656
+7657
+7658
+7659
+7660
+7661
+7662
+7663
+7664
+7665
+7666
+7667
+7668
+7669
+7670
+7671
+7672
+7673
+7674
+7675
+7676
+7677
+7678
+7679
+7680
+7681
+7682
+7683
+7684
+7685
+7686
+7687
+7688
+7689
+7690
+7691
+7692
+7693
+7694
+7695
+7696
+7697
+7698
+7699
+7700
+7701
+7702
+7703
+7704
+7705
+7706
+7707
+7708
+7709
+7710
+7711
+7712
+7713
+7714
+7715
+7716
+7717
+7718
+7719
+7720
+7721
+7722
+7723
+7724
+7725
+7726
+7727
+7728
+7729
+7730
+7731
+7732
+7733
+7734
+7735
+7736
+7737
+7738
+7739
+7740
+7741
+7742
+7743
+7744
+7745
+7746
+7747
+7748
+7749
+7750
+7751
+7752
+7753
+7754
+7755
+7756
+7757
+7758
+7759
+7760
+7761
+7762
+7763
+7764
+7765
+7766
+7767
+7768
+7769
+7770
+7771
+7772
+7773
+7774
+7775
+7776
+7777
+7778
+7779
+7780
+7781
+7782
+7783
+7784
+7785
+7786
+7787
+7788
+7789
+7790
+7791
+7792
+7793
+7794
+7795
+7796
+7797
+7798
+7799
+7800
+7801
+7802
+7803
+7804
+7805
+7806
+7807
+7808
+7809
+7810
+7811
+7812
+7813
+7814
+7815
+7816
+7817
+7818
+7819
+7820
+7821
+7822
+7823
+7824
+7825
+7826
+7827
+7828
+7829
+7830
+7831
+7832
+7833
+7834
+7835
+7836
+7837
+7838
+7839
+7840
+7841
+7842
+7843
+7844
+7845
+7846
+7847
+7848
+7849
+7850
+7851
+7852
+7853
+7854
+7855
+7856
+7857
+7858
+7859
+7860
+7861
+7862
+7863
+7864
+7865
+7866
+7867
+7868
+7869
+7870
+7871
+7872
+7873
+7874
+7875
+7876
+7877
+7878
+7879
+7880
+7881
+7882
+7883
+7884
+7885
+7886
+7887
+7888
+7889
+7890
+7891
+7892
+7893
+7894
+7895
+7896
+7897
+7898
+7899
+7900
+7901
+7902
+7903
+7904
+7905
+7906
+7907
+7908
+7909
+7910
+7911
+7912
+7913
+7914
+7915
+7916
+7917
+7918
+7919
+7920
+7921
+7922
+7923
+7924
+7925
+7926
+7927
+7928
+7929
+7930
+7931
+7932
+7933
+7934
+7935
+7936
+7937
+7938
+7939
+7940
+7941
+7942
+7943
+7944
+7945
+7946
+7947
+7948
+7949
+7950
+7951
+7952
+7953
+7954
+7955
+7956
+7957
+7958
+7959
+7960
+7961
+7962
+7963
+7964
+7965
+7966
+7967
+7968
+7969
+7970
+7971
+7972
+7973
+7974
+7975
+7976
+7977
+7978
+7979
+7980
+7981
+7982
+7983
+7984
+7985
+7986
+7987
+7988
+7989
+7990
+7991
+7992
+7993
+7994
+7995
+7996
+7997
+7998
+7999
+8000
+8001
+8002
+8003
+8004
+8005
+8006
+8007
+8008
+8009
+8010
+8011
+8012
+8013
+8014
+8015
+8016
+8017
+8018
+8019
+8020
+8021
+8022
+8023
+8024
+8025
+8026
+8027
+8028
+8029
+8030
+8031
+8032
+8033
+8034
+8035
+8036
+8037
+8038
+8039
+8040
+8041
+8042
+8043
+8044
+8045
+8046
+8047
+8048
+8049
+8050
+8051
+8052
+8053
+8054
+8055
+8056
+8057
+8058
+8059
+8060
+8061
+8062
+8063
+8064
+8065
+8066
+8067
+8068
+8069
+8070
+8071
+8072
+8073
+8074
+8075
+8076
+8077
+8078
+8079
+8080
+8081
+8082
+8083
+8084
+8085
+8086
+8087
+8088
+8089
+8090
+8091
+8092
+8093
+8094
+8095
+8096
+8097
+8098
+8099
+8100
+8101
+8102
+8103
+8104
+8105
+8106
+8107
+8108
+8109
+8110
+8111
+8112
+8113
+8114
+8115
+8116
+8117
+8118
+8119
+8120
+8121
+8122
+8123
+8124
+8125
+8126
+8127
+8128
+8129
+8130
+8131
+8132
+8133
+8134
+8135
+8136
+8137
+8138
+8139
+8140
+8141
+8142
+8143
+8144
+8145
+8146
+8147
+8148
+8149
+8150
+8151
+8152
+8153
+8154
+8155
+8156
+8157
+8158
+8159
+8160
+8161
+8162
+8163
+8164
+8165
+8166
+8167
+8168
+8169
+8170
+8171
+8172
+8173
+8174
+8175
+8176
+8177
+8178
+8179
+8180
+8181
+8182
+8183
+8184
+8185
+8186
+8187
+8188
+8189
+8190
+8191
+8192
+8193
+8194
+8195
+8196
+8197
+8198
+8199
+8200
+8201
+8202
+8203
+8204
+8205
+8206
+8207
+8208
+8209
+8210
+8211
+8212
+8213
+8214
+8215
+8216
+8217
+8218
+8219
+8220
+8221
+8222
+8223
+8224
+8225
+8226
+8227
+8228
+8229
+8230
+8231
+8232
+8233
+8234
+8235
+8236
+8237
+8238
+8239
+8240
+8241
+8242
+8243
+8244
+8245
+8246
+8247
+8248
+8249
+8250
+8251
+8252
+8253
+8254
+8255
+8256
+8257
+8258
+8259
+8260
+8261
+8262
+8263
+8264
+8265
+8266
+8267
+8268
+8269
+8270
+8271
+8272
+8273
+8274
+8275
+8276
+8277
+8278
+8279
+8280
+8281
+8282
+8283
+8284
+8285
+8286
+8287
+8288
+8289
+8290
+8291
+8292
+8293
+8294
+8295
+8296
+8297
+8298
+8299
+8300
+8301
+8302
+8303
+8304
+8305
+8306
+8307
+8308
+8309
+8310
+8311
+8312
+8313
+8314
+8315
+8316
+8317
+8318
+8319
+8320
+8321
+8322
+8323
+8324
+8325
+8326
+8327
+8328
+8329
+8330
+8331
+8332
+8333
+8334
+8335
+8336
+8337
+8338
+8339
+8340
+8341
+8342
+8343
+8344
+8345
+8346
+8347
+8348
+8349
+8350
+8351
+8352
+8353
+8354
+8355
+8356
+8357
+8358
+8359
+8360
+8361
+8362
+8363
+8364
+8365
+8366
+8367
+8368
+8369
+8370
+8371
+8372
+8373
+8374
+8375
+8376
+8377
+8378
+8379
+8380
+8381
+8382
+8383
+8384
+8385
+8386
+8387
+8388
+8389
+8390
+8391
+8392
+8393
+8394
+8395
+8396
+8397
+8398
+8399
+8400
+8401
+8402
+8403
+8404
+8405
+8406
+8407
+8408
+8409
+8410
+8411
+8412
+8413
+8414
+8415
+8416
+8417
+8418
+8419
+8420
+8421
+8422
+8423
+8424
+8425
+8426
+8427
+8428
+8429
+8430
+8431
+8432
+8433
+8434
+8435
+8436
+8437
+8438
+8439
+8440
+8441
+8442
+8443
+8444
+8445
+8446
+8447
+8448
+8449
+8450
+8451
+8452
+8453
+8454
+8455
+8456
+8457
+8458
+8459
+8460
+8461
+8462
+8463
+8464
+8465
+8466
+8467
+8468
+8469
+8470
+8471
+8472
+8473
+8474
+8475
+8476
+8477
+8478
+8479
+8480
+8481
+8482
+8483
+8484
+8485
+8486
+8487
+8488
+8489
+8490
+8491
+8492
+8493
+8494
+8495
+8496
+8497
+8498
+8499
+8500
+8501
+8502
+8503
+8504
+8505
+8506
+8507
+8508
+8509
+8510
+8511
+8512
+8513
+8514
+8515
+8516
+8517
+8518
+8519
+8520
+8521
+8522
+8523
+8524
+8525
+8526
+8527
+8528
+8529
+8530
+8531
+8532
+8533
+8534
+8535
+8536
+8537
+8538
+8539
+8540
+8541
+8542
+8543
+8544
+8545
+8546
+8547
+8548
+8549
+8550
+8551
+8552
+8553
+8554
+8555
+8556
+8557
+8558
+8559
+8560
+8561
+8562
+8563
+8564
+8565
+8566
+8567
+8568
+8569
+8570
+8571
+8572
+8573
+8574
+8575
+8576
+8577
+8578
+8579
+8580
+8581
+8582
+8583
+8584
+8585
+8586
+8587
+8588
+8589
+8590
+8591
+8592
+8593
+8594
+8595
+8596
+8597
+8598
+8599
+8600
+8601
+8602
+8603
+8604
+8605
+8606
+8607
+8608
+8609
+8610
+8611
+8612
+8613
+8614
+8615
+8616
+8617
+8618
+8619
+8620
+8621
+8622
+8623
+8624
+8625
+8626
+8627
+8628
+8629
+8630
+8631
+8632
+8633
+8634
+8635
+8636
+8637
+8638
+8639
+8640
+8641
+8642
+8643
+8644
+8645
+8646
+8647
+8648
+8649
+8650
+8651
+8652
+8653
+8654
+8655
+8656
+8657
+8658
+8659
+8660
+8661
+8662
+8663
+8664
+8665
+8666
+8667
+8668
+8669
+8670
+8671
+8672
+8673
+8674
+8675
+8676
+8677
+8678
+8679
+8680
+8681
+8682
+8683
+8684
+8685
+8686
+8687
+8688
+8689
+8690
+8691
+8692
+8693
+8694
+8695
+8696
+8697
+8698
+8699
+8700
+8701
+8702
+8703
+8704
+8705
+8706
+8707
+8708
+8709
+8710
+8711
+8712
+8713
+8714
+8715
+8716
+8717
+8718
+8719
+8720
+8721
+8722
+8723
+8724
+8725
+8726
+8727
+8728
+8729
+8730
+8731
+8732
+8733
+8734
+8735
+8736
+8737
+8738
+8739
+8740
+8741
+8742
+8743
+8744
+8745
+8746
+8747
+8748
+8749
+8750
+8751
+8752
+8753
+8754
+8755
+8756
+8757
+8758
+8759
+8760
+8761
+8762
+8763
+8764
+8765
+8766
+8767
+8768
+8769
+8770
+8771
+8772
+8773
+8774
+8775
+8776
+8777
+8778
+8779
+8780
+8781
+8782
+8783
+8784
+8785
+8786
+8787
+8788
+8789
+8790
+8791
+8792
+8793
+8794
+8795
+8796
+8797
+8798
+8799
+8800
+8801
+8802
+8803
+8804
+8805
+8806
+8807
+8808
+8809
+8810
+8811
+8812
+8813
+8814
+8815
+8816
+8817
+8818
+8819
+8820
+8821
+8822
+8823
+8824
+8825
+8826
+8827
+8828
+8829
+8830
+8831
+8832
+8833
+8834
+8835
+8836
+8837
+8838
+8839
+8840
+8841
+8842
+8843
+8844
+8845
+8846
+8847
+8848
+8849
+8850
+8851
+8852
+8853
+8854
+8855
+8856
+8857
+8858
+8859
+8860
+8861
+8862
+8863
+8864
+8865
+8866
+8867
+8868
+8869
+8870
+8871
+8872
+8873
+8874
+8875
+8876
+8877
+8878
+8879
+8880
+8881
+8882
+8883
+8884
+8885
+8886
+8887
+8888
+8889
+8890
+8891
+8892
+8893
+8894
+8895
+8896
+8897
+8898
+8899
+8900
+8901
+8902
+8903
+8904
+8905
+8906
+8907
+8908
+8909
+8910
+8911
+8912
+8913
+8914
+8915
+8916
+8917
+8918
+8919
+8920
+8921
+8922
+8923
+8924
+8925
+8926
+8927
+8928
+8929
+8930
+8931
+8932
+8933
+8934
+8935
+8936
+8937
+8938
+8939
+8940
+8941
+8942
+8943
+8944
+8945
+8946
+8947
+8948
+8949
+8950
+8951
+8952
+8953
+8954
+8955
+8956
+8957
+8958
+8959
+8960
+8961
+8962
+8963
+8964
+8965
+8966
+8967
+8968
+8969
+8970
+8971
+8972
+8973
+8974
+8975
+8976
+8977
+8978
+8979
+8980
+8981
+8982
+8983
+8984
+8985
+8986
+8987
+8988
+8989
+8990
+8991
+8992
+8993
+8994
+8995
+8996
+8997
+8998
+8999
+9000
+9001
+9002
+9003
+9004
+9005
+9006
+9007
+9008
+9009
+9010
+9011
+9012
+9013
+9014
+9015
+9016
+9017
+9018
+9019
+9020
+9021
+9022
+9023
+9024
+9025
+9026
+9027
+9028
+9029
+9030
+9031
+9032
+9033
+9034
+9035
+9036
+9037
+9038
+9039
+9040
+9041
+9042
+9043
+9044
+9045
+9046
+9047
+9048
+9049
+9050
+9051
+9052
+9053
+9054
+9055
+9056
+9057
+9058
+9059
+9060
+9061
+9062
+9063
+9064
+9065
+9066
+9067
+9068
+9069
+9070
+9071
+9072
+9073
+9074
+9075
+9076
+9077
+9078
+9079
+9080
+9081
+9082
+9083
+9084
+9085
+9086
+9087
+9088
+9089
+9090
+9091
+9092
+9093
+9094
+9095
+9096
+9097
+9098
+9099
+9100
+9101
+9102
+9103
+9104
+9105
+9106
+9107
+9108
+9109
+9110
+9111
+9112
+9113
+9114
+9115
+9116
+9117
+9118
+9119
+9120
+9121
+9122
+9123
+9124
+9125
+9126
+9127
+9128
+9129
+9130
+9131
+9132
+9133
+9134
+9135
+9136
+9137
+9138
+9139
+9140
+9141
+9142
+9143
+9144
+9145
+9146
+9147
+9148
+9149
+9150
+9151
+9152
+9153
+9154
+9155
+9156
+9157
+9158
+9159
+9160
+9161
+9162
+9163
+9164
+9165
+9166
+9167
+9168
+9169
+9170
+9171
+9172
+9173
+9174
+9175
+9176
+9177
+9178
+9179
+9180
+9181
+9182
+9183
+9184
+9185
+9186
+9187
+9188
+9189
+9190
+9191
+9192
+9193
+9194
+9195
+9196
+9197
+9198
+9199
+9200
+9201
+9202
+9203
+9204
+9205
+9206
+9207
+9208
+9209
+9210
+9211
+9212
+9213
+9214
+9215
+9216
+9217
+9218
+9219
+9220
+9221
+9222
+9223
+9224
+9225
+9226
+9227
+9228
+9229
+9230
+9231
+9232
+9233
+9234
+9235
+9236
+9237
+9238
+9239
+9240
+9241
+9242
+9243
+9244
+9245
+9246
+9247
+9248
+9249
+9250
+9251
+9252
+9253
+9254
+9255
+9256
+9257
+9258
+9259
+9260
+9261
+9262
+9263
+9264
+9265
+9266
+9267
+9268
+9269
+9270
+9271
+9272
+9273
+9274
+9275
+9276
+9277
+9278
+9279
+9280
+9281
+9282
+9283
+9284
+9285
+9286
+9287
+9288
+9289
+9290
+9291
+9292
+9293
+9294
+9295
+9296
+9297
+9298
+9299
+9300
+9301
+9302
+9303
+9304
+9305
+9306
+9307
+9308
+9309
+9310
+9311
+9312
+9313
+9314
+9315
+9316
+9317
+9318
+9319
+9320
+9321
+9322
+9323
+9324
+9325
+9326
+9327
+9328
+9329
+9330
+9331
+9332
+9333
+9334
+9335
+9336
+9337
+9338
+9339
+9340
+9341
+9342
+9343
+9344
+9345
+9346
+9347
+9348
+9349
+9350
+9351
+9352
+9353
+9354
+9355
+9356
+9357
+9358
+9359
+9360
+9361
+9362
+9363
+9364
+9365
+9366
+9367
+9368
+9369
+9370
+9371
+9372
+9373
+9374
+9375
+9376
+9377
+9378
+9379
+9380
+9381
+9382
+9383
+9384
+9385
+9386
+9387
+9388
+9389
+9390
+9391
+9392
+9393
+9394
+9395
+9396
+9397
+9398
+9399
+9400
+9401
+9402
+9403
+9404
+9405
+9406
+9407
+9408
+9409
+9410
+9411
+9412
+9413
+9414
+9415
+9416
+9417
+9418
+9419
+9420
+9421
+9422
+9423
+9424
+9425
+9426
+9427
+9428
+9429
+9430
+9431
+9432
+9433
+9434
+9435
+9436
+9437
+9438
+9439
+9440
+9441
+9442
+9443
+9444
+9445
+9446
+9447
+9448
+9449
+9450
+9451
+9452
+9453
+9454
+9455
+9456
+9457
+9458
+9459
+9460
+9461
+9462
+9463
+9464
+9465
+9466
+9467
+9468
+9469
+9470
+9471
+9472
+9473
+9474
+9475
+9476
+9477
+9478
+9479
+9480
+9481
+9482
+9483
+9484
+9485
+9486
+9487
+9488
+9489
+9490
+9491
+9492
+9493
+9494
+9495
+9496
+9497
+9498
+9499
+9500
+9501
+9502
+9503
+9504
+9505
+9506
+9507
+9508
+9509
+9510
+9511
+9512
+9513
+9514
+9515
+9516
+9517
+9518
+9519
+9520
+9521
+9522
+9523
+9524
+9525
+9526
+9527
+9528
+9529
+9530
+9531
+9532
+9533
+9534
+9535
+9536
+9537
+9538
+9539
+9540
+9541
+9542
+9543
+9544
+9545
+9546
+9547
+9548
+9549
+9550
+9551
+9552
+9553
+9554
+9555
+9556
+9557
+9558
+9559
+9560
+9561
+9562
+9563
+9564
+9565
+9566
+9567
+9568
+9569
+9570
+9571
+9572
+9573
+9574
+9575
+9576
+9577
+9578
+9579
+9580
+9581
+9582
+9583
+9584
+9585
+9586
+9587
+9588
+9589
+9590
+9591
+9592
+9593
+9594
+9595
+9596
+9597
+9598
+9599
+9600
+9601
+9602
+9603
+9604
+9605
+9606
+9607
+9608
+9609
+9610
+9611
+9612
+9613
+9614
+9615
+9616
+9617
+9618
+9619
+9620
+9621
+9622
+9623
+9624
+9625
+9626
+9627
+9628
+9629
+9630
+9631
+9632
+9633
+9634
+9635
+9636
+9637
+9638
+9639
+9640
+9641
+9642
+9643
+9644
+9645
+9646
+9647
+9648
+9649
+9650
+9651
+9652
+9653
+9654
+9655
+9656
+9657
+9658
+9659
+9660
+9661
+9662
+9663
+9664
+9665
+9666
+9667
+9668
+9669
+9670
+9671
+9672
+9673
+9674
+9675
+9676
+9677
+9678
+9679
+9680
+9681
+9682
+9683
+9684
+9685
+9686
+9687
+9688
+9689
+9690
+9691
+9692
+9693
+9694
+9695
+9696
+9697
+9698
+9699
+9700
+9701
+9702
+9703
+9704
+9705
+9706
+9707
+9708
+9709
+9710
+9711
+9712
+9713
+9714
+9715
+9716
+9717
+9718
+9719
+9720
+9721
+9722
+9723
+9724
+9725
+9726
+9727
+9728
+9729
+9730
+9731
+9732
+9733
+9734
+9735
+9736
+9737
+9738
+9739
+9740
+9741
+9742
+9743
+9744
+9745
+9746
+9747
+9748
+9749
+9750
+9751
+9752
+9753
+9754
+9755
+9756
+9757
+9758
+9759
+9760
+9761
+9762
+9763
+9764
+9765
+9766
+9767
+9768
+9769
+9770
+9771
+9772
+9773
+9774
+9775
+9776
+9777
+9778
+9779
+9780
+9781
+9782
+9783
+9784
+9785
+9786
+9787
+9788
+9789
+9790
+9791
+9792
+9793
+9794
+9795
+9796
+9797
+9798
+9799
+9800
+9801
+9802
+9803
+9804
+9805
+9806
+9807
+9808
+9809
+9810
+9811
+9812
+9813
+9814
+9815
+9816
+9817
+9818
+9819
+9820
+9821
+9822
+9823
+9824
+9825
+9826
+9827
+9828
+9829
+9830
+9831
+9832
+9833
+9834
+9835
+9836
+9837
+9838
+9839
+9840
+9841
+9842
+9843
+9844
+9845
+9846
+9847
+9848
+9849
+9850
+9851
+9852
+9853
+9854
+9855
+9856
+9857
+9858
+9859
+9860
+9861
+9862
+9863
+9864
+9865
+9866
+9867
+9868
+9869
+9870
+9871
+9872
+9873
+9874
+9875
+9876
+9877
+9878
+9879
+9880
+9881
+9882
+9883
+9884
+9885
+9886
+9887
+9888
+9889
+9890
+9891
+9892
+9893
+9894
+9895
+9896
+9897
+9898
+9899
+9900
+9901
+9902
+9903
+9904
+9905
+9906
+9907
+9908
+9909
+9910
+9911
+9912
+9913
+9914
+9915
+9916
+9917
+9918
+9919
+9920
+9921
+9922
+9923
+9924
+9925
+9926
+9927
+9928
+9929
+9930
+9931
+9932
+9933
+9934
+9935
+9936
+9937
+9938
+9939
+9940
+9941
+9942
+9943
+9944
+9945
+9946
+9947
+9948
+9949
+9950
+9951
+9952
+9953
+9954
+9955
+9956
+9957
+9958
+9959
+9960
+9961
+9962
+9963
+9964
+9965
+9966
+9967
+9968
+9969
+9970
+9971
+9972
+9973
+9974
+9975
+9976
+9977
+9978
+9979
+9980
+9981
+9982
+9983
+9984
+9985
+9986
+9987
+9988
+9989
+9990
+9991
+9992
+9993
+9994
+9995
+9996
+9997
+9998
+9999
diff --git a/core-java-jvm/README.md b/core-java-modules/core-java-jvm/README.md
similarity index 100%
rename from core-java-jvm/README.md
rename to core-java-modules/core-java-jvm/README.md
diff --git a/core-java-jvm/pom.xml b/core-java-modules/core-java-jvm/pom.xml
similarity index 96%
rename from core-java-jvm/pom.xml
rename to core-java-modules/core-java-jvm/pom.xml
index 752b26f03f..6c700cd005 100644
--- a/core-java-jvm/pom.xml
+++ b/core-java-modules/core-java-jvm/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/core-java-jvm/src/main/java/com/baeldung/inlining/ConsecutiveNumbersSum.java b/core-java-modules/core-java-jvm/src/main/java/com/baeldung/inlining/ConsecutiveNumbersSum.java
similarity index 100%
rename from core-java-jvm/src/main/java/com/baeldung/inlining/ConsecutiveNumbersSum.java
rename to core-java-modules/core-java-jvm/src/main/java/com/baeldung/inlining/ConsecutiveNumbersSum.java
diff --git a/core-java-jvm/src/main/java/com/baeldung/inlining/InliningExample.java b/core-java-modules/core-java-jvm/src/main/java/com/baeldung/inlining/InliningExample.java
similarity index 100%
rename from core-java-jvm/src/main/java/com/baeldung/inlining/InliningExample.java
rename to core-java-modules/core-java-jvm/src/main/java/com/baeldung/inlining/InliningExample.java
diff --git a/core-java-jvm/src/test/java/com/baeldung/inlining/ConsecutiveNumbersSumUnitTest.java b/core-java-modules/core-java-jvm/src/test/java/com/baeldung/inlining/ConsecutiveNumbersSumUnitTest.java
similarity index 100%
rename from core-java-jvm/src/test/java/com/baeldung/inlining/ConsecutiveNumbersSumUnitTest.java
rename to core-java-modules/core-java-jvm/src/test/java/com/baeldung/inlining/ConsecutiveNumbersSumUnitTest.java
diff --git a/core-java-lambdas/pom.xml b/core-java-modules/core-java-lambdas/pom.xml
similarity index 90%
rename from core-java-lambdas/pom.xml
rename to core-java-modules/core-java-lambdas/pom.xml
index 25538a3524..d6158c2946 100644
--- a/core-java-lambdas/pom.xml
+++ b/core-java-modules/core-java-lambdas/pom.xml
@@ -12,7 +12,7 @@
     <groupId>com.baeldung</groupId>
     <artifactId>parent-java</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <relativePath>../parent-java</relativePath>
+    <relativePath>../../parent-java</relativePath>
   </parent>
 
 
diff --git a/core-java-lambdas/src/main/java/com/baeldung/lambdas/LambdaVariables.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/lambdas/LambdaVariables.java
similarity index 100%
rename from core-java-lambdas/src/main/java/com/baeldung/lambdas/LambdaVariables.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/baeldung/lambdas/LambdaVariables.java
diff --git a/core-java-lang-oop-2/.gitignore b/core-java-modules/core-java-lang-oop-2/.gitignore
similarity index 100%
rename from core-java-lang-oop-2/.gitignore
rename to core-java-modules/core-java-lang-oop-2/.gitignore
diff --git a/core-java-lang-oop-2/README.md b/core-java-modules/core-java-lang-oop-2/README.md
similarity index 100%
rename from core-java-lang-oop-2/README.md
rename to core-java-modules/core-java-lang-oop-2/README.md
diff --git a/core-java-lang-oop-2/pom.xml b/core-java-modules/core-java-lang-oop-2/pom.xml
similarity index 94%
rename from core-java-lang-oop-2/pom.xml
rename to core-java-modules/core-java-lang-oop-2/pom.xml
index 3faf9fe6ee..669a37b0f5 100644
--- a/core-java-lang-oop-2/pom.xml
+++ b/core-java-modules/core-java-lang-oop-2/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <build>
diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/anonymous/Book.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/anonymous/Book.java
similarity index 100%
rename from core-java-lang-oop-2/src/main/java/com/baeldung/anonymous/Book.java
rename to core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/anonymous/Book.java
diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/anonymous/Main.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/anonymous/Main.java
similarity index 100%
rename from core-java-lang-oop-2/src/main/java/com/baeldung/anonymous/Main.java
rename to core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/anonymous/Main.java
diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/generics/Entry.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/generics/Entry.java
similarity index 100%
rename from core-java-lang-oop-2/src/main/java/com/baeldung/generics/Entry.java
rename to core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/generics/Entry.java
diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/generics/GenericEntry.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/generics/GenericEntry.java
similarity index 100%
rename from core-java-lang-oop-2/src/main/java/com/baeldung/generics/GenericEntry.java
rename to core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/generics/GenericEntry.java
diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/generics/MapEntry.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/generics/MapEntry.java
similarity index 100%
rename from core-java-lang-oop-2/src/main/java/com/baeldung/generics/MapEntry.java
rename to core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/generics/MapEntry.java
diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/generics/Product.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/generics/Product.java
similarity index 100%
rename from core-java-lang-oop-2/src/main/java/com/baeldung/generics/Product.java
rename to core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/generics/Product.java
diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/generics/Rankable.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/generics/Rankable.java
similarity index 100%
rename from core-java-lang-oop-2/src/main/java/com/baeldung/generics/Rankable.java
rename to core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/generics/Rankable.java
diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClass.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClass.java
similarity index 100%
rename from core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClass.java
rename to core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClass.java
diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution1.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution1.java
similarity index 100%
rename from core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution1.java
rename to core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution1.java
diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution2.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution2.java
similarity index 100%
rename from core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution2.java
rename to core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution2.java
diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution3.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution3.java
similarity index 100%
rename from core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution3.java
rename to core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution3.java
diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyException.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyException.java
similarity index 100%
rename from core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyException.java
rename to core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyException.java
diff --git a/core-java-lang-oop-2/src/test/java/com/baeldung/generics/GenericConstructorUnitTest.java b/core-java-modules/core-java-lang-oop-2/src/test/java/com/baeldung/generics/GenericConstructorUnitTest.java
similarity index 100%
rename from core-java-lang-oop-2/src/test/java/com/baeldung/generics/GenericConstructorUnitTest.java
rename to core-java-modules/core-java-lang-oop-2/src/test/java/com/baeldung/generics/GenericConstructorUnitTest.java
diff --git a/core-java-lang-oop/.gitignore b/core-java-modules/core-java-lang-oop/.gitignore
similarity index 100%
rename from core-java-lang-oop/.gitignore
rename to core-java-modules/core-java-lang-oop/.gitignore
diff --git a/core-java-lang-oop/README.md b/core-java-modules/core-java-lang-oop/README.md
similarity index 100%
rename from core-java-lang-oop/README.md
rename to core-java-modules/core-java-lang-oop/README.md
diff --git a/core-java-lang-oop/pom.xml b/core-java-modules/core-java-lang-oop/pom.xml
similarity index 98%
rename from core-java-lang-oop/pom.xml
rename to core-java-modules/core-java-lang-oop/pom.xml
index 6763bbb26d..c9bb3b3e5a 100644
--- a/core-java-lang-oop/pom.xml
+++ b/core-java-modules/core-java-lang-oop/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/Public.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/Public.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/Public.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/Public.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/SubClass.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/SubClass.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/SubClass.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/SubClass.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/SuperPublic.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/SuperPublic.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/SuperPublic.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/SuperPublic.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/another/AnotherPublic.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/another/AnotherPublic.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/another/AnotherPublic.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/another/AnotherPublic.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/another/AnotherSubClass.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/another/AnotherSubClass.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/another/AnotherSubClass.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/another/AnotherSubClass.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/another/AnotherSuperPublic.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/another/AnotherSuperPublic.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/another/AnotherSuperPublic.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/accessmodifiers/another/AnotherSuperPublic.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/casting/Animal.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/casting/Animal.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/casting/Animal.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/casting/Animal.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/casting/AnimalFeeder.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/casting/AnimalFeeder.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/casting/AnimalFeeder.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/casting/AnimalFeeder.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/casting/AnimalFeederGeneric.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/casting/AnimalFeederGeneric.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/casting/AnimalFeederGeneric.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/casting/AnimalFeederGeneric.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/casting/Cat.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/casting/Cat.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/casting/Cat.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/casting/Cat.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/casting/Dog.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/casting/Dog.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/casting/Dog.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/casting/Dog.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/casting/Mew.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/casting/Mew.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/casting/Mew.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/casting/Mew.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/constructors/BankAccount.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/constructors/BankAccount.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/constructors/BankAccount.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/constructors/BankAccount.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/constructors/Transaction.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/constructors/Transaction.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/constructors/Transaction.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/constructors/Transaction.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/deepcopy/Address.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/deepcopy/Address.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/deepcopy/Address.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/deepcopy/Address.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/deepcopy/User.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/deepcopy/User.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/deepcopy/User.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/deepcopy/User.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/Money.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/Money.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/Money.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/Money.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/Team.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/Team.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/Team.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/Team.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/Voucher.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/Voucher.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/Voucher.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/Voucher.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/WrongTeam.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/WrongTeam.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/WrongTeam.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/WrongTeam.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/WrongVoucher.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/WrongVoucher.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/WrongVoucher.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/WrongVoucher.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/ComplexClass.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/ComplexClass.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/ComplexClass.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/ComplexClass.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/PrimitiveClass.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/PrimitiveClass.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/PrimitiveClass.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/PrimitiveClass.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/Rectangle.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/Rectangle.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/Rectangle.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/Rectangle.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/Shape.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/Shape.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/Shape.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/Shape.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/Square.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/Square.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/Square.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/equalshashcode/entities/Square.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/BlackCat.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/BlackCat.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/BlackCat.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/BlackCat.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/BlackDog.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/BlackDog.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/BlackDog.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/BlackDog.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/Cat.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/Cat.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/Cat.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/Cat.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/Dog.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/Dog.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/Dog.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/finalkeyword/Dog.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/hashcode/entities/User.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hashcode/entities/User.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/hashcode/entities/User.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hashcode/entities/User.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/immutableobjects/Currency.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/immutableobjects/Currency.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/immutableobjects/Currency.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/immutableobjects/Currency.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/immutableobjects/Money.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/immutableobjects/Money.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/immutableobjects/Money.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/immutableobjects/Money.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/ArmoredCar.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/ArmoredCar.java
similarity index 96%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritance/ArmoredCar.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/ArmoredCar.java
index b6bb5181b8..ad654ba31a 100644
--- a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/ArmoredCar.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/ArmoredCar.java
@@ -1,43 +1,43 @@
-package com.baeldung.inheritance;
-
-public class ArmoredCar extends Car implements Floatable, Flyable{
-    private int bulletProofWindows;
-    private String model;
-    
-    public void remoteStartCar() {
-        // this vehicle can be started by using a remote control
-    }
-    
-    public String registerModel() {
-        return model;
-    }
-    
-    public String getAValue() {
-        return super.model;   // returns value of model defined in base class Car
-        // return this.model;   // will return value of model defined in ArmoredCar
-        // return model;   // will return value of model defined in ArmoredCar
-    }
-    
-    public static String msg() {
-    	// return super.msg(); // this won't compile.
-    	return "ArmoredCar"; 
-    }
-    
-	@Override
-    public void floatOnWater() {
-        System.out.println("I can float!");
-    }
-    
-	@Override
-    public void fly() {
-        System.out.println("I can fly!");
-    }
-    
-    public void aMethod() {
-        // System.out.println(duration); // Won't compile
-        System.out.println(Floatable.duration); // outputs 10
-        System.out.println(Flyable.duration); // outputs 20
-    }
-    
-    
-}
+package com.baeldung.inheritance;
+
+public class ArmoredCar extends Car implements Floatable, Flyable{
+    private int bulletProofWindows;
+    private String model;
+    
+    public void remoteStartCar() {
+        // this vehicle can be started by using a remote control
+    }
+    
+    public String registerModel() {
+        return model;
+    }
+    
+    public String getAValue() {
+        return super.model;   // returns value of model defined in base class Car
+        // return this.model;   // will return value of model defined in ArmoredCar
+        // return model;   // will return value of model defined in ArmoredCar
+    }
+    
+    public static String msg() {
+    	// return super.msg(); // this won't compile.
+    	return "ArmoredCar"; 
+    }
+    
+	@Override
+    public void floatOnWater() {
+        System.out.println("I can float!");
+    }
+    
+	@Override
+    public void fly() {
+        System.out.println("I can fly!");
+    }
+    
+    public void aMethod() {
+        // System.out.println(duration); // Won't compile
+        System.out.println(Floatable.duration); // outputs 10
+        System.out.println(Flyable.duration); // outputs 20
+    }
+    
+    
+}
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/BMW.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/BMW.java
similarity index 93%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritance/BMW.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/BMW.java
index 8ad3bb683f..8eb6198203 100644
--- a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/BMW.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/BMW.java
@@ -1,12 +1,12 @@
-package com.baeldung.inheritance;
-
-public class BMW extends Car {
-    public BMW() {
-    	super(5, "BMW");
-    }
-	
-	@Override
-    public String toString() {
-    	return model;
-    }
-}
+package com.baeldung.inheritance;
+
+public class BMW extends Car {
+    public BMW() {
+    	super(5, "BMW");
+    }
+	
+	@Override
+    public String toString() {
+    	return model;
+    }
+}
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Car.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Car.java
similarity index 95%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritance/Car.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Car.java
index 21ea9ea569..ddb06dcf08 100644
--- a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Car.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Car.java
@@ -1,32 +1,32 @@
-package com.baeldung.inheritance;
-
-public class Car {
-	private final int DEFAULT_WHEEL_COUNT = 5;
-	private final String DEFAULT_MODEL = "Basic";
-
-	protected int wheels;
-    protected String model;
-    
-    public Car() {
-    	this.wheels = DEFAULT_WHEEL_COUNT;
-    	this.model = DEFAULT_MODEL;
-    }
-    
-    public Car(int wheels, String model) {
-    	this.wheels = wheels;
-    	this.model = model;
-    }
-        
-    public void start() {
-        // Check essential parts
-        // If okay, start.
-    }
-    public static int count = 10;
-    public static String msg() {
-        return "Car";
-    }
-    
-    public String toString() {
-    	return model;
-    } 
+package com.baeldung.inheritance;
+
+public class Car {
+	private final int DEFAULT_WHEEL_COUNT = 5;
+	private final String DEFAULT_MODEL = "Basic";
+
+	protected int wheels;
+    protected String model;
+    
+    public Car() {
+    	this.wheels = DEFAULT_WHEEL_COUNT;
+    	this.model = DEFAULT_MODEL;
+    }
+    
+    public Car(int wheels, String model) {
+    	this.wheels = wheels;
+    	this.model = model;
+    }
+        
+    public void start() {
+        // Check essential parts
+        // If okay, start.
+    }
+    public static int count = 10;
+    public static String msg() {
+        return "Car";
+    }
+    
+    public String toString() {
+    	return model;
+    } 
 }
\ No newline at end of file
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Employee.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Employee.java
similarity index 94%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritance/Employee.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Employee.java
index 599a1d7331..9018382087 100644
--- a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Employee.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Employee.java
@@ -1,15 +1,15 @@
-package com.baeldung.inheritance;
-
-public class Employee {
-    private String name;
-    private Car car;
-    
-    public Employee(String name, Car car) {
-        this.name = name;
-        this.car = car;
-    }
-    
-    public Car getCar() {
-    	return car;
-    }
+package com.baeldung.inheritance;
+
+public class Employee {
+    private String name;
+    private Car car;
+    
+    public Employee(String name, Car car) {
+        this.name = name;
+        this.car = car;
+    }
+    
+    public Car getCar() {
+    	return car;
+    }
 }
\ No newline at end of file
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Floatable.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Floatable.java
similarity index 95%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritance/Floatable.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Floatable.java
index c0b456dffb..b90163487a 100644
--- a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Floatable.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Floatable.java
@@ -1,10 +1,10 @@
-package com.baeldung.inheritance;
-
-public interface Floatable {
-    int duration = 10;
-    void floatOnWater();
-    
-    default void repair() {
-        System.out.println("Repairing Floatable object");   
-    }
-}
+package com.baeldung.inheritance;
+
+public interface Floatable {
+    int duration = 10;
+    void floatOnWater();
+    
+    default void repair() {
+        System.out.println("Repairing Floatable object");   
+    }
+}
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Flyable.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Flyable.java
similarity index 94%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritance/Flyable.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Flyable.java
index cb8244cf5b..a25ce6f91b 100644
--- a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Flyable.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/Flyable.java
@@ -1,13 +1,13 @@
-package com.baeldung.inheritance;
-
-public interface Flyable {
-    int duration = 10;
-    void fly();
-    
-    /*
-     * Commented 
-     */
-    //default void repair() {
-    //    System.out.println("Repairing Flyable object"); 
-    //}
-}
+package com.baeldung.inheritance;
+
+public interface Flyable {
+    int duration = 10;
+    void fly();
+    
+    /*
+     * Commented 
+     */
+    //default void repair() {
+    //    System.out.println("Repairing Flyable object"); 
+    //}
+}
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/SpaceCar.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/SpaceCar.java
similarity index 95%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritance/SpaceCar.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/SpaceCar.java
index 8c23b26da9..76a44411db 100644
--- a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/SpaceCar.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/SpaceCar.java
@@ -1,18 +1,18 @@
-package com.baeldung.inheritance;
-
-public class SpaceCar extends Car implements SpaceTraveller {
-	@Override
-    public void floatOnWater() {
-        System.out.println("SpaceCar floating!");
-    }
-    
-	@Override
-    public void fly() {
-        System.out.println("SpaceCar flying!");
-    }
-    
-	@Override
-    public void remoteControl() {
-        System.out.println("SpaceCar being controlled remotely!");
-    }
-}
+package com.baeldung.inheritance;
+
+public class SpaceCar extends Car implements SpaceTraveller {
+	@Override
+    public void floatOnWater() {
+        System.out.println("SpaceCar floating!");
+    }
+    
+	@Override
+    public void fly() {
+        System.out.println("SpaceCar flying!");
+    }
+    
+	@Override
+    public void remoteControl() {
+        System.out.println("SpaceCar being controlled remotely!");
+    }
+}
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/SpaceTraveller.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/SpaceTraveller.java
similarity index 96%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritance/SpaceTraveller.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/SpaceTraveller.java
index 9b66441791..3a473af093 100644
--- a/core-java-lang-oop/src/main/java/com/baeldung/inheritance/SpaceTraveller.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritance/SpaceTraveller.java
@@ -1,6 +1,6 @@
-package com.baeldung.inheritance;
-
-public interface SpaceTraveller extends Floatable, Flyable {
-    int duration = 10;
-    void remoteControl();
+package com.baeldung.inheritance;
+
+public interface SpaceTraveller extends Floatable, Flyable {
+    int duration = 10;
+    void remoteControl();
 }
\ No newline at end of file
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/application/Application.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/application/Application.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/application/Application.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/application/Application.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Actress.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Actress.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Actress.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Actress.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Computer.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Computer.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Computer.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Computer.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Memory.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Memory.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Memory.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Memory.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Person.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Person.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Person.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Person.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Processor.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Processor.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Processor.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Processor.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/SoundCard.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/SoundCard.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/SoundCard.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/SoundCard.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/StandardMemory.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/StandardMemory.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/StandardMemory.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/StandardMemory.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/StandardProcessor.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/StandardProcessor.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/StandardProcessor.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/StandardProcessor.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/StandardSoundCard.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/StandardSoundCard.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/StandardSoundCard.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/StandardSoundCard.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Waitress.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Waitress.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Waitress.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/inheritancecomposition/model/Waitress.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/initializationguide/User.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/initializationguide/User.java
similarity index 94%
rename from core-java-lang-syntax/src/main/java/com/baeldung/initializationguide/User.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/initializationguide/User.java
index e2e3f051dd..1d9a872d69 100644
--- a/core-java-lang-syntax/src/main/java/com/baeldung/initializationguide/User.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/initializationguide/User.java
@@ -1,53 +1,53 @@
-package com.baeldung.initializationguide;
-
-import java.io.Serializable;
-
-public class User implements Serializable, Cloneable {
-    private static final long serialVersionUID = 1L;
-    static String forum;
-    private String name;
-    private int id;
-
-    {
-        id = 0;
-        System.out.println("Instance Initializer");
-    }
-
-    static {
-    	forum = "Java";
-        System.out.println("Static Initializer");
-    }
-
-    public User(String name, int id) {
-        super();
-        this.name = name;
-        this.id = id;
-    }
-
-    public User() {
-        System.out.println("Constructor");
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        return this;
-    }
-
-}
-
+package com.baeldung.initializationguide;
+
+import java.io.Serializable;
+
+public class User implements Serializable, Cloneable {
+    private static final long serialVersionUID = 1L;
+    static String forum;
+    private String name;
+    private int id;
+
+    {
+        id = 0;
+        System.out.println("Instance Initializer");
+    }
+
+    static {
+    	forum = "Java";
+        System.out.println("Static Initializer");
+    }
+
+    public User(String name, int id) {
+        super();
+        this.name = name;
+        this.id = id;
+    }
+
+    public User() {
+        System.out.println("Constructor");
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return this;
+    }
+
+}
+
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/keyword/KeywordDemo.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/keyword/KeywordDemo.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/keyword/KeywordDemo.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/keyword/KeywordDemo.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/keyword/superkeyword/SuperBase.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/keyword/superkeyword/SuperBase.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/keyword/superkeyword/SuperBase.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/keyword/superkeyword/SuperBase.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/keyword/superkeyword/SuperSub.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/keyword/superkeyword/SuperSub.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/keyword/superkeyword/SuperSub.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/keyword/superkeyword/SuperSub.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/keyword/thiskeyword/KeywordUnitTest.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/keyword/thiskeyword/KeywordUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/keyword/thiskeyword/KeywordUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/keyword/thiskeyword/KeywordUnitTest.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/DeletableShape.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/DeletableShape.java
similarity index 94%
rename from core-java-lang-oop/src/main/java/com/baeldung/markerinterface/DeletableShape.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/DeletableShape.java
index 7674407da8..800ba6f46c 100644
--- a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/DeletableShape.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/DeletableShape.java
@@ -1,5 +1,5 @@
-package com.baeldung.markerinterface;
-
-public interface DeletableShape extends Shape {
-
-}
+package com.baeldung.markerinterface;
+
+public interface DeletableShape extends Shape {
+
+}
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Rectangle.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Rectangle.java
similarity index 95%
rename from core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Rectangle.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Rectangle.java
index d64ffad0a2..659f2af2ee 100644
--- a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Rectangle.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Rectangle.java
@@ -1,22 +1,22 @@
-package com.baeldung.markerinterface;
-
-public class Rectangle implements DeletableShape {
-
-    private double width;
-    private double height;
-
-    public Rectangle(double width, double height) {
-        this.width = width;
-        this.height = height;
-    }
-
-    @Override
-    public double getArea() {
-        return width * height;
-    }
-
-    @Override
-    public double getCircumference() {
-        return 2 * (width + height);
-    }
-}
+package com.baeldung.markerinterface;
+
+public class Rectangle implements DeletableShape {
+
+    private double width;
+    private double height;
+
+    public Rectangle(double width, double height) {
+        this.width = width;
+        this.height = height;
+    }
+
+    @Override
+    public double getArea() {
+        return width * height;
+    }
+
+    @Override
+    public double getCircumference() {
+        return 2 * (width + height);
+    }
+}
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Shape.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Shape.java
similarity index 95%
rename from core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Shape.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Shape.java
index 2e53aefc03..b1db906087 100644
--- a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Shape.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Shape.java
@@ -1,6 +1,6 @@
-package com.baeldung.markerinterface;
-
-public interface Shape {
-    double getArea();
-    double getCircumference();
+package com.baeldung.markerinterface;
+
+public interface Shape {
+    double getArea();
+    double getCircumference();
 }
\ No newline at end of file
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/ShapeDao.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/ShapeDao.java
similarity index 95%
rename from core-java-lang-oop/src/main/java/com/baeldung/markerinterface/ShapeDao.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/ShapeDao.java
index bc988a793d..1b95c7b307 100644
--- a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/ShapeDao.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/ShapeDao.java
@@ -1,14 +1,14 @@
-package com.baeldung.markerinterface;
-
-public class ShapeDao {
-
-    public boolean delete(Object object) {
-        if (!(object instanceof DeletableShape)) {
-            return false;
-        }
-        // Calling the code that deletes the entity from the database
-
-        return true;
-    }
-
-}
+package com.baeldung.markerinterface;
+
+public class ShapeDao {
+
+    public boolean delete(Object object) {
+        if (!(object instanceof DeletableShape)) {
+            return false;
+        }
+        // Calling the code that deletes the entity from the database
+
+        return true;
+    }
+
+}
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/application/Application.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/application/Application.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/application/Application.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/application/Application.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/model/Car.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/model/Car.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/model/Car.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/model/Car.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/model/Vehicle.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/model/Vehicle.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/model/Vehicle.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/model/Vehicle.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/util/Multiplier.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/util/Multiplier.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/util/Multiplier.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/methodoverloadingoverriding/util/Multiplier.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/polymorphism/FileManager.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/polymorphism/FileManager.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/polymorphism/FileManager.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/polymorphism/FileManager.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/polymorphism/GenericFile.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/polymorphism/GenericFile.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/polymorphism/GenericFile.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/polymorphism/GenericFile.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/polymorphism/ImageFile.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/polymorphism/ImageFile.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/polymorphism/ImageFile.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/polymorphism/ImageFile.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/polymorphism/TextFile.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/polymorphism/TextFile.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/polymorphism/TextFile.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/polymorphism/TextFile.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/scope/method/BaseMethodClass.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/method/BaseMethodClass.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/scope/method/BaseMethodClass.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/method/BaseMethodClass.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/scope/method/ChildMethodClass.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/method/ChildMethodClass.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/scope/method/ChildMethodClass.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/method/ChildMethodClass.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/scope/method/MethodHidingDemo.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/method/MethodHidingDemo.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/scope/method/MethodHidingDemo.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/method/MethodHidingDemo.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/scope/variable/ChildVariable.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/variable/ChildVariable.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/scope/variable/ChildVariable.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/variable/ChildVariable.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/scope/variable/HideVariable.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/variable/HideVariable.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/scope/variable/HideVariable.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/variable/HideVariable.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/scope/variable/ParentVariable.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/variable/ParentVariable.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/scope/variable/ParentVariable.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/variable/ParentVariable.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/scope/variable/VariableHidingDemo.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/variable/VariableHidingDemo.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/scope/variable/VariableHidingDemo.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/scope/variable/VariableHidingDemo.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/staticdemo/Car.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/staticdemo/Car.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/staticdemo/Car.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/staticdemo/Car.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/staticdemo/Singleton.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/staticdemo/Singleton.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/staticdemo/Singleton.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/staticdemo/Singleton.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/staticdemo/StaticBlock.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/staticdemo/StaticBlock.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/staticdemo/StaticBlock.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/staticdemo/StaticBlock.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/typeerasure/ArrayContentPrintUtil.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/typeerasure/ArrayContentPrintUtil.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/typeerasure/ArrayContentPrintUtil.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/typeerasure/ArrayContentPrintUtil.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/typeerasure/BoundStack.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/typeerasure/BoundStack.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/typeerasure/BoundStack.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/typeerasure/BoundStack.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/typeerasure/IntegerStack.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/typeerasure/IntegerStack.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/typeerasure/IntegerStack.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/typeerasure/IntegerStack.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/typeerasure/Stack.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/typeerasure/Stack.java
similarity index 100%
rename from core-java-lang-oop/src/main/java/com/baeldung/typeerasure/Stack.java
rename to core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/typeerasure/Stack.java
diff --git a/core-java-lang-oop/src/main/resources/logback.xml b/core-java-modules/core-java-lang-oop/src/main/resources/logback.xml
similarity index 100%
rename from core-java-lang-oop/src/main/resources/logback.xml
rename to core-java-modules/core-java-lang-oop/src/main/resources/logback.xml
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/casting/CastingUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/casting/CastingUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/casting/CastingUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/casting/CastingUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/constructors/ConstructorUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/constructors/ConstructorUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/constructors/ConstructorUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/constructors/ConstructorUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/deepcopy/DeepCopyUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/deepcopy/DeepCopyUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/deepcopy/DeepCopyUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/deepcopy/DeepCopyUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/deepcopy/ShallowCopyUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/deepcopy/ShallowCopyUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/deepcopy/ShallowCopyUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/deepcopy/ShallowCopyUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/MoneyUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/MoneyUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/MoneyUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/MoneyUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/TeamUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/TeamUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/TeamUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/TeamUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/entities/ComplexClassUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/entities/ComplexClassUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/entities/ComplexClassUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/entities/ComplexClassUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/entities/PrimitiveClassUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/entities/PrimitiveClassUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/entities/PrimitiveClassUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/entities/PrimitiveClassUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/entities/SquareClassUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/entities/SquareClassUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/entities/SquareClassUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/equalshashcode/entities/SquareClassUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/finalkeyword/FinalUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/finalkeyword/FinalUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/finalkeyword/FinalUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/finalkeyword/FinalUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/hashcode/application/ApplicationUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/hashcode/application/ApplicationUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/hashcode/application/ApplicationUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/hashcode/application/ApplicationUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/hashcode/entities/UserUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/hashcode/entities/UserUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/hashcode/entities/UserUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/hashcode/entities/UserUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/immutableobjects/ImmutableObjectsUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/immutableobjects/ImmutableObjectsUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/immutableobjects/ImmutableObjectsUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/immutableobjects/ImmutableObjectsUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/inheritance/AppUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/inheritance/AppUnitTest.java
similarity index 96%
rename from core-java-lang-oop/src/test/java/com/baeldung/inheritance/AppUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/inheritance/AppUnitTest.java
index 1c3c2fff35..0d9dfed27a 100644
--- a/core-java-lang-oop/src/test/java/com/baeldung/inheritance/AppUnitTest.java
+++ b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/inheritance/AppUnitTest.java
@@ -1,46 +1,46 @@
-package com.baeldung.inheritance;
-
-import com.baeldung.inheritance.*;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AppUnitTest extends TestCase {
-    
-	public AppUnitTest(String testName) {
-        super( testName );
-    }
-
-    public static Test suite() {
-        return new TestSuite(AppUnitTest.class);
-    }
-
-    @SuppressWarnings("static-access")
-	public void testStaticMethodUsingBaseClassVariable() {
-    	Car first = new ArmoredCar();
-    	assertEquals("Car", first.msg());
-    }
-    	
-    @SuppressWarnings("static-access")
-	public void testStaticMethodUsingDerivedClassVariable() {
-    	ArmoredCar second = new ArmoredCar();
-    	assertEquals("ArmoredCar", second.msg());
-    }
-    
-    public void testAssignArmoredCarToCar() {
-    	Employee e1 = new Employee("Shreya", new ArmoredCar());
-    	assertNotNull(e1.getCar());
-    }
-
-    public void testAssignSpaceCarToCar() {
-    	Employee e2 = new Employee("Paul", new SpaceCar());
-    	assertNotNull(e2.getCar());
-    }
-
-    public void testBMWToCar() {
-    	Employee e3 = new Employee("Pavni", new BMW());
-    	assertNotNull(e3.getCar());
-    }
-
-}
+package com.baeldung.inheritance;
+
+import com.baeldung.inheritance.*;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class AppUnitTest extends TestCase {
+    
+	public AppUnitTest(String testName) {
+        super( testName );
+    }
+
+    public static Test suite() {
+        return new TestSuite(AppUnitTest.class);
+    }
+
+    @SuppressWarnings("static-access")
+	public void testStaticMethodUsingBaseClassVariable() {
+    	Car first = new ArmoredCar();
+    	assertEquals("Car", first.msg());
+    }
+    	
+    @SuppressWarnings("static-access")
+	public void testStaticMethodUsingDerivedClassVariable() {
+    	ArmoredCar second = new ArmoredCar();
+    	assertEquals("ArmoredCar", second.msg());
+    }
+    
+    public void testAssignArmoredCarToCar() {
+    	Employee e1 = new Employee("Shreya", new ArmoredCar());
+    	assertNotNull(e1.getCar());
+    }
+
+    public void testAssignSpaceCarToCar() {
+    	Employee e2 = new Employee("Paul", new SpaceCar());
+    	assertNotNull(e2.getCar());
+    }
+
+    public void testBMWToCar() {
+    	Employee e3 = new Employee("Pavni", new BMW());
+    	assertNotNull(e3.getCar());
+    }
+
+}
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/ActressUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/ActressUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/ActressUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/ActressUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/CompositionUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/CompositionUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/CompositionUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/CompositionUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/InheritanceUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/InheritanceUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/InheritanceUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/InheritanceUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/PersonUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/PersonUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/PersonUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/PersonUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/WaitressUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/WaitressUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/WaitressUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/inheritancecomposition/test/WaitressUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/initializationguide/UserUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/initializationguide/UserUnitTest.java
similarity index 97%
rename from core-java-lang-syntax/src/test/java/com/baeldung/initializationguide/UserUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/initializationguide/UserUnitTest.java
index f74384e6f7..a26b602609 100644
--- a/core-java-lang-syntax/src/test/java/com/baeldung/initializationguide/UserUnitTest.java
+++ b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/initializationguide/UserUnitTest.java
@@ -1,37 +1,37 @@
-package com.baeldung.initializationguide;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.*;
-
-import java.lang.reflect.InvocationTargetException;
-
-public class UserUnitTest {
-
-    @Test
-    public void givenUserInstance_whenIntializedWithNew_thenInstanceIsNotNull() {
-        User user = new User("Alice", 1);
-        assertThat(user).isNotNull();
-    }
-
-    @Test
-    public void givenUserInstance_whenInitializedWithReflection_thenInstanceIsNotNull() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        User user = User.class.getConstructor(String.class, int.class)
-            .newInstance("Alice", 2);
-        assertThat(user).isNotNull();
-    }
-
-    @Test
-    public void givenUserInstance_whenCopiedWithClone_thenExactMatchIsCreated() throws CloneNotSupportedException {
-        User user = new User("Alice", 3);
-        User clonedUser = (User) user.clone();
-        assertThat(clonedUser).isEqualTo(user);
-    }
-
-    @Test
-    public void givenUserInstance_whenValuesAreNotInitialized_thenUserNameAndIdReturnDefault() {
-        User user = new User();
-        assertThat(user.getName()).isNull();
-        assertThat(user.getId() == 0);
-    }
-}
+package com.baeldung.initializationguide;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.lang.reflect.InvocationTargetException;
+
+public class UserUnitTest {
+
+    @Test
+    public void givenUserInstance_whenIntializedWithNew_thenInstanceIsNotNull() {
+        User user = new User("Alice", 1);
+        assertThat(user).isNotNull();
+    }
+
+    @Test
+    public void givenUserInstance_whenInitializedWithReflection_thenInstanceIsNotNull() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
+        User user = User.class.getConstructor(String.class, int.class)
+            .newInstance("Alice", 2);
+        assertThat(user).isNotNull();
+    }
+
+    @Test
+    public void givenUserInstance_whenCopiedWithClone_thenExactMatchIsCreated() throws CloneNotSupportedException {
+        User user = new User("Alice", 3);
+        User clonedUser = (User) user.clone();
+        assertThat(clonedUser).isEqualTo(user);
+    }
+
+    @Test
+    public void givenUserInstance_whenValuesAreNotInitialized_thenUserNameAndIdReturnDefault() {
+        User user = new User();
+        assertThat(user.getName()).isNull();
+        assertThat(user.getId() == 0);
+    }
+}
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/markerinterface/MarkerInterfaceUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/markerinterface/MarkerInterfaceUnitTest.java
similarity index 96%
rename from core-java-lang-oop/src/test/java/com/baeldung/markerinterface/MarkerInterfaceUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/markerinterface/MarkerInterfaceUnitTest.java
index 70d32ba253..81cd51ce51 100644
--- a/core-java-lang-oop/src/test/java/com/baeldung/markerinterface/MarkerInterfaceUnitTest.java
+++ b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/markerinterface/MarkerInterfaceUnitTest.java
@@ -1,26 +1,26 @@
-package com.baeldung.markerinterface;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-public class MarkerInterfaceUnitTest {
-
-    @Test
-    public void givenDeletableObjectThenTrueReturned() {
-        ShapeDao shapeDao = new ShapeDao();
-        Object rectangle = new Rectangle(2, 3);
-
-        boolean result = shapeDao.delete(rectangle);
-        assertEquals(true, result);
-    }
-    
-    @Test
-    public void givenNonDeletableObjectThenFalseReturned() {
-        ShapeDao shapeDao = new ShapeDao();
-        Object object = new Object();
-
-        boolean result = shapeDao.delete(object);
-        assertEquals(false, result);
-    }
-}
+package com.baeldung.markerinterface;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class MarkerInterfaceUnitTest {
+
+    @Test
+    public void givenDeletableObjectThenTrueReturned() {
+        ShapeDao shapeDao = new ShapeDao();
+        Object rectangle = new Rectangle(2, 3);
+
+        boolean result = shapeDao.delete(rectangle);
+        assertEquals(true, result);
+    }
+    
+    @Test
+    public void givenNonDeletableObjectThenFalseReturned() {
+        ShapeDao shapeDao = new ShapeDao();
+        Object object = new Object();
+
+        boolean result = shapeDao.delete(object);
+        assertEquals(false, result);
+    }
+}
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/methodoverloadingoverriding/test/MethodOverloadingUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/methodoverloadingoverriding/test/MethodOverloadingUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/methodoverloadingoverriding/test/MethodOverloadingUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/methodoverloadingoverriding/test/MethodOverloadingUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/methodoverloadingoverriding/test/MethodOverridingUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/methodoverloadingoverriding/test/MethodOverridingUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/methodoverloadingoverriding/test/MethodOverridingUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/methodoverloadingoverriding/test/MethodOverridingUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/parameterpassing/NonPrimitivesUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/parameterpassing/NonPrimitivesUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/parameterpassing/NonPrimitivesUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/parameterpassing/NonPrimitivesUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/parameterpassing/PrimitivesUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/parameterpassing/PrimitivesUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/parameterpassing/PrimitivesUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/parameterpassing/PrimitivesUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/polymorphism/PolymorphismUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/polymorphism/PolymorphismUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/polymorphism/PolymorphismUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/polymorphism/PolymorphismUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/staticdemo/CarIntegrationTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/staticdemo/CarIntegrationTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/staticdemo/CarIntegrationTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/staticdemo/CarIntegrationTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/staticdemo/SingletonIntegrationTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/staticdemo/SingletonIntegrationTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/staticdemo/SingletonIntegrationTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/staticdemo/SingletonIntegrationTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/staticdemo/StaticBlockIntegrationTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/staticdemo/StaticBlockIntegrationTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/staticdemo/StaticBlockIntegrationTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/staticdemo/StaticBlockIntegrationTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/typeerasure/TypeErasureUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/typeerasure/TypeErasureUnitTest.java
similarity index 100%
rename from core-java-lang-oop/src/test/java/com/baeldung/typeerasure/TypeErasureUnitTest.java
rename to core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/typeerasure/TypeErasureUnitTest.java
diff --git a/core-java-lang-oop/src/test/resources/.gitignore b/core-java-modules/core-java-lang-oop/src/test/resources/.gitignore
similarity index 100%
rename from core-java-lang-oop/src/test/resources/.gitignore
rename to core-java-modules/core-java-lang-oop/src/test/resources/.gitignore
diff --git a/core-java-lang-syntax/.gitignore b/core-java-modules/core-java-lang-syntax/.gitignore
similarity index 100%
rename from core-java-lang-syntax/.gitignore
rename to core-java-modules/core-java-lang-syntax/.gitignore
diff --git a/core-java-lang-syntax/README.md b/core-java-modules/core-java-lang-syntax/README.md
similarity index 100%
rename from core-java-lang-syntax/README.md
rename to core-java-modules/core-java-lang-syntax/README.md
diff --git a/core-java-lang-syntax/pom.xml b/core-java-modules/core-java-lang-syntax/pom.xml
similarity index 96%
rename from core-java-lang-syntax/pom.xml
rename to core-java-modules/core-java-lang-syntax/pom.xml
index 9a9df01057..46fa8d1206 100644
--- a/core-java-lang-syntax/pom.xml
+++ b/core-java-modules/core-java-lang-syntax/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/breakcontinue/BreakContinue.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/breakcontinue/BreakContinue.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/breakcontinue/BreakContinue.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/breakcontinue/BreakContinue.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/enums/Pizza.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/enums/Pizza.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/enums/Pizza.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/enums/Pizza.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/generics/Building.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/generics/Building.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/generics/Building.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/generics/Building.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/generics/Generics.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/generics/Generics.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/generics/Generics.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/generics/Generics.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/generics/House.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/generics/House.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/generics/House.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/generics/House.java
diff --git a/core-java-lang-oop/src/main/java/com/baeldung/initializationguide/User.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/initializationguide/User.java
similarity index 94%
rename from core-java-lang-oop/src/main/java/com/baeldung/initializationguide/User.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/initializationguide/User.java
index e2e3f051dd..1d9a872d69 100644
--- a/core-java-lang-oop/src/main/java/com/baeldung/initializationguide/User.java
+++ b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/initializationguide/User.java
@@ -1,53 +1,53 @@
-package com.baeldung.initializationguide;
-
-import java.io.Serializable;
-
-public class User implements Serializable, Cloneable {
-    private static final long serialVersionUID = 1L;
-    static String forum;
-    private String name;
-    private int id;
-
-    {
-        id = 0;
-        System.out.println("Instance Initializer");
-    }
-
-    static {
-    	forum = "Java";
-        System.out.println("Static Initializer");
-    }
-
-    public User(String name, int id) {
-        super();
-        this.name = name;
-        this.id = id;
-    }
-
-    public User() {
-        System.out.println("Constructor");
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        return this;
-    }
-
-}
-
+package com.baeldung.initializationguide;
+
+import java.io.Serializable;
+
+public class User implements Serializable, Cloneable {
+    private static final long serialVersionUID = 1L;
+    static String forum;
+    private String name;
+    private int id;
+
+    {
+        id = 0;
+        System.out.println("Instance Initializer");
+    }
+
+    static {
+    	forum = "Java";
+        System.out.println("Static Initializer");
+    }
+
+    public User(String name, int id) {
+        super();
+        this.name = name;
+        this.id = id;
+    }
+
+    public User() {
+        System.out.println("Constructor");
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return this;
+    }
+
+}
+
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Circle.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Circle.java
similarity index 94%
rename from core-java-lang-syntax/src/main/java/com/baeldung/keyword/Circle.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Circle.java
index 231b2f5a59..807020d267 100644
--- a/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Circle.java
+++ b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Circle.java
@@ -1,5 +1,5 @@
-package com.baeldung.keyword;
-
-public class Circle extends Round implements Shape {
-
-}
+package com.baeldung.keyword;
+
+public class Circle extends Round implements Shape {
+
+}
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Ring.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Ring.java
similarity index 94%
rename from core-java-lang-syntax/src/main/java/com/baeldung/keyword/Ring.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Ring.java
index 99873f9640..64274cbb6b 100644
--- a/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Ring.java
+++ b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Ring.java
@@ -1,4 +1,4 @@
-package com.baeldung.keyword;
-
-public class Ring extends Round {
-}
+package com.baeldung.keyword;
+
+public class Ring extends Round {
+}
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Round.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Round.java
similarity index 93%
rename from core-java-lang-syntax/src/main/java/com/baeldung/keyword/Round.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Round.java
index 0e2cc2c8c7..37008de09c 100644
--- a/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Round.java
+++ b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Round.java
@@ -1,4 +1,4 @@
-package com.baeldung.keyword;
-
-public class Round {
-}
+package com.baeldung.keyword;
+
+public class Round {
+}
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Shape.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Shape.java
similarity index 93%
rename from core-java-lang-syntax/src/main/java/com/baeldung/keyword/Shape.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Shape.java
index 8d00c165a3..437917c29e 100644
--- a/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Shape.java
+++ b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Shape.java
@@ -1,4 +1,4 @@
-package com.baeldung.keyword;
-
-public interface Shape {
-}
+package com.baeldung.keyword;
+
+public interface Shape {
+}
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Triangle.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Triangle.java
similarity index 94%
rename from core-java-lang-syntax/src/main/java/com/baeldung/keyword/Triangle.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Triangle.java
index 406b8f23e5..4cb6ed72ba 100644
--- a/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Triangle.java
+++ b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Triangle.java
@@ -1,4 +1,4 @@
-package com.baeldung.keyword;
-
-public class Triangle implements Shape {
-}
+package com.baeldung.keyword;
+
+public class Triangle implements Shape {
+}
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/loops/InfiniteLoops.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/loops/InfiniteLoops.java
similarity index 95%
rename from core-java-lang-syntax/src/main/java/com/baeldung/loops/InfiniteLoops.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/loops/InfiniteLoops.java
index 0706c85db8..4952fd7b35 100644
--- a/core-java-lang-syntax/src/main/java/com/baeldung/loops/InfiniteLoops.java
+++ b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/loops/InfiniteLoops.java
@@ -1,23 +1,23 @@
-package com.baeldung.loops;
-
-public class InfiniteLoops {
-
-    public void infiniteLoopUsingWhile() {
-        while (true) {
-            System.out.println("Infinite loop using while");
-        }
-    }
-
-    public void infiniteLoopUsingFor() {
-        for (;;) {
-            System.out.println("Infinite loop using for");
-        }
-    }
-
-    public void infiniteLoopUsingDoWhile() {
-        do {
-            System.out.println("Infinite loop using do-while");
-        } while (true);
-    }
-
-}
+package com.baeldung.loops;
+
+public class InfiniteLoops {
+
+    public void infiniteLoopUsingWhile() {
+        while (true) {
+            System.out.println("Infinite loop using while");
+        }
+    }
+
+    public void infiniteLoopUsingFor() {
+        for (;;) {
+            System.out.println("Infinite loop using for");
+        }
+    }
+
+    public void infiniteLoopUsingDoWhile() {
+        do {
+            System.out.println("Infinite loop using do-while");
+        } while (true);
+    }
+
+}
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/loops/LoopsInJava.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/loops/LoopsInJava.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/loops/LoopsInJava.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/loops/LoopsInJava.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/switchstatement/SwitchStatement.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/switchstatement/SwitchStatement.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/switchstatement/SwitchStatement.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/switchstatement/SwitchStatement.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/system/ChatWindow.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/ChatWindow.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/system/ChatWindow.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/ChatWindow.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/system/DateTimeService.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/DateTimeService.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/system/DateTimeService.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/DateTimeService.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/system/EnvironmentVariables.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/EnvironmentVariables.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/system/EnvironmentVariables.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/EnvironmentVariables.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemErrDemo.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemErrDemo.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/system/SystemErrDemo.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemErrDemo.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemExitDemo.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemExitDemo.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/system/SystemExitDemo.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemExitDemo.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemOutDemo.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemOutDemo.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/system/SystemOutDemo.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemOutDemo.java
diff --git a/core-java-lang-syntax/src/main/java/com/baeldung/system/UserCredentials.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/UserCredentials.java
similarity index 100%
rename from core-java-lang-syntax/src/main/java/com/baeldung/system/UserCredentials.java
rename to core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/UserCredentials.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/breakcontinue/BreakContinueUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/breakcontinue/BreakContinueUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/breakcontinue/BreakContinueUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/breakcontinue/BreakContinueUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/enums/PizzaUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/enums/PizzaUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/enums/PizzaUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/enums/PizzaUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/generics/GenericsUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/generics/GenericsUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/generics/GenericsUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/generics/GenericsUnitTest.java
diff --git a/core-java-lang-oop/src/test/java/com/baeldung/initializationguide/UserUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/initializationguide/UserUnitTest.java
similarity index 97%
rename from core-java-lang-oop/src/test/java/com/baeldung/initializationguide/UserUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/initializationguide/UserUnitTest.java
index f74384e6f7..a26b602609 100644
--- a/core-java-lang-oop/src/test/java/com/baeldung/initializationguide/UserUnitTest.java
+++ b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/initializationguide/UserUnitTest.java
@@ -1,37 +1,37 @@
-package com.baeldung.initializationguide;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.*;
-
-import java.lang.reflect.InvocationTargetException;
-
-public class UserUnitTest {
-
-    @Test
-    public void givenUserInstance_whenIntializedWithNew_thenInstanceIsNotNull() {
-        User user = new User("Alice", 1);
-        assertThat(user).isNotNull();
-    }
-
-    @Test
-    public void givenUserInstance_whenInitializedWithReflection_thenInstanceIsNotNull() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        User user = User.class.getConstructor(String.class, int.class)
-            .newInstance("Alice", 2);
-        assertThat(user).isNotNull();
-    }
-
-    @Test
-    public void givenUserInstance_whenCopiedWithClone_thenExactMatchIsCreated() throws CloneNotSupportedException {
-        User user = new User("Alice", 3);
-        User clonedUser = (User) user.clone();
-        assertThat(clonedUser).isEqualTo(user);
-    }
-
-    @Test
-    public void givenUserInstance_whenValuesAreNotInitialized_thenUserNameAndIdReturnDefault() {
-        User user = new User();
-        assertThat(user.getName()).isNull();
-        assertThat(user.getId() == 0);
-    }
-}
+package com.baeldung.initializationguide;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.lang.reflect.InvocationTargetException;
+
+public class UserUnitTest {
+
+    @Test
+    public void givenUserInstance_whenIntializedWithNew_thenInstanceIsNotNull() {
+        User user = new User("Alice", 1);
+        assertThat(user).isNotNull();
+    }
+
+    @Test
+    public void givenUserInstance_whenInitializedWithReflection_thenInstanceIsNotNull() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
+        User user = User.class.getConstructor(String.class, int.class)
+            .newInstance("Alice", 2);
+        assertThat(user).isNotNull();
+    }
+
+    @Test
+    public void givenUserInstance_whenCopiedWithClone_thenExactMatchIsCreated() throws CloneNotSupportedException {
+        User user = new User("Alice", 3);
+        User clonedUser = (User) user.clone();
+        assertThat(clonedUser).isEqualTo(user);
+    }
+
+    @Test
+    public void givenUserInstance_whenValuesAreNotInitialized_thenUserNameAndIdReturnDefault() {
+        User user = new User();
+        assertThat(user.getName()).isNull();
+        assertThat(user.getId() == 0);
+    }
+}
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Car.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Car.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Car.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Car.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Diesel.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Diesel.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Diesel.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Diesel.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Engine.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Engine.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Engine.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Engine.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Vehicle.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Vehicle.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Vehicle.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Vehicle.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java
similarity index 96%
rename from core-java-lang-syntax/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java
index 4c010e3a16..6966fa3944 100644
--- a/core-java-lang-syntax/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java
+++ b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java
@@ -1,55 +1,55 @@
-package com.baeldung.keyword.test;
-
-import org.junit.Assert;
-import org.junit.jupiter.api.Test;
-
-import com.baeldung.keyword.Circle;
-import com.baeldung.keyword.Ring;
-import com.baeldung.keyword.Round;
-import com.baeldung.keyword.Shape;
-import com.baeldung.keyword.Triangle;
-
-public class InstanceOfUnitTest {
-
-    @Test
-    public void giveWhenInstanceIsCorrect_thenReturnTrue() {
-        Ring ring = new Ring();
-        Assert.assertTrue("ring is instance of Round ", ring instanceof Round);
-    }
-
-    @Test
-    public void giveWhenObjectIsInstanceOfType_thenReturnTrue() {
-        Circle circle = new Circle();
-        Assert.assertTrue("circle is instance of Circle ", circle instanceof Circle);
-    }
-
-  
-    @Test
-    public void giveWhenInstanceIsOfSubtype_thenReturnTrue() {
-        Circle circle = new Circle();
-        Assert.assertTrue("circle is instance of Round", circle instanceof Round);
-    }
-
-    @Test
-    public void giveWhenTypeIsInterface_thenReturnTrue() {
-        Circle circle = new Circle();
-        Assert.assertTrue("circle is instance of Shape", circle instanceof Shape);
-    }
-    
-    @Test
-    public void giveWhenTypeIsOfObjectType_thenReturnTrue() {
-        Thread thread = new Thread();
-        Assert.assertTrue("thread is instance of Object", thread instanceof Object);
-    }
-
-    @Test
-    public void giveWhenInstanceValueIsNull_thenReturnFalse() {
-        Circle circle = null;
-        Assert.assertFalse("circle is instance of Round", circle instanceof Round);
-    }
-
-    @Test
-    public void giveWhenComparingClassInDiffHierarchy_thenCompilationError() {
-        // Assert.assertFalse("circle is instance of Triangle", circle instanceof Triangle);
-    }
-}
+package com.baeldung.keyword.test;
+
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+
+import com.baeldung.keyword.Circle;
+import com.baeldung.keyword.Ring;
+import com.baeldung.keyword.Round;
+import com.baeldung.keyword.Shape;
+import com.baeldung.keyword.Triangle;
+
+public class InstanceOfUnitTest {
+
+    @Test
+    public void giveWhenInstanceIsCorrect_thenReturnTrue() {
+        Ring ring = new Ring();
+        Assert.assertTrue("ring is instance of Round ", ring instanceof Round);
+    }
+
+    @Test
+    public void giveWhenObjectIsInstanceOfType_thenReturnTrue() {
+        Circle circle = new Circle();
+        Assert.assertTrue("circle is instance of Circle ", circle instanceof Circle);
+    }
+
+  
+    @Test
+    public void giveWhenInstanceIsOfSubtype_thenReturnTrue() {
+        Circle circle = new Circle();
+        Assert.assertTrue("circle is instance of Round", circle instanceof Round);
+    }
+
+    @Test
+    public void giveWhenTypeIsInterface_thenReturnTrue() {
+        Circle circle = new Circle();
+        Assert.assertTrue("circle is instance of Shape", circle instanceof Shape);
+    }
+    
+    @Test
+    public void giveWhenTypeIsOfObjectType_thenReturnTrue() {
+        Thread thread = new Thread();
+        Assert.assertTrue("thread is instance of Object", thread instanceof Object);
+    }
+
+    @Test
+    public void giveWhenInstanceValueIsNull_thenReturnFalse() {
+        Circle circle = null;
+        Assert.assertFalse("circle is instance of Round", circle instanceof Round);
+    }
+
+    @Test
+    public void giveWhenComparingClassInDiffHierarchy_thenCompilationError() {
+        // Assert.assertFalse("circle is instance of Triangle", circle instanceof Triangle);
+    }
+}
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/loops/WhenUsingLoops.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/loops/WhenUsingLoops.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/loops/WhenUsingLoops.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/loops/WhenUsingLoops.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/modulo/ModuloUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/modulo/ModuloUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/modulo/ModuloUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/modulo/ModuloUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/primitiveconversion/PrimitiveConversionsJUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/primitiveconversion/PrimitiveConversionsJUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/primitiveconversion/PrimitiveConversionsJUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/primitiveconversion/PrimitiveConversionsJUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/switchstatement/SwitchStatementUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/switchstatement/SwitchStatementUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/switchstatement/SwitchStatementUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/switchstatement/SwitchStatementUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/system/DateTimeServiceUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/DateTimeServiceUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/system/DateTimeServiceUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/DateTimeServiceUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/system/EnvironmentVariablesUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/EnvironmentVariablesUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/system/EnvironmentVariablesUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/EnvironmentVariablesUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemArrayCopyUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemArrayCopyUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/system/SystemArrayCopyUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemArrayCopyUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemNanoUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemNanoUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/system/SystemNanoUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemNanoUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemPropertiesUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemPropertiesUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/system/SystemPropertiesUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemPropertiesUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java
diff --git a/core-java-lang-syntax/src/test/java/com/baeldung/varargs/FormatterUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/varargs/FormatterUnitTest.java
similarity index 100%
rename from core-java-lang-syntax/src/test/java/com/baeldung/varargs/FormatterUnitTest.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/varargs/FormatterUnitTest.java
diff --git a/core-java-lang/.gitignore b/core-java-modules/core-java-lang/.gitignore
similarity index 100%
rename from core-java-lang/.gitignore
rename to core-java-modules/core-java-lang/.gitignore
diff --git a/core-java-lang/README.md b/core-java-modules/core-java-lang/README.md
similarity index 100%
rename from core-java-lang/README.md
rename to core-java-modules/core-java-lang/README.md
diff --git a/core-java-lang/pom.xml b/core-java-modules/core-java-lang/pom.xml
similarity index 98%
rename from core-java-lang/pom.xml
rename to core-java-modules/core-java-lang/pom.xml
index 551c8e8505..45ccc8d0f5 100644
--- a/core-java-lang/pom.xml
+++ b/core-java-modules/core-java-lang/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-lang/src/main/java/com/baeldung/assertion/Assertion.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/assertion/Assertion.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/assertion/Assertion.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/assertion/Assertion.java
diff --git a/core-java-lang/src/main/java/com/baeldung/binding/Animal.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/binding/Animal.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/binding/Animal.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/binding/Animal.java
diff --git a/core-java-lang/src/main/java/com/baeldung/binding/AnimalActivity.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/binding/AnimalActivity.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/binding/AnimalActivity.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/binding/AnimalActivity.java
diff --git a/core-java-lang/src/main/java/com/baeldung/binding/Cat.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/binding/Cat.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/binding/Cat.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/binding/Cat.java
diff --git a/core-java-lang/src/main/java/com/baeldung/chainedexception/LogWithChain.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/chainedexception/LogWithChain.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/chainedexception/LogWithChain.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/chainedexception/LogWithChain.java
diff --git a/core-java-lang/src/main/java/com/baeldung/chainedexception/LogWithoutChain.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/chainedexception/LogWithoutChain.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/chainedexception/LogWithoutChain.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/chainedexception/LogWithoutChain.java
diff --git a/core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/GirlFriendOfManagerUpsetException.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/GirlFriendOfManagerUpsetException.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/GirlFriendOfManagerUpsetException.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/GirlFriendOfManagerUpsetException.java
diff --git a/core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/ManagerUpsetException.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/ManagerUpsetException.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/ManagerUpsetException.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/ManagerUpsetException.java
diff --git a/core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/NoLeaveGrantedException.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/NoLeaveGrantedException.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/NoLeaveGrantedException.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/NoLeaveGrantedException.java
diff --git a/core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/TeamLeadUpsetException.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/TeamLeadUpsetException.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/TeamLeadUpsetException.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/chainedexception/exceptions/TeamLeadUpsetException.java
diff --git a/core-java-lang/src/main/java/com/baeldung/className/RetrievingClassName.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/className/RetrievingClassName.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/className/RetrievingClassName.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/className/RetrievingClassName.java
diff --git a/core-java-lang/src/main/java/com/baeldung/comparable/Player.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/comparable/Player.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/comparable/Player.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/comparable/Player.java
diff --git a/core-java-lang/src/main/java/com/baeldung/comparable/PlayerSorter.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/comparable/PlayerSorter.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/comparable/PlayerSorter.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/comparable/PlayerSorter.java
diff --git a/core-java-lang/src/main/java/com/baeldung/comparator/Player.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/comparator/Player.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/comparator/Player.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/comparator/Player.java
diff --git a/core-java-lang/src/main/java/com/baeldung/comparator/PlayerAgeComparator.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/comparator/PlayerAgeComparator.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/comparator/PlayerAgeComparator.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/comparator/PlayerAgeComparator.java
diff --git a/core-java-lang/src/main/java/com/baeldung/comparator/PlayerAgeSorter.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/comparator/PlayerAgeSorter.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/comparator/PlayerAgeSorter.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/comparator/PlayerAgeSorter.java
diff --git a/core-java-lang/src/main/java/com/baeldung/comparator/PlayerRankingComparator.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/comparator/PlayerRankingComparator.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/comparator/PlayerRankingComparator.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/comparator/PlayerRankingComparator.java
diff --git a/core-java-lang/src/main/java/com/baeldung/comparator/PlayerRankingSorter.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/comparator/PlayerRankingSorter.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/comparator/PlayerRankingSorter.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/comparator/PlayerRankingSorter.java
diff --git a/core-java-lang/src/main/java/com/baeldung/controlstructures/ConditionalBranches.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/controlstructures/ConditionalBranches.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/controlstructures/ConditionalBranches.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/controlstructures/ConditionalBranches.java
diff --git a/core-java-lang/src/main/java/com/baeldung/controlstructures/Loops.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/controlstructures/Loops.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/controlstructures/Loops.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/controlstructures/Loops.java
diff --git a/core-java-lang/src/main/java/com/baeldung/customexception/FileManager.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/customexception/FileManager.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/customexception/FileManager.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/customexception/FileManager.java
diff --git a/core-java-lang/src/main/java/com/baeldung/customexception/IncorrectFileExtensionException.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/customexception/IncorrectFileExtensionException.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/customexception/IncorrectFileExtensionException.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/customexception/IncorrectFileExtensionException.java
diff --git a/core-java-lang/src/main/java/com/baeldung/customexception/IncorrectFileNameException.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/customexception/IncorrectFileNameException.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/customexception/IncorrectFileNameException.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/customexception/IncorrectFileNameException.java
diff --git a/core-java-lang/src/main/java/com/baeldung/doubles/SplitFloatingPointNumbers.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/doubles/SplitFloatingPointNumbers.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/doubles/SplitFloatingPointNumbers.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/doubles/SplitFloatingPointNumbers.java
diff --git a/core-java-lang/src/main/java/com/baeldung/dynamicproxy/DynamicInvocationHandler.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/dynamicproxy/DynamicInvocationHandler.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/dynamicproxy/DynamicInvocationHandler.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/dynamicproxy/DynamicInvocationHandler.java
diff --git a/core-java-lang/src/main/java/com/baeldung/dynamicproxy/TimingDynamicInvocationHandler.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/dynamicproxy/TimingDynamicInvocationHandler.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/dynamicproxy/TimingDynamicInvocationHandler.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/dynamicproxy/TimingDynamicInvocationHandler.java
diff --git a/core-java-lang/src/main/java/com/baeldung/enums/values/Element1.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/enums/values/Element1.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/enums/values/Element1.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/enums/values/Element1.java
diff --git a/core-java-lang/src/main/java/com/baeldung/enums/values/Element2.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/enums/values/Element2.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/enums/values/Element2.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/enums/values/Element2.java
diff --git a/core-java-lang/src/main/java/com/baeldung/enums/values/Element3.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/enums/values/Element3.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/enums/values/Element3.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/enums/values/Element3.java
diff --git a/core-java-lang/src/main/java/com/baeldung/enums/values/Element4.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/enums/values/Element4.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/enums/values/Element4.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/enums/values/Element4.java
diff --git a/core-java-lang/src/main/java/com/baeldung/enums/values/Labeled.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/enums/values/Labeled.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/enums/values/Labeled.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/enums/values/Labeled.java
diff --git a/core-java-lang/src/main/java/com/baeldung/exceptionhandling/Exceptions.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/Exceptions.java
similarity index 96%
rename from core-java-lang/src/main/java/com/baeldung/exceptionhandling/Exceptions.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/Exceptions.java
index 9690648386..32d88cfd12 100644
--- a/core-java-lang/src/main/java/com/baeldung/exceptionhandling/Exceptions.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/Exceptions.java
@@ -1,212 +1,212 @@
-package com.baeldung.exceptionhandling;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Scanner;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
-
-public class Exceptions {
-
-    private final static Logger logger = Logger.getLogger("ExceptionLogging");
-
-    public static List<Player> getPlayers() throws IOException {
-        Path path = Paths.get("players.dat");
-        List<String> players = Files.readAllLines(path);
-
-        return players.stream()
-          .map(Player::new)
-          .collect(Collectors.toList());
-    }
-
-    public List<Player> loadAllPlayers(String playersFile) throws IOException{
-        try {
-            throw new IOException();
-        } catch(IOException ex) {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getPlayerScoreThrows(String playerFile) throws FileNotFoundException {		 
-        Scanner contents = new Scanner(new File(playerFile));
-        return Integer.parseInt(contents.nextLine());
-    }
-
-    public int getPlayerScoreTryCatch(String playerFile) {
-        try {
-            Scanner contents = new Scanner(new File(playerFile));
-            return Integer.parseInt(contents.nextLine());
-        } catch (FileNotFoundException noFile) {
-            throw new IllegalArgumentException("File not found");
-        }
-    }
-
-    public int getPlayerScoreTryCatchRecovery(String playerFile) {
-        try {
-            Scanner contents = new Scanner(new File(playerFile));
-            return Integer.parseInt(contents.nextLine());
-        } catch ( FileNotFoundException noFile ) {
-            logger.warning("File not found, resetting score.");
-            return 0;
-        }
-    }
-
-    public int getPlayerScoreFinally(String playerFile) throws FileNotFoundException {
-        Scanner contents = null;
-        try {
-            contents = new Scanner(new File(playerFile));
-            return Integer.parseInt(contents.nextLine());
-        } finally {
-            if (contents != null) {
-                contents.close();
-            }
-        }
-    }
-
-    public int getPlayerScoreTryWithResources(String playerFile) {
-        try (Scanner contents = new Scanner(new File(playerFile))) {
-            return Integer.parseInt(contents.nextLine());
-        } catch (FileNotFoundException e ) {
-            logger.warning("File not found, resetting score.");
-            return 0;
-        }
-    }
-
-    public int getPlayerScoreMultipleCatchBlocks(String playerFile) {
-        try (Scanner contents = new Scanner(new File(playerFile))) {
-            return Integer.parseInt(contents.nextLine());
-        } catch (IOException e) {
-            logger.warning("Player file wouldn't load!");
-            return 0;
-        } catch (NumberFormatException e) {
-            logger.warning("Player file was corrupted!");
-            return 0;
-        }
-    }
-
-    public int getPlayerScoreMultipleCatchBlocksAlternative(String playerFile) {
-        try (Scanner contents = new Scanner(new File(playerFile)) ) {
-            return Integer.parseInt(contents.nextLine());
-        } catch (FileNotFoundException e) {
-            logger.warning("Player file not found!");
-            return 0;
-        } catch (IOException e) {
-            logger.warning("Player file wouldn't load!");
-            return 0;
-        } catch (NumberFormatException e) {
-            logger.warning("Player file was corrupted!");
-            return 0;
-        }
-    }
-
-    public int getPlayerScoreUnionCatchBlocks(String playerFile) {
-        try (Scanner contents = new Scanner(new File(playerFile))) {
-            return Integer.parseInt(contents.nextLine());
-        } catch (IOException | NumberFormatException e) {
-            logger.warning("Failed to load score!");
-            return 0;
-        }
-    }
-
-    public List<Player> loadAllPlayersThrowingChecked(String playersFile) throws TimeoutException {
-        boolean tooLong = true;
-
-        while (!tooLong) {
-            // ... potentially long operation
-        }
-            throw new TimeoutException("This operation took too long");
-    }
-
-    public List<Player> loadAllPlayersThrowingUnchecked(String playersFile) throws TimeoutException {
-        if(!isFilenameValid(playersFile)) {
-            throw new IllegalArgumentException("Filename isn't valid!");
-        }
-        return null;
-
-        // ...
-    }
-
-    public List<Player> loadAllPlayersWrapping(String playersFile) throws IOException {
-        try { 
-            throw new IOException();
-        } catch (IOException io) { 		
-            throw io;
-        }
-    }
-
-    public List<Player> loadAllPlayersRethrowing(String playersFile) throws PlayerLoadException {
-        try { 
-            throw new IOException();
-        } catch (IOException io) { 		
-            throw new PlayerLoadException(io);
-        }
-    }
-
-    public List<Player> loadAllPlayersThrowable(String playersFile) {
-        try {
-            throw new NullPointerException();
-        } catch ( Throwable t ) {
-            throw t;
-        }
-    }
-
-    class FewerExceptions extends Exceptions {
-        @Override
-        public List<Player> loadAllPlayers(String playersFile) {  //can't add "throws MyCheckedException 
-            return null;
-            // overridden
-        }
-    }
-
-    public void throwAsGotoAntiPattern() throws MyException {
-        try {
-            // bunch of code
-            throw new MyException();
-            // second bunch of code
-        } catch ( MyException e ) {
-            // third bunch of code
-        }
-    }
-
-    public int getPlayerScoreSwallowingExceptionAntiPattern(String playerFile) {
-        try {
-        // ...
-        } catch (Exception e) {} // <== catch and swallow
-            return 0;
-    }
-
-    public int getPlayerScoreSwallowingExceptionAntiPatternAlternative(String playerFile) {
-        try {
-            // ...
-        } catch (Exception e) {
-             e.printStackTrace();
-        }
-      return 0;
-    }
-
-    public int getPlayerScoreSwallowingExceptionAntiPatternAlternative2(String playerFile) throws PlayerScoreException {
-        try {
-            throw new IOException();
-        } catch (IOException e) {
-            throw new PlayerScoreException(e);
-        }
-    }
-
-    public int getPlayerScoreReturnInFinallyAntiPattern(String playerFile) {
-        int score = 0;
-        try {
-            throw new IOException();
-        } finally {
-            return score; // <== the IOException is dropped
-        }
-    }
-
-    private boolean isFilenameValid(String name) {
-        return false;
-    }
-}
+package com.baeldung.exceptionhandling;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Scanner;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+public class Exceptions {
+
+    private final static Logger logger = Logger.getLogger("ExceptionLogging");
+
+    public static List<Player> getPlayers() throws IOException {
+        Path path = Paths.get("players.dat");
+        List<String> players = Files.readAllLines(path);
+
+        return players.stream()
+          .map(Player::new)
+          .collect(Collectors.toList());
+    }
+
+    public List<Player> loadAllPlayers(String playersFile) throws IOException{
+        try {
+            throw new IOException();
+        } catch(IOException ex) {
+            throw new IllegalStateException();
+        }
+    }
+
+    public int getPlayerScoreThrows(String playerFile) throws FileNotFoundException {		 
+        Scanner contents = new Scanner(new File(playerFile));
+        return Integer.parseInt(contents.nextLine());
+    }
+
+    public int getPlayerScoreTryCatch(String playerFile) {
+        try {
+            Scanner contents = new Scanner(new File(playerFile));
+            return Integer.parseInt(contents.nextLine());
+        } catch (FileNotFoundException noFile) {
+            throw new IllegalArgumentException("File not found");
+        }
+    }
+
+    public int getPlayerScoreTryCatchRecovery(String playerFile) {
+        try {
+            Scanner contents = new Scanner(new File(playerFile));
+            return Integer.parseInt(contents.nextLine());
+        } catch ( FileNotFoundException noFile ) {
+            logger.warning("File not found, resetting score.");
+            return 0;
+        }
+    }
+
+    public int getPlayerScoreFinally(String playerFile) throws FileNotFoundException {
+        Scanner contents = null;
+        try {
+            contents = new Scanner(new File(playerFile));
+            return Integer.parseInt(contents.nextLine());
+        } finally {
+            if (contents != null) {
+                contents.close();
+            }
+        }
+    }
+
+    public int getPlayerScoreTryWithResources(String playerFile) {
+        try (Scanner contents = new Scanner(new File(playerFile))) {
+            return Integer.parseInt(contents.nextLine());
+        } catch (FileNotFoundException e ) {
+            logger.warning("File not found, resetting score.");
+            return 0;
+        }
+    }
+
+    public int getPlayerScoreMultipleCatchBlocks(String playerFile) {
+        try (Scanner contents = new Scanner(new File(playerFile))) {
+            return Integer.parseInt(contents.nextLine());
+        } catch (IOException e) {
+            logger.warning("Player file wouldn't load!");
+            return 0;
+        } catch (NumberFormatException e) {
+            logger.warning("Player file was corrupted!");
+            return 0;
+        }
+    }
+
+    public int getPlayerScoreMultipleCatchBlocksAlternative(String playerFile) {
+        try (Scanner contents = new Scanner(new File(playerFile)) ) {
+            return Integer.parseInt(contents.nextLine());
+        } catch (FileNotFoundException e) {
+            logger.warning("Player file not found!");
+            return 0;
+        } catch (IOException e) {
+            logger.warning("Player file wouldn't load!");
+            return 0;
+        } catch (NumberFormatException e) {
+            logger.warning("Player file was corrupted!");
+            return 0;
+        }
+    }
+
+    public int getPlayerScoreUnionCatchBlocks(String playerFile) {
+        try (Scanner contents = new Scanner(new File(playerFile))) {
+            return Integer.parseInt(contents.nextLine());
+        } catch (IOException | NumberFormatException e) {
+            logger.warning("Failed to load score!");
+            return 0;
+        }
+    }
+
+    public List<Player> loadAllPlayersThrowingChecked(String playersFile) throws TimeoutException {
+        boolean tooLong = true;
+
+        while (!tooLong) {
+            // ... potentially long operation
+        }
+            throw new TimeoutException("This operation took too long");
+    }
+
+    public List<Player> loadAllPlayersThrowingUnchecked(String playersFile) throws TimeoutException {
+        if(!isFilenameValid(playersFile)) {
+            throw new IllegalArgumentException("Filename isn't valid!");
+        }
+        return null;
+
+        // ...
+    }
+
+    public List<Player> loadAllPlayersWrapping(String playersFile) throws IOException {
+        try { 
+            throw new IOException();
+        } catch (IOException io) { 		
+            throw io;
+        }
+    }
+
+    public List<Player> loadAllPlayersRethrowing(String playersFile) throws PlayerLoadException {
+        try { 
+            throw new IOException();
+        } catch (IOException io) { 		
+            throw new PlayerLoadException(io);
+        }
+    }
+
+    public List<Player> loadAllPlayersThrowable(String playersFile) {
+        try {
+            throw new NullPointerException();
+        } catch ( Throwable t ) {
+            throw t;
+        }
+    }
+
+    class FewerExceptions extends Exceptions {
+        @Override
+        public List<Player> loadAllPlayers(String playersFile) {  //can't add "throws MyCheckedException 
+            return null;
+            // overridden
+        }
+    }
+
+    public void throwAsGotoAntiPattern() throws MyException {
+        try {
+            // bunch of code
+            throw new MyException();
+            // second bunch of code
+        } catch ( MyException e ) {
+            // third bunch of code
+        }
+    }
+
+    public int getPlayerScoreSwallowingExceptionAntiPattern(String playerFile) {
+        try {
+        // ...
+        } catch (Exception e) {} // <== catch and swallow
+            return 0;
+    }
+
+    public int getPlayerScoreSwallowingExceptionAntiPatternAlternative(String playerFile) {
+        try {
+            // ...
+        } catch (Exception e) {
+             e.printStackTrace();
+        }
+      return 0;
+    }
+
+    public int getPlayerScoreSwallowingExceptionAntiPatternAlternative2(String playerFile) throws PlayerScoreException {
+        try {
+            throw new IOException();
+        } catch (IOException e) {
+            throw new PlayerScoreException(e);
+        }
+    }
+
+    public int getPlayerScoreReturnInFinallyAntiPattern(String playerFile) {
+        int score = 0;
+        try {
+            throw new IOException();
+        } finally {
+            return score; // <== the IOException is dropped
+        }
+    }
+
+    private boolean isFilenameValid(String name) {
+        return false;
+    }
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/exceptionhandling/MyException.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/MyException.java
similarity index 94%
rename from core-java-lang/src/main/java/com/baeldung/exceptionhandling/MyException.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/MyException.java
index 5a50acc4de..c2908b7278 100644
--- a/core-java-lang/src/main/java/com/baeldung/exceptionhandling/MyException.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/MyException.java
@@ -1,5 +1,5 @@
-package com.baeldung.exceptionhandling;
-
-public class MyException extends Throwable {
-
-}
+package com.baeldung.exceptionhandling;
+
+public class MyException extends Throwable {
+
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/exceptionhandling/Player.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/Player.java
similarity index 93%
rename from core-java-lang/src/main/java/com/baeldung/exceptionhandling/Player.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/Player.java
index 4efd37134f..e866802fe3 100644
--- a/core-java-lang/src/main/java/com/baeldung/exceptionhandling/Player.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/Player.java
@@ -1,12 +1,12 @@
-package com.baeldung.exceptionhandling;
-
-public class Player {
-
-    public int id;
-    public String name;
-
-    public Player(String name) {
-        this.name = name;
-    }
-
-}
+package com.baeldung.exceptionhandling;
+
+public class Player {
+
+    public int id;
+    public String name;
+
+    public Player(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/exceptionhandling/PlayerLoadException.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/PlayerLoadException.java
similarity index 94%
rename from core-java-lang/src/main/java/com/baeldung/exceptionhandling/PlayerLoadException.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/PlayerLoadException.java
index 5302fd8e7d..d92edeebbd 100644
--- a/core-java-lang/src/main/java/com/baeldung/exceptionhandling/PlayerLoadException.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/PlayerLoadException.java
@@ -1,11 +1,11 @@
-package com.baeldung.exceptionhandling;
-
-import java.io.IOException;
-
-public class PlayerLoadException extends Exception {
-
-    public PlayerLoadException(IOException io) {
-        super(io);
-    }
-
-}
+package com.baeldung.exceptionhandling;
+
+import java.io.IOException;
+
+public class PlayerLoadException extends Exception {
+
+    public PlayerLoadException(IOException io) {
+        super(io);
+    }
+
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/exceptionhandling/PlayerScoreException.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/PlayerScoreException.java
similarity index 95%
rename from core-java-lang/src/main/java/com/baeldung/exceptionhandling/PlayerScoreException.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/PlayerScoreException.java
index d11159217e..299370ee86 100644
--- a/core-java-lang/src/main/java/com/baeldung/exceptionhandling/PlayerScoreException.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/PlayerScoreException.java
@@ -1,8 +1,8 @@
-package com.baeldung.exceptionhandling;
-
-public class PlayerScoreException extends Exception {
-
-    public PlayerScoreException(Exception e) {
-        super(e);
-    }
-}
+package com.baeldung.exceptionhandling;
+
+public class PlayerScoreException extends Exception {
+
+    public PlayerScoreException(Exception e) {
+        super(e);
+    }
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/exceptionhandling/TimeoutException.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/TimeoutException.java
similarity index 95%
rename from core-java-lang/src/main/java/com/baeldung/exceptionhandling/TimeoutException.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/TimeoutException.java
index 294ad542d3..0211284e5d 100644
--- a/core-java-lang/src/main/java/com/baeldung/exceptionhandling/TimeoutException.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/exceptionhandling/TimeoutException.java
@@ -1,8 +1,8 @@
-package com.baeldung.exceptionhandling;
-
-public class TimeoutException extends Exception {
-
-    public TimeoutException(String message) {
-        super(message);
-    }
-}
+package com.baeldung.exceptionhandling;
+
+public class TimeoutException extends Exception {
+
+    public TimeoutException(String message) {
+        super(message);
+    }
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/finalize/CloseableResource.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/finalize/CloseableResource.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/finalize/CloseableResource.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/finalize/CloseableResource.java
diff --git a/core-java-lang/src/main/java/com/baeldung/finalize/Finalizable.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/finalize/Finalizable.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/finalize/Finalizable.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/finalize/Finalizable.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/Box.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/Box.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/Box.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/Box.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/CommaSeparatedCustomers.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/CommaSeparatedCustomers.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/CommaSeparatedCustomers.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/CommaSeparatedCustomers.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/Customer.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/Customer.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/Customer.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/Customer.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/Employee.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/Employee.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/Employee.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/Employee.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/EmployeeSalaryComparator.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/EmployeeSalaryComparator.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/EmployeeSalaryComparator.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/EmployeeSalaryComparator.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/HasColor.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/HasColor.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/HasColor.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/HasColor.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Car.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Car.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Car.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Car.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Fly.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Fly.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Fly.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Fly.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Transform.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Transform.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Transform.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Transform.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Vehicle.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Vehicle.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Vehicle.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Vehicle.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Circle.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Circle.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Circle.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Circle.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/MainTestClass.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/MainTestClass.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/MainTestClass.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/MainTestClass.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Shape.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Shape.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Shape.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Shape.java
diff --git a/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Square.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Square.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Square.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Square.java
diff --git a/core-java-lang/src/main/java/com/baeldung/java/reflection/Animal.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Animal.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/java/reflection/Animal.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Animal.java
diff --git a/core-java-lang/src/main/java/com/baeldung/java/reflection/Bird.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Bird.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/java/reflection/Bird.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Bird.java
diff --git a/core-java-lang/src/main/java/com/baeldung/java/reflection/DynamicGreeter.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/DynamicGreeter.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/java/reflection/DynamicGreeter.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/DynamicGreeter.java
diff --git a/core-java-lang/src/main/java/com/baeldung/java/reflection/Eating.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Eating.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/java/reflection/Eating.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Eating.java
diff --git a/core-java-lang/src/main/java/com/baeldung/java/reflection/Goat.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Goat.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/java/reflection/Goat.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Goat.java
diff --git a/core-java-lang/src/main/java/com/baeldung/java/reflection/Greeter.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Greeter.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/java/reflection/Greeter.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Greeter.java
diff --git a/core-java-lang/src/main/java/com/baeldung/java/reflection/GreetingAnnotation.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/GreetingAnnotation.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/java/reflection/GreetingAnnotation.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/GreetingAnnotation.java
diff --git a/core-java-lang/src/main/java/com/baeldung/java/reflection/Greetings.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Greetings.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/java/reflection/Greetings.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Greetings.java
diff --git a/core-java-lang/src/main/java/com/baeldung/java/reflection/Locomotion.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Locomotion.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/java/reflection/Locomotion.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Locomotion.java
diff --git a/core-java-lang/src/main/java/com/baeldung/java/reflection/Operations.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Operations.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/java/reflection/Operations.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Operations.java
diff --git a/core-java-lang/src/main/java/com/baeldung/java/reflection/Person.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Person.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/java/reflection/Person.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/java/reflection/Person.java
diff --git a/core-java-lang/src/main/java/com/baeldung/keywords/finalize/FinalizeObject.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/keywords/finalize/FinalizeObject.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/keywords/finalize/FinalizeObject.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/keywords/finalize/FinalizeObject.java
diff --git a/core-java-lang/src/main/java/com/baeldung/keywords/finalkeyword/Child.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/keywords/finalkeyword/Child.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/keywords/finalkeyword/Child.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/keywords/finalkeyword/Child.java
diff --git a/core-java-lang/src/main/java/com/baeldung/keywords/finalkeyword/GrandChild.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/keywords/finalkeyword/GrandChild.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/keywords/finalkeyword/GrandChild.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/keywords/finalkeyword/GrandChild.java
diff --git a/core-java-lang/src/main/java/com/baeldung/keywords/finalkeyword/Parent.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/keywords/finalkeyword/Parent.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/keywords/finalkeyword/Parent.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/keywords/finalkeyword/Parent.java
diff --git a/core-java-lang/src/main/java/com/baeldung/keywords/finallykeyword/FinallyExample.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/keywords/finallykeyword/FinallyExample.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/keywords/finallykeyword/FinallyExample.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/keywords/finallykeyword/FinallyExample.java
diff --git a/core-java-lang/src/main/java/com/baeldung/nativekeyword/DateTimeUtils.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/nativekeyword/DateTimeUtils.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/nativekeyword/DateTimeUtils.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/nativekeyword/DateTimeUtils.java
diff --git a/core-java-lang/src/main/java/com/baeldung/nativekeyword/NativeMainApp.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/nativekeyword/NativeMainApp.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/nativekeyword/NativeMainApp.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/nativekeyword/NativeMainApp.java
diff --git a/core-java-lang/src/main/java/com/baeldung/noclassdeffounderror/ClassWithInitErrors.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/noclassdeffounderror/ClassWithInitErrors.java
similarity index 95%
rename from core-java-lang/src/main/java/com/baeldung/noclassdeffounderror/ClassWithInitErrors.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/noclassdeffounderror/ClassWithInitErrors.java
index 2b19f3496d..b5b357a322 100644
--- a/core-java-lang/src/main/java/com/baeldung/noclassdeffounderror/ClassWithInitErrors.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/noclassdeffounderror/ClassWithInitErrors.java
@@ -1,5 +1,5 @@
-package com.baeldung.noclassdeffounderror;
-
-public class ClassWithInitErrors {
-    static int data = 1 / 0;
-}
+package com.baeldung.noclassdeffounderror;
+
+public class ClassWithInitErrors {
+    static int data = 1 / 0;
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorExample.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorExample.java
similarity index 96%
rename from core-java-lang/src/main/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorExample.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorExample.java
index 0d02391a73..7bcefbdbd3 100644
--- a/core-java-lang/src/main/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorExample.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorExample.java
@@ -1,14 +1,14 @@
-package com.baeldung.noclassdeffounderror;
-
-public class NoClassDefFoundErrorExample {
-    public ClassWithInitErrors getClassWithInitErrors() {
-        ClassWithInitErrors test;
-        try {
-            test = new ClassWithInitErrors();
-        } catch (Throwable t) {
-            System.out.println(t);
-        }
-        test = new ClassWithInitErrors();
-        return test;
-    }
+package com.baeldung.noclassdeffounderror;
+
+public class NoClassDefFoundErrorExample {
+    public ClassWithInitErrors getClassWithInitErrors() {
+        ClassWithInitErrors test;
+        try {
+            test = new ClassWithInitErrors();
+        } catch (Throwable t) {
+            System.out.println(t);
+        }
+        test = new ClassWithInitErrors();
+        return test;
+    }
 }
\ No newline at end of file
diff --git a/core-java-lang/src/main/java/com/baeldung/objects/Car.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/objects/Car.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/objects/Car.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/objects/Car.java
diff --git a/core-java-lang/src/main/java/com/baeldung/packages/TodoApp.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/TodoApp.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/packages/TodoApp.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/TodoApp.java
diff --git a/core-java-lang/src/main/java/com/baeldung/packages/TodoList.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/TodoList.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/packages/TodoList.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/TodoList.java
diff --git a/core-java-lang/src/main/java/com/baeldung/packages/domain/TodoItem.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/domain/TodoItem.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/packages/domain/TodoItem.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/domain/TodoItem.java
diff --git a/core-java-lang/src/main/java/com/baeldung/parameterpassing/NonPrimitives.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/parameterpassing/NonPrimitives.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/parameterpassing/NonPrimitives.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/parameterpassing/NonPrimitives.java
diff --git a/core-java-lang/src/main/java/com/baeldung/parameterpassing/Primitives.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/parameterpassing/Primitives.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/parameterpassing/Primitives.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/parameterpassing/Primitives.java
diff --git a/core-java-lang/src/main/java/com/baeldung/recursion/BinaryNode.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/recursion/BinaryNode.java
similarity index 95%
rename from core-java-lang/src/main/java/com/baeldung/recursion/BinaryNode.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/recursion/BinaryNode.java
index 0c3f0ecc40..c5dd746a4c 100644
--- a/core-java-lang/src/main/java/com/baeldung/recursion/BinaryNode.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/recursion/BinaryNode.java
@@ -1,31 +1,31 @@
-package com.baeldung.recursion;
-
-public class BinaryNode {
-    int value;
-    BinaryNode left;
-    BinaryNode right;
-    
-    public BinaryNode(int value){
-        this.value = value;
-    }
-    
-    public int getValue() {
-        return value;
-    }
-    public void setValue(int value) {
-        this.value = value;
-    }
-    public BinaryNode getLeft() {
-        return left;
-    }
-    public void setLeft(BinaryNode left) {
-        this.left = left;
-    }
-    public BinaryNode getRight() {
-        return right;
-    }
-    public void setRight(BinaryNode right) {
-        this.right = right;
-    }
-    
-}
+package com.baeldung.recursion;
+
+public class BinaryNode {
+    int value;
+    BinaryNode left;
+    BinaryNode right;
+    
+    public BinaryNode(int value){
+        this.value = value;
+    }
+    
+    public int getValue() {
+        return value;
+    }
+    public void setValue(int value) {
+        this.value = value;
+    }
+    public BinaryNode getLeft() {
+        return left;
+    }
+    public void setLeft(BinaryNode left) {
+        this.left = left;
+    }
+    public BinaryNode getRight() {
+        return right;
+    }
+    public void setRight(BinaryNode right) {
+        this.right = right;
+    }
+    
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/recursion/RecursionExample.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/recursion/RecursionExample.java
similarity index 95%
rename from core-java-lang/src/main/java/com/baeldung/recursion/RecursionExample.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/recursion/RecursionExample.java
index 649c0e0587..b6800d2e7e 100644
--- a/core-java-lang/src/main/java/com/baeldung/recursion/RecursionExample.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/recursion/RecursionExample.java
@@ -1,64 +1,64 @@
-package com.baeldung.recursion;
-
-public class RecursionExample {
-    
-    public int sum(int n){
-        if (n >= 1){
-            return sum(n - 1) + n;
-        }
-        return n;
-    }
-    
-    public int tailSum(int currentSum, int n){
-        if (n <= 1) {
-            return currentSum + n;
-        }
-        return tailSum(currentSum + n, n - 1);
-    }
-    
-    public int iterativeSum(int n){
-        int sum = 0;
-        if(n < 0){
-            return -1;
-        }
-        for(int i=0; i<=n; i++){
-            sum += i;
-        }
-        return sum;
-    }
-    
-    public int powerOf10(int n){
-        if (n == 0){
-            return 1;
-        }
-        return powerOf10(n-1)*10;
-    }
-    
-    public int fibonacci(int n){
-        if (n <=1 ){
-            return n;
-        }
-        return fibonacci(n-1) + fibonacci(n-2);
-    }
-    
-    public String toBinary(int n){
-        if (n <= 1 ){
-            return String.valueOf(n);
-        }
-        return toBinary(n / 2) + String.valueOf(n % 2);
-    }
-    
-    public int calculateTreeHeight(BinaryNode root){
-        if (root!= null){
-            if (root.getLeft() != null || root.getRight() != null){
-                return 1 + max(calculateTreeHeight(root.left) , calculateTreeHeight(root.right));
-            }
-        }
-        return 0;
-    }
-    
-    public int max(int a,int b){
-        return a>b ? a:b;
-    }
-    
-}
+package com.baeldung.recursion;
+
+public class RecursionExample {
+    
+    public int sum(int n){
+        if (n >= 1){
+            return sum(n - 1) + n;
+        }
+        return n;
+    }
+    
+    public int tailSum(int currentSum, int n){
+        if (n <= 1) {
+            return currentSum + n;
+        }
+        return tailSum(currentSum + n, n - 1);
+    }
+    
+    public int iterativeSum(int n){
+        int sum = 0;
+        if(n < 0){
+            return -1;
+        }
+        for(int i=0; i<=n; i++){
+            sum += i;
+        }
+        return sum;
+    }
+    
+    public int powerOf10(int n){
+        if (n == 0){
+            return 1;
+        }
+        return powerOf10(n-1)*10;
+    }
+    
+    public int fibonacci(int n){
+        if (n <=1 ){
+            return n;
+        }
+        return fibonacci(n-1) + fibonacci(n-2);
+    }
+    
+    public String toBinary(int n){
+        if (n <= 1 ){
+            return String.valueOf(n);
+        }
+        return toBinary(n / 2) + String.valueOf(n % 2);
+    }
+    
+    public int calculateTreeHeight(BinaryNode root){
+        if (root!= null){
+            if (root.getLeft() != null || root.getRight() != null){
+                return 1 + max(calculateTreeHeight(root.left) , calculateTreeHeight(root.right));
+            }
+        }
+        return 0;
+    }
+    
+    public int max(int a,int b){
+        return a>b ? a:b;
+    }
+    
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/scope/BracketScopeExample.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/BracketScopeExample.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/scope/BracketScopeExample.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/BracketScopeExample.java
diff --git a/core-java-lang/src/main/java/com/baeldung/scope/ClassScopeExample.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/ClassScopeExample.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/scope/ClassScopeExample.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/ClassScopeExample.java
diff --git a/core-java-lang/src/main/java/com/baeldung/scope/LoopScopeExample.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/LoopScopeExample.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/scope/LoopScopeExample.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/LoopScopeExample.java
diff --git a/core-java-lang/src/main/java/com/baeldung/scope/MethodScopeExample.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/MethodScopeExample.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/scope/MethodScopeExample.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/MethodScopeExample.java
diff --git a/core-java-lang/src/main/java/com/baeldung/scope/NestedScopesExample.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/NestedScopesExample.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/scope/NestedScopesExample.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/NestedScopesExample.java
diff --git a/core-java-lang/src/main/java/com/baeldung/sneakythrows/SneakyRunnable.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/sneakythrows/SneakyRunnable.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/sneakythrows/SneakyRunnable.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/sneakythrows/SneakyRunnable.java
diff --git a/core-java-lang/src/main/java/com/baeldung/sneakythrows/SneakyThrows.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/sneakythrows/SneakyThrows.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/sneakythrows/SneakyThrows.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/sneakythrows/SneakyThrows.java
diff --git a/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/AccountHolder.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/AccountHolder.java
similarity index 96%
rename from core-java-lang/src/main/java/com/baeldung/stackoverflowerror/AccountHolder.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/AccountHolder.java
index 9555433792..91b8a3bbb0 100644
--- a/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/AccountHolder.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/AccountHolder.java
@@ -1,8 +1,8 @@
-package com.baeldung.stackoverflowerror;
-
-public class AccountHolder {
-    private String firstName;
-    private String lastName;
-
-    AccountHolder jointAccountHolder = new AccountHolder();
-}
+package com.baeldung.stackoverflowerror;
+
+public class AccountHolder {
+    private String firstName;
+    private String lastName;
+
+    AccountHolder jointAccountHolder = new AccountHolder();
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/ClassOne.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/ClassOne.java
similarity index 95%
rename from core-java-lang/src/main/java/com/baeldung/stackoverflowerror/ClassOne.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/ClassOne.java
index 99ef2b4f92..3b95fd1368 100644
--- a/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/ClassOne.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/ClassOne.java
@@ -1,16 +1,16 @@
-package com.baeldung.stackoverflowerror;
-
-public class ClassOne {
-    private int oneValue;
-    private ClassTwo clsTwoInstance = null;
-
-    public ClassOne() {
-        oneValue = 0;
-        clsTwoInstance = new ClassTwo();
-    }
-
-    public ClassOne(int oneValue, ClassTwo clsTwoInstance) {
-        this.oneValue = oneValue;
-        this.clsTwoInstance = clsTwoInstance;
-    }
-}
+package com.baeldung.stackoverflowerror;
+
+public class ClassOne {
+    private int oneValue;
+    private ClassTwo clsTwoInstance = null;
+
+    public ClassOne() {
+        oneValue = 0;
+        clsTwoInstance = new ClassTwo();
+    }
+
+    public ClassOne(int oneValue, ClassTwo clsTwoInstance) {
+        this.oneValue = oneValue;
+        this.clsTwoInstance = clsTwoInstance;
+    }
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/ClassTwo.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/ClassTwo.java
similarity index 95%
rename from core-java-lang/src/main/java/com/baeldung/stackoverflowerror/ClassTwo.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/ClassTwo.java
index 0d34ac3c32..0adf075b43 100644
--- a/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/ClassTwo.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/ClassTwo.java
@@ -1,16 +1,16 @@
-package com.baeldung.stackoverflowerror;
-
-public class ClassTwo {
-    private int twoValue;
-    private ClassOne clsOneInstance = null;
-
-    public ClassTwo() {
-        twoValue = 10;
-        clsOneInstance = new ClassOne();
-    }
-
-    public ClassTwo(int twoValue, ClassOne clsOneInstance) {
-        this.twoValue = twoValue;
-        this.clsOneInstance = clsOneInstance;
-    }
-}
+package com.baeldung.stackoverflowerror;
+
+public class ClassTwo {
+    private int twoValue;
+    private ClassOne clsOneInstance = null;
+
+    public ClassTwo() {
+        twoValue = 10;
+        clsOneInstance = new ClassOne();
+    }
+
+    public ClassTwo(int twoValue, ClassOne clsOneInstance) {
+        this.twoValue = twoValue;
+        this.clsOneInstance = clsOneInstance;
+    }
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationCondition.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationCondition.java
similarity index 97%
rename from core-java-lang/src/main/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationCondition.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationCondition.java
index 9fb00d4b83..c67eeb30d1 100644
--- a/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationCondition.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationCondition.java
@@ -1,7 +1,7 @@
-package com.baeldung.stackoverflowerror;
-
-public class InfiniteRecursionWithTerminationCondition {
-    public int calculateFactorial(final int number) {
-        return number == 1 ? 1 : number * calculateFactorial(number - 1);
-    }
-}
+package com.baeldung.stackoverflowerror;
+
+public class InfiniteRecursionWithTerminationCondition {
+    public int calculateFactorial(final int number) {
+        return number == 1 ? 1 : number * calculateFactorial(number - 1);
+    }
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationCondition.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationCondition.java
similarity index 97%
rename from core-java-lang/src/main/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationCondition.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationCondition.java
index 16d771f389..8d10c65dcc 100644
--- a/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationCondition.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationCondition.java
@@ -1,7 +1,7 @@
-package com.baeldung.stackoverflowerror;
-
-public class RecursionWithCorrectTerminationCondition {
-    public int calculateFactorial(final int number) {
-        return number <= 1 ? 1 : number * calculateFactorial(number - 1);
-    }
-}
+package com.baeldung.stackoverflowerror;
+
+public class RecursionWithCorrectTerminationCondition {
+    public int calculateFactorial(final int number) {
+        return number <= 1 ? 1 : number * calculateFactorial(number - 1);
+    }
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursion.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursion.java
similarity index 96%
rename from core-java-lang/src/main/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursion.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursion.java
index f5160c3eb3..0b7fb3cf94 100644
--- a/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursion.java
+++ b/core-java-modules/core-java-lang/src/main/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursion.java
@@ -1,7 +1,7 @@
-package com.baeldung.stackoverflowerror;
-
-public class UnintendedInfiniteRecursion {
-    public int calculateFactorial(int number) {
-        return number * calculateFactorial(number - 1);
-    }
-}
+package com.baeldung.stackoverflowerror;
+
+public class UnintendedInfiniteRecursion {
+    public int calculateFactorial(int number) {
+        return number * calculateFactorial(number - 1);
+    }
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/synthetic/BridgeMethodDemo.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/synthetic/BridgeMethodDemo.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/synthetic/BridgeMethodDemo.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/synthetic/BridgeMethodDemo.java
diff --git a/core-java-lang/src/main/java/com/baeldung/synthetic/SyntheticConstructorDemo.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/synthetic/SyntheticConstructorDemo.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/synthetic/SyntheticConstructorDemo.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/synthetic/SyntheticConstructorDemo.java
diff --git a/core-java-lang/src/main/java/com/baeldung/synthetic/SyntheticFieldDemo.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/synthetic/SyntheticFieldDemo.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/synthetic/SyntheticFieldDemo.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/synthetic/SyntheticFieldDemo.java
diff --git a/core-java-lang/src/main/java/com/baeldung/synthetic/SyntheticMethodDemo.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/synthetic/SyntheticMethodDemo.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/synthetic/SyntheticMethodDemo.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/synthetic/SyntheticMethodDemo.java
diff --git a/core-java-lang/src/main/java/com/baeldung/throwsexception/DataAccessException.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/throwsexception/DataAccessException.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/throwsexception/DataAccessException.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/throwsexception/DataAccessException.java
diff --git a/core-java-lang/src/main/java/com/baeldung/throwsexception/Main.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/throwsexception/Main.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/throwsexception/Main.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/throwsexception/Main.java
diff --git a/core-java-lang/src/main/java/com/baeldung/throwsexception/PersonRepository.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/throwsexception/PersonRepository.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/throwsexception/PersonRepository.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/throwsexception/PersonRepository.java
diff --git a/core-java-lang/src/main/java/com/baeldung/throwsexception/SimpleService.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/throwsexception/SimpleService.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/throwsexception/SimpleService.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/throwsexception/SimpleService.java
diff --git a/core-java-lang/src/main/java/com/baeldung/throwsexception/TryCatch.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/throwsexception/TryCatch.java
similarity index 100%
rename from core-java-lang/src/main/java/com/baeldung/throwsexception/TryCatch.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/throwsexception/TryCatch.java
diff --git a/core-java-lang/src/main/resources/file.txt b/core-java-modules/core-java-lang/src/main/resources/file.txt
similarity index 100%
rename from core-java-lang/src/main/resources/file.txt
rename to core-java-modules/core-java-lang/src/main/resources/file.txt
diff --git a/core-java-lang/src/test/java/com/baeldung/binding/AnimalActivityUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/binding/AnimalActivityUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/binding/AnimalActivityUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/binding/AnimalActivityUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/binding/AnimalUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/binding/AnimalUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/binding/AnimalUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/binding/AnimalUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/binding/CatUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/binding/CatUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/binding/CatUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/binding/CatUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/className/RetrievingClassNameUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/className/RetrievingClassNameUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/className/RetrievingClassNameUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/className/RetrievingClassNameUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionUnitTest.java
similarity index 96%
rename from core-java-lang/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionUnitTest.java
index b076b0324a..59605fb1c9 100644
--- a/core-java-lang/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionUnitTest.java
+++ b/core-java-modules/core-java-lang/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionUnitTest.java
@@ -1,11 +1,11 @@
-package com.baeldung.classnotfoundexception;
-
-import org.junit.Test;
-
-public class ClassNotFoundExceptionUnitTest {
-
-    @Test(expected = ClassNotFoundException.class)
-    public void givenNoDriversInClassPath_whenLoadDrivers_thenClassNotFoundException() throws ClassNotFoundException {
-        Class.forName("oracle.jdbc.driver.OracleDriver");
-    }
+package com.baeldung.classnotfoundexception;
+
+import org.junit.Test;
+
+public class ClassNotFoundExceptionUnitTest {
+
+    @Test(expected = ClassNotFoundException.class)
+    public void givenNoDriversInClassPath_whenLoadDrivers_thenClassNotFoundException() throws ClassNotFoundException {
+        Class.forName("oracle.jdbc.driver.OracleDriver");
+    }
 }
\ No newline at end of file
diff --git a/core-java-lang/src/test/java/com/baeldung/comparable/ComparableUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/comparable/ComparableUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/comparable/ComparableUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/comparable/ComparableUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/compoundoperators/CompoundOperatorsUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/compoundoperators/CompoundOperatorsUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/compoundoperators/CompoundOperatorsUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/compoundoperators/CompoundOperatorsUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/customexception/IncorrectFileExtensionExceptionUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/customexception/IncorrectFileExtensionExceptionUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/customexception/IncorrectFileExtensionExceptionUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/customexception/IncorrectFileExtensionExceptionUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/customexception/IncorrectFileNameExceptionUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/customexception/IncorrectFileNameExceptionUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/customexception/IncorrectFileNameExceptionUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/customexception/IncorrectFileNameExceptionUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/dynamicproxy/DynamicProxyIntegrationTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/dynamicproxy/DynamicProxyIntegrationTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/dynamicproxy/DynamicProxyIntegrationTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/dynamicproxy/DynamicProxyIntegrationTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/enums/values/Element1UnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/values/Element1UnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/enums/values/Element1UnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/values/Element1UnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/enums/values/Element2UnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/values/Element2UnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/enums/values/Element2UnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/values/Element2UnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/enums/values/Element3UnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/values/Element3UnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/enums/values/Element3UnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/values/Element3UnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/enums/values/Element4UnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/values/Element4UnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/enums/values/Element4UnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/values/Element4UnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/exceptionhandling/ExceptionsUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/exceptionhandling/ExceptionsUnitTest.java
similarity index 96%
rename from core-java-lang/src/test/java/com/baeldung/exceptionhandling/ExceptionsUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/exceptionhandling/ExceptionsUnitTest.java
index b3f585cfe4..29c690133d 100644
--- a/core-java-lang/src/test/java/com/baeldung/exceptionhandling/ExceptionsUnitTest.java
+++ b/core-java-modules/core-java-lang/src/test/java/com/baeldung/exceptionhandling/ExceptionsUnitTest.java
@@ -1,80 +1,80 @@
-package com.baeldung.exceptionhandling;
-
-import org.junit.Test;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.nio.file.NoSuchFileException;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-public class ExceptionsUnitTest {
-
-    Exceptions exceptions = new Exceptions();
-
-    @Test
-    public void getPlayers() {
-        assertThatThrownBy(() -> exceptions.getPlayers())
-            .isInstanceOf(NoSuchFileException.class);
-    }
-
-    @Test
-    public void loadAllPlayers() {
-        assertThatThrownBy(() -> exceptions.loadAllPlayers(""))
-            .isInstanceOf(IllegalStateException.class);
-    }
-
-    @Test
-    public void getPlayerScoreThrows() {
-        assertThatThrownBy(() -> exceptions.getPlayerScoreThrows(""))
-            .isInstanceOf(FileNotFoundException.class);
-    }
-    
-    @Test
-    public void getPlayerScoreTryCatch() {
-        assertThatThrownBy(() -> exceptions.getPlayerScoreTryCatch(""))
-            .isInstanceOf(IllegalArgumentException.class);
-    }
-    
-    @Test
-    public void getPlayerScoreFinally() {
-        assertThatThrownBy(() -> exceptions.getPlayerScoreFinally(""))
-            .isInstanceOf(FileNotFoundException.class);
-    }
-    
-    @Test
-    public void loadAllPlayersThrowingChecked() {
-        assertThatThrownBy(() -> exceptions.loadAllPlayersThrowingChecked(""))
-            .isInstanceOf(TimeoutException.class);
-    }
-    
-    @Test
-    public void loadAllPlayersThrowingUnchecked() {
-        assertThatThrownBy(() -> exceptions.loadAllPlayersThrowingUnchecked(""))
-            .isInstanceOf(IllegalArgumentException.class);
-    }
-    
-    @Test
-    public void loadAllPlayersWrapping() {
-        assertThatThrownBy(() -> exceptions.loadAllPlayersWrapping(""))
-            .isInstanceOf(IOException.class);
-    }
-    
-    @Test
-    public void loadAllPlayersRethrowing() {
-        assertThatThrownBy(() -> exceptions.loadAllPlayersRethrowing(""))
-            .isInstanceOf(PlayerLoadException.class);
-    }
-    
-    @Test
-    public void loadAllPlayersThrowable() {
-        assertThatThrownBy(() -> exceptions.loadAllPlayersThrowable(""))
-            .isInstanceOf(NullPointerException.class);
-    }
-    
-    @Test
-    public void getPlayerScoreSwallowingExceptionAntiPatternAlternative2() {
-        assertThatThrownBy(() -> exceptions.getPlayerScoreSwallowingExceptionAntiPatternAlternative2(""))
-            .isInstanceOf(PlayerScoreException.class);
-    }
-}
+package com.baeldung.exceptionhandling;
+
+import org.junit.Test;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.NoSuchFileException;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class ExceptionsUnitTest {
+
+    Exceptions exceptions = new Exceptions();
+
+    @Test
+    public void getPlayers() {
+        assertThatThrownBy(() -> exceptions.getPlayers())
+            .isInstanceOf(NoSuchFileException.class);
+    }
+
+    @Test
+    public void loadAllPlayers() {
+        assertThatThrownBy(() -> exceptions.loadAllPlayers(""))
+            .isInstanceOf(IllegalStateException.class);
+    }
+
+    @Test
+    public void getPlayerScoreThrows() {
+        assertThatThrownBy(() -> exceptions.getPlayerScoreThrows(""))
+            .isInstanceOf(FileNotFoundException.class);
+    }
+    
+    @Test
+    public void getPlayerScoreTryCatch() {
+        assertThatThrownBy(() -> exceptions.getPlayerScoreTryCatch(""))
+            .isInstanceOf(IllegalArgumentException.class);
+    }
+    
+    @Test
+    public void getPlayerScoreFinally() {
+        assertThatThrownBy(() -> exceptions.getPlayerScoreFinally(""))
+            .isInstanceOf(FileNotFoundException.class);
+    }
+    
+    @Test
+    public void loadAllPlayersThrowingChecked() {
+        assertThatThrownBy(() -> exceptions.loadAllPlayersThrowingChecked(""))
+            .isInstanceOf(TimeoutException.class);
+    }
+    
+    @Test
+    public void loadAllPlayersThrowingUnchecked() {
+        assertThatThrownBy(() -> exceptions.loadAllPlayersThrowingUnchecked(""))
+            .isInstanceOf(IllegalArgumentException.class);
+    }
+    
+    @Test
+    public void loadAllPlayersWrapping() {
+        assertThatThrownBy(() -> exceptions.loadAllPlayersWrapping(""))
+            .isInstanceOf(IOException.class);
+    }
+    
+    @Test
+    public void loadAllPlayersRethrowing() {
+        assertThatThrownBy(() -> exceptions.loadAllPlayersRethrowing(""))
+            .isInstanceOf(PlayerLoadException.class);
+    }
+    
+    @Test
+    public void loadAllPlayersThrowable() {
+        assertThatThrownBy(() -> exceptions.loadAllPlayersThrowable(""))
+            .isInstanceOf(NullPointerException.class);
+    }
+    
+    @Test
+    public void getPlayerScoreSwallowingExceptionAntiPatternAlternative2() {
+        assertThatThrownBy(() -> exceptions.getPlayerScoreSwallowingExceptionAntiPatternAlternative2(""))
+            .isInstanceOf(PlayerScoreException.class);
+    }
+}
diff --git a/core-java-lang/src/test/java/com/baeldung/finalize/FinalizeUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/finalize/FinalizeUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/finalize/FinalizeUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/finalize/FinalizeUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/interfaces/InnerInterfaceUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/interfaces/InnerInterfaceUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/interfaces/InnerInterfaceUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/interfaces/InnerInterfaceUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/java/enumiteration/DaysOfWeekEnum.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/java/enumiteration/DaysOfWeekEnum.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/java/enumiteration/DaysOfWeekEnum.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/java/enumiteration/DaysOfWeekEnum.java
diff --git a/core-java-lang/src/test/java/com/baeldung/java/enumiteration/EnumIterationExamples.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/java/enumiteration/EnumIterationExamples.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/java/enumiteration/EnumIterationExamples.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/java/enumiteration/EnumIterationExamples.java
diff --git a/core-java-lang/src/test/java/com/baeldung/java/reflection/OperationsUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/java/reflection/OperationsUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/java/reflection/OperationsUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/java/reflection/OperationsUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/java/reflection/ReflectionUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/java/reflection/ReflectionUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/java/reflection/ReflectionUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/java/reflection/ReflectionUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/nativekeyword/DateTimeUtilsManualTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/nativekeyword/DateTimeUtilsManualTest.java
similarity index 96%
rename from core-java-lang/src/test/java/com/baeldung/nativekeyword/DateTimeUtilsManualTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/nativekeyword/DateTimeUtilsManualTest.java
index d5003dfc1f..ac27c11c68 100644
--- a/core-java-lang/src/test/java/com/baeldung/nativekeyword/DateTimeUtilsManualTest.java
+++ b/core-java-modules/core-java-lang/src/test/java/com/baeldung/nativekeyword/DateTimeUtilsManualTest.java
@@ -1,27 +1,27 @@
-package com.baeldung.nativekeyword;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.slf4j.Logger;
-
-public class DateTimeUtilsManualTest {
-
-    private static final Logger LOG = org.slf4j.LoggerFactory.getLogger(DateTimeUtilsManualTest.class);
-
-    @BeforeClass
-    public static void setUpClass() {
-        System.loadLibrary("msvcr100");
-        System.loadLibrary("libgcc_s_sjlj-1");
-        System.loadLibrary("libstdc++-6");
-        System.loadLibrary("nativedatetimeutils");
-    }
-
-    @Test
-    public void givenNativeLibsLoaded_thenNativeMethodIsAccessible() {
-        DateTimeUtils dateTimeUtils = new DateTimeUtils();
-        LOG.info("System time is : " + dateTimeUtils.getSystemTime());
-        assertNotNull(dateTimeUtils.getSystemTime());
-    }
-}
+package com.baeldung.nativekeyword;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+
+public class DateTimeUtilsManualTest {
+
+    private static final Logger LOG = org.slf4j.LoggerFactory.getLogger(DateTimeUtilsManualTest.class);
+
+    @BeforeClass
+    public static void setUpClass() {
+        System.loadLibrary("msvcr100");
+        System.loadLibrary("libgcc_s_sjlj-1");
+        System.loadLibrary("libstdc++-6");
+        System.loadLibrary("nativedatetimeutils");
+    }
+
+    @Test
+    public void givenNativeLibsLoaded_thenNativeMethodIsAccessible() {
+        DateTimeUtils dateTimeUtils = new DateTimeUtils();
+        LOG.info("System time is : " + dateTimeUtils.getSystemTime());
+        assertNotNull(dateTimeUtils.getSystemTime());
+    }
+}
diff --git a/core-java-lang/src/test/java/com/baeldung/nestedclass/AnonymousInner.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/AnonymousInner.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/nestedclass/AnonymousInner.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/AnonymousInner.java
diff --git a/core-java-lang/src/test/java/com/baeldung/nestedclass/Enclosing.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/Enclosing.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/nestedclass/Enclosing.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/Enclosing.java
diff --git a/core-java-lang/src/test/java/com/baeldung/nestedclass/NewEnclosing.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/NewEnclosing.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/nestedclass/NewEnclosing.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/NewEnclosing.java
diff --git a/core-java-lang/src/test/java/com/baeldung/nestedclass/NewOuter.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/NewOuter.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/nestedclass/NewOuter.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/NewOuter.java
diff --git a/core-java-lang/src/test/java/com/baeldung/nestedclass/Outer.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/Outer.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/nestedclass/Outer.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/Outer.java
diff --git a/core-java-lang/src/test/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorUnitTest.java
similarity index 96%
rename from core-java-lang/src/test/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorUnitTest.java
index ccc8c1f69c..521c50098a 100644
--- a/core-java-lang/src/test/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorUnitTest.java
+++ b/core-java-modules/core-java-lang/src/test/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorUnitTest.java
@@ -1,12 +1,12 @@
-package com.baeldung.noclassdeffounderror;
-
-import org.junit.Test;
-
-public class NoClassDefFoundErrorUnitTest {
-
-    @Test(expected = NoClassDefFoundError.class)
-    public void givenInitErrorInClass_whenloadClass_thenNoClassDefFoundError() {
-        NoClassDefFoundErrorExample sample = new NoClassDefFoundErrorExample();
-        sample.getClassWithInitErrors();
-    }
+package com.baeldung.noclassdeffounderror;
+
+import org.junit.Test;
+
+public class NoClassDefFoundErrorUnitTest {
+
+    @Test(expected = NoClassDefFoundError.class)
+    public void givenInitErrorInClass_whenloadClass_thenNoClassDefFoundError() {
+        NoClassDefFoundErrorExample sample = new NoClassDefFoundErrorExample();
+        sample.getClassWithInitErrors();
+    }
 }
\ No newline at end of file
diff --git a/core-java-lang/src/test/java/com/baeldung/objects/CarUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/objects/CarUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/objects/CarUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/objects/CarUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/packages/PackagesUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/packages/PackagesUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/packages/PackagesUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/packages/PackagesUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/recursion/RecursionExampleUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/recursion/RecursionExampleUnitTest.java
similarity index 96%
rename from core-java-lang/src/test/java/com/baeldung/recursion/RecursionExampleUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/recursion/RecursionExampleUnitTest.java
index 6c560c9c37..7b11e968ce 100644
--- a/core-java-lang/src/test/java/com/baeldung/recursion/RecursionExampleUnitTest.java
+++ b/core-java-modules/core-java-lang/src/test/java/com/baeldung/recursion/RecursionExampleUnitTest.java
@@ -1,61 +1,61 @@
-package com.baeldung.recursion;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class RecursionExampleUnitTest {
-    
-    RecursionExample recursion = new RecursionExample();
-
-    @Test
-    public void testPowerOf10() {
-        int p0 = recursion.powerOf10(0);
-        int p1 = recursion.powerOf10(1);
-        int p4 = recursion.powerOf10(4);
-        
-        Assert.assertEquals(1, p0);
-        Assert.assertEquals(10, p1);
-        Assert.assertEquals(10000, p4);
-    }
-    
-    @Test
-    public void testFibonacci() {
-        int n0 = recursion.fibonacci(0);
-        int n1 = recursion.fibonacci(1);
-        int n7 = recursion.fibonacci(7);
-        
-        Assert.assertEquals(0, n0);
-        Assert.assertEquals(1, n1);
-        Assert.assertEquals(13, n7);
-    }
-    
-    @Test
-    public void testToBinary() {
-        String b0 = recursion.toBinary(0);
-        String b1 = recursion.toBinary(1);
-        String b10 = recursion.toBinary(10);
-        
-        Assert.assertEquals("0", b0);
-        Assert.assertEquals("1", b1);
-        Assert.assertEquals("1010", b10);
-    }
-    
-    @Test
-    public void testCalculateTreeHeight() {
-        BinaryNode root = new BinaryNode(1);
-        root.setLeft(new BinaryNode(1));
-        root.setRight(new BinaryNode(1));
-        
-        root.getLeft().setLeft(new BinaryNode(1));
-        root.getLeft().getLeft().setRight(new BinaryNode(1));
-        root.getLeft().getLeft().getRight().setLeft(new BinaryNode(1));
-        
-        root.getRight().setLeft(new BinaryNode(1));
-        root.getRight().getLeft().setRight(new BinaryNode(1));
-        
-        int height = recursion.calculateTreeHeight(root);
-        
-        Assert.assertEquals(4, height);
-    }
-
-}
+package com.baeldung.recursion;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class RecursionExampleUnitTest {
+    
+    RecursionExample recursion = new RecursionExample();
+
+    @Test
+    public void testPowerOf10() {
+        int p0 = recursion.powerOf10(0);
+        int p1 = recursion.powerOf10(1);
+        int p4 = recursion.powerOf10(4);
+        
+        Assert.assertEquals(1, p0);
+        Assert.assertEquals(10, p1);
+        Assert.assertEquals(10000, p4);
+    }
+    
+    @Test
+    public void testFibonacci() {
+        int n0 = recursion.fibonacci(0);
+        int n1 = recursion.fibonacci(1);
+        int n7 = recursion.fibonacci(7);
+        
+        Assert.assertEquals(0, n0);
+        Assert.assertEquals(1, n1);
+        Assert.assertEquals(13, n7);
+    }
+    
+    @Test
+    public void testToBinary() {
+        String b0 = recursion.toBinary(0);
+        String b1 = recursion.toBinary(1);
+        String b10 = recursion.toBinary(10);
+        
+        Assert.assertEquals("0", b0);
+        Assert.assertEquals("1", b1);
+        Assert.assertEquals("1010", b10);
+    }
+    
+    @Test
+    public void testCalculateTreeHeight() {
+        BinaryNode root = new BinaryNode(1);
+        root.setLeft(new BinaryNode(1));
+        root.setRight(new BinaryNode(1));
+        
+        root.getLeft().setLeft(new BinaryNode(1));
+        root.getLeft().getLeft().setRight(new BinaryNode(1));
+        root.getLeft().getLeft().getRight().setLeft(new BinaryNode(1));
+        
+        root.getRight().setLeft(new BinaryNode(1));
+        root.getRight().getLeft().setRight(new BinaryNode(1));
+        
+        int height = recursion.calculateTreeHeight(root);
+        
+        Assert.assertEquals(4, height);
+    }
+
+}
diff --git a/core-java-lang/src/test/java/com/baeldung/sneakythrows/SneakyRunnableUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/sneakythrows/SneakyRunnableUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/sneakythrows/SneakyRunnableUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/sneakythrows/SneakyRunnableUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/sneakythrows/SneakyThrowsUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/sneakythrows/SneakyThrowsUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/sneakythrows/SneakyThrowsUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/sneakythrows/SneakyThrowsUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/AccountHolderManualTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/AccountHolderManualTest.java
similarity index 96%
rename from core-java-lang/src/test/java/com/baeldung/stackoverflowerror/AccountHolderManualTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/AccountHolderManualTest.java
index e6a8f89a16..180b7723ac 100644
--- a/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/AccountHolderManualTest.java
+++ b/core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/AccountHolderManualTest.java
@@ -1,10 +1,10 @@
-package com.baeldung.stackoverflowerror;
-
-import org.junit.Test;
-
-public class AccountHolderManualTest {
-    @Test(expected = StackOverflowError.class)
-    public void whenInstanciatingAccountHolder_thenThrowsException() {
-        AccountHolder holder = new AccountHolder();
-    }
-}
+package com.baeldung.stackoverflowerror;
+
+import org.junit.Test;
+
+public class AccountHolderManualTest {
+    @Test(expected = StackOverflowError.class)
+    public void whenInstanciatingAccountHolder_thenThrowsException() {
+        AccountHolder holder = new AccountHolder();
+    }
+}
diff --git a/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java
similarity index 96%
rename from core-java-lang/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java
index 1f1de9149a..95164ac935 100644
--- a/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java
+++ b/core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java
@@ -1,10 +1,10 @@
-package com.baeldung.stackoverflowerror;
-
-import org.junit.Test;
-
-public class CyclicDependancyManualTest {
-    @Test(expected = StackOverflowError.class)
-    public void whenInstanciatingClassOne_thenThrowsException() {
-        ClassOne obj = new ClassOne();
-    }
-}
+package com.baeldung.stackoverflowerror;
+
+import org.junit.Test;
+
+public class CyclicDependancyManualTest {
+    @Test(expected = StackOverflowError.class)
+    public void whenInstanciatingClassOne_thenThrowsException() {
+        ClassOne obj = new ClassOne();
+    }
+}
diff --git a/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java
similarity index 97%
rename from core-java-lang/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java
index 3530fa1c3e..ccf8c25271 100644
--- a/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java
+++ b/core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java
@@ -1,31 +1,31 @@
-package com.baeldung.stackoverflowerror;
-
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertEquals;
-
-public class InfiniteRecursionWithTerminationConditionManualTest {
-    @Test
-    public void givenPositiveIntNoOne_whenCalcFact_thenCorrectlyCalc() {
-        int numToCalcFactorial = 1;
-        InfiniteRecursionWithTerminationCondition irtc = new InfiniteRecursionWithTerminationCondition();
-
-        assertEquals(1, irtc.calculateFactorial(numToCalcFactorial));
-    }
-
-    @Test
-    public void givenPositiveIntGtOne_whenCalcFact_thenCorrectlyCalc() {
-        int numToCalcFactorial = 5;
-        InfiniteRecursionWithTerminationCondition irtc = new InfiniteRecursionWithTerminationCondition();
-
-        assertEquals(120, irtc.calculateFactorial(numToCalcFactorial));
-    }
-
-    @Test(expected = StackOverflowError.class)
-    public void givenNegativeInt_whenCalcFact_thenThrowsException() {
-        int numToCalcFactorial = -1;
-        InfiniteRecursionWithTerminationCondition irtc = new InfiniteRecursionWithTerminationCondition();
-
-        irtc.calculateFactorial(numToCalcFactorial);
-    }
-}
+package com.baeldung.stackoverflowerror;
+
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+
+public class InfiniteRecursionWithTerminationConditionManualTest {
+    @Test
+    public void givenPositiveIntNoOne_whenCalcFact_thenCorrectlyCalc() {
+        int numToCalcFactorial = 1;
+        InfiniteRecursionWithTerminationCondition irtc = new InfiniteRecursionWithTerminationCondition();
+
+        assertEquals(1, irtc.calculateFactorial(numToCalcFactorial));
+    }
+
+    @Test
+    public void givenPositiveIntGtOne_whenCalcFact_thenCorrectlyCalc() {
+        int numToCalcFactorial = 5;
+        InfiniteRecursionWithTerminationCondition irtc = new InfiniteRecursionWithTerminationCondition();
+
+        assertEquals(120, irtc.calculateFactorial(numToCalcFactorial));
+    }
+
+    @Test(expected = StackOverflowError.class)
+    public void givenNegativeInt_whenCalcFact_thenThrowsException() {
+        int numToCalcFactorial = -1;
+        InfiniteRecursionWithTerminationCondition irtc = new InfiniteRecursionWithTerminationCondition();
+
+        irtc.calculateFactorial(numToCalcFactorial);
+    }
+}
diff --git a/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationConditionManualTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationConditionManualTest.java
similarity index 96%
rename from core-java-lang/src/test/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationConditionManualTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationConditionManualTest.java
index 858cec2ffa..40c2c4799e 100644
--- a/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationConditionManualTest.java
+++ b/core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationConditionManualTest.java
@@ -1,15 +1,15 @@
-package com.baeldung.stackoverflowerror;
-
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertEquals;
-
-public class RecursionWithCorrectTerminationConditionManualTest {
-    @Test
-    public void givenNegativeInt_whenCalcFact_thenCorrectlyCalc() {
-        int numToCalcFactorial = -1;
-        RecursionWithCorrectTerminationCondition rctc = new RecursionWithCorrectTerminationCondition();
-
-        assertEquals(1, rctc.calculateFactorial(numToCalcFactorial));
-    }
-}
+package com.baeldung.stackoverflowerror;
+
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+
+public class RecursionWithCorrectTerminationConditionManualTest {
+    @Test
+    public void givenNegativeInt_whenCalcFact_thenCorrectlyCalc() {
+        int numToCalcFactorial = -1;
+        RecursionWithCorrectTerminationCondition rctc = new RecursionWithCorrectTerminationCondition();
+
+        assertEquals(1, rctc.calculateFactorial(numToCalcFactorial));
+    }
+}
diff --git a/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java
similarity index 97%
rename from core-java-lang/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java
index 1e1c245d4d..f4e2e5221a 100644
--- a/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java
+++ b/core-java-modules/core-java-lang/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java
@@ -1,30 +1,30 @@
-package com.baeldung.stackoverflowerror;
-
-
-import org.junit.Test;
-
-public class UnintendedInfiniteRecursionManualTest {
-    @Test(expected = StackOverflowError.class)
-    public void givenPositiveIntNoOne_whenCalFact_thenThrowsException() {
-        int numToCalcFactorial = 1;
-        UnintendedInfiniteRecursion uir = new UnintendedInfiniteRecursion();
-
-        uir.calculateFactorial(numToCalcFactorial);
-    }
-
-    @Test(expected = StackOverflowError.class)
-    public void givenPositiveIntGtOne_whenCalcFact_thenThrowsException() {
-        int numToCalcFactorial = 2;
-        UnintendedInfiniteRecursion uir = new UnintendedInfiniteRecursion();
-
-        uir.calculateFactorial(numToCalcFactorial);
-    }
-
-    @Test(expected = StackOverflowError.class)
-    public void givenNegativeInt_whenCalcFact_thenThrowsException() {
-        int numToCalcFactorial = -1;
-        UnintendedInfiniteRecursion uir = new UnintendedInfiniteRecursion();
-
-        uir.calculateFactorial(numToCalcFactorial);
-    }
-}
+package com.baeldung.stackoverflowerror;
+
+
+import org.junit.Test;
+
+public class UnintendedInfiniteRecursionManualTest {
+    @Test(expected = StackOverflowError.class)
+    public void givenPositiveIntNoOne_whenCalFact_thenThrowsException() {
+        int numToCalcFactorial = 1;
+        UnintendedInfiniteRecursion uir = new UnintendedInfiniteRecursion();
+
+        uir.calculateFactorial(numToCalcFactorial);
+    }
+
+    @Test(expected = StackOverflowError.class)
+    public void givenPositiveIntGtOne_whenCalcFact_thenThrowsException() {
+        int numToCalcFactorial = 2;
+        UnintendedInfiniteRecursion uir = new UnintendedInfiniteRecursion();
+
+        uir.calculateFactorial(numToCalcFactorial);
+    }
+
+    @Test(expected = StackOverflowError.class)
+    public void givenNegativeInt_whenCalcFact_thenThrowsException() {
+        int numToCalcFactorial = -1;
+        UnintendedInfiniteRecursion uir = new UnintendedInfiniteRecursion();
+
+        uir.calculateFactorial(numToCalcFactorial);
+    }
+}
diff --git a/core-java-lang/src/test/java/com/baeldung/synthetic/SyntheticUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/synthetic/SyntheticUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/synthetic/SyntheticUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/synthetic/SyntheticUnitTest.java
diff --git a/core-java-lang/src/test/java/com/baeldung/throwsexception/SimpleServiceUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/throwsexception/SimpleServiceUnitTest.java
similarity index 100%
rename from core-java-lang/src/test/java/com/baeldung/throwsexception/SimpleServiceUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/throwsexception/SimpleServiceUnitTest.java
diff --git a/core-java-lang/src/test/resources/correctFileNameWithoutProperExtension b/core-java-modules/core-java-lang/src/test/resources/correctFileNameWithoutProperExtension
similarity index 100%
rename from core-java-lang/src/test/resources/correctFileNameWithoutProperExtension
rename to core-java-modules/core-java-lang/src/test/resources/correctFileNameWithoutProperExtension
diff --git a/core-java-networking/.gitignore b/core-java-modules/core-java-networking/.gitignore
similarity index 100%
rename from core-java-networking/.gitignore
rename to core-java-modules/core-java-networking/.gitignore
diff --git a/core-java-networking/README.md b/core-java-modules/core-java-networking/README.md
similarity index 100%
rename from core-java-networking/README.md
rename to core-java-modules/core-java-networking/README.md
diff --git a/core-java-networking/pom.xml b/core-java-modules/core-java-networking/pom.xml
similarity index 96%
rename from core-java-networking/pom.xml
rename to core-java-modules/core-java-networking/pom.xml
index 12bb257fcb..550ebdb4ff 100644
--- a/core-java-networking/pom.xml
+++ b/core-java-modules/core-java-networking/pom.xml
@@ -10,7 +10,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-networking/src/main/java/com/baeldung/http/FullResponseBuilder.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/http/FullResponseBuilder.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/http/FullResponseBuilder.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/http/FullResponseBuilder.java
diff --git a/core-java-networking/src/main/java/com/baeldung/http/ParameterStringBuilder.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/http/ParameterStringBuilder.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/http/ParameterStringBuilder.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/http/ParameterStringBuilder.java
diff --git a/core-java-networking/src/main/java/com/baeldung/mail/EmailService.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/mail/EmailService.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/mail/EmailService.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/mail/EmailService.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/cookies/PersistentCookieStore.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/cookies/PersistentCookieStore.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/cookies/PersistentCookieStore.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/cookies/PersistentCookieStore.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/cookies/ProxyAcceptCookiePolicy.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/cookies/ProxyAcceptCookiePolicy.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/cookies/ProxyAcceptCookiePolicy.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/cookies/ProxyAcceptCookiePolicy.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/proxies/CommandLineProxyDemo.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/proxies/CommandLineProxyDemo.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/proxies/CommandLineProxyDemo.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/proxies/CommandLineProxyDemo.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/proxies/DirectProxyDemo.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/proxies/DirectProxyDemo.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/proxies/DirectProxyDemo.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/proxies/DirectProxyDemo.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/proxies/SocksProxyDemo.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/proxies/SocksProxyDemo.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/proxies/SocksProxyDemo.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/proxies/SocksProxyDemo.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/proxies/SystemPropertyProxyDemo.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/proxies/SystemPropertyProxyDemo.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/proxies/SystemPropertyProxyDemo.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/proxies/SystemPropertyProxyDemo.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/proxies/UrlConnectionUtils.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/proxies/UrlConnectionUtils.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/proxies/UrlConnectionUtils.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/proxies/UrlConnectionUtils.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/proxies/WebProxyDemo.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/proxies/WebProxyDemo.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/proxies/WebProxyDemo.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/proxies/WebProxyDemo.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/udp/EchoClient.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/udp/EchoClient.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/udp/EchoClient.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/udp/EchoClient.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/udp/EchoServer.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/udp/EchoServer.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/udp/EchoServer.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/udp/EchoServer.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/udp/broadcast/BroadcastingClient.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/udp/broadcast/BroadcastingClient.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/udp/broadcast/BroadcastingClient.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/udp/broadcast/BroadcastingClient.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/udp/broadcast/BroadcastingEchoServer.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/udp/broadcast/BroadcastingEchoServer.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/udp/broadcast/BroadcastingEchoServer.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/udp/broadcast/BroadcastingEchoServer.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/udp/multicast/MulticastEchoServer.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/udp/multicast/MulticastEchoServer.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/udp/multicast/MulticastEchoServer.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/udp/multicast/MulticastEchoServer.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/udp/multicast/MulticastingClient.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/udp/multicast/MulticastingClient.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/udp/multicast/MulticastingClient.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/udp/multicast/MulticastingClient.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/uriurl/URIDemo.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/uriurl/URIDemo.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/uriurl/URIDemo.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/uriurl/URIDemo.java
diff --git a/core-java-networking/src/main/java/com/baeldung/networking/uriurl/URLDemo.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/uriurl/URLDemo.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/networking/uriurl/URLDemo.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/uriurl/URLDemo.java
diff --git a/core-java-networking/src/main/java/com/baeldung/socket/EchoClient.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/EchoClient.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/socket/EchoClient.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/EchoClient.java
diff --git a/core-java-networking/src/main/java/com/baeldung/socket/EchoMultiServer.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/EchoMultiServer.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/socket/EchoMultiServer.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/EchoMultiServer.java
diff --git a/core-java-networking/src/main/java/com/baeldung/socket/EchoServer.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/EchoServer.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/socket/EchoServer.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/EchoServer.java
diff --git a/core-java-networking/src/main/java/com/baeldung/socket/GreetClient.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/GreetClient.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/socket/GreetClient.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/GreetClient.java
diff --git a/core-java-networking/src/main/java/com/baeldung/socket/GreetServer.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/GreetServer.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/socket/GreetServer.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/GreetServer.java
diff --git a/core-java-networking/src/main/java/com/baeldung/socket/read/Client.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/read/Client.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/socket/read/Client.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/read/Client.java
diff --git a/core-java-networking/src/main/java/com/baeldung/socket/read/Server.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/read/Server.java
similarity index 100%
rename from core-java-networking/src/main/java/com/baeldung/socket/read/Server.java
rename to core-java-modules/core-java-networking/src/main/java/com/baeldung/socket/read/Server.java
diff --git a/core-java-networking/src/main/resources/logback.xml b/core-java-modules/core-java-networking/src/main/resources/logback.xml
similarity index 100%
rename from core-java-networking/src/main/resources/logback.xml
rename to core-java-modules/core-java-networking/src/main/resources/logback.xml
diff --git a/core-java-networking/src/test/java/com/baeldung/encoderdecoder/EncoderDecoderUnitTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/encoderdecoder/EncoderDecoderUnitTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/encoderdecoder/EncoderDecoderUnitTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/encoderdecoder/EncoderDecoderUnitTest.java
diff --git a/core-java-networking/src/test/java/com/baeldung/http/HttpRequestLiveTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/http/HttpRequestLiveTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/http/HttpRequestLiveTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/http/HttpRequestLiveTest.java
diff --git a/core-java-networking/src/test/java/com/baeldung/networking/interfaces/NetworkInterfaceManualTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/interfaces/NetworkInterfaceManualTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/networking/interfaces/NetworkInterfaceManualTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/interfaces/NetworkInterfaceManualTest.java
diff --git a/core-java-networking/src/test/java/com/baeldung/networking/udp/UDPLiveTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/udp/UDPLiveTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/networking/udp/UDPLiveTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/udp/UDPLiveTest.java
diff --git a/core-java-networking/src/test/java/com/baeldung/networking/udp/broadcast/BroadcastLiveTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/udp/broadcast/BroadcastLiveTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/networking/udp/broadcast/BroadcastLiveTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/udp/broadcast/BroadcastLiveTest.java
diff --git a/core-java-networking/src/test/java/com/baeldung/networking/udp/multicast/MulticastLiveTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/udp/multicast/MulticastLiveTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/networking/udp/multicast/MulticastLiveTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/udp/multicast/MulticastLiveTest.java
diff --git a/core-java-networking/src/test/java/com/baeldung/networking/uriurl/URIDemoLiveTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/uriurl/URIDemoLiveTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/networking/uriurl/URIDemoLiveTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/uriurl/URIDemoLiveTest.java
diff --git a/core-java-networking/src/test/java/com/baeldung/networking/uriurl/URIvsURLUnitTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/uriurl/URIvsURLUnitTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/networking/uriurl/URIvsURLUnitTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/uriurl/URIvsURLUnitTest.java
diff --git a/core-java-networking/src/test/java/com/baeldung/networking/uriurl/URLDemoLiveTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/uriurl/URLDemoLiveTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/networking/uriurl/URLDemoLiveTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/uriurl/URLDemoLiveTest.java
diff --git a/core-java-networking/src/test/java/com/baeldung/networking/url/UrlUnitTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/url/UrlUnitTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/networking/url/UrlUnitTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/url/UrlUnitTest.java
diff --git a/core-java-networking/src/test/java/com/baeldung/socket/EchoIntegrationTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/EchoIntegrationTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/socket/EchoIntegrationTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/EchoIntegrationTest.java
diff --git a/core-java-networking/src/test/java/com/baeldung/socket/GreetServerIntegrationTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/GreetServerIntegrationTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/socket/GreetServerIntegrationTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/GreetServerIntegrationTest.java
diff --git a/core-java-networking/src/test/java/com/baeldung/socket/SocketEchoMultiIntegrationTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/SocketEchoMultiIntegrationTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/socket/SocketEchoMultiIntegrationTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/SocketEchoMultiIntegrationTest.java
diff --git a/core-java-networking/src/test/java/com/baeldung/socket/read/SocketReadAllDataLiveTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/read/SocketReadAllDataLiveTest.java
similarity index 100%
rename from core-java-networking/src/test/java/com/baeldung/socket/read/SocketReadAllDataLiveTest.java
rename to core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/read/SocketReadAllDataLiveTest.java
diff --git a/core-java-networking/src/test/resources/.gitignore b/core-java-modules/core-java-networking/src/test/resources/.gitignore
similarity index 100%
rename from core-java-networking/src/test/resources/.gitignore
rename to core-java-modules/core-java-networking/src/test/resources/.gitignore
diff --git a/core-java-os/.gitignore b/core-java-modules/core-java-os/.gitignore
similarity index 100%
rename from core-java-os/.gitignore
rename to core-java-modules/core-java-os/.gitignore
diff --git a/core-java-os/README.md b/core-java-modules/core-java-os/README.md
similarity index 100%
rename from core-java-os/README.md
rename to core-java-modules/core-java-os/README.md
diff --git a/core-java-os/pom.xml b/core-java-modules/core-java-os/pom.xml
similarity index 95%
rename from core-java-os/pom.xml
rename to core-java-modules/core-java-os/pom.xml
index c9097cb554..85194b176e 100644
--- a/core-java-os/pom.xml
+++ b/core-java-modules/core-java-os/pom.xml
@@ -1,82 +1,82 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>core-java-os</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>core-java-os</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>${commons-collections4.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <!-- test scoped -->
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>core-java-os</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-         <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
-        <collections-generic.version>4.01</collections-generic.version>
-    
-        <!-- testing -->
-        <assertj.version>3.6.1</assertj.version>
-        <asspectj.version>1.8.9</asspectj.version>
-        <maven.compiler.source>1.9</maven.compiler.source>
-        <maven.compiler.target>1.9</maven.compiler.target>
-        <guava.version>25.1-jre</guava.version>
-    </properties>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>core-java-os</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-os</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>${commons-collections4.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-os</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+         <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- util -->
+        <commons-lang3.version>3.5</commons-lang3.version>
+        <commons-collections4.version>4.1</commons-collections4.version>
+        <collections-generic.version>4.01</collections-generic.version>
+    
+        <!-- testing -->
+        <assertj.version>3.6.1</assertj.version>
+        <asspectj.version>1.8.9</asspectj.version>
+        <maven.compiler.source>1.9</maven.compiler.source>
+        <maven.compiler.target>1.9</maven.compiler.target>
+        <guava.version>25.1-jre</guava.version>
+    </properties>
+</project>
diff --git a/core-java-os/src/main/java/com/baeldung/java9/process/ChildProcess.java b/core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/ChildProcess.java
similarity index 100%
rename from core-java-os/src/main/java/com/baeldung/java9/process/ChildProcess.java
rename to core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/ChildProcess.java
diff --git a/core-java-os/src/main/java/com/baeldung/java9/process/OutputStreamExample.java b/core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/OutputStreamExample.java
similarity index 96%
rename from core-java-os/src/main/java/com/baeldung/java9/process/OutputStreamExample.java
rename to core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/OutputStreamExample.java
index 443847916a..37378f9d6c 100644
--- a/core-java-os/src/main/java/com/baeldung/java9/process/OutputStreamExample.java
+++ b/core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/OutputStreamExample.java
@@ -1,16 +1,16 @@
-package com.baeldung.java9.process;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class OutputStreamExample {
-
-    public static void main(String[] args) {
-        Logger log = Logger.getLogger(OutputStreamExample.class.getName());
-        log.log(Level.INFO, Integer.toString(sum(1,2)));
-    }
-
-    public static int sum(int a, int b) {
-        return a + b;
-    }
-}
+package com.baeldung.java9.process;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class OutputStreamExample {
+
+    public static void main(String[] args) {
+        Logger log = Logger.getLogger(OutputStreamExample.class.getName());
+        log.log(Level.INFO, Integer.toString(sum(1,2)));
+    }
+
+    public static int sum(int a, int b) {
+        return a + b;
+    }
+}
diff --git a/core-java-os/src/main/java/com/baeldung/java9/process/ProcessCompilationError.java b/core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/ProcessCompilationError.java
similarity index 100%
rename from core-java-os/src/main/java/com/baeldung/java9/process/ProcessCompilationError.java
rename to core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/ProcessCompilationError.java
diff --git a/core-java-os/src/main/java/com/baeldung/java9/process/ProcessUnderstanding.java b/core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/ProcessUnderstanding.java
similarity index 100%
rename from core-java-os/src/main/java/com/baeldung/java9/process/ProcessUnderstanding.java
rename to core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/ProcessUnderstanding.java
diff --git a/core-java-os/src/main/java/com/baeldung/java9/process/ProcessUtils.java b/core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/ProcessUtils.java
similarity index 96%
rename from core-java-os/src/main/java/com/baeldung/java9/process/ProcessUtils.java
rename to core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/ProcessUtils.java
index 5cd2567fb3..1b952f0c3c 100644
--- a/core-java-os/src/main/java/com/baeldung/java9/process/ProcessUtils.java
+++ b/core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/ProcessUtils.java
@@ -1,43 +1,43 @@
-package com.baeldung.java9.process;
-
-import java.io.File;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.stream.Stream;
-
-public class ProcessUtils {
-
-    public static String getClassPath() {
-        String cp = System.getProperty("java.class.path");
-        System.out.println("ClassPath is " + cp);
-        return cp;
-    }
-
-    public static File getJavaCmd() throws IOException {
-        String javaHome = System.getProperty("java.home");
-        File javaCmd;
-        if (System.getProperty("os.name").startsWith("Win")) {
-            javaCmd = new File(javaHome, "bin/java.exe");
-        } else {
-            javaCmd = new File(javaHome, "bin/java");
-        }
-        if (javaCmd.canExecute()) {
-            return javaCmd;
-        } else {
-            throw new UnsupportedOperationException(javaCmd.getCanonicalPath() + " is not executable");
-        }
-    }
-
-    public static String getMainClass() {
-        return System.getProperty("sun.java.command");
-    }
-
-    public static String getSystemProperties() {
-        StringBuilder sb = new StringBuilder();
-        System.getProperties().forEach((s1, s2) -> sb.append(s1 + " - " + s2));
-        return sb.toString();
-    }
-}
+package com.baeldung.java9.process;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.stream.Stream;
+
+public class ProcessUtils {
+
+    public static String getClassPath() {
+        String cp = System.getProperty("java.class.path");
+        System.out.println("ClassPath is " + cp);
+        return cp;
+    }
+
+    public static File getJavaCmd() throws IOException {
+        String javaHome = System.getProperty("java.home");
+        File javaCmd;
+        if (System.getProperty("os.name").startsWith("Win")) {
+            javaCmd = new File(javaHome, "bin/java.exe");
+        } else {
+            javaCmd = new File(javaHome, "bin/java");
+        }
+        if (javaCmd.canExecute()) {
+            return javaCmd;
+        } else {
+            throw new UnsupportedOperationException(javaCmd.getCanonicalPath() + " is not executable");
+        }
+    }
+
+    public static String getMainClass() {
+        return System.getProperty("sun.java.command");
+    }
+
+    public static String getSystemProperties() {
+        StringBuilder sb = new StringBuilder();
+        System.getProperties().forEach((s1, s2) -> sb.append(s1 + " - " + s2));
+        return sb.toString();
+    }
+}
diff --git a/core-java-os/src/main/java/com/baeldung/java9/process/ServiceMain.java b/core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/ServiceMain.java
similarity index 96%
rename from core-java-os/src/main/java/com/baeldung/java9/process/ServiceMain.java
rename to core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/ServiceMain.java
index 5dc00dba25..77831f601c 100644
--- a/core-java-os/src/main/java/com/baeldung/java9/process/ServiceMain.java
+++ b/core-java-modules/core-java-os/src/main/java/com/baeldung/java9/process/ServiceMain.java
@@ -1,21 +1,21 @@
-package com.baeldung.java9.process;
-
-import java.util.Optional;
-
-public class ServiceMain {
-
-    public static void main(String[] args) throws InterruptedException {
-        ProcessHandle thisProcess = ProcessHandle.current();
-        long pid = thisProcess.pid();
-
-        Optional<String[]> opArgs = Optional.ofNullable(args);
-        String procName = opArgs.map(str -> str.length > 0 ? str[0] : null).orElse(System.getProperty("sun.java.command"));
-
-        for (int i = 0; i < 10000; i++) {
-            System.out.println("Process " + procName + " with ID " + pid + " is running!");
-            Thread.sleep(10000);
-        }
-
-    }
-
-}
+package com.baeldung.java9.process;
+
+import java.util.Optional;
+
+public class ServiceMain {
+
+    public static void main(String[] args) throws InterruptedException {
+        ProcessHandle thisProcess = ProcessHandle.current();
+        long pid = thisProcess.pid();
+
+        Optional<String[]> opArgs = Optional.ofNullable(args);
+        String procName = opArgs.map(str -> str.length > 0 ? str[0] : null).orElse(System.getProperty("sun.java.command"));
+
+        for (int i = 0; i < 10000; i++) {
+            System.out.println("Process " + procName + " with ID " + pid + " is running!");
+            Thread.sleep(10000);
+        }
+
+    }
+
+}
diff --git a/core-java-os/src/main/resources/logback.xml b/core-java-modules/core-java-os/src/main/resources/logback.xml
similarity index 100%
rename from core-java-os/src/main/resources/logback.xml
rename to core-java-modules/core-java-os/src/main/resources/logback.xml
diff --git a/core-java-os/src/test/java/com/baeldung/java9/process/ProcessAPIEnhancementsUnitTest.java b/core-java-modules/core-java-os/src/test/java/com/baeldung/java9/process/ProcessAPIEnhancementsUnitTest.java
similarity index 100%
rename from core-java-os/src/test/java/com/baeldung/java9/process/ProcessAPIEnhancementsUnitTest.java
rename to core-java-modules/core-java-os/src/test/java/com/baeldung/java9/process/ProcessAPIEnhancementsUnitTest.java
diff --git a/core-java-os/src/test/java/com/baeldung/java9/process/ProcessApiUnitTest.java b/core-java-modules/core-java-os/src/test/java/com/baeldung/java9/process/ProcessApiUnitTest.java
similarity index 97%
rename from core-java-os/src/test/java/com/baeldung/java9/process/ProcessApiUnitTest.java
rename to core-java-modules/core-java-os/src/test/java/com/baeldung/java9/process/ProcessApiUnitTest.java
index 8bdf8cb09f..c3f390d8ae 100644
--- a/core-java-os/src/test/java/com/baeldung/java9/process/ProcessApiUnitTest.java
+++ b/core-java-modules/core-java-os/src/test/java/com/baeldung/java9/process/ProcessApiUnitTest.java
@@ -1,111 +1,111 @@
-package com.baeldung.java9.process;
-
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Stream;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import junit.framework.Assert;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class ProcessApiUnitTest {
-
-    @Before
-    public void init() {
-
-    }
-
-    @Test
-    public void processInfoExample() throws NoSuchAlgorithmException {
-        ProcessHandle self = ProcessHandle.current();
-        long PID = self.pid();
-        ProcessHandle.Info procInfo = self.info();
-        Optional<String[]> args = procInfo.arguments();
-        Optional<String> cmd = procInfo.commandLine();
-        Optional<Instant> startTime = procInfo.startInstant();
-        Optional<Duration> cpuUsage = procInfo.totalCpuDuration();
-
-        waistCPU();
-        System.out.println("Args " + args);
-        System.out.println("Command " + cmd.orElse("EmptyCmd"));
-        System.out.println("Start time: " + startTime.get().toString());
-        System.out.println(cpuUsage.get().toMillis());
-
-        Stream<ProcessHandle> allProc = ProcessHandle.current().children();
-        allProc.forEach(p -> {
-            System.out.println("Proc " + p.pid());
-        });
-
-    }
-
-    @Test
-    public void createAndDestroyProcess() throws IOException, InterruptedException {
-        int numberOfChildProcesses = 5;
-        for (int i = 0; i < numberOfChildProcesses; i++) {
-            createNewJVM(ServiceMain.class, i).pid();
-        }
-
-        Stream<ProcessHandle> childProc = ProcessHandle.current().children();
-        assertEquals(childProc.count(), numberOfChildProcesses);
-
-        childProc = ProcessHandle.current().children();
-        childProc.forEach(processHandle -> {
-            assertTrue("Process " + processHandle.pid() + " should be alive!", processHandle.isAlive());
-            CompletableFuture<ProcessHandle> onProcExit = processHandle.onExit();
-            onProcExit.thenAccept(procHandle -> {
-                System.out.println("Process with PID " + procHandle.pid() + " has stopped");
-            });
-        });
-
-        Thread.sleep(10000);
-
-        childProc = ProcessHandle.current().children();
-        childProc.forEach(procHandle -> {
-            assertTrue("Could not kill process " + procHandle.pid(), procHandle.destroy());
-        });
-
-        Thread.sleep(5000);
-
-        childProc = ProcessHandle.current().children();
-        childProc.forEach(procHandle -> {
-            assertFalse("Process " + procHandle.pid() + " should not be alive!", procHandle.isAlive());
-        });
-
-    }
-
-    private Process createNewJVM(Class mainClass, int number) throws IOException {
-        ArrayList<String> cmdParams = new ArrayList<String>(5);
-        cmdParams.add(ProcessUtils.getJavaCmd().getAbsolutePath());
-        cmdParams.add("-cp");
-        cmdParams.add(ProcessUtils.getClassPath());
-        cmdParams.add(mainClass.getName());
-        cmdParams.add("Service " + number);
-        ProcessBuilder myService = new ProcessBuilder(cmdParams);
-        myService.inheritIO();
-        return myService.start();
-    }
-
-    private void waistCPU() throws NoSuchAlgorithmException {
-        ArrayList<Integer> randArr = new ArrayList<Integer>(4096);
-        SecureRandom sr = SecureRandom.getInstanceStrong();
-        Duration somecpu = Duration.ofMillis(4200L);
-        Instant end = Instant.now().plus(somecpu);
-        while (Instant.now().isBefore(end)) {
-            // System.out.println(sr.nextInt());
-            randArr.add(sr.nextInt());
-        }
-    }
-
-}
+package com.baeldung.java9.process;
+
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Stream;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import junit.framework.Assert;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class ProcessApiUnitTest {
+
+    @Before
+    public void init() {
+
+    }
+
+    @Test
+    public void processInfoExample() throws NoSuchAlgorithmException {
+        ProcessHandle self = ProcessHandle.current();
+        long PID = self.pid();
+        ProcessHandle.Info procInfo = self.info();
+        Optional<String[]> args = procInfo.arguments();
+        Optional<String> cmd = procInfo.commandLine();
+        Optional<Instant> startTime = procInfo.startInstant();
+        Optional<Duration> cpuUsage = procInfo.totalCpuDuration();
+
+        waistCPU();
+        System.out.println("Args " + args);
+        System.out.println("Command " + cmd.orElse("EmptyCmd"));
+        System.out.println("Start time: " + startTime.get().toString());
+        System.out.println(cpuUsage.get().toMillis());
+
+        Stream<ProcessHandle> allProc = ProcessHandle.current().children();
+        allProc.forEach(p -> {
+            System.out.println("Proc " + p.pid());
+        });
+
+    }
+
+    @Test
+    public void createAndDestroyProcess() throws IOException, InterruptedException {
+        int numberOfChildProcesses = 5;
+        for (int i = 0; i < numberOfChildProcesses; i++) {
+            createNewJVM(ServiceMain.class, i).pid();
+        }
+
+        Stream<ProcessHandle> childProc = ProcessHandle.current().children();
+        assertEquals(childProc.count(), numberOfChildProcesses);
+
+        childProc = ProcessHandle.current().children();
+        childProc.forEach(processHandle -> {
+            assertTrue("Process " + processHandle.pid() + " should be alive!", processHandle.isAlive());
+            CompletableFuture<ProcessHandle> onProcExit = processHandle.onExit();
+            onProcExit.thenAccept(procHandle -> {
+                System.out.println("Process with PID " + procHandle.pid() + " has stopped");
+            });
+        });
+
+        Thread.sleep(10000);
+
+        childProc = ProcessHandle.current().children();
+        childProc.forEach(procHandle -> {
+            assertTrue("Could not kill process " + procHandle.pid(), procHandle.destroy());
+        });
+
+        Thread.sleep(5000);
+
+        childProc = ProcessHandle.current().children();
+        childProc.forEach(procHandle -> {
+            assertFalse("Process " + procHandle.pid() + " should not be alive!", procHandle.isAlive());
+        });
+
+    }
+
+    private Process createNewJVM(Class mainClass, int number) throws IOException {
+        ArrayList<String> cmdParams = new ArrayList<String>(5);
+        cmdParams.add(ProcessUtils.getJavaCmd().getAbsolutePath());
+        cmdParams.add("-cp");
+        cmdParams.add(ProcessUtils.getClassPath());
+        cmdParams.add(mainClass.getName());
+        cmdParams.add("Service " + number);
+        ProcessBuilder myService = new ProcessBuilder(cmdParams);
+        myService.inheritIO();
+        return myService.start();
+    }
+
+    private void waistCPU() throws NoSuchAlgorithmException {
+        ArrayList<Integer> randArr = new ArrayList<Integer>(4096);
+        SecureRandom sr = SecureRandom.getInstanceStrong();
+        Duration somecpu = Duration.ofMillis(4200L);
+        Instant end = Instant.now().plus(somecpu);
+        while (Instant.now().isBefore(end)) {
+            // System.out.println(sr.nextInt());
+            randArr.add(sr.nextInt());
+        }
+    }
+
+}
diff --git a/core-java-os/src/test/java/com/baeldung/java9/process/ProcessUnderstandingUnitTest.java b/core-java-modules/core-java-os/src/test/java/com/baeldung/java9/process/ProcessUnderstandingUnitTest.java
similarity index 100%
rename from core-java-os/src/test/java/com/baeldung/java9/process/ProcessUnderstandingUnitTest.java
rename to core-java-modules/core-java-os/src/test/java/com/baeldung/java9/process/ProcessUnderstandingUnitTest.java
diff --git a/core-java-os/src/test/java/com/baeldung/processbuilder/ProcessBuilderUnitTest.java b/core-java-modules/core-java-os/src/test/java/com/baeldung/processbuilder/ProcessBuilderUnitTest.java
similarity index 97%
rename from core-java-os/src/test/java/com/baeldung/processbuilder/ProcessBuilderUnitTest.java
rename to core-java-modules/core-java-os/src/test/java/com/baeldung/processbuilder/ProcessBuilderUnitTest.java
index 0458383e99..8fc5f9f160 100644
--- a/core-java-os/src/test/java/com/baeldung/processbuilder/ProcessBuilderUnitTest.java
+++ b/core-java-modules/core-java-os/src/test/java/com/baeldung/processbuilder/ProcessBuilderUnitTest.java
@@ -1,182 +1,182 @@
-package com.baeldung.processbuilder;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.ProcessBuilder.Redirect;
-import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-public class ProcessBuilderUnitTest {
-
-    @Rule
-    public TemporaryFolder tempFolder = new TemporaryFolder();
-
-    @Test
-    public void givenProcessBuilder_whenInvokeStart_thenSuccess() throws IOException, InterruptedException, ExecutionException {
-        ProcessBuilder processBuilder = new ProcessBuilder("java", "-version");
-        processBuilder.redirectErrorStream(true);
-
-        Process process = processBuilder.start();
-
-        List<String> results = readOutput(process.getInputStream());
-        assertThat("Results should not be empty", results, is(not(empty())));
-        assertThat("Results should contain java version: ", results, hasItem(containsString("java version")));
-
-        int exitCode = process.waitFor();
-        assertEquals("No errors should be detected", 0, exitCode);
-    }
-
-    @Test
-    public void givenProcessBuilder_whenModifyEnvironment_thenSuccess() throws IOException, InterruptedException {
-        ProcessBuilder processBuilder = new ProcessBuilder();
-        Map<String, String> environment = processBuilder.environment();
-        environment.forEach((key, value) -> System.out.println(key + value));
-
-        environment.put("GREETING", "Hola Mundo");
-
-        List<String> command = getGreetingCommand();
-        processBuilder.command(command);
-        Process process = processBuilder.start();
-
-        List<String> results = readOutput(process.getInputStream());
-        assertThat("Results should not be empty", results, is(not(empty())));
-        assertThat("Results should contain a greeting ", results, hasItem(containsString("Hola Mundo")));
-
-        int exitCode = process.waitFor();
-        assertEquals("No errors should be detected", 0, exitCode);
-    }
-
-    @Test
-    public void givenProcessBuilder_whenModifyWorkingDir_thenSuccess() throws IOException, InterruptedException {
-        List<String> command = getDirectoryListingCommand();
-        ProcessBuilder processBuilder = new ProcessBuilder(command);
-
-        processBuilder.directory(new File("src"));
-        Process process = processBuilder.start();
-
-        List<String> results = readOutput(process.getInputStream());
-        assertThat("Results should not be empty", results, is(not(empty())));
-        assertThat("Results should contain directory listing: ", results, hasItems(containsString("main"), containsString("test")));
-
-        int exitCode = process.waitFor();
-        assertEquals("No errors should be detected", 0, exitCode);
-    }
-
-    @Test
-    public void givenProcessBuilder_whenRedirectStandardOutput_thenSuccessWriting() throws IOException, InterruptedException {
-        ProcessBuilder processBuilder = new ProcessBuilder("java", "-version");
-
-        processBuilder.redirectErrorStream(true);
-        File log = tempFolder.newFile("java-version.log");
-        processBuilder.redirectOutput(log);
-
-        Process process = processBuilder.start();
-
-        assertEquals("If redirected, should be -1 ", -1, process.getInputStream()
-            .read());
-        int exitCode = process.waitFor();
-        assertEquals("No errors should be detected", 0, exitCode);
-
-        List<String> lines = Files.lines(log.toPath())
-            .collect(Collectors.toList());
-
-        assertThat("Results should not be empty", lines, is(not(empty())));
-        assertThat("Results should contain java version: ", lines, hasItem(containsString("java version")));
-    }
-
-    @Test
-    public void givenProcessBuilder_whenRedirectStandardOutput_thenSuccessAppending() throws IOException, InterruptedException {
-        ProcessBuilder processBuilder = new ProcessBuilder("java", "-version");
-
-        File log = tempFolder.newFile("java-version-append.log");
-        processBuilder.redirectErrorStream(true);
-        processBuilder.redirectOutput(Redirect.appendTo(log));
-
-        Process process = processBuilder.start();
-
-        assertEquals("If redirected output, should be -1 ", -1, process.getInputStream()
-            .read());
-
-        int exitCode = process.waitFor();
-        assertEquals("No errors should be detected", 0, exitCode);
-
-        List<String> lines = Files.lines(log.toPath())
-            .collect(Collectors.toList());
-
-        assertThat("Results should not be empty", lines, is(not(empty())));
-        assertThat("Results should contain java version: ", lines, hasItem(containsString("java version")));
-    }
-
-    @Test
-    public void givenProcessBuilder_whenStartingPipeline_thenSuccess() throws IOException, InterruptedException {
-        if (!isWindows()) {
-            List<ProcessBuilder> builders = Arrays.asList(
-                new ProcessBuilder("find", "src", "-name", "*.java", "-type", "f"), 
-                new ProcessBuilder("wc", "-l"));
-
-            List<Process> processes = ProcessBuilder.startPipeline(builders);
-            Process last = processes.get(processes.size() - 1);
-
-            List<String> output = readOutput(last.getInputStream());
-            assertThat("Results should not be empty", output, is(not(empty())));
-        }
-    }
-    
-    @Test
-    public void givenProcessBuilder_whenInheritIO_thenSuccess() throws IOException, InterruptedException {
-        List<String> command = getEchoCommand();
-        ProcessBuilder processBuilder = new ProcessBuilder(command);
-
-        processBuilder.inheritIO();
-        Process process = processBuilder.start();
-
-        int exitCode = process.waitFor();
-        assertEquals("No errors should be detected", 0, exitCode);
-    }
-
-    private List<String> readOutput(InputStream inputStream) throws IOException {
-        try (BufferedReader output = new BufferedReader(new InputStreamReader(inputStream))) {
-            return output.lines()
-                .collect(Collectors.toList());
-        }
-    }
-
-    private List<String> getDirectoryListingCommand() {
-        return isWindows() ? Arrays.asList("cmd.exe", "/c", "dir") : Arrays.asList("/bin/sh", "-c", "ls");
-    }
-
-    private List<String> getGreetingCommand() {
-        return isWindows() ? Arrays.asList("cmd.exe", "/c", "echo %GREETING%") : Arrays.asList("/bin/bash", "-c", "echo $GREETING");
-    }
-
-    private List<String> getEchoCommand() {
-        return isWindows() ? Arrays.asList("cmd.exe", "/c", "echo hello") : Arrays.asList("/bin/sh", "-c", "echo hello");
-    }
-
-    private boolean isWindows() {
-        return System.getProperty("os.name")
-            .toLowerCase()
-            .startsWith("windows");
-    }
-
-}
+package com.baeldung.processbuilder;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.ProcessBuilder.Redirect;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+public class ProcessBuilderUnitTest {
+
+    @Rule
+    public TemporaryFolder tempFolder = new TemporaryFolder();
+
+    @Test
+    public void givenProcessBuilder_whenInvokeStart_thenSuccess() throws IOException, InterruptedException, ExecutionException {
+        ProcessBuilder processBuilder = new ProcessBuilder("java", "-version");
+        processBuilder.redirectErrorStream(true);
+
+        Process process = processBuilder.start();
+
+        List<String> results = readOutput(process.getInputStream());
+        assertThat("Results should not be empty", results, is(not(empty())));
+        assertThat("Results should contain java version: ", results, hasItem(containsString("java version")));
+
+        int exitCode = process.waitFor();
+        assertEquals("No errors should be detected", 0, exitCode);
+    }
+
+    @Test
+    public void givenProcessBuilder_whenModifyEnvironment_thenSuccess() throws IOException, InterruptedException {
+        ProcessBuilder processBuilder = new ProcessBuilder();
+        Map<String, String> environment = processBuilder.environment();
+        environment.forEach((key, value) -> System.out.println(key + value));
+
+        environment.put("GREETING", "Hola Mundo");
+
+        List<String> command = getGreetingCommand();
+        processBuilder.command(command);
+        Process process = processBuilder.start();
+
+        List<String> results = readOutput(process.getInputStream());
+        assertThat("Results should not be empty", results, is(not(empty())));
+        assertThat("Results should contain a greeting ", results, hasItem(containsString("Hola Mundo")));
+
+        int exitCode = process.waitFor();
+        assertEquals("No errors should be detected", 0, exitCode);
+    }
+
+    @Test
+    public void givenProcessBuilder_whenModifyWorkingDir_thenSuccess() throws IOException, InterruptedException {
+        List<String> command = getDirectoryListingCommand();
+        ProcessBuilder processBuilder = new ProcessBuilder(command);
+
+        processBuilder.directory(new File("src"));
+        Process process = processBuilder.start();
+
+        List<String> results = readOutput(process.getInputStream());
+        assertThat("Results should not be empty", results, is(not(empty())));
+        assertThat("Results should contain directory listing: ", results, hasItems(containsString("main"), containsString("test")));
+
+        int exitCode = process.waitFor();
+        assertEquals("No errors should be detected", 0, exitCode);
+    }
+
+    @Test
+    public void givenProcessBuilder_whenRedirectStandardOutput_thenSuccessWriting() throws IOException, InterruptedException {
+        ProcessBuilder processBuilder = new ProcessBuilder("java", "-version");
+
+        processBuilder.redirectErrorStream(true);
+        File log = tempFolder.newFile("java-version.log");
+        processBuilder.redirectOutput(log);
+
+        Process process = processBuilder.start();
+
+        assertEquals("If redirected, should be -1 ", -1, process.getInputStream()
+            .read());
+        int exitCode = process.waitFor();
+        assertEquals("No errors should be detected", 0, exitCode);
+
+        List<String> lines = Files.lines(log.toPath())
+            .collect(Collectors.toList());
+
+        assertThat("Results should not be empty", lines, is(not(empty())));
+        assertThat("Results should contain java version: ", lines, hasItem(containsString("java version")));
+    }
+
+    @Test
+    public void givenProcessBuilder_whenRedirectStandardOutput_thenSuccessAppending() throws IOException, InterruptedException {
+        ProcessBuilder processBuilder = new ProcessBuilder("java", "-version");
+
+        File log = tempFolder.newFile("java-version-append.log");
+        processBuilder.redirectErrorStream(true);
+        processBuilder.redirectOutput(Redirect.appendTo(log));
+
+        Process process = processBuilder.start();
+
+        assertEquals("If redirected output, should be -1 ", -1, process.getInputStream()
+            .read());
+
+        int exitCode = process.waitFor();
+        assertEquals("No errors should be detected", 0, exitCode);
+
+        List<String> lines = Files.lines(log.toPath())
+            .collect(Collectors.toList());
+
+        assertThat("Results should not be empty", lines, is(not(empty())));
+        assertThat("Results should contain java version: ", lines, hasItem(containsString("java version")));
+    }
+
+    @Test
+    public void givenProcessBuilder_whenStartingPipeline_thenSuccess() throws IOException, InterruptedException {
+        if (!isWindows()) {
+            List<ProcessBuilder> builders = Arrays.asList(
+                new ProcessBuilder("find", "src", "-name", "*.java", "-type", "f"), 
+                new ProcessBuilder("wc", "-l"));
+
+            List<Process> processes = ProcessBuilder.startPipeline(builders);
+            Process last = processes.get(processes.size() - 1);
+
+            List<String> output = readOutput(last.getInputStream());
+            assertThat("Results should not be empty", output, is(not(empty())));
+        }
+    }
+    
+    @Test
+    public void givenProcessBuilder_whenInheritIO_thenSuccess() throws IOException, InterruptedException {
+        List<String> command = getEchoCommand();
+        ProcessBuilder processBuilder = new ProcessBuilder(command);
+
+        processBuilder.inheritIO();
+        Process process = processBuilder.start();
+
+        int exitCode = process.waitFor();
+        assertEquals("No errors should be detected", 0, exitCode);
+    }
+
+    private List<String> readOutput(InputStream inputStream) throws IOException {
+        try (BufferedReader output = new BufferedReader(new InputStreamReader(inputStream))) {
+            return output.lines()
+                .collect(Collectors.toList());
+        }
+    }
+
+    private List<String> getDirectoryListingCommand() {
+        return isWindows() ? Arrays.asList("cmd.exe", "/c", "dir") : Arrays.asList("/bin/sh", "-c", "ls");
+    }
+
+    private List<String> getGreetingCommand() {
+        return isWindows() ? Arrays.asList("cmd.exe", "/c", "echo %GREETING%") : Arrays.asList("/bin/bash", "-c", "echo $GREETING");
+    }
+
+    private List<String> getEchoCommand() {
+        return isWindows() ? Arrays.asList("cmd.exe", "/c", "echo hello") : Arrays.asList("/bin/sh", "-c", "echo hello");
+    }
+
+    private boolean isWindows() {
+        return System.getProperty("os.name")
+            .toLowerCase()
+            .startsWith("windows");
+    }
+
+}
diff --git a/core-java-os/src/test/resources/.gitignore b/core-java-modules/core-java-os/src/test/resources/.gitignore
similarity index 100%
rename from core-java-os/src/test/resources/.gitignore
rename to core-java-modules/core-java-os/src/test/resources/.gitignore
diff --git a/core-java-perf/README.md b/core-java-modules/core-java-perf/README.md
similarity index 100%
rename from core-java-perf/README.md
rename to core-java-modules/core-java-perf/README.md
diff --git a/core-java-perf/pom.xml b/core-java-modules/core-java-perf/pom.xml
similarity index 94%
rename from core-java-perf/pom.xml
rename to core-java-modules/core-java-perf/pom.xml
index 0e0ec79691..f225a9554b 100644
--- a/core-java-perf/pom.xml
+++ b/core-java-modules/core-java-perf/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-perf/src/main/java/com/baeldung/flightrecorder/FlightRecorder.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/flightrecorder/FlightRecorder.java
similarity index 100%
rename from core-java-perf/src/main/java/com/baeldung/flightrecorder/FlightRecorder.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/flightrecorder/FlightRecorder.java
diff --git a/core-java-perf/src/main/java/com/baeldung/gc/VerboseGarbageCollectorRunner.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/gc/VerboseGarbageCollectorRunner.java
similarity index 97%
rename from core-java-perf/src/main/java/com/baeldung/gc/VerboseGarbageCollectorRunner.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/gc/VerboseGarbageCollectorRunner.java
index f57580bbb5..9e4e6d9902 100644
--- a/core-java-perf/src/main/java/com/baeldung/gc/VerboseGarbageCollectorRunner.java
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/gc/VerboseGarbageCollectorRunner.java
@@ -1,63 +1,63 @@
-package com.baeldung.gc;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A simple Java program to demonstrate how to enable verbose Garbage Collection (GC) logging.
- * <p>
- * This simple program loads 3 million {@link java.lang.String} instances into a {@link java.util.HashMap} 
- * object before making an explicit call to the garbage collector using <code>System.gc()</code>.
- * <p>
- * Finally, it removes 2 million of the {@link java.lang.String} instances from the {@link java.util.HashMap}. 
- * We also explicitly use <code>System.out.println</code> to make interpreting the output easier.
- * <p>
- * Run this program with the following arguments to see verbose GC logging in its complete form:
- * <pre>
- * -XX:+UseSerialGC -Xms1024m -Xmx1024m -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xloggc:/path/to/file/gc.log
- * </pre>
- * Where:
- * <ul>
- *   <li><code>-XX:+UseSerialGC</code> - specify the serial garbage collector.</li>
- *   <li><code>-Xms1024m</code> - specify the minimal heap size.</li>
- *   <li><code>-Xmx1024m</code> - specify the maximal heap size.</li>
- *   <li><code>-verbose:gc</code> - activate the logging of garbage collection information in its simplest form.</li>
- *   <li><code>-XX:+PrintGCDetails</code> - activate detailed information about garbage collection.</li>
- *   <li><code>-XX:+PrintGCTimeStamps</code> - include a timestamp in the output reflecting the real-time passed in seconds since the JVM started.</li>
- *   <li><code>-XX:+PrintGCDateStamps</code> - include the absolute date and time at the start of each line.</li>
- *   <li><code>-Xloggc</code> - by default the GC log is written to stdout. Specify an output file via this argument.</li>
- * </ul>
- * <p>
- * It should be noted that the first three arguments are not strictly necessary but for the purposes or the example
- * help really simplify things.
- *
- */
-public class VerboseGarbageCollectorRunner {
-
-    private static Map<String, String> stringContainer = new HashMap<>();
-
-    public static void main(String[] args) {
-        System.out.println("Start of program!");
-        String stringWithPrefix = "stringWithPrefix";
-
-        // Load Java Heap with 3 M java.lang.String instances
-        for (int i = 0; i < 3000000; i++) {
-            String newString = stringWithPrefix + i;
-            stringContainer.put(newString, newString);
-        }
-        System.out.println("MAP size: " + stringContainer.size());
-
-        // Explicit GC!
-        System.gc();
-
-        // Remove 2 M out of 3 M
-        for (int i = 0; i < 2000000; i++) {
-            String newString = stringWithPrefix + i;
-            stringContainer.remove(newString);
-        }
-
-        System.out.println("MAP size: " + stringContainer.size());
-        System.out.println("End of program!");
-    }
-
-}
+package com.baeldung.gc;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A simple Java program to demonstrate how to enable verbose Garbage Collection (GC) logging.
+ * <p>
+ * This simple program loads 3 million {@link java.lang.String} instances into a {@link java.util.HashMap} 
+ * object before making an explicit call to the garbage collector using <code>System.gc()</code>.
+ * <p>
+ * Finally, it removes 2 million of the {@link java.lang.String} instances from the {@link java.util.HashMap}. 
+ * We also explicitly use <code>System.out.println</code> to make interpreting the output easier.
+ * <p>
+ * Run this program with the following arguments to see verbose GC logging in its complete form:
+ * <pre>
+ * -XX:+UseSerialGC -Xms1024m -Xmx1024m -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xloggc:/path/to/file/gc.log
+ * </pre>
+ * Where:
+ * <ul>
+ *   <li><code>-XX:+UseSerialGC</code> - specify the serial garbage collector.</li>
+ *   <li><code>-Xms1024m</code> - specify the minimal heap size.</li>
+ *   <li><code>-Xmx1024m</code> - specify the maximal heap size.</li>
+ *   <li><code>-verbose:gc</code> - activate the logging of garbage collection information in its simplest form.</li>
+ *   <li><code>-XX:+PrintGCDetails</code> - activate detailed information about garbage collection.</li>
+ *   <li><code>-XX:+PrintGCTimeStamps</code> - include a timestamp in the output reflecting the real-time passed in seconds since the JVM started.</li>
+ *   <li><code>-XX:+PrintGCDateStamps</code> - include the absolute date and time at the start of each line.</li>
+ *   <li><code>-Xloggc</code> - by default the GC log is written to stdout. Specify an output file via this argument.</li>
+ * </ul>
+ * <p>
+ * It should be noted that the first three arguments are not strictly necessary but for the purposes or the example
+ * help really simplify things.
+ *
+ */
+public class VerboseGarbageCollectorRunner {
+
+    private static Map<String, String> stringContainer = new HashMap<>();
+
+    public static void main(String[] args) {
+        System.out.println("Start of program!");
+        String stringWithPrefix = "stringWithPrefix";
+
+        // Load Java Heap with 3 M java.lang.String instances
+        for (int i = 0; i < 3000000; i++) {
+            String newString = stringWithPrefix + i;
+            stringContainer.put(newString, newString);
+        }
+        System.out.println("MAP size: " + stringContainer.size());
+
+        // Explicit GC!
+        System.gc();
+
+        // Remove 2 M out of 3 M
+        for (int i = 0; i < 2000000; i++) {
+            String newString = stringWithPrefix + i;
+            stringContainer.remove(newString);
+        }
+
+        System.out.println("MAP size: " + stringContainer.size());
+        System.out.println("End of program!");
+    }
+
+}
diff --git a/core-java-perf/src/main/java/com/baeldung/heapdump/HeapDump.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/heapdump/HeapDump.java
similarity index 100%
rename from core-java-perf/src/main/java/com/baeldung/heapdump/HeapDump.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/heapdump/HeapDump.java
diff --git a/core-java-perf/src/main/java/com/baeldung/jmx/Game.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmx/Game.java
similarity index 100%
rename from core-java-perf/src/main/java/com/baeldung/jmx/Game.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/jmx/Game.java
diff --git a/core-java-perf/src/main/java/com/baeldung/jmx/GameMBean.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmx/GameMBean.java
similarity index 100%
rename from core-java-perf/src/main/java/com/baeldung/jmx/GameMBean.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/jmx/GameMBean.java
diff --git a/core-java-perf/src/main/java/com/baeldung/jmx/JMXTutorialMainlauncher.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmx/JMXTutorialMainlauncher.java
similarity index 100%
rename from core-java-perf/src/main/java/com/baeldung/jmx/JMXTutorialMainlauncher.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/jmx/JMXTutorialMainlauncher.java
diff --git a/core-java-perf/src/main/java/com/baeldung/memoryleaks/equalshashcode/Person.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/equalshashcode/Person.java
old mode 100755
new mode 100644
similarity index 94%
rename from core-java-perf/src/main/java/com/baeldung/memoryleaks/equalshashcode/Person.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/equalshashcode/Person.java
index e16d1ae6da..a5b5794238
--- a/core-java-perf/src/main/java/com/baeldung/memoryleaks/equalshashcode/Person.java
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/equalshashcode/Person.java
@@ -1,9 +1,9 @@
-package com.baeldung.memoryleaks.equalshashcode;
-
-public class Person {
-    public String name;
-     
-    public Person(String name) {
-        this.name = name;
-    }
-}
+package com.baeldung.memoryleaks.equalshashcode;
+
+public class Person {
+    public String name;
+     
+    public Person(String name) {
+        this.name = name;
+    }
+}
diff --git a/core-java-perf/src/main/java/com/baeldung/memoryleaks/equalshashcode/PersonOptimized.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/equalshashcode/PersonOptimized.java
old mode 100755
new mode 100644
similarity index 96%
rename from core-java-perf/src/main/java/com/baeldung/memoryleaks/equalshashcode/PersonOptimized.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/equalshashcode/PersonOptimized.java
index 3af70dd1eb..3e54332264
--- a/core-java-perf/src/main/java/com/baeldung/memoryleaks/equalshashcode/PersonOptimized.java
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/equalshashcode/PersonOptimized.java
@@ -1,25 +1,25 @@
-package com.baeldung.memoryleaks.equalshashcode;
-
-public class PersonOptimized {
-    public String name;
-     
-    public PersonOptimized(String name) {
-        this.name = name;
-    }
-     
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) return true;
-        if (!(o instanceof PersonOptimized)) {
-            return false;
-        }
-        PersonOptimized person = (PersonOptimized) o;
-        return person.name.equals(name);
-    }
-     
-    @Override
-    public int hashCode() {
-        int result = 17;
-        result = 31 * result + name.hashCode();
-        return result;
-    }}
+package com.baeldung.memoryleaks.equalshashcode;
+
+public class PersonOptimized {
+    public String name;
+     
+    public PersonOptimized(String name) {
+        this.name = name;
+    }
+     
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) return true;
+        if (!(o instanceof PersonOptimized)) {
+            return false;
+        }
+        PersonOptimized person = (PersonOptimized) o;
+        return person.name.equals(name);
+    }
+     
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + name.hashCode();
+        return result;
+    }}
diff --git a/core-java-perf/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObject.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObject.java
old mode 100755
new mode 100644
similarity index 95%
rename from core-java-perf/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObject.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObject.java
index ce77d883f6..07ed52e38d
--- a/core-java-perf/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObject.java
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObject.java
@@ -1,32 +1,32 @@
-package com.baeldung.memoryleaks.finalize;
-
-import java.nio.charset.Charset;
-import java.util.Random;
-
-public class BulkyObject {
-    private String data[];
-    
-    public BulkyObject() {
-        data = new String[1000000];
-        
-        for(int i=0; i<1000000; i++) {
-            data[i] = getRandomString();
-        }
-    }
-    
-    private String getRandomString() {
-        byte[] array = new byte[1000];
-        new Random().nextBytes(array);
-        return new String(array, Charset.forName("UTF-8"));
-    }
-    
-    @Override
-    public void finalize() {
-        try {
-            Thread.sleep(100);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        System.out.println("Finalizer called");
-    }
-}
+package com.baeldung.memoryleaks.finalize;
+
+import java.nio.charset.Charset;
+import java.util.Random;
+
+public class BulkyObject {
+    private String data[];
+    
+    public BulkyObject() {
+        data = new String[1000000];
+        
+        for(int i=0; i<1000000; i++) {
+            data[i] = getRandomString();
+        }
+    }
+    
+    private String getRandomString() {
+        byte[] array = new byte[1000];
+        new Random().nextBytes(array);
+        return new String(array, Charset.forName("UTF-8"));
+    }
+    
+    @Override
+    public void finalize() {
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        System.out.println("Finalizer called");
+    }
+}
diff --git a/core-java-perf/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObjectOptimized.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObjectOptimized.java
similarity index 96%
rename from core-java-perf/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObjectOptimized.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObjectOptimized.java
index dc1302432e..8a8f2ae6c2 100644
--- a/core-java-perf/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObjectOptimized.java
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/finalize/BulkyObjectOptimized.java
@@ -1,22 +1,22 @@
-package com.baeldung.memoryleaks.finalize;
-
-import java.nio.charset.Charset;
-import java.util.Random;
-
-public class BulkyObjectOptimized {
-    private String data[];
-    
-    public BulkyObjectOptimized() {
-        data = new String[1000000];
-        
-        for(int i=0; i<1000000; i++) {
-            data[i] = getRandomString();
-        }
-    }
-    
-    private String getRandomString() {
-        byte[] array = new byte[1000];
-        new Random().nextBytes(array);
-        return new String(array, Charset.forName("UTF-8"));
-    }
-}
+package com.baeldung.memoryleaks.finalize;
+
+import java.nio.charset.Charset;
+import java.util.Random;
+
+public class BulkyObjectOptimized {
+    private String data[];
+    
+    public BulkyObjectOptimized() {
+        data = new String[1000000];
+        
+        for(int i=0; i<1000000; i++) {
+            data[i] = getRandomString();
+        }
+    }
+    
+    private String getRandomString() {
+        byte[] array = new byte[1000];
+        new Random().nextBytes(array);
+        return new String(array, Charset.forName("UTF-8"));
+    }
+}
diff --git a/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/BulkyObject.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/BulkyObject.java
old mode 100755
new mode 100644
similarity index 95%
rename from core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/BulkyObject.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/BulkyObject.java
index bbd5310182..47801878f8
--- a/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/BulkyObject.java
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/BulkyObject.java
@@ -1,22 +1,22 @@
-package com.baeldung.memoryleaks.innerclass;
-
-import java.nio.charset.Charset;
-import java.util.Random;
-
-public class BulkyObject {
-    private String data[];
-    
-    public BulkyObject() {
-        data = new String[1000000];
-        
-        for(int i=0; i<1000000; i++) {
-            data[i] = getRandomString();
-        }
-    }
-    
-    private String getRandomString() {
-        byte[] array = new byte[1000];
-        new Random().nextBytes(array);
-        return new String(array, Charset.forName("UTF-8"));
-    }
-}
+package com.baeldung.memoryleaks.innerclass;
+
+import java.nio.charset.Charset;
+import java.util.Random;
+
+public class BulkyObject {
+    private String data[];
+    
+    public BulkyObject() {
+        data = new String[1000000];
+        
+        for(int i=0; i<1000000; i++) {
+            data[i] = getRandomString();
+        }
+    }
+    
+    private String getRandomString() {
+        byte[] array = new byte[1000];
+        new Random().nextBytes(array);
+        return new String(array, Charset.forName("UTF-8"));
+    }
+}
diff --git a/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassDriver.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassDriver.java
old mode 100755
new mode 100644
similarity index 97%
rename from core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassDriver.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassDriver.java
index 06f928bc4a..e3e4506397
--- a/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassDriver.java
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassDriver.java
@@ -1,17 +1,17 @@
-package com.baeldung.memoryleaks.innerclass;
-
-public class InnerClassDriver {
-    public static InnerClassWrapper.SimpleInnerClass getSimpleInnerClassObj() {
-        return new InnerClassWrapper().new SimpleInnerClass();
-    }
-    
-    public static void main2(String[] args) {
-        InnerClassWrapper.SimpleInnerClass simpleInnerClassObj = getSimpleInnerClassObj();
-        System.out.println("Debug point");
-    }
-    
-    public static void main(String[] args) {
-        StaticNestedClassWrapper.StaticNestedClass simpleInnerClassObj = new StaticNestedClassWrapper.StaticNestedClass();
-        System.out.println("Debug point");
-    }
-}
+package com.baeldung.memoryleaks.innerclass;
+
+public class InnerClassDriver {
+    public static InnerClassWrapper.SimpleInnerClass getSimpleInnerClassObj() {
+        return new InnerClassWrapper().new SimpleInnerClass();
+    }
+    
+    public static void main2(String[] args) {
+        InnerClassWrapper.SimpleInnerClass simpleInnerClassObj = getSimpleInnerClassObj();
+        System.out.println("Debug point");
+    }
+    
+    public static void main(String[] args) {
+        StaticNestedClassWrapper.StaticNestedClass simpleInnerClassObj = new StaticNestedClassWrapper.StaticNestedClass();
+        System.out.println("Debug point");
+    }
+}
diff --git a/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassWrapper.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassWrapper.java
old mode 100755
new mode 100644
similarity index 95%
rename from core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassWrapper.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassWrapper.java
index 25fecf9bb3..97b05ea02e
--- a/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassWrapper.java
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/InnerClassWrapper.java
@@ -1,10 +1,10 @@
-package com.baeldung.memoryleaks.innerclass;
-
-
-public class InnerClassWrapper {
-    private BulkyObject bulkyObject = new BulkyObject();
-    
-    public class SimpleInnerClass {
-        
-    }
-}
+package com.baeldung.memoryleaks.innerclass;
+
+
+public class InnerClassWrapper {
+    private BulkyObject bulkyObject = new BulkyObject();
+    
+    public class SimpleInnerClass {
+        
+    }
+}
diff --git a/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/StaticNestedClassWrapper.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/StaticNestedClassWrapper.java
old mode 100755
new mode 100644
similarity index 95%
rename from core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/StaticNestedClassWrapper.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/StaticNestedClassWrapper.java
index d1729d78a3..c37e08a049
--- a/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/StaticNestedClassWrapper.java
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/innerclass/StaticNestedClassWrapper.java
@@ -1,10 +1,10 @@
-package com.baeldung.memoryleaks.innerclass;
-
-
-public class StaticNestedClassWrapper {
-    private BulkyObject bulkyObject = new BulkyObject();
-    
-    public static class StaticNestedClass {
-        
-    }
-}
+package com.baeldung.memoryleaks.innerclass;
+
+
+public class StaticNestedClassWrapper {
+    private BulkyObject bulkyObject = new BulkyObject();
+    
+    public static class StaticNestedClass {
+        
+    }
+}
diff --git a/core-java-perf/src/main/java/com/baeldung/memoryleaks/internedstrings/InternedString.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/internedstrings/InternedString.java
similarity index 100%
rename from core-java-perf/src/main/java/com/baeldung/memoryleaks/internedstrings/InternedString.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/internedstrings/InternedString.java
diff --git a/core-java-perf/src/main/java/com/baeldung/memoryleaks/internedstrings/ReadStringFromFileUtil.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/internedstrings/ReadStringFromFileUtil.java
similarity index 100%
rename from core-java-perf/src/main/java/com/baeldung/memoryleaks/internedstrings/ReadStringFromFileUtil.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/internedstrings/ReadStringFromFileUtil.java
diff --git a/core-java-perf/src/main/java/com/baeldung/memoryleaks/internedstrings/StringObject.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/internedstrings/StringObject.java
similarity index 100%
rename from core-java-perf/src/main/java/com/baeldung/memoryleaks/internedstrings/StringObject.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/internedstrings/StringObject.java
diff --git a/core-java-perf/src/main/java/com/baeldung/memoryleaks/staticfields/NonStaticFieldsDemo.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/staticfields/NonStaticFieldsDemo.java
similarity index 100%
rename from core-java-perf/src/main/java/com/baeldung/memoryleaks/staticfields/NonStaticFieldsDemo.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/staticfields/NonStaticFieldsDemo.java
diff --git a/core-java-perf/src/main/java/com/baeldung/memoryleaks/staticfields/StaticFieldsDemo.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/staticfields/StaticFieldsDemo.java
similarity index 100%
rename from core-java-perf/src/main/java/com/baeldung/memoryleaks/staticfields/StaticFieldsDemo.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/memoryleaks/staticfields/StaticFieldsDemo.java
diff --git a/core-java-perf/src/main/java/com/baeldung/outofmemoryerror/OutOfMemoryGCLimitExceed.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/outofmemoryerror/OutOfMemoryGCLimitExceed.java
similarity index 100%
rename from core-java-perf/src/main/java/com/baeldung/outofmemoryerror/OutOfMemoryGCLimitExceed.java
rename to core-java-modules/core-java-perf/src/main/java/com/baeldung/outofmemoryerror/OutOfMemoryGCLimitExceed.java
diff --git a/core-java-perf/src/main/resources/logback.xml b/core-java-modules/core-java-perf/src/main/resources/logback.xml
similarity index 100%
rename from core-java-perf/src/main/resources/logback.xml
rename to core-java-modules/core-java-perf/src/main/resources/logback.xml
diff --git a/core-java-perf/src/test/java/com/baeldung/memoryleaks/equalshashcode/PersonMemoryLeakUnitTest.java b/core-java-modules/core-java-perf/src/test/java/com/baeldung/memoryleaks/equalshashcode/PersonMemoryLeakUnitTest.java
similarity index 100%
rename from core-java-perf/src/test/java/com/baeldung/memoryleaks/equalshashcode/PersonMemoryLeakUnitTest.java
rename to core-java-modules/core-java-perf/src/test/java/com/baeldung/memoryleaks/equalshashcode/PersonMemoryLeakUnitTest.java
diff --git a/core-java-perf/src/test/java/com/baeldung/memoryleaks/finalize/FinalizeMemoryLeakUnitTest.java b/core-java-modules/core-java-perf/src/test/java/com/baeldung/memoryleaks/finalize/FinalizeMemoryLeakUnitTest.java
similarity index 100%
rename from core-java-perf/src/test/java/com/baeldung/memoryleaks/finalize/FinalizeMemoryLeakUnitTest.java
rename to core-java-modules/core-java-perf/src/test/java/com/baeldung/memoryleaks/finalize/FinalizeMemoryLeakUnitTest.java
diff --git a/core-java-perf/src/test/java/com/baeldung/memoryleaks/innerclass/StaticInnerClassMemoryLeakUnitTest.java b/core-java-modules/core-java-perf/src/test/java/com/baeldung/memoryleaks/innerclass/StaticInnerClassMemoryLeakUnitTest.java
similarity index 100%
rename from core-java-perf/src/test/java/com/baeldung/memoryleaks/innerclass/StaticInnerClassMemoryLeakUnitTest.java
rename to core-java-modules/core-java-perf/src/test/java/com/baeldung/memoryleaks/innerclass/StaticInnerClassMemoryLeakUnitTest.java
diff --git a/core-java-perf/src/test/java/com/baeldung/memoryleaks/internedstrings/StringInternMemoryLeakUnitTest.java b/core-java-modules/core-java-perf/src/test/java/com/baeldung/memoryleaks/internedstrings/StringInternMemoryLeakUnitTest.java
similarity index 100%
rename from core-java-perf/src/test/java/com/baeldung/memoryleaks/internedstrings/StringInternMemoryLeakUnitTest.java
rename to core-java-modules/core-java-perf/src/test/java/com/baeldung/memoryleaks/internedstrings/StringInternMemoryLeakUnitTest.java
diff --git a/core-java-perf/src/test/java/com/baeldung/memoryleaks/staticfields/NonStaticFieldsMemoryLeakUnitTest.java b/core-java-modules/core-java-perf/src/test/java/com/baeldung/memoryleaks/staticfields/NonStaticFieldsMemoryLeakUnitTest.java
similarity index 100%
rename from core-java-perf/src/test/java/com/baeldung/memoryleaks/staticfields/NonStaticFieldsMemoryLeakUnitTest.java
rename to core-java-modules/core-java-perf/src/test/java/com/baeldung/memoryleaks/staticfields/NonStaticFieldsMemoryLeakUnitTest.java
diff --git a/core-java-perf/src/test/java/com/baeldung/memoryleaks/staticfields/StaticFieldsMemoryLeakUnitTest.java b/core-java-modules/core-java-perf/src/test/java/com/baeldung/memoryleaks/staticfields/StaticFieldsMemoryLeakUnitTest.java
similarity index 100%
rename from core-java-perf/src/test/java/com/baeldung/memoryleaks/staticfields/StaticFieldsMemoryLeakUnitTest.java
rename to core-java-modules/core-java-perf/src/test/java/com/baeldung/memoryleaks/staticfields/StaticFieldsMemoryLeakUnitTest.java
diff --git a/core-java-reflection/pom.xml b/core-java-modules/core-java-reflection/pom.xml
similarity index 93%
rename from core-java-reflection/pom.xml
rename to core-java-modules/core-java-reflection/pom.xml
index fc2e908fe8..e6c7f81d6c 100644
--- a/core-java-reflection/pom.xml
+++ b/core-java-modules/core-java-reflection/pom.xml
@@ -12,7 +12,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Action.java b/core-java-modules/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Action.java
similarity index 100%
rename from core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Action.java
rename to core-java-modules/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Action.java
diff --git a/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Calculator.java b/core-java-modules/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Calculator.java
similarity index 100%
rename from core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Calculator.java
rename to core-java-modules/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Calculator.java
diff --git a/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Defer.java b/core-java-modules/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Defer.java
similarity index 100%
rename from core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Defer.java
rename to core-java-modules/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/Defer.java
diff --git a/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/MyOwnDefer.java b/core-java-modules/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/MyOwnDefer.java
similarity index 100%
rename from core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/MyOwnDefer.java
rename to core-java-modules/core-java-reflection/src/main/java/com/baeldung/reflection/voidtype/MyOwnDefer.java
diff --git a/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/CalculatorUnitTest.java b/core-java-modules/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/CalculatorUnitTest.java
similarity index 100%
rename from core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/CalculatorUnitTest.java
rename to core-java-modules/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/CalculatorUnitTest.java
diff --git a/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/DeferUnitTest.java b/core-java-modules/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/DeferUnitTest.java
similarity index 100%
rename from core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/DeferUnitTest.java
rename to core-java-modules/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/DeferUnitTest.java
diff --git a/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/MyOwnDeferUnitTest.java b/core-java-modules/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/MyOwnDeferUnitTest.java
similarity index 100%
rename from core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/MyOwnDeferUnitTest.java
rename to core-java-modules/core-java-reflection/src/test/java/com/baeldung/reflection/voidtype/MyOwnDeferUnitTest.java
diff --git a/core-java-security/README.md b/core-java-modules/core-java-security/README.md
similarity index 100%
rename from core-java-security/README.md
rename to core-java-modules/core-java-security/README.md
diff --git a/core-java-security/pom.xml b/core-java-modules/core-java-security/pom.xml
similarity index 97%
rename from core-java-security/pom.xml
rename to core-java-modules/core-java-security/pom.xml
index 63bc46b114..ed82a5209a 100644
--- a/core-java-security/pom.xml
+++ b/core-java-modules/core-java-security/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-security/src/main/java/com/baeldung/cipher/Encryptor.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/cipher/Encryptor.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/cipher/Encryptor.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/cipher/Encryptor.java
diff --git a/core-java-security/src/main/java/com/baeldung/encrypt/FileEncrypterDecrypter.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/encrypt/FileEncrypterDecrypter.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/encrypt/FileEncrypterDecrypter.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/encrypt/FileEncrypterDecrypter.java
diff --git a/core-java-security/src/main/java/com/baeldung/hashing/DigestAlgorithms.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/hashing/DigestAlgorithms.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/hashing/DigestAlgorithms.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/hashing/DigestAlgorithms.java
diff --git a/core-java-security/src/main/java/com/baeldung/hashing/Keccak256Hashing.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/hashing/Keccak256Hashing.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/hashing/Keccak256Hashing.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/hashing/Keccak256Hashing.java
diff --git a/core-java-security/src/main/java/com/baeldung/hashing/SHA256Hashing.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/hashing/SHA256Hashing.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/hashing/SHA256Hashing.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/hashing/SHA256Hashing.java
diff --git a/core-java-security/src/main/java/com/baeldung/hashing/SHA3Hashing.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/hashing/SHA3Hashing.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/hashing/SHA3Hashing.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/hashing/SHA3Hashing.java
diff --git a/core-java-security/src/main/java/com/baeldung/hashing/SHACommonUtils.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/hashing/SHACommonUtils.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/hashing/SHACommonUtils.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/hashing/SHACommonUtils.java
diff --git a/core-java-security/src/main/java/com/baeldung/keystore/JavaKeyStore.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/keystore/JavaKeyStore.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/keystore/JavaKeyStore.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/keystore/JavaKeyStore.java
diff --git a/core-java-security/src/main/java/com/baeldung/passwordhashing/PBKDF2Hasher.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/passwordhashing/PBKDF2Hasher.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/passwordhashing/PBKDF2Hasher.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/passwordhashing/PBKDF2Hasher.java
diff --git a/core-java-security/src/main/java/com/baeldung/passwordhashing/SHA512Hasher.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/passwordhashing/SHA512Hasher.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/passwordhashing/SHA512Hasher.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/passwordhashing/SHA512Hasher.java
diff --git a/core-java-security/src/main/java/com/baeldung/passwordhashing/SimplePBKDF2Hasher.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/passwordhashing/SimplePBKDF2Hasher.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/passwordhashing/SimplePBKDF2Hasher.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/passwordhashing/SimplePBKDF2Hasher.java
diff --git a/core-java-security/src/main/java/com/baeldung/ssl/EnableTLSv12.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/EnableTLSv12.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/ssl/EnableTLSv12.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/EnableTLSv12.java
diff --git a/core-java-security/src/main/java/com/baeldung/ssl/SecureConnection.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/SecureConnection.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/ssl/SecureConnection.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/SecureConnection.java
diff --git a/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleClient.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleClient.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/ssl/example/SimpleClient.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleClient.java
diff --git a/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleServer.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleServer.java
similarity index 100%
rename from core-java-security/src/main/java/com/baeldung/ssl/example/SimpleServer.java
rename to core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleServer.java
diff --git a/core-java-security/src/main/resources/logback.xml b/core-java-modules/core-java-security/src/main/resources/logback.xml
similarity index 100%
rename from core-java-security/src/main/resources/logback.xml
rename to core-java-modules/core-java-security/src/main/resources/logback.xml
diff --git a/core-java-security/src/test/java/com/baeldung/cipher/EncryptorUnitTest.java b/core-java-modules/core-java-security/src/test/java/com/baeldung/cipher/EncryptorUnitTest.java
similarity index 100%
rename from core-java-security/src/test/java/com/baeldung/cipher/EncryptorUnitTest.java
rename to core-java-modules/core-java-security/src/test/java/com/baeldung/cipher/EncryptorUnitTest.java
diff --git a/core-java-security/src/test/java/com/baeldung/encrypt/FileEncrypterDecrypterIntegrationTest.java b/core-java-modules/core-java-security/src/test/java/com/baeldung/encrypt/FileEncrypterDecrypterIntegrationTest.java
similarity index 100%
rename from core-java-security/src/test/java/com/baeldung/encrypt/FileEncrypterDecrypterIntegrationTest.java
rename to core-java-modules/core-java-security/src/test/java/com/baeldung/encrypt/FileEncrypterDecrypterIntegrationTest.java
diff --git a/core-java-security/src/test/java/com/baeldung/hashing/Keccak256HashingUnitTest.java b/core-java-modules/core-java-security/src/test/java/com/baeldung/hashing/Keccak256HashingUnitTest.java
similarity index 100%
rename from core-java-security/src/test/java/com/baeldung/hashing/Keccak256HashingUnitTest.java
rename to core-java-modules/core-java-security/src/test/java/com/baeldung/hashing/Keccak256HashingUnitTest.java
diff --git a/core-java-security/src/test/java/com/baeldung/hashing/SHA256HashingUnitTest.java b/core-java-modules/core-java-security/src/test/java/com/baeldung/hashing/SHA256HashingUnitTest.java
similarity index 100%
rename from core-java-security/src/test/java/com/baeldung/hashing/SHA256HashingUnitTest.java
rename to core-java-modules/core-java-security/src/test/java/com/baeldung/hashing/SHA256HashingUnitTest.java
diff --git a/core-java-security/src/test/java/com/baeldung/hashing/SHA3HashingUnitTest.java b/core-java-modules/core-java-security/src/test/java/com/baeldung/hashing/SHA3HashingUnitTest.java
similarity index 100%
rename from core-java-security/src/test/java/com/baeldung/hashing/SHA3HashingUnitTest.java
rename to core-java-modules/core-java-security/src/test/java/com/baeldung/hashing/SHA3HashingUnitTest.java
diff --git a/core-java-security/src/test/java/com/baeldung/keystore/JavaKeyStoreUnitTest.java b/core-java-modules/core-java-security/src/test/java/com/baeldung/keystore/JavaKeyStoreUnitTest.java
similarity index 100%
rename from core-java-security/src/test/java/com/baeldung/keystore/JavaKeyStoreUnitTest.java
rename to core-java-modules/core-java-security/src/test/java/com/baeldung/keystore/JavaKeyStoreUnitTest.java
diff --git a/core-java-security/src/test/java/com/baeldung/passwordhashing/PBKDF2HasherUnitTest.java b/core-java-modules/core-java-security/src/test/java/com/baeldung/passwordhashing/PBKDF2HasherUnitTest.java
similarity index 100%
rename from core-java-security/src/test/java/com/baeldung/passwordhashing/PBKDF2HasherUnitTest.java
rename to core-java-modules/core-java-security/src/test/java/com/baeldung/passwordhashing/PBKDF2HasherUnitTest.java
diff --git a/core-java-security/src/test/java/com/baeldung/passwordhashing/SHA512HasherUnitTest.java b/core-java-modules/core-java-security/src/test/java/com/baeldung/passwordhashing/SHA512HasherUnitTest.java
similarity index 100%
rename from core-java-security/src/test/java/com/baeldung/passwordhashing/SHA512HasherUnitTest.java
rename to core-java-modules/core-java-security/src/test/java/com/baeldung/passwordhashing/SHA512HasherUnitTest.java
diff --git a/core-java-security/src/test/java/org/baeldung/java/md5/JavaMD5UnitTest.java b/core-java-modules/core-java-security/src/test/java/org/baeldung/java/md5/JavaMD5UnitTest.java
similarity index 100%
rename from core-java-security/src/test/java/org/baeldung/java/md5/JavaMD5UnitTest.java
rename to core-java-modules/core-java-security/src/test/java/org/baeldung/java/md5/JavaMD5UnitTest.java
diff --git a/core-java-security/src/test/resources/test_md5.txt b/core-java-modules/core-java-security/src/test/resources/test_md5.txt
similarity index 100%
rename from core-java-security/src/test/resources/test_md5.txt
rename to core-java-modules/core-java-security/src/test/resources/test_md5.txt
diff --git a/core-java-sun/.gitignore b/core-java-modules/core-java-sun/.gitignore
similarity index 100%
rename from core-java-sun/.gitignore
rename to core-java-modules/core-java-sun/.gitignore
diff --git a/core-java-sun/README.md b/core-java-modules/core-java-sun/README.md
similarity index 100%
rename from core-java-sun/README.md
rename to core-java-modules/core-java-sun/README.md
diff --git a/core-java-sun/pom.xml b/core-java-modules/core-java-sun/pom.xml
similarity index 99%
rename from core-java-sun/pom.xml
rename to core-java-modules/core-java-sun/pom.xml
index 5f2065016f..da27564d96 100644
--- a/core-java-sun/pom.xml
+++ b/core-java-modules/core-java-sun/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-sun/src/main/java/com/baeldung/.gitignore b/core-java-modules/core-java-sun/src/main/java/com/baeldung/.gitignore
similarity index 100%
rename from core-java-sun/src/main/java/com/baeldung/.gitignore
rename to core-java-modules/core-java-sun/src/main/java/com/baeldung/.gitignore
diff --git a/core-java-sun/src/main/java/com/baeldung/README.md b/core-java-modules/core-java-sun/src/main/java/com/baeldung/README.md
similarity index 100%
rename from core-java-sun/src/main/java/com/baeldung/README.md
rename to core-java-modules/core-java-sun/src/main/java/com/baeldung/README.md
diff --git a/core-java-sun/src/main/java/com/baeldung/javac/Positive.java b/core-java-modules/core-java-sun/src/main/java/com/baeldung/javac/Positive.java
similarity index 100%
rename from core-java-sun/src/main/java/com/baeldung/javac/Positive.java
rename to core-java-modules/core-java-sun/src/main/java/com/baeldung/javac/Positive.java
diff --git a/core-java-sun/src/main/java/com/baeldung/javac/SampleJavacPlugin.java b/core-java-modules/core-java-sun/src/main/java/com/baeldung/javac/SampleJavacPlugin.java
similarity index 100%
rename from core-java-sun/src/main/java/com/baeldung/javac/SampleJavacPlugin.java
rename to core-java-modules/core-java-sun/src/main/java/com/baeldung/javac/SampleJavacPlugin.java
diff --git a/core-java-sun/src/main/resources/META-INF/services/com.sun.source.util.Plugin b/core-java-modules/core-java-sun/src/main/resources/META-INF/services/com.sun.source.util.Plugin
similarity index 100%
rename from core-java-sun/src/main/resources/META-INF/services/com.sun.source.util.Plugin
rename to core-java-modules/core-java-sun/src/main/resources/META-INF/services/com.sun.source.util.Plugin
diff --git a/core-java-sun/src/main/resources/log4j.properties b/core-java-modules/core-java-sun/src/main/resources/log4j.properties
similarity index 100%
rename from core-java-sun/src/main/resources/log4j.properties
rename to core-java-modules/core-java-sun/src/main/resources/log4j.properties
diff --git a/core-java-sun/src/main/resources/logback.xml b/core-java-modules/core-java-sun/src/main/resources/logback.xml
similarity index 100%
rename from core-java-sun/src/main/resources/logback.xml
rename to core-java-modules/core-java-sun/src/main/resources/logback.xml
diff --git a/core-java-sun/src/test/java/com/baeldung/javac/SampleJavacPluginIntegrationTest.java b/core-java-modules/core-java-sun/src/test/java/com/baeldung/javac/SampleJavacPluginIntegrationTest.java
similarity index 100%
rename from core-java-sun/src/test/java/com/baeldung/javac/SampleJavacPluginIntegrationTest.java
rename to core-java-modules/core-java-sun/src/test/java/com/baeldung/javac/SampleJavacPluginIntegrationTest.java
diff --git a/core-java-sun/src/test/java/com/baeldung/javac/SimpleClassFile.java b/core-java-modules/core-java-sun/src/test/java/com/baeldung/javac/SimpleClassFile.java
similarity index 100%
rename from core-java-sun/src/test/java/com/baeldung/javac/SimpleClassFile.java
rename to core-java-modules/core-java-sun/src/test/java/com/baeldung/javac/SimpleClassFile.java
diff --git a/core-java-sun/src/test/java/com/baeldung/javac/SimpleFileManager.java b/core-java-modules/core-java-sun/src/test/java/com/baeldung/javac/SimpleFileManager.java
similarity index 100%
rename from core-java-sun/src/test/java/com/baeldung/javac/SimpleFileManager.java
rename to core-java-modules/core-java-sun/src/test/java/com/baeldung/javac/SimpleFileManager.java
diff --git a/core-java-sun/src/test/java/com/baeldung/javac/SimpleSourceFile.java b/core-java-modules/core-java-sun/src/test/java/com/baeldung/javac/SimpleSourceFile.java
similarity index 100%
rename from core-java-sun/src/test/java/com/baeldung/javac/SimpleSourceFile.java
rename to core-java-modules/core-java-sun/src/test/java/com/baeldung/javac/SimpleSourceFile.java
diff --git a/core-java-sun/src/test/java/com/baeldung/javac/TestCompiler.java b/core-java-modules/core-java-sun/src/test/java/com/baeldung/javac/TestCompiler.java
similarity index 100%
rename from core-java-sun/src/test/java/com/baeldung/javac/TestCompiler.java
rename to core-java-modules/core-java-sun/src/test/java/com/baeldung/javac/TestCompiler.java
diff --git a/core-java-sun/src/test/java/com/baeldung/javac/TestRunner.java b/core-java-modules/core-java-sun/src/test/java/com/baeldung/javac/TestRunner.java
similarity index 100%
rename from core-java-sun/src/test/java/com/baeldung/javac/TestRunner.java
rename to core-java-modules/core-java-sun/src/test/java/com/baeldung/javac/TestRunner.java
diff --git a/core-java-sun/src/test/java/com/baeldung/unsafe/CASCounter.java b/core-java-modules/core-java-sun/src/test/java/com/baeldung/unsafe/CASCounter.java
similarity index 100%
rename from core-java-sun/src/test/java/com/baeldung/unsafe/CASCounter.java
rename to core-java-modules/core-java-sun/src/test/java/com/baeldung/unsafe/CASCounter.java
diff --git a/core-java-sun/src/test/java/com/baeldung/unsafe/OffHeapArray.java b/core-java-modules/core-java-sun/src/test/java/com/baeldung/unsafe/OffHeapArray.java
similarity index 100%
rename from core-java-sun/src/test/java/com/baeldung/unsafe/OffHeapArray.java
rename to core-java-modules/core-java-sun/src/test/java/com/baeldung/unsafe/OffHeapArray.java
diff --git a/core-java-sun/src/test/java/com/baeldung/unsafe/UnsafeUnitTest.java b/core-java-modules/core-java-sun/src/test/java/com/baeldung/unsafe/UnsafeUnitTest.java
similarity index 100%
rename from core-java-sun/src/test/java/com/baeldung/unsafe/UnsafeUnitTest.java
rename to core-java-modules/core-java-sun/src/test/java/com/baeldung/unsafe/UnsafeUnitTest.java
diff --git a/core-java-sun/src/test/resources/.gitignore b/core-java-modules/core-java-sun/src/test/resources/.gitignore
similarity index 100%
rename from core-java-sun/src/test/resources/.gitignore
rename to core-java-modules/core-java-sun/src/test/resources/.gitignore
diff --git a/core-java/.gitignore b/core-java-modules/core-java/.gitignore
similarity index 100%
rename from core-java/.gitignore
rename to core-java-modules/core-java/.gitignore
diff --git a/core-java/README.md b/core-java-modules/core-java/README.md
similarity index 100%
rename from core-java/README.md
rename to core-java-modules/core-java/README.md
diff --git a/core-java/customers.xml b/core-java-modules/core-java/customers.xml
similarity index 100%
rename from core-java/customers.xml
rename to core-java-modules/core-java/customers.xml
diff --git a/core-java/externalizable.txt b/core-java-modules/core-java/externalizable.txt
similarity index 100%
rename from core-java/externalizable.txt
rename to core-java-modules/core-java/externalizable.txt
diff --git a/core-java/pom.xml b/core-java-modules/core-java/pom.xml
similarity index 99%
rename from core-java/pom.xml
rename to core-java-modules/core-java/pom.xml
index 463b65a4ce..b0f9fea26e 100644
--- a/core-java/pom.xml
+++ b/core-java-modules/core-java/pom.xml
@@ -10,7 +10,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
 
diff --git a/core-java/src/main/java/com/baeldung/.gitignore b/core-java-modules/core-java/src/main/java/com/baeldung/.gitignore
similarity index 100%
rename from core-java/src/main/java/com/baeldung/.gitignore
rename to core-java-modules/core-java/src/main/java/com/baeldung/.gitignore
diff --git a/core-java/src/main/java/com/baeldung/README.md b/core-java-modules/core-java/src/main/java/com/baeldung/README.md
similarity index 100%
rename from core-java/src/main/java/com/baeldung/README.md
rename to core-java-modules/core-java/src/main/java/com/baeldung/README.md
diff --git a/core-java/src/main/java/com/baeldung/abstractclasses/application/Application.java b/core-java-modules/core-java/src/main/java/com/baeldung/abstractclasses/application/Application.java
similarity index 97%
rename from core-java/src/main/java/com/baeldung/abstractclasses/application/Application.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/abstractclasses/application/Application.java
index 3180762227..5b250635ea 100644
--- a/core-java/src/main/java/com/baeldung/abstractclasses/application/Application.java
+++ b/core-java-modules/core-java/src/main/java/com/baeldung/abstractclasses/application/Application.java
@@ -1,29 +1,29 @@
-package com.baeldung.abstractclasses.application;
-
-import com.baeldung.abstractclasses.filereaders.BaseFileReader;
-import com.baeldung.abstractclasses.filereaders.LowercaseFileReader;
-import com.baeldung.abstractclasses.filereaders.UppercaseFileReader;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-public class Application {
-
-    public static void main(String[] args) throws IOException, URISyntaxException {
-
-        Application application = new Application();
-        Path path = application.getPathFromResourcesFile("files/test.txt");
-        BaseFileReader lowercaseFileReader = new LowercaseFileReader(path);
-        lowercaseFileReader.readFile().forEach(line -> System.out.println(line));
-        
-        BaseFileReader uppercaseFileReader = new UppercaseFileReader(path);
-        uppercaseFileReader.readFile().forEach(line -> System.out.println(line));
-
-    }
-    
-    private Path getPathFromResourcesFile(String filePath) throws URISyntaxException {
-        return Paths.get(getClass().getClassLoader().getResource(filePath).toURI());
-         
-    }
-}
+package com.baeldung.abstractclasses.application;
+
+import com.baeldung.abstractclasses.filereaders.BaseFileReader;
+import com.baeldung.abstractclasses.filereaders.LowercaseFileReader;
+import com.baeldung.abstractclasses.filereaders.UppercaseFileReader;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class Application {
+
+    public static void main(String[] args) throws IOException, URISyntaxException {
+
+        Application application = new Application();
+        Path path = application.getPathFromResourcesFile("files/test.txt");
+        BaseFileReader lowercaseFileReader = new LowercaseFileReader(path);
+        lowercaseFileReader.readFile().forEach(line -> System.out.println(line));
+        
+        BaseFileReader uppercaseFileReader = new UppercaseFileReader(path);
+        uppercaseFileReader.readFile().forEach(line -> System.out.println(line));
+
+    }
+    
+    private Path getPathFromResourcesFile(String filePath) throws URISyntaxException {
+        return Paths.get(getClass().getClassLoader().getResource(filePath).toURI());
+         
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/BaseFileReader.java b/core-java-modules/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/BaseFileReader.java
similarity index 96%
rename from core-java/src/main/java/com/baeldung/abstractclasses/filereaders/BaseFileReader.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/BaseFileReader.java
index 97452a9eca..376147aa13 100644
--- a/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/BaseFileReader.java
+++ b/core-java-modules/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/BaseFileReader.java
@@ -1,27 +1,27 @@
-package com.baeldung.abstractclasses.filereaders;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public abstract class BaseFileReader {
-    
-    protected Path filePath;
-    
-    protected BaseFileReader(Path filePath) {
-        this.filePath = filePath;
-    }
-    
-    public Path getFilePath() {
-        return filePath;
-    }
-    
-    public List<String> readFile() throws IOException {
-        return Files.lines(filePath)
-            .map(this::mapFileLine).collect(Collectors.toList());
-    }
-    
-    protected abstract String mapFileLine(String line);
-}
+package com.baeldung.abstractclasses.filereaders;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public abstract class BaseFileReader {
+    
+    protected Path filePath;
+    
+    protected BaseFileReader(Path filePath) {
+        this.filePath = filePath;
+    }
+    
+    public Path getFilePath() {
+        return filePath;
+    }
+    
+    public List<String> readFile() throws IOException {
+        return Files.lines(filePath)
+            .map(this::mapFileLine).collect(Collectors.toList());
+    }
+    
+    protected abstract String mapFileLine(String line);
+}
diff --git a/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/LowercaseFileReader.java b/core-java-modules/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/LowercaseFileReader.java
similarity index 95%
rename from core-java/src/main/java/com/baeldung/abstractclasses/filereaders/LowercaseFileReader.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/LowercaseFileReader.java
index 53820d393c..33a3e098a0 100644
--- a/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/LowercaseFileReader.java
+++ b/core-java-modules/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/LowercaseFileReader.java
@@ -1,15 +1,15 @@
-package com.baeldung.abstractclasses.filereaders;
-
-import java.nio.file.Path;
-
-public class LowercaseFileReader extends BaseFileReader {
-
-    public LowercaseFileReader(Path filePath) {
-        super(filePath);
-    }
-
-    @Override
-    public String mapFileLine(String line) {
-        return line.toLowerCase();
-    }   
-}
+package com.baeldung.abstractclasses.filereaders;
+
+import java.nio.file.Path;
+
+public class LowercaseFileReader extends BaseFileReader {
+
+    public LowercaseFileReader(Path filePath) {
+        super(filePath);
+    }
+
+    @Override
+    public String mapFileLine(String line) {
+        return line.toLowerCase();
+    }   
+}
diff --git a/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/UppercaseFileReader.java b/core-java-modules/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/UppercaseFileReader.java
similarity index 95%
rename from core-java/src/main/java/com/baeldung/abstractclasses/filereaders/UppercaseFileReader.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/UppercaseFileReader.java
index 3144a4f27f..4c93e75df7 100644
--- a/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/UppercaseFileReader.java
+++ b/core-java-modules/core-java/src/main/java/com/baeldung/abstractclasses/filereaders/UppercaseFileReader.java
@@ -1,15 +1,15 @@
-package com.baeldung.abstractclasses.filereaders;
-
-import java.nio.file.Path;
-
-public class UppercaseFileReader extends BaseFileReader {
-
-    public UppercaseFileReader(Path filePath) {
-        super(filePath);
-    }
-
-    @Override
-    public String mapFileLine(String line) {
-        return line.toUpperCase();
-    }
-}
+package com.baeldung.abstractclasses.filereaders;
+
+import java.nio.file.Path;
+
+public class UppercaseFileReader extends BaseFileReader {
+
+    public UppercaseFileReader(Path filePath) {
+        super(filePath);
+    }
+
+    @Override
+    public String mapFileLine(String line) {
+        return line.toUpperCase();
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/asciiart/AsciiArt.java b/core-java-modules/core-java/src/main/java/com/baeldung/asciiart/AsciiArt.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/asciiart/AsciiArt.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/asciiart/AsciiArt.java
diff --git a/core-java/src/main/java/com/baeldung/basicsyntax/SimpleAddition.java b/core-java-modules/core-java/src/main/java/com/baeldung/basicsyntax/SimpleAddition.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/basicsyntax/SimpleAddition.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/basicsyntax/SimpleAddition.java
diff --git a/core-java/src/main/java/com/baeldung/classloader/CustomClassLoader.java b/core-java-modules/core-java/src/main/java/com/baeldung/classloader/CustomClassLoader.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/classloader/CustomClassLoader.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/classloader/CustomClassLoader.java
diff --git a/core-java/src/main/java/com/baeldung/classloader/PrintClassLoader.java b/core-java-modules/core-java/src/main/java/com/baeldung/classloader/PrintClassLoader.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/classloader/PrintClassLoader.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/classloader/PrintClassLoader.java
diff --git a/core-java/src/main/java/com/baeldung/console/ConsoleConsoleClass.java b/core-java-modules/core-java/src/main/java/com/baeldung/console/ConsoleConsoleClass.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/console/ConsoleConsoleClass.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/console/ConsoleConsoleClass.java
diff --git a/core-java/src/main/java/com/baeldung/console/ConsoleScannerClass.java b/core-java-modules/core-java/src/main/java/com/baeldung/console/ConsoleScannerClass.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/console/ConsoleScannerClass.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/console/ConsoleScannerClass.java
diff --git a/core-java/src/main/java/com/baeldung/curltojava/JavaCurlExamples.java b/core-java-modules/core-java/src/main/java/com/baeldung/curltojava/JavaCurlExamples.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/curltojava/JavaCurlExamples.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/curltojava/JavaCurlExamples.java
diff --git a/core-java/src/main/java/com/baeldung/deserialization/AppleProduct.java b/core-java-modules/core-java/src/main/java/com/baeldung/deserialization/AppleProduct.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/deserialization/AppleProduct.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/deserialization/AppleProduct.java
diff --git a/core-java/src/main/java/com/baeldung/deserialization/DeserializationUtility.java b/core-java-modules/core-java/src/main/java/com/baeldung/deserialization/DeserializationUtility.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/deserialization/DeserializationUtility.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/deserialization/DeserializationUtility.java
diff --git a/core-java/src/main/java/com/baeldung/deserialization/SerializationUtility.java b/core-java-modules/core-java/src/main/java/com/baeldung/deserialization/SerializationUtility.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/deserialization/SerializationUtility.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/deserialization/SerializationUtility.java
diff --git a/core-java/src/main/java/com/baeldung/encoding/CharacterEncodingExamples.java b/core-java-modules/core-java/src/main/java/com/baeldung/encoding/CharacterEncodingExamples.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/encoding/CharacterEncodingExamples.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/encoding/CharacterEncodingExamples.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/Arithmetic.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/Arithmetic.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/Arithmetic.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/Arithmetic.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/ArrayIndexOutOfBounds.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/ArrayIndexOutOfBounds.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/ArrayIndexOutOfBounds.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/ArrayIndexOutOfBounds.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/ClassCast.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/ClassCast.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/ClassCast.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/ClassCast.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/FileNotFound.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/FileNotFound.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/FileNotFound.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/FileNotFound.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/GlobalExceptionHandler.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/GlobalExceptionHandler.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/GlobalExceptionHandler.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/GlobalExceptionHandler.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/IllegalArgument.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/IllegalArgument.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/IllegalArgument.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/IllegalArgument.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/IllegalState.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/IllegalState.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/IllegalState.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/IllegalState.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/InterruptedExceptionExample.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/InterruptedExceptionExample.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/InterruptedExceptionExample.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/InterruptedExceptionExample.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/MalformedURL.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/MalformedURL.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/MalformedURL.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/MalformedURL.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/NullPointer.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/NullPointer.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/NullPointer.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/NullPointer.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/NumberFormat.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/NumberFormat.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/NumberFormat.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/NumberFormat.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/ParseExceptionExample.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/ParseExceptionExample.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/ParseExceptionExample.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/ParseExceptionExample.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/StackTraceToString.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/StackTraceToString.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/StackTraceToString.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/StackTraceToString.java
diff --git a/core-java/src/main/java/com/baeldung/exceptions/StringIndexOutOfBounds.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/StringIndexOutOfBounds.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/StringIndexOutOfBounds.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/StringIndexOutOfBounds.java
diff --git a/core-java/src/main/java/com/baeldung/executable/ExecutableMavenJar.java b/core-java-modules/core-java/src/main/java/com/baeldung/executable/ExecutableMavenJar.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/executable/ExecutableMavenJar.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/executable/ExecutableMavenJar.java
diff --git a/core-java/src/main/java/com/baeldung/externalizable/Community.java b/core-java-modules/core-java/src/main/java/com/baeldung/externalizable/Community.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/externalizable/Community.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/externalizable/Community.java
diff --git a/core-java/src/main/java/com/baeldung/externalizable/Country.java b/core-java-modules/core-java/src/main/java/com/baeldung/externalizable/Country.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/externalizable/Country.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/externalizable/Country.java
diff --git a/core-java/src/main/java/com/baeldung/externalizable/Region.java b/core-java-modules/core-java/src/main/java/com/baeldung/externalizable/Region.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/externalizable/Region.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/externalizable/Region.java
diff --git a/core-java/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java b/core-java-modules/core-java/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java
diff --git a/core-java/src/main/java/com/baeldung/fileparser/FileReaderExample.java b/core-java-modules/core-java/src/main/java/com/baeldung/fileparser/FileReaderExample.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/fileparser/FileReaderExample.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/fileparser/FileReaderExample.java
diff --git a/core-java/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java b/core-java-modules/core-java/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java
diff --git a/core-java/src/main/java/com/baeldung/fileparser/ScannerIntExample.java b/core-java-modules/core-java/src/main/java/com/baeldung/fileparser/ScannerIntExample.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/fileparser/ScannerIntExample.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/fileparser/ScannerIntExample.java
diff --git a/core-java/src/main/java/com/baeldung/fileparser/ScannerStringExample.java b/core-java-modules/core-java/src/main/java/com/baeldung/fileparser/ScannerStringExample.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/fileparser/ScannerStringExample.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/fileparser/ScannerStringExample.java
diff --git a/core-java/src/main/java/com/baeldung/filesystem/jndi/LookupFSJNDI.java b/core-java-modules/core-java/src/main/java/com/baeldung/filesystem/jndi/LookupFSJNDI.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/filesystem/jndi/LookupFSJNDI.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/filesystem/jndi/LookupFSJNDI.java
diff --git a/core-java/src/main/java/com/baeldung/graph/Graph.java b/core-java-modules/core-java/src/main/java/com/baeldung/graph/Graph.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/graph/Graph.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/graph/Graph.java
diff --git a/core-java/src/main/java/com/baeldung/graph/GraphTraversal.java b/core-java-modules/core-java/src/main/java/com/baeldung/graph/GraphTraversal.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/graph/GraphTraversal.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/graph/GraphTraversal.java
diff --git a/core-java/src/main/java/com/baeldung/instrumentation/agent/AtmTransformer.java b/core-java-modules/core-java/src/main/java/com/baeldung/instrumentation/agent/AtmTransformer.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/instrumentation/agent/AtmTransformer.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/instrumentation/agent/AtmTransformer.java
diff --git a/core-java/src/main/java/com/baeldung/instrumentation/agent/MyInstrumentationAgent.java b/core-java-modules/core-java/src/main/java/com/baeldung/instrumentation/agent/MyInstrumentationAgent.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/instrumentation/agent/MyInstrumentationAgent.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/instrumentation/agent/MyInstrumentationAgent.java
diff --git a/core-java/src/main/java/com/baeldung/instrumentation/application/AgentLoader.java b/core-java-modules/core-java/src/main/java/com/baeldung/instrumentation/application/AgentLoader.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/instrumentation/application/AgentLoader.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/instrumentation/application/AgentLoader.java
diff --git a/core-java/src/main/java/com/baeldung/instrumentation/application/Launcher.java b/core-java-modules/core-java/src/main/java/com/baeldung/instrumentation/application/Launcher.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/instrumentation/application/Launcher.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/instrumentation/application/Launcher.java
diff --git a/core-java/src/main/java/com/baeldung/instrumentation/application/MyAtm.java b/core-java-modules/core-java/src/main/java/com/baeldung/instrumentation/application/MyAtm.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/instrumentation/application/MyAtm.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/instrumentation/application/MyAtm.java
diff --git a/core-java/src/main/java/com/baeldung/instrumentation/application/MyAtmApplication.java b/core-java-modules/core-java/src/main/java/com/baeldung/instrumentation/application/MyAtmApplication.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/instrumentation/application/MyAtmApplication.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/instrumentation/application/MyAtmApplication.java
diff --git a/core-java/src/main/java/com/baeldung/jar/JarExample.java b/core-java-modules/core-java/src/main/java/com/baeldung/jar/JarExample.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/jar/JarExample.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/jar/JarExample.java
diff --git a/core-java/src/main/java/com/baeldung/jar/example_manifest.txt b/core-java-modules/core-java/src/main/java/com/baeldung/jar/example_manifest.txt
similarity index 100%
rename from core-java/src/main/java/com/baeldung/jar/example_manifest.txt
rename to core-java-modules/core-java/src/main/java/com/baeldung/jar/example_manifest.txt
diff --git a/core-java/src/main/java/com/baeldung/javac/Data.java b/core-java-modules/core-java/src/main/java/com/baeldung/javac/Data.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/javac/Data.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/javac/Data.java
diff --git a/core-java/src/main/java/com/baeldung/javadoc/Person.java b/core-java-modules/core-java/src/main/java/com/baeldung/javadoc/Person.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/javadoc/Person.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/javadoc/Person.java
diff --git a/core-java/src/main/java/com/baeldung/javadoc/SuperHero.java b/core-java-modules/core-java/src/main/java/com/baeldung/javadoc/SuperHero.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/javadoc/SuperHero.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/javadoc/SuperHero.java
diff --git a/core-java/src/main/java/com/baeldung/logforging/LogForgingDemo.java b/core-java-modules/core-java/src/main/java/com/baeldung/logforging/LogForgingDemo.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/logforging/LogForgingDemo.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/logforging/LogForgingDemo.java
diff --git a/core-java/src/main/java/com/baeldung/manifest/AppExample.java b/core-java-modules/core-java/src/main/java/com/baeldung/manifest/AppExample.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/manifest/AppExample.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/manifest/AppExample.java
diff --git a/core-java/src/main/java/com/baeldung/manifest/ExecuteJarFile.java b/core-java-modules/core-java/src/main/java/com/baeldung/manifest/ExecuteJarFile.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/manifest/ExecuteJarFile.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/manifest/ExecuteJarFile.java
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF b/core-java-modules/core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF
new file mode 100644
index 0000000000..a363171952
--- /dev/null
+++ b/core-java-modules/core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF
@@ -0,0 +1 @@
+Main-Class: com.baeldung.manifest.AppExample
diff --git a/core-java/src/main/java/com/baeldung/money/JavaMoney.java b/core-java-modules/core-java/src/main/java/com/baeldung/money/JavaMoney.java
similarity index 97%
rename from core-java/src/main/java/com/baeldung/money/JavaMoney.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/money/JavaMoney.java
index 3171d226ed..aa507071cf 100644
--- a/core-java/src/main/java/com/baeldung/money/JavaMoney.java
+++ b/core-java-modules/core-java/src/main/java/com/baeldung/money/JavaMoney.java
@@ -1,151 +1,151 @@
-package com.baeldung.money;
-
-import java.util.Locale;
-import java.util.logging.Logger;
-
-import javax.money.CurrencyUnit;
-import javax.money.Monetary;
-import javax.money.MonetaryAmount;
-import javax.money.UnknownCurrencyException;
-import javax.money.convert.ConversionQueryBuilder;
-import javax.money.convert.CurrencyConversion;
-import javax.money.convert.MonetaryConversions;
-import javax.money.format.AmountFormatQueryBuilder;
-import javax.money.format.MonetaryAmountFormat;
-import javax.money.format.MonetaryFormats;
-
-import org.javamoney.moneta.FastMoney;
-import org.javamoney.moneta.Money;
-import org.javamoney.moneta.format.CurrencyStyle;
-
-public class JavaMoney {
-    final static Logger LOGGER = Logger.getLogger(JavaMoney.class.getName());
-    CurrencyUnit USD;
-    MonetaryAmount fstAmtUSD;
-    MonetaryAmount fstAmtEUR;
-    MonetaryAmount oneDolar;
-    MonetaryAmount moneyof;
-    MonetaryAmount fastmoneyof;
-    MonetaryAmount roundEUR;
-    MonetaryAmount calcAmtUSD;
-    MonetaryAmount[] monetaryAmounts;
-    MonetaryAmount sumAmtCHF;
-    MonetaryAmount calcMoneyFastMoney;
-    MonetaryAmount convertedAmountEURtoUSD;
-    MonetaryAmount convertedAmountEURtoUSD2;
-    MonetaryAmount convertedAmountUSDtoEUR;
-    MonetaryAmount convertedAmountUSDtoEUR2;
-    MonetaryAmount multiplyAmount;
-    MonetaryAmount divideAmount;
-    MonetaryAmount oneDivThree;
-    CurrencyConversion convEUR;
-    CurrencyConversion convUSD;
-    CurrencyConversion conversionUSD;
-    CurrencyConversion conversionEUR;
-    MonetaryAmount oneEuro;
-    MonetaryAmountFormat formatUSD;
-    MonetaryAmountFormat customFormat;
-    String usFormatted;
-    String customFormatted;
-    
-    public JavaMoney() {
-        USD = Monetary.getCurrency("USD");
-        fstAmtUSD = Monetary.getDefaultAmountFactory().setCurrency(USD).setNumber(200.50).create();
-        fstAmtEUR = Monetary.getDefaultAmountFactory().setCurrency("EUR").setNumber(1.30473908).create();
-        oneDolar = Monetary.getDefaultAmountFactory().setCurrency("USD").setNumber(1).create();
-        moneyof = Money.of(12, USD);
-        fastmoneyof = FastMoney.of(2, USD);
- 
-        LOGGER.info("First Amount in USD : " + fstAmtUSD);
-        LOGGER.info("First Amount in EUR : " + fstAmtEUR);
-        LOGGER.info("One Dolar : " + oneDolar);
-        LOGGER.info("MoneyOf : " + moneyof);
-        LOGGER.info("FastMoneyOf : " + fastmoneyof);
-        
-        try{
-            @SuppressWarnings("unused")
-            CurrencyUnit AAA = Monetary.getCurrency("AAA");
-        } catch (UnknownCurrencyException e) {
-            LOGGER.severe("Unknown Currency");
-        }
-
-        roundEUR = fstAmtEUR.with(Monetary.getDefaultRounding());
-
-        LOGGER.info("Rounded EUR : " + roundEUR);
-
-        calcAmtUSD = Money.of(1, "USD").subtract(fstAmtUSD);
-
-        LOGGER.info("Substracting amounts : " + calcAmtUSD);
-
-        calcMoneyFastMoney = moneyof.subtract(fastmoneyof);
-
-        LOGGER.info("Money & FastMoney operations : " + calcMoneyFastMoney);
-
-        monetaryAmounts = 
-                new MonetaryAmount[] { 
-                        Money.of(100, "CHF"), 
-                        Money.of(10.20, "CHF"), 
-                        Money.of(1.15, "CHF"), };
-        sumAmtCHF = Money.of(0, "CHF");
-        for (MonetaryAmount monetaryAmount : monetaryAmounts) {
-            sumAmtCHF = sumAmtCHF.add(monetaryAmount);
-        }
-
-        LOGGER.info("Adding amounts : " + sumAmtCHF);
-
-        multiplyAmount = oneDolar.multiply(0.25);
-        LOGGER.info("Multiply Amount : " + multiplyAmount);
-
-        divideAmount = oneDolar.divide(0.25);
-        LOGGER.info("Divide Amount : " + divideAmount);
-
-        try{
-            oneDivThree = oneDolar.divide(3);
-        }catch (ArithmeticException e) {
-            LOGGER.severe("One divide by Three is an infinite number");
-        }
-        
-        convEUR = MonetaryConversions.getConversion(ConversionQueryBuilder.of().setTermCurrency("EUR").build());
-        convUSD = MonetaryConversions.getConversion(ConversionQueryBuilder.of().setTermCurrency(USD).build());
-
-        conversionUSD = MonetaryConversions.getConversion("USD");
-        conversionEUR = MonetaryConversions.getConversion("EUR");
-
-        convertedAmountEURtoUSD = fstAmtEUR.with(conversionUSD);
-        convertedAmountEURtoUSD2 = fstAmtEUR.with(convUSD);
-        convertedAmountUSDtoEUR = oneDolar.with(conversionEUR);
-        convertedAmountUSDtoEUR2 = oneDolar.with(convEUR);
-        LOGGER.info("C1 - " + convertedAmountEURtoUSD);
-        LOGGER.info("C2 - " + convertedAmountEURtoUSD2);
-        LOGGER.info("One Euro -> " + convertedAmountUSDtoEUR);
-        LOGGER.info("One Euro2 -> " + convertedAmountUSDtoEUR2);
-
-        oneEuro = Money.of(1, "EUR");
-
-        if (oneEuro.equals(FastMoney.of(1, "EUR"))) {
-            LOGGER.info("Money == FastMoney");
-        } else {
-            LOGGER.info("Money != FastMoney");
-        }
-
-        if (oneDolar.equals(Money.of(1, "USD"))) {
-            LOGGER.info("Factory == Money");
-        } else {
-            LOGGER.info("Factory != Money");
-        }
-
-        formatUSD = MonetaryFormats.getAmountFormat(Locale.US);
-        usFormatted = formatUSD.format(oneDolar);
-        LOGGER.info("One dolar standard formatted : " + usFormatted);
-
-        customFormat = MonetaryFormats.getAmountFormat(AmountFormatQueryBuilder.of(Locale.US).set(CurrencyStyle.NAME).set("pattern", "00000.00 ¤").build());
-        customFormatted = customFormat.format(oneDolar);
-        LOGGER.info("One dolar custom formatted : " + customFormatted);
-    }
-    
-    public static void main(String[] args) {
-        @SuppressWarnings("unused")
-        JavaMoney java9Money = new JavaMoney();
-    }
-    
-}
+package com.baeldung.money;
+
+import java.util.Locale;
+import java.util.logging.Logger;
+
+import javax.money.CurrencyUnit;
+import javax.money.Monetary;
+import javax.money.MonetaryAmount;
+import javax.money.UnknownCurrencyException;
+import javax.money.convert.ConversionQueryBuilder;
+import javax.money.convert.CurrencyConversion;
+import javax.money.convert.MonetaryConversions;
+import javax.money.format.AmountFormatQueryBuilder;
+import javax.money.format.MonetaryAmountFormat;
+import javax.money.format.MonetaryFormats;
+
+import org.javamoney.moneta.FastMoney;
+import org.javamoney.moneta.Money;
+import org.javamoney.moneta.format.CurrencyStyle;
+
+public class JavaMoney {
+    final static Logger LOGGER = Logger.getLogger(JavaMoney.class.getName());
+    CurrencyUnit USD;
+    MonetaryAmount fstAmtUSD;
+    MonetaryAmount fstAmtEUR;
+    MonetaryAmount oneDolar;
+    MonetaryAmount moneyof;
+    MonetaryAmount fastmoneyof;
+    MonetaryAmount roundEUR;
+    MonetaryAmount calcAmtUSD;
+    MonetaryAmount[] monetaryAmounts;
+    MonetaryAmount sumAmtCHF;
+    MonetaryAmount calcMoneyFastMoney;
+    MonetaryAmount convertedAmountEURtoUSD;
+    MonetaryAmount convertedAmountEURtoUSD2;
+    MonetaryAmount convertedAmountUSDtoEUR;
+    MonetaryAmount convertedAmountUSDtoEUR2;
+    MonetaryAmount multiplyAmount;
+    MonetaryAmount divideAmount;
+    MonetaryAmount oneDivThree;
+    CurrencyConversion convEUR;
+    CurrencyConversion convUSD;
+    CurrencyConversion conversionUSD;
+    CurrencyConversion conversionEUR;
+    MonetaryAmount oneEuro;
+    MonetaryAmountFormat formatUSD;
+    MonetaryAmountFormat customFormat;
+    String usFormatted;
+    String customFormatted;
+    
+    public JavaMoney() {
+        USD = Monetary.getCurrency("USD");
+        fstAmtUSD = Monetary.getDefaultAmountFactory().setCurrency(USD).setNumber(200.50).create();
+        fstAmtEUR = Monetary.getDefaultAmountFactory().setCurrency("EUR").setNumber(1.30473908).create();
+        oneDolar = Monetary.getDefaultAmountFactory().setCurrency("USD").setNumber(1).create();
+        moneyof = Money.of(12, USD);
+        fastmoneyof = FastMoney.of(2, USD);
+ 
+        LOGGER.info("First Amount in USD : " + fstAmtUSD);
+        LOGGER.info("First Amount in EUR : " + fstAmtEUR);
+        LOGGER.info("One Dolar : " + oneDolar);
+        LOGGER.info("MoneyOf : " + moneyof);
+        LOGGER.info("FastMoneyOf : " + fastmoneyof);
+        
+        try{
+            @SuppressWarnings("unused")
+            CurrencyUnit AAA = Monetary.getCurrency("AAA");
+        } catch (UnknownCurrencyException e) {
+            LOGGER.severe("Unknown Currency");
+        }
+
+        roundEUR = fstAmtEUR.with(Monetary.getDefaultRounding());
+
+        LOGGER.info("Rounded EUR : " + roundEUR);
+
+        calcAmtUSD = Money.of(1, "USD").subtract(fstAmtUSD);
+
+        LOGGER.info("Substracting amounts : " + calcAmtUSD);
+
+        calcMoneyFastMoney = moneyof.subtract(fastmoneyof);
+
+        LOGGER.info("Money & FastMoney operations : " + calcMoneyFastMoney);
+
+        monetaryAmounts = 
+                new MonetaryAmount[] { 
+                        Money.of(100, "CHF"), 
+                        Money.of(10.20, "CHF"), 
+                        Money.of(1.15, "CHF"), };
+        sumAmtCHF = Money.of(0, "CHF");
+        for (MonetaryAmount monetaryAmount : monetaryAmounts) {
+            sumAmtCHF = sumAmtCHF.add(monetaryAmount);
+        }
+
+        LOGGER.info("Adding amounts : " + sumAmtCHF);
+
+        multiplyAmount = oneDolar.multiply(0.25);
+        LOGGER.info("Multiply Amount : " + multiplyAmount);
+
+        divideAmount = oneDolar.divide(0.25);
+        LOGGER.info("Divide Amount : " + divideAmount);
+
+        try{
+            oneDivThree = oneDolar.divide(3);
+        }catch (ArithmeticException e) {
+            LOGGER.severe("One divide by Three is an infinite number");
+        }
+        
+        convEUR = MonetaryConversions.getConversion(ConversionQueryBuilder.of().setTermCurrency("EUR").build());
+        convUSD = MonetaryConversions.getConversion(ConversionQueryBuilder.of().setTermCurrency(USD).build());
+
+        conversionUSD = MonetaryConversions.getConversion("USD");
+        conversionEUR = MonetaryConversions.getConversion("EUR");
+
+        convertedAmountEURtoUSD = fstAmtEUR.with(conversionUSD);
+        convertedAmountEURtoUSD2 = fstAmtEUR.with(convUSD);
+        convertedAmountUSDtoEUR = oneDolar.with(conversionEUR);
+        convertedAmountUSDtoEUR2 = oneDolar.with(convEUR);
+        LOGGER.info("C1 - " + convertedAmountEURtoUSD);
+        LOGGER.info("C2 - " + convertedAmountEURtoUSD2);
+        LOGGER.info("One Euro -> " + convertedAmountUSDtoEUR);
+        LOGGER.info("One Euro2 -> " + convertedAmountUSDtoEUR2);
+
+        oneEuro = Money.of(1, "EUR");
+
+        if (oneEuro.equals(FastMoney.of(1, "EUR"))) {
+            LOGGER.info("Money == FastMoney");
+        } else {
+            LOGGER.info("Money != FastMoney");
+        }
+
+        if (oneDolar.equals(Money.of(1, "USD"))) {
+            LOGGER.info("Factory == Money");
+        } else {
+            LOGGER.info("Factory != Money");
+        }
+
+        formatUSD = MonetaryFormats.getAmountFormat(Locale.US);
+        usFormatted = formatUSD.format(oneDolar);
+        LOGGER.info("One dolar standard formatted : " + usFormatted);
+
+        customFormat = MonetaryFormats.getAmountFormat(AmountFormatQueryBuilder.of(Locale.US).set(CurrencyStyle.NAME).set("pattern", "00000.00 ¤").build());
+        customFormatted = customFormat.format(oneDolar);
+        LOGGER.info("One dolar custom formatted : " + customFormatted);
+    }
+    
+    public static void main(String[] args) {
+        @SuppressWarnings("unused")
+        JavaMoney java9Money = new JavaMoney();
+    }
+    
+}
diff --git a/core-java/src/main/java/com/baeldung/objectsize/InstrumentationAgent.java b/core-java-modules/core-java/src/main/java/com/baeldung/objectsize/InstrumentationAgent.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/objectsize/InstrumentationAgent.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/objectsize/InstrumentationAgent.java
diff --git a/core-java/src/main/java/com/baeldung/objectsize/InstrumentationExample.java b/core-java-modules/core-java/src/main/java/com/baeldung/objectsize/InstrumentationExample.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/objectsize/InstrumentationExample.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/objectsize/InstrumentationExample.java
diff --git a/core-java/src/main/java/com/baeldung/objectsize/MANIFEST.MF b/core-java-modules/core-java/src/main/java/com/baeldung/objectsize/MANIFEST.MF
similarity index 100%
rename from core-java/src/main/java/com/baeldung/objectsize/MANIFEST.MF
rename to core-java-modules/core-java/src/main/java/com/baeldung/objectsize/MANIFEST.MF
diff --git a/core-java/src/main/java/com/baeldung/printf/PrintfExamples.java b/core-java-modules/core-java/src/main/java/com/baeldung/printf/PrintfExamples.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/printf/PrintfExamples.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/printf/PrintfExamples.java
diff --git a/core-java/src/main/java/com/baeldung/printscreen/README.md b/core-java-modules/core-java/src/main/java/com/baeldung/printscreen/README.md
similarity index 100%
rename from core-java/src/main/java/com/baeldung/printscreen/README.md
rename to core-java-modules/core-java/src/main/java/com/baeldung/printscreen/README.md
diff --git a/core-java/src/main/java/com/baeldung/printscreen/Screenshot.java b/core-java-modules/core-java/src/main/java/com/baeldung/printscreen/Screenshot.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/printscreen/Screenshot.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/printscreen/Screenshot.java
diff --git a/core-java/src/main/java/com/baeldung/reflection/BaeldungReflectionUtils.java b/core-java-modules/core-java/src/main/java/com/baeldung/reflection/BaeldungReflectionUtils.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/reflection/BaeldungReflectionUtils.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/reflection/BaeldungReflectionUtils.java
diff --git a/core-java/src/main/java/com/baeldung/reflection/Customer.java b/core-java-modules/core-java/src/main/java/com/baeldung/reflection/Customer.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/reflection/Customer.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/reflection/Customer.java
diff --git a/core-java/src/main/java/com/baeldung/reflection/Employee.java b/core-java-modules/core-java/src/main/java/com/baeldung/reflection/Employee.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/reflection/Employee.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/reflection/Employee.java
diff --git a/core-java/src/main/java/com/baeldung/reflection/MonthEmployee.java b/core-java-modules/core-java/src/main/java/com/baeldung/reflection/MonthEmployee.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/reflection/MonthEmployee.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/reflection/MonthEmployee.java
diff --git a/core-java/src/main/java/com/baeldung/reflection/Person.java b/core-java-modules/core-java/src/main/java/com/baeldung/reflection/Person.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/reflection/Person.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/reflection/Person.java
diff --git a/core-java/src/main/java/com/baeldung/resourcebundle/ExampleControl.java b/core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleControl.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/resourcebundle/ExampleControl.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleControl.java
diff --git a/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource.java b/core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource.java
diff --git a/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl.java b/core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl.java
diff --git a/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl_PL.java b/core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl_PL.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl_PL.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl_PL.java
diff --git a/core-java/src/main/java/com/baeldung/serialization/Address.java b/core-java-modules/core-java/src/main/java/com/baeldung/serialization/Address.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/serialization/Address.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/serialization/Address.java
diff --git a/core-java/src/main/java/com/baeldung/serialization/Employee.java b/core-java-modules/core-java/src/main/java/com/baeldung/serialization/Employee.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/serialization/Employee.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/serialization/Employee.java
diff --git a/core-java/src/main/java/com/baeldung/serialization/Person.java b/core-java-modules/core-java/src/main/java/com/baeldung/serialization/Person.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/serialization/Person.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/serialization/Person.java
diff --git a/core-java/src/main/java/com/baeldung/staticclass/Pizza.java b/core-java-modules/core-java/src/main/java/com/baeldung/staticclass/Pizza.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/staticclass/Pizza.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/staticclass/Pizza.java
diff --git a/core-java/src/main/java/com/baeldung/system/DetectOS.java b/core-java-modules/core-java/src/main/java/com/baeldung/system/DetectOS.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/system/DetectOS.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/system/DetectOS.java
diff --git a/core-java/src/main/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnection.java b/core-java-modules/core-java/src/main/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnection.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnection.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnection.java
diff --git a/core-java/src/main/java/com/baeldung/util/PropertiesLoader.java b/core-java-modules/core-java/src/main/java/com/baeldung/util/PropertiesLoader.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/util/PropertiesLoader.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/util/PropertiesLoader.java
diff --git a/core-java/src/main/java/com/baeldung/uuid/UUIDGenerator.java b/core-java-modules/core-java/src/main/java/com/baeldung/uuid/UUIDGenerator.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/uuid/UUIDGenerator.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/uuid/UUIDGenerator.java
diff --git a/core-java/src/main/java/javac-args/arguments b/core-java-modules/core-java/src/main/java/javac-args/arguments
similarity index 100%
rename from core-java/src/main/java/javac-args/arguments
rename to core-java-modules/core-java/src/main/java/javac-args/arguments
diff --git a/core-java/src/main/java/javac-args/options b/core-java-modules/core-java/src/main/java/javac-args/options
similarity index 100%
rename from core-java/src/main/java/javac-args/options
rename to core-java-modules/core-java/src/main/java/javac-args/options
diff --git a/core-java/src/main/java/javac-args/types b/core-java-modules/core-java/src/main/java/javac-args/types
similarity index 100%
rename from core-java/src/main/java/javac-args/types
rename to core-java-modules/core-java/src/main/java/javac-args/types
diff --git a/core-java/src/main/java/javac-args/xlint-ops b/core-java-modules/core-java/src/main/java/javac-args/xlint-ops
similarity index 100%
rename from core-java/src/main/java/javac-args/xlint-ops
rename to core-java-modules/core-java/src/main/java/javac-args/xlint-ops
diff --git a/core-java/src/main/java/log4j.properties b/core-java-modules/core-java/src/main/java/log4j.properties
similarity index 100%
rename from core-java/src/main/java/log4j.properties
rename to core-java-modules/core-java/src/main/java/log4j.properties
diff --git a/core-java/src/main/java/org/baeldung/executable/ExecutableMavenJar.java b/core-java-modules/core-java/src/main/java/org/baeldung/executable/ExecutableMavenJar.java
similarity index 100%
rename from core-java/src/main/java/org/baeldung/executable/ExecutableMavenJar.java
rename to core-java-modules/core-java/src/main/java/org/baeldung/executable/ExecutableMavenJar.java
diff --git a/core-java/src/main/resources/ESAPI.properties b/core-java-modules/core-java/src/main/resources/ESAPI.properties
similarity index 100%
rename from core-java/src/main/resources/ESAPI.properties
rename to core-java-modules/core-java/src/main/resources/ESAPI.properties
diff --git a/core-java/src/main/resources/META-INF/BenchmarkList b/core-java-modules/core-java/src/main/resources/META-INF/BenchmarkList
old mode 100755
new mode 100644
similarity index 100%
rename from core-java/src/main/resources/META-INF/BenchmarkList
rename to core-java-modules/core-java/src/main/resources/META-INF/BenchmarkList
diff --git a/core-java/src/main/resources/META-INF/MANIFEST.MF b/core-java-modules/core-java/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from core-java/src/main/resources/META-INF/MANIFEST.MF
rename to core-java-modules/core-java/src/main/resources/META-INF/MANIFEST.MF
diff --git a/core-java/src/main/resources/META-INF/persistence.xml b/core-java-modules/core-java/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from core-java/src/main/resources/META-INF/persistence.xml
rename to core-java-modules/core-java/src/main/resources/META-INF/persistence.xml
diff --git a/core-java/src/main/resources/countries.properties b/core-java-modules/core-java/src/main/resources/countries.properties
similarity index 100%
rename from core-java/src/main/resources/countries.properties
rename to core-java-modules/core-java/src/main/resources/countries.properties
diff --git a/core-java/src/main/resources/datasource.properties b/core-java-modules/core-java/src/main/resources/datasource.properties
similarity index 100%
rename from core-java/src/main/resources/datasource.properties
rename to core-java-modules/core-java/src/main/resources/datasource.properties
diff --git a/core-java/src/main/resources/files/test.txt b/core-java-modules/core-java/src/main/resources/files/test.txt
similarity index 100%
rename from core-java/src/main/resources/files/test.txt
rename to core-java-modules/core-java/src/main/resources/files/test.txt
diff --git a/core-java/src/main/resources/js/bind.js b/core-java-modules/core-java/src/main/resources/js/bind.js
similarity index 100%
rename from core-java/src/main/resources/js/bind.js
rename to core-java-modules/core-java/src/main/resources/js/bind.js
diff --git a/core-java/src/main/resources/js/locations.js b/core-java-modules/core-java/src/main/resources/js/locations.js
similarity index 100%
rename from core-java/src/main/resources/js/locations.js
rename to core-java-modules/core-java/src/main/resources/js/locations.js
diff --git a/core-java/src/main/resources/js/math_module.js b/core-java-modules/core-java/src/main/resources/js/math_module.js
similarity index 100%
rename from core-java/src/main/resources/js/math_module.js
rename to core-java-modules/core-java/src/main/resources/js/math_module.js
diff --git a/core-java/src/main/resources/js/no_such.js b/core-java-modules/core-java/src/main/resources/js/no_such.js
similarity index 100%
rename from core-java/src/main/resources/js/no_such.js
rename to core-java-modules/core-java/src/main/resources/js/no_such.js
diff --git a/core-java/src/main/resources/js/script.js b/core-java-modules/core-java/src/main/resources/js/script.js
similarity index 100%
rename from core-java/src/main/resources/js/script.js
rename to core-java-modules/core-java/src/main/resources/js/script.js
diff --git a/core-java/src/main/resources/js/trim.js b/core-java-modules/core-java/src/main/resources/js/trim.js
similarity index 100%
rename from core-java/src/main/resources/js/trim.js
rename to core-java-modules/core-java/src/main/resources/js/trim.js
diff --git a/core-java/src/main/resources/js/typed_arrays.js b/core-java-modules/core-java/src/main/resources/js/typed_arrays.js
similarity index 100%
rename from core-java/src/main/resources/js/typed_arrays.js
rename to core-java-modules/core-java/src/main/resources/js/typed_arrays.js
diff --git a/core-java/src/main/resources/log4j.properties b/core-java-modules/core-java/src/main/resources/log4j.properties
similarity index 100%
rename from core-java/src/main/resources/log4j.properties
rename to core-java-modules/core-java/src/main/resources/log4j.properties
diff --git a/core-java/src/main/resources/log4j2.xml b/core-java-modules/core-java/src/main/resources/log4j2.xml
similarity index 100%
rename from core-java/src/main/resources/log4j2.xml
rename to core-java-modules/core-java/src/main/resources/log4j2.xml
diff --git a/core-java/src/main/resources/log4jstructuraldp.properties b/core-java-modules/core-java/src/main/resources/log4jstructuraldp.properties
similarity index 100%
rename from core-java/src/main/resources/log4jstructuraldp.properties
rename to core-java-modules/core-java/src/main/resources/log4jstructuraldp.properties
diff --git a/core-java/src/main/resources/logback.xml b/core-java-modules/core-java/src/main/resources/logback.xml
similarity index 100%
rename from core-java/src/main/resources/logback.xml
rename to core-java-modules/core-java/src/main/resources/logback.xml
diff --git a/core-java/src/main/resources/product.png b/core-java-modules/core-java/src/main/resources/product.png
similarity index 100%
rename from core-java/src/main/resources/product.png
rename to core-java-modules/core-java/src/main/resources/product.png
diff --git a/core-java/src/main/resources/resourcebundle/resource.properties b/core-java-modules/core-java/src/main/resources/resourcebundle/resource.properties
similarity index 100%
rename from core-java/src/main/resources/resourcebundle/resource.properties
rename to core-java-modules/core-java/src/main/resources/resourcebundle/resource.properties
diff --git a/core-java/src/main/resources/resourcebundle/resource_en.properties b/core-java-modules/core-java/src/main/resources/resourcebundle/resource_en.properties
similarity index 100%
rename from core-java/src/main/resources/resourcebundle/resource_en.properties
rename to core-java-modules/core-java/src/main/resources/resourcebundle/resource_en.properties
diff --git a/core-java/src/main/resources/resourcebundle/resource_pl_PL.properties b/core-java-modules/core-java/src/main/resources/resourcebundle/resource_pl_PL.properties
similarity index 100%
rename from core-java/src/main/resources/resourcebundle/resource_pl_PL.properties
rename to core-java-modules/core-java/src/main/resources/resourcebundle/resource_pl_PL.properties
diff --git a/core-java/src/test/java/com/baeldung/abstractclasses/test/LowercaseFileReaderUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/abstractclasses/test/LowercaseFileReaderUnitTest.java
similarity index 97%
rename from core-java/src/test/java/com/baeldung/abstractclasses/test/LowercaseFileReaderUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/abstractclasses/test/LowercaseFileReaderUnitTest.java
index 4f0d3a7cd5..45e16f0d25 100644
--- a/core-java/src/test/java/com/baeldung/abstractclasses/test/LowercaseFileReaderUnitTest.java
+++ b/core-java-modules/core-java/src/test/java/com/baeldung/abstractclasses/test/LowercaseFileReaderUnitTest.java
@@ -1,20 +1,20 @@
-package com.baeldung.abstractclasses.test;
-
-import com.baeldung.abstractclasses.filereaders.BaseFileReader;
-import com.baeldung.abstractclasses.filereaders.LowercaseFileReader;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
-
-public class LowercaseFileReaderUnitTest {
-    
-    @Test
-    public void givenLowercaseFileReaderInstance_whenCalledreadFile_thenCorrect() throws Exception {
-        Path path = Paths.get(getClass().getClassLoader().getResource("files/test.txt").toURI());
-        BaseFileReader lowercaseFileReader = new LowercaseFileReader(path);
-        
-        assertThat(lowercaseFileReader.readFile()).isInstanceOf(List.class);
-    }
-}
+package com.baeldung.abstractclasses.test;
+
+import com.baeldung.abstractclasses.filereaders.BaseFileReader;
+import com.baeldung.abstractclasses.filereaders.LowercaseFileReader;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class LowercaseFileReaderUnitTest {
+    
+    @Test
+    public void givenLowercaseFileReaderInstance_whenCalledreadFile_thenCorrect() throws Exception {
+        Path path = Paths.get(getClass().getClassLoader().getResource("files/test.txt").toURI());
+        BaseFileReader lowercaseFileReader = new LowercaseFileReader(path);
+        
+        assertThat(lowercaseFileReader.readFile()).isInstanceOf(List.class);
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/abstractclasses/test/UppercaseFileReaderUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/abstractclasses/test/UppercaseFileReaderUnitTest.java
similarity index 97%
rename from core-java/src/test/java/com/baeldung/abstractclasses/test/UppercaseFileReaderUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/abstractclasses/test/UppercaseFileReaderUnitTest.java
index e11db57000..dc4df900e4 100644
--- a/core-java/src/test/java/com/baeldung/abstractclasses/test/UppercaseFileReaderUnitTest.java
+++ b/core-java-modules/core-java/src/test/java/com/baeldung/abstractclasses/test/UppercaseFileReaderUnitTest.java
@@ -1,20 +1,20 @@
-package com.baeldung.abstractclasses.test;
-
-import com.baeldung.abstractclasses.filereaders.BaseFileReader;
-import com.baeldung.abstractclasses.filereaders.UppercaseFileReader;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
-
-public class UppercaseFileReaderUnitTest {
-
-    @Test
-    public void givenUppercaseFileReaderInstance_whenCalledreadFile_thenCorrect() throws Exception {
-        Path path = Paths.get(getClass().getClassLoader().getResource("files/test.txt").toURI());
-        BaseFileReader uppercaseFileReader = new UppercaseFileReader(path);
-        
-        assertThat(uppercaseFileReader.readFile()).isInstanceOf(List.class);
-    }    
-}
+package com.baeldung.abstractclasses.test;
+
+import com.baeldung.abstractclasses.filereaders.BaseFileReader;
+import com.baeldung.abstractclasses.filereaders.UppercaseFileReader;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class UppercaseFileReaderUnitTest {
+
+    @Test
+    public void givenUppercaseFileReaderInstance_whenCalledreadFile_thenCorrect() throws Exception {
+        Path path = Paths.get(getClass().getClassLoader().getResource("files/test.txt").toURI());
+        BaseFileReader uppercaseFileReader = new UppercaseFileReader(path);
+        
+        assertThat(uppercaseFileReader.readFile()).isInstanceOf(List.class);
+    }    
+}
diff --git a/core-java/src/test/java/com/baeldung/asciiart/AsciiArtIntegrationTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/asciiart/AsciiArtIntegrationTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/asciiart/AsciiArtIntegrationTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/asciiart/AsciiArtIntegrationTest.java
diff --git a/core-java/src/test/java/com/baeldung/bitwiseoperator/test/BitwiseOperatorUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/bitwiseoperator/test/BitwiseOperatorUnitTest.java
similarity index 96%
rename from core-java/src/test/java/com/baeldung/bitwiseoperator/test/BitwiseOperatorUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/bitwiseoperator/test/BitwiseOperatorUnitTest.java
index f74e181e36..1ca7b7281e 100644
--- a/core-java/src/test/java/com/baeldung/bitwiseoperator/test/BitwiseOperatorUnitTest.java
+++ b/core-java-modules/core-java/src/test/java/com/baeldung/bitwiseoperator/test/BitwiseOperatorUnitTest.java
@@ -1,81 +1,81 @@
-package com.baeldung.bitwiseoperator.test;
-
-import static org.junit.Assert.assertEquals;
-import org.junit.jupiter.api.Test;
-
-public class BitwiseOperatorUnitTest {
-
-    @Test
-    public void givenTwoIntegers_whenAndOperator_thenNewDecimalNumber() {
-        int value1 = 6;
-        int value2 = 5;
-        int result = value1 & value2;
-        assertEquals(4, result);
-    }
-
-    @Test
-    public void givenTwoIntegers_whenOrOperator_thenNewDecimalNumber() {
-        int value1 = 6;
-        int value2 = 5;
-        int result = value1 | value2;
-        assertEquals(7, result);
-    }
-
-    @Test
-    public void givenTwoIntegers_whenXorOperator_thenNewDecimalNumber() {
-        int value1 = 6;
-        int value2 = 5;
-        int result = value1 ^ value2;
-        assertEquals(3, result);
-    }
-
-    @Test
-    public void givenOneInteger_whenNotOperator_thenNewDecimalNumber() {
-        int value1 = 6;
-        int result = ~value1;
-        assertEquals(result, -7);
-    }
-
-    @Test
-    public void givenOnePositiveInteger_whenSignedRightShiftOperator_thenNewDecimalNumber() {
-        int value = 12;
-        int rightShift = value >> 2;
-        assertEquals(3, rightShift);
-    }
-
-    @Test
-    public void givenOneNegativeInteger_whenSignedRightShiftOperator_thenNewDecimalNumber() {
-        int value = -12;
-        int rightShift = value >> 2;
-        assertEquals(-3, rightShift);
-    }
-
-    @Test
-    public void givenOnePositiveInteger_whenLeftShiftOperator_thenNewDecimalNumber() {
-        int value = 12;
-        int leftShift = value << 2;
-        assertEquals(48, leftShift);
-    }
-
-    @Test
-    public void givenOneNegativeInteger_whenLeftShiftOperator_thenNewDecimalNumber() {
-        int value = -12;
-        int leftShift = value << 2;
-        assertEquals(-48, leftShift);
-    }
-
-    @Test
-    public void givenOnePositiveInteger_whenUnsignedRightShiftOperator_thenNewDecimalNumber() {
-        int value = 12;
-        int unsignedRightShift = value >>> 2;
-        assertEquals(3, unsignedRightShift);
-    }
-
-    @Test
-    public void givenOneNegativeInteger_whenUnsignedRightShiftOperator_thenNewDecimalNumber() {
-        int value = -12;
-        int unsignedRightShift = value >>> 2;
-        assertEquals(1073741821, unsignedRightShift);
-    }
-
-}
+package com.baeldung.bitwiseoperator.test;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+
+public class BitwiseOperatorUnitTest {
+
+    @Test
+    public void givenTwoIntegers_whenAndOperator_thenNewDecimalNumber() {
+        int value1 = 6;
+        int value2 = 5;
+        int result = value1 & value2;
+        assertEquals(4, result);
+    }
+
+    @Test
+    public void givenTwoIntegers_whenOrOperator_thenNewDecimalNumber() {
+        int value1 = 6;
+        int value2 = 5;
+        int result = value1 | value2;
+        assertEquals(7, result);
+    }
+
+    @Test
+    public void givenTwoIntegers_whenXorOperator_thenNewDecimalNumber() {
+        int value1 = 6;
+        int value2 = 5;
+        int result = value1 ^ value2;
+        assertEquals(3, result);
+    }
+
+    @Test
+    public void givenOneInteger_whenNotOperator_thenNewDecimalNumber() {
+        int value1 = 6;
+        int result = ~value1;
+        assertEquals(result, -7);
+    }
+
+    @Test
+    public void givenOnePositiveInteger_whenSignedRightShiftOperator_thenNewDecimalNumber() {
+        int value = 12;
+        int rightShift = value >> 2;
+        assertEquals(3, rightShift);
+    }
+
+    @Test
+    public void givenOneNegativeInteger_whenSignedRightShiftOperator_thenNewDecimalNumber() {
+        int value = -12;
+        int rightShift = value >> 2;
+        assertEquals(-3, rightShift);
+    }
+
+    @Test
+    public void givenOnePositiveInteger_whenLeftShiftOperator_thenNewDecimalNumber() {
+        int value = 12;
+        int leftShift = value << 2;
+        assertEquals(48, leftShift);
+    }
+
+    @Test
+    public void givenOneNegativeInteger_whenLeftShiftOperator_thenNewDecimalNumber() {
+        int value = -12;
+        int leftShift = value << 2;
+        assertEquals(-48, leftShift);
+    }
+
+    @Test
+    public void givenOnePositiveInteger_whenUnsignedRightShiftOperator_thenNewDecimalNumber() {
+        int value = 12;
+        int unsignedRightShift = value >>> 2;
+        assertEquals(3, unsignedRightShift);
+    }
+
+    @Test
+    public void givenOneNegativeInteger_whenUnsignedRightShiftOperator_thenNewDecimalNumber() {
+        int value = -12;
+        int unsignedRightShift = value >>> 2;
+        assertEquals(1073741821, unsignedRightShift);
+    }
+
+}
diff --git a/core-java/src/test/java/com/baeldung/classloader/CustomClassLoaderUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/classloader/CustomClassLoaderUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/classloader/CustomClassLoaderUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/classloader/CustomClassLoaderUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/classloader/PrintClassLoaderUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/classloader/PrintClassLoaderUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/classloader/PrintClassLoaderUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/classloader/PrintClassLoaderUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/curltojava/JavaCurlExamplesLiveTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/curltojava/JavaCurlExamplesLiveTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/curltojava/JavaCurlExamplesLiveTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/curltojava/JavaCurlExamplesLiveTest.java
diff --git a/core-java/src/test/java/com/baeldung/deserialization/DeserializationUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/deserialization/DeserializationUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/deserialization/DeserializationUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/deserialization/DeserializationUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/encoding/CharacterEncodingExamplesUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/encoding/CharacterEncodingExamplesUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/encoding/CharacterEncodingExamplesUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/encoding/CharacterEncodingExamplesUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/exceptions/GlobalExceptionHandlerUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/exceptions/GlobalExceptionHandlerUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/exceptions/GlobalExceptionHandlerUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/exceptions/GlobalExceptionHandlerUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/externalizable/ExternalizableUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/externalizable/ExternalizableUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/externalizable/ExternalizableUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/externalizable/ExternalizableUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/graph/GraphTraversalUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/graph/GraphTraversalUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/graph/GraphTraversalUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/graph/GraphTraversalUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/grep/GrepWithUnix4JIntegrationTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/grep/GrepWithUnix4JIntegrationTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/grep/GrepWithUnix4JIntegrationTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/grep/GrepWithUnix4JIntegrationTest.java
diff --git a/core-java/src/test/java/com/baeldung/hexToAscii/HexToAsciiUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/hexToAscii/HexToAsciiUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/hexToAscii/HexToAsciiUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/hexToAscii/HexToAsciiUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/hexToAscii/README.md b/core-java-modules/core-java/src/test/java/com/baeldung/hexToAscii/README.md
similarity index 100%
rename from core-java/src/test/java/com/baeldung/hexToAscii/README.md
rename to core-java-modules/core-java/src/test/java/com/baeldung/hexToAscii/README.md
diff --git a/core-java/src/test/java/com/baeldung/java/clock/ClockUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/java/clock/ClockUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/java/clock/ClockUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/java/clock/ClockUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/java/currentmethod/CurrentlyExecutedMethodFinderUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/java/currentmethod/CurrentlyExecutedMethodFinderUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/java/currentmethod/CurrentlyExecutedMethodFinderUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/java/currentmethod/CurrentlyExecutedMethodFinderUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/java/properties/PropertiesUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/java/properties/PropertiesUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/java/properties/PropertiesUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/java/properties/PropertiesUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/java/regex/RegexUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/java/regex/RegexUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/java/regex/RegexUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/java/regex/RegexUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/java8/Java8MapAndFlatMap.java b/core-java-modules/core-java/src/test/java/com/baeldung/java8/Java8MapAndFlatMap.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/java8/Java8MapAndFlatMap.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/java8/Java8MapAndFlatMap.java
diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/SignInUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/SignInUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/junit4vstestng/SignInUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/SignInUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/SuiteUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/SuiteUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/junit4vstestng/SuiteUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/SuiteUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/leapyear/LeapYearUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/leapyear/LeapYearUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/leapyear/LeapYearUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/leapyear/LeapYearUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/manifest/ExecuteJarFileUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/manifest/ExecuteJarFileUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/manifest/ExecuteJarFileUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/manifest/ExecuteJarFileUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/money/JavaMoneyUnitManualTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/money/JavaMoneyUnitManualTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/money/JavaMoneyUnitManualTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/money/JavaMoneyUnitManualTest.java
diff --git a/core-java/src/test/java/com/baeldung/printscreen/ScreenshotLiveTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/printscreen/ScreenshotLiveTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/printscreen/ScreenshotLiveTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/printscreen/ScreenshotLiveTest.java
diff --git a/core-java/src/test/java/com/baeldung/properties/MergePropertiesUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/properties/MergePropertiesUnitTest.java
similarity index 97%
rename from core-java/src/test/java/com/baeldung/properties/MergePropertiesUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/properties/MergePropertiesUnitTest.java
index 8720aff36b..50daaed950 100644
--- a/core-java/src/test/java/com/baeldung/properties/MergePropertiesUnitTest.java
+++ b/core-java-modules/core-java/src/test/java/com/baeldung/properties/MergePropertiesUnitTest.java
@@ -1,84 +1,84 @@
-package com.baeldung.properties;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import org.junit.Test;
-
-public class MergePropertiesUnitTest {
-
-    @Test
-    public void givenTwoProperties_whenMergedUsingIteration_thenAllPropertiesInResult() {
-        Properties globalProperties = mergePropertiesByIteratingKeySet(propertiesA(), propertiesB());
-
-        testMergedProperties(globalProperties);
-    }
-
-    @Test
-    public void givenTwoProperties_whenMergedUsingPutAll_thenAllPropertiesInResult() {
-        Properties globalProperties = mergePropertiesByUsingPutAll(propertiesA(), propertiesB());
-
-        testMergedProperties(globalProperties);
-    }
-
-    @Test
-    public void givenTwoProperties_whenMergedUsingStreamAPI_thenAllPropertiesInResult() {
-        Properties globalProperties = mergePropertiesByUsingStreamApi(propertiesB(), propertiesA());
-
-        testMergedProperties(globalProperties);
-    }
-
-    private Properties mergePropertiesByIteratingKeySet(Properties... properties) {
-        Properties mergedProperties = new Properties();
-        for (Properties property : properties) {
-            Set<String> propertyNames = property.stringPropertyNames();
-            for (String name : propertyNames) {
-                String propertyValue = property.getProperty(name);
-                mergedProperties.setProperty(name, propertyValue);
-            }
-        }
-        return mergedProperties;
-    }
-
-    private Properties mergePropertiesByUsingPutAll(Properties... properties) {
-        Properties mergedProperties = new Properties();
-        for (Properties property : properties) {
-            mergedProperties.putAll(property);
-        }
-        return mergedProperties;
-    }
-
-    private Properties mergePropertiesByUsingStreamApi(Properties... properties) {
-        return Stream.of(properties)
-            .collect(Properties::new, Map::putAll, Map::putAll);
-    }
-
-    private Properties propertiesA() {
-        Properties properties = new Properties();
-        properties.setProperty("application.name", "my-app");
-        properties.setProperty("application.version", "1.0");
-        return properties;
-    }
-
-    private Properties propertiesB() {
-        Properties properties = new Properties();
-        properties.setProperty("property-1", "sample property");
-        properties.setProperty("property-2", "another sample property");
-        return properties;
-    }
-
-    private void testMergedProperties(Properties globalProperties) {
-        assertThat("There should be 4 properties", globalProperties.size(), equalTo(4));
-        assertEquals("Property should be", globalProperties.getProperty("application.name"), "my-app");
-        assertEquals("Property should be", globalProperties.getProperty("application.version"), "1.0");
-        assertEquals("Property should be", globalProperties.getProperty("property-1"), "sample property");
-        assertEquals("Property should be", globalProperties.getProperty("property-2"), "another sample property");
-    }
-
-}
+package com.baeldung.properties;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.junit.Test;
+
+public class MergePropertiesUnitTest {
+
+    @Test
+    public void givenTwoProperties_whenMergedUsingIteration_thenAllPropertiesInResult() {
+        Properties globalProperties = mergePropertiesByIteratingKeySet(propertiesA(), propertiesB());
+
+        testMergedProperties(globalProperties);
+    }
+
+    @Test
+    public void givenTwoProperties_whenMergedUsingPutAll_thenAllPropertiesInResult() {
+        Properties globalProperties = mergePropertiesByUsingPutAll(propertiesA(), propertiesB());
+
+        testMergedProperties(globalProperties);
+    }
+
+    @Test
+    public void givenTwoProperties_whenMergedUsingStreamAPI_thenAllPropertiesInResult() {
+        Properties globalProperties = mergePropertiesByUsingStreamApi(propertiesB(), propertiesA());
+
+        testMergedProperties(globalProperties);
+    }
+
+    private Properties mergePropertiesByIteratingKeySet(Properties... properties) {
+        Properties mergedProperties = new Properties();
+        for (Properties property : properties) {
+            Set<String> propertyNames = property.stringPropertyNames();
+            for (String name : propertyNames) {
+                String propertyValue = property.getProperty(name);
+                mergedProperties.setProperty(name, propertyValue);
+            }
+        }
+        return mergedProperties;
+    }
+
+    private Properties mergePropertiesByUsingPutAll(Properties... properties) {
+        Properties mergedProperties = new Properties();
+        for (Properties property : properties) {
+            mergedProperties.putAll(property);
+        }
+        return mergedProperties;
+    }
+
+    private Properties mergePropertiesByUsingStreamApi(Properties... properties) {
+        return Stream.of(properties)
+            .collect(Properties::new, Map::putAll, Map::putAll);
+    }
+
+    private Properties propertiesA() {
+        Properties properties = new Properties();
+        properties.setProperty("application.name", "my-app");
+        properties.setProperty("application.version", "1.0");
+        return properties;
+    }
+
+    private Properties propertiesB() {
+        Properties properties = new Properties();
+        properties.setProperty("property-1", "sample property");
+        properties.setProperty("property-2", "another sample property");
+        return properties;
+    }
+
+    private void testMergedProperties(Properties globalProperties) {
+        assertThat("There should be 4 properties", globalProperties.size(), equalTo(4));
+        assertEquals("Property should be", globalProperties.getProperty("application.name"), "my-app");
+        assertEquals("Property should be", globalProperties.getProperty("application.version"), "1.0");
+        assertEquals("Property should be", globalProperties.getProperty("property-1"), "sample property");
+        assertEquals("Property should be", globalProperties.getProperty("property-2"), "another sample property");
+    }
+
+}
diff --git a/core-java/src/test/java/com/baeldung/reflection/BaeldungReflectionUtilsUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/reflection/BaeldungReflectionUtilsUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/reflection/BaeldungReflectionUtilsUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/reflection/BaeldungReflectionUtilsUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/reflection/PersonAndEmployeeReflectionUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/reflection/PersonAndEmployeeReflectionUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/reflection/PersonAndEmployeeReflectionUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/reflection/PersonAndEmployeeReflectionUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/regexp/EscapingCharsUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/regexp/EscapingCharsUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/regexp/EscapingCharsUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/regexp/EscapingCharsUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/regexp/optmization/OptimizedMatcherManualTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/regexp/optmization/OptimizedMatcherManualTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/regexp/optmization/OptimizedMatcherManualTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/regexp/optmization/OptimizedMatcherManualTest.java
diff --git a/core-java/src/test/java/com/baeldung/resourcebundle/ExampleResourceUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/resourcebundle/ExampleResourceUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/resourcebundle/ExampleResourceUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/resourcebundle/ExampleResourceUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/resourcebundle/PropertyResourceUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/resourcebundle/PropertyResourceUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/resourcebundle/PropertyResourceUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/resourcebundle/PropertyResourceUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/scripting/NashornUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/scripting/NashornUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/scripting/NashornUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/scripting/NashornUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/serialization/PersonUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/serialization/PersonUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/serialization/PersonUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/serialization/PersonUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/stack/StackUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/stack/StackUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/stack/StackUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/stack/StackUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/stringisnumeric.zip b/core-java-modules/core-java/src/test/java/com/baeldung/stringisnumeric.zip
similarity index 100%
rename from core-java/src/test/java/com/baeldung/stringisnumeric.zip
rename to core-java-modules/core-java/src/test/java/com/baeldung/stringisnumeric.zip
diff --git a/core-java/src/test/java/com/baeldung/system/WhenDetectingOSUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/system/WhenDetectingOSUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/system/WhenDetectingOSUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/system/WhenDetectingOSUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/util/PropertiesLoaderUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/util/PropertiesLoaderUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/util/PropertiesLoaderUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/util/PropertiesLoaderUnitTest.java
diff --git a/core-java/src/test/java/org/baeldung/java/JavaIoUnitTest.java b/core-java-modules/core-java/src/test/java/org/baeldung/java/JavaIoUnitTest.java
similarity index 100%
rename from core-java/src/test/java/org/baeldung/java/JavaIoUnitTest.java
rename to core-java-modules/core-java/src/test/java/org/baeldung/java/JavaIoUnitTest.java
diff --git a/core-java/src/test/java/org/baeldung/java/JavaTimerLongRunningUnitTest.java b/core-java-modules/core-java/src/test/java/org/baeldung/java/JavaTimerLongRunningUnitTest.java
similarity index 100%
rename from core-java/src/test/java/org/baeldung/java/JavaTimerLongRunningUnitTest.java
rename to core-java-modules/core-java/src/test/java/org/baeldung/java/JavaTimerLongRunningUnitTest.java
diff --git a/core-java/src/test/java/org/baeldung/java/arrays/ArraysJoinAndSplitJUnitTest.java b/core-java-modules/core-java/src/test/java/org/baeldung/java/arrays/ArraysJoinAndSplitJUnitTest.java
similarity index 100%
rename from core-java/src/test/java/org/baeldung/java/arrays/ArraysJoinAndSplitJUnitTest.java
rename to core-java-modules/core-java/src/test/java/org/baeldung/java/arrays/ArraysJoinAndSplitJUnitTest.java
diff --git a/core-java/src/test/java/org/baeldung/java/rawtypes/RawTypesUnitTest.java b/core-java-modules/core-java/src/test/java/org/baeldung/java/rawtypes/RawTypesUnitTest.java
similarity index 100%
rename from core-java/src/test/java/org/baeldung/java/rawtypes/RawTypesUnitTest.java
rename to core-java-modules/core-java/src/test/java/org/baeldung/java/rawtypes/RawTypesUnitTest.java
diff --git a/core-java/src/test/java/org/baeldung/java/sandbox/SandboxJavaManualTest.java b/core-java-modules/core-java/src/test/java/org/baeldung/java/sandbox/SandboxJavaManualTest.java
similarity index 100%
rename from core-java/src/test/java/org/baeldung/java/sandbox/SandboxJavaManualTest.java
rename to core-java-modules/core-java/src/test/java/org/baeldung/java/sandbox/SandboxJavaManualTest.java
diff --git a/core-java/src/test/java/org/baeldung/java/shell/JavaProcessUnitIntegrationTest.java b/core-java-modules/core-java/src/test/java/org/baeldung/java/shell/JavaProcessUnitIntegrationTest.java
similarity index 100%
rename from core-java/src/test/java/org/baeldung/java/shell/JavaProcessUnitIntegrationTest.java
rename to core-java-modules/core-java/src/test/java/org/baeldung/java/shell/JavaProcessUnitIntegrationTest.java
diff --git a/core-java/src/test/resources/.gitignore b/core-java-modules/core-java/src/test/resources/.gitignore
similarity index 100%
rename from core-java/src/test/resources/.gitignore
rename to core-java-modules/core-java/src/test/resources/.gitignore
diff --git a/core-java/src/test/resources/app.properties b/core-java-modules/core-java/src/test/resources/app.properties
similarity index 100%
rename from core-java/src/test/resources/app.properties
rename to core-java-modules/core-java/src/test/resources/app.properties
diff --git a/core-java/src/test/resources/catalog b/core-java-modules/core-java/src/test/resources/catalog
similarity index 100%
rename from core-java/src/test/resources/catalog
rename to core-java-modules/core-java/src/test/resources/catalog
diff --git a/core-java/src/test/resources/configuration.properties b/core-java-modules/core-java/src/test/resources/configuration.properties
similarity index 100%
rename from core-java/src/test/resources/configuration.properties
rename to core-java-modules/core-java/src/test/resources/configuration.properties
diff --git a/core-java/src/test/resources/default.properties b/core-java-modules/core-java/src/test/resources/default.properties
similarity index 100%
rename from core-java/src/test/resources/default.properties
rename to core-java-modules/core-java/src/test/resources/default.properties
diff --git a/core-java/src/test/resources/dictionary.in b/core-java-modules/core-java/src/test/resources/dictionary.in
similarity index 100%
rename from core-java/src/test/resources/dictionary.in
rename to core-java-modules/core-java/src/test/resources/dictionary.in
diff --git a/core-java/src/test/resources/encoding.txt b/core-java-modules/core-java/src/test/resources/encoding.txt
similarity index 100%
rename from core-java/src/test/resources/encoding.txt
rename to core-java-modules/core-java/src/test/resources/encoding.txt
diff --git a/core-java/src/test/resources/icons.xml b/core-java-modules/core-java/src/test/resources/icons.xml
similarity index 100%
rename from core-java/src/test/resources/icons.xml
rename to core-java-modules/core-java/src/test/resources/icons.xml
diff --git a/core-java/src/test/resources/newFile1.txt b/core-java-modules/core-java/src/test/resources/newFile1.txt
similarity index 100%
rename from core-java/src/test/resources/newFile1.txt
rename to core-java-modules/core-java/src/test/resources/newFile1.txt
diff --git a/core-java/src/test/resources/newFile2.txt b/core-java-modules/core-java/src/test/resources/newFile2.txt
similarity index 100%
rename from core-java/src/test/resources/newFile2.txt
rename to core-java-modules/core-java/src/test/resources/newFile2.txt
diff --git a/core-java/src/test/resources/newFile3.txt b/core-java-modules/core-java/src/test/resources/newFile3.txt
similarity index 100%
rename from core-java/src/test/resources/newFile3.txt
rename to core-java-modules/core-java/src/test/resources/newFile3.txt
diff --git a/core-java/src/test/resources/original.txt b/core-java-modules/core-java/src/test/resources/original.txt
similarity index 56%
rename from core-java/src/test/resources/original.txt
rename to core-java-modules/core-java/src/test/resources/original.txt
index cf8c89d389..8511f56bef 100644
--- a/core-java/src/test/resources/original.txt
+++ b/core-java-modules/core-java/src/test/resources/original.txt
@@ -1,2 +1,2 @@
-#Copy a File with Java (www.Baeldung.com)
+#Copy a File with Java (www.Baeldung.com)
 Copying Files with Java is Fun!
\ No newline at end of file
diff --git a/core-java/src/test/resources/sampleNumberFile.txt b/core-java-modules/core-java/src/test/resources/sampleNumberFile.txt
similarity index 100%
rename from core-java/src/test/resources/sampleNumberFile.txt
rename to core-java-modules/core-java/src/test/resources/sampleNumberFile.txt
diff --git a/core-java/src/test/resources/sampleTextFile.txt b/core-java-modules/core-java/src/test/resources/sampleTextFile.txt
similarity index 100%
rename from core-java/src/test/resources/sampleTextFile.txt
rename to core-java-modules/core-java/src/test/resources/sampleTextFile.txt
diff --git a/core-java/src/test/resources/sourceFile.txt b/core-java-modules/core-java/src/test/resources/sourceFile.txt
similarity index 100%
rename from core-java/src/test/resources/sourceFile.txt
rename to core-java-modules/core-java/src/test/resources/sourceFile.txt
diff --git a/core-java/src/test/resources/test.find b/core-java-modules/core-java/src/test/resources/test.find
similarity index 100%
rename from core-java/src/test/resources/test.find
rename to core-java-modules/core-java/src/test/resources/test.find
diff --git a/core-java/src/test/resources/test_read.in b/core-java-modules/core-java/src/test/resources/test_read.in
similarity index 100%
rename from core-java/src/test/resources/test_read.in
rename to core-java-modules/core-java/src/test/resources/test_read.in
diff --git a/core-java/src/test/resources/test_read1.in b/core-java-modules/core-java/src/test/resources/test_read1.in
similarity index 100%
rename from core-java/src/test/resources/test_read1.in
rename to core-java-modules/core-java/src/test/resources/test_read1.in
diff --git a/core-java/src/test/resources/test_read2.in b/core-java-modules/core-java/src/test/resources/test_read2.in
similarity index 100%
rename from core-java/src/test/resources/test_read2.in
rename to core-java-modules/core-java/src/test/resources/test_read2.in
diff --git a/core-java/src/test/resources/test_read3.in b/core-java-modules/core-java/src/test/resources/test_read3.in
similarity index 100%
rename from core-java/src/test/resources/test_read3.in
rename to core-java-modules/core-java/src/test/resources/test_read3.in
diff --git a/core-java/src/test/resources/test_read4.in b/core-java-modules/core-java/src/test/resources/test_read4.in
similarity index 100%
rename from core-java/src/test/resources/test_read4.in
rename to core-java-modules/core-java/src/test/resources/test_read4.in
diff --git a/core-java/src/test/resources/test_read7.in b/core-java-modules/core-java/src/test/resources/test_read7.in
similarity index 100%
rename from core-java/src/test/resources/test_read7.in
rename to core-java-modules/core-java/src/test/resources/test_read7.in
diff --git a/core-java/src/test/resources/test_read8.in b/core-java-modules/core-java/src/test/resources/test_read8.in
similarity index 100%
rename from core-java/src/test/resources/test_read8.in
rename to core-java-modules/core-java/src/test/resources/test_read8.in
diff --git a/core-java/src/test/resources/test_read_d.in b/core-java-modules/core-java/src/test/resources/test_read_d.in
similarity index 100%
rename from core-java/src/test/resources/test_read_d.in
rename to core-java-modules/core-java/src/test/resources/test_read_d.in
diff --git a/core-java/src/test/resources/test_read_multiple.in b/core-java-modules/core-java/src/test/resources/test_read_multiple.in
similarity index 100%
rename from core-java/src/test/resources/test_read_multiple.in
rename to core-java-modules/core-java/src/test/resources/test_read_multiple.in
diff --git a/core-java/yofile.txt b/core-java-modules/core-java/yofile.txt
similarity index 100%
rename from core-java/yofile.txt
rename to core-java-modules/core-java/yofile.txt
diff --git a/core-java/yofile2.txt b/core-java-modules/core-java/yofile2.txt
similarity index 100%
rename from core-java/yofile2.txt
rename to core-java-modules/core-java/yofile2.txt
diff --git a/pom.xml b/pom.xml
index 7eb31f63b2..68dd7dab1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -381,33 +381,33 @@
                 <module>core-groovy</module>
                 <module>core-groovy-2</module>
 		<module>core-groovy-collections</module>
-                <!-- <module>core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
-                <!-- <module>core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
-                <!-- <module>core-java-12</module> --> <!-- We haven't upgraded to java 12. Fixing in BAEL-10841 -->
-                <module>core-java-8</module>
-                <module>core-java-8-2</module>
-				<module>core-java-lambdas</module>
-                <!--<module>core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
-                <!--<module>core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
-                <module>core-java-arrays</module>
-                <module>core-java-collections</module>
-                <module>core-java-collections-list</module>
-                <module>core-java-collections-set</module>
-                <module>core-java-concurrency-basic</module>
-                <module>core-java-concurrency-collections</module>
-                <module>core-java-io</module>
-                <module>core-java-security</module>
-                <module>core-java-lang-syntax</module>
-                <module>core-java-lang</module>
-                <module>core-java-lang-oop</module>
-                <module>core-java-lang-oop-2</module>
+                <!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
+                <!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
+                <!-- <module>core-java-modules/core-java-12</module> --> <!-- We haven't upgraded to java 12. Fixing in BAEL-10841 -->
+                <module>core-java-modules/core-java-8</module>
+                <module>core-java-modules/core-java-8-2</module>
+				<module>core-java-modules/core-java-lambdas</module>
+                <!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+                <!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
+                <module>core-java-modules/core-java-arrays</module>
+                <module>core-java-modules/core-java-collections</module>
+                <module>core-java-modules/core-java-collections-list</module>
+                <module>core-java-modules/core-java-collections-set</module>
+                <module>core-java-modules/core-java-concurrency-basic</module>
+                <module>core-java-modules/core-java-concurrency-collections</module>
+                <module>core-java-modules/core-java-io</module>
+                <module>core-java-modules/core-java-security</module>
+                <module>core-java-modules/core-java-lang-syntax</module>
+                <module>core-java-modules/core-java-lang</module>
+                <module>core-java-modules/core-java-lang-oop</module>
+                <module>core-java-modules/core-java-lang-oop-2</module>
                 <module>core-java-modules</module>
-                <module>core-java-networking</module>
-                <module>core-java-perf</module>
-                <module>core-java-reflection</module>
-                <module>core-java-sun</module>
-                <module>core-java</module>
-                <module>core-java-jvm</module>
+                <module>core-java-modules/core-java-networking</module>
+                <module>core-java-modules/core-java-perf</module>
+                <module>core-java-modules/core-java-reflection</module>
+                <module>core-java-modules/core-java-sun</module>
+                <module>core-java-modules/core-java</module>
+                <module>core-java-modules/core-java-jvm</module>
                 <module>core-scala</module>
                 <module>couchbase</module>
                 <module>custom-pmd</module>
@@ -970,7 +970,7 @@
                 <module>parent-java</module>
                 <module>parent-kotlin</module>
 
-                <module>core-java-concurrency-advanced</module> <!-- very long running? -->
+                <module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
                 <module>core-kotlin</module> <!-- long running? -->
                 <module>core-kotlin-2</module>
                 <module>core-kotlin-io</module>
@@ -1063,28 +1063,28 @@
                 <module>core-groovy</module>
                 <module>core-groovy-2</module>
                 <module>core-groovy-collections</module>
-                <!-- <module>core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
-                <!-- <module>core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
-                <module>core-java-8</module>
-                <module>core-java-8-2</module>
-                <!--<module>core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
-                <!--<module>core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
-                <module>core-java-arrays</module>
-                <module>core-java-collections</module>
-                <module>core-java-collections-list</module>
-                <module>core-java-collections-set</module>
-                <module>core-java-concurrency-basic</module>
-                <module>core-java-concurrency-collections</module>
-                <module>core-java-io</module>
-                <module>core-java-security</module>
-                <module>core-java-lang-syntax</module>
-                <module>core-java-lang</module>
-                <module>core-java-lang-oop</module>
-                <module>core-java-lang-oop-2</module>
+                <!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
+                <!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
+                <module>core-java-modules/core-java-8</module>
+                <module>core-java-modules/core-java-8-2</module>
+                <!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+                <!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
+                <module>core-java-modules/core-java-arrays</module>
+                <module>core-java-modules/core-java-collections</module>
+                <module>core-java-modules/core-java-collections-list</module>
+                <module>core-java-modules/core-java-collections-set</module>
+                <module>core-java-modules/core-java-concurrency-basic</module>
+                <module>core-java-modules/core-java-concurrency-collections</module>
+                <module>core-java-modules/core-java-io</module>
+                <module>core-java-modules/core-java-security</module>
+                <module>core-java-modules/core-java-lang-syntax</module>
+                <module>core-java-modules/core-java-lang</module>
+                <module>core-java-modules/core-java-lang-oop</module>
+                <module>core-java-modules/core-java-lang-oop-2</module>
                 <module>core-java-modules</module>
-                <module>core-java-networking</module>
-                <module>core-java-perf</module>
-                <module>core-java-sun</module>
+                <module>core-java-modules/core-java-networking</module>
+                <module>core-java-modules/core-java-perf</module>
+                <module>core-java-modules/core-java-sun</module>
                 <module>core-scala</module>
                 <module>couchbase</module>
                 <module>custom-pmd</module>
@@ -1477,8 +1477,8 @@
                 <module>parent-java</module>
                 <module>parent-kotlin</module>
 
-                <module>core-java</module>
-                <module>core-java-concurrency-advanced</module> <!-- very long running? -->
+                <module>core-java-modules/core-java</module>
+                <module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
                 <module>core-kotlin</module> <!-- long running? -->
                 <module>core-kotlin-2</module>
 

From 42aeb2daab83bbd59a0c6e08e5c10e5d75f1f399 Mon Sep 17 00:00:00 2001
From: Kacper Koza <kkoza11@gmail.com>
Date: Sun, 5 May 2019 20:51:13 +0200
Subject: [PATCH 204/295] master

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

diff --git a/testing-modules/junit-5-configuration/pom.xml b/testing-modules/junit-5-configuration/pom.xml
index aa488ebb8b..35e42b6543 100644
--- a/testing-modules/junit-5-configuration/pom.xml
+++ b/testing-modules/junit-5-configuration/pom.xml
@@ -33,7 +33,7 @@
     </build>
 
     <properties>
-        <junit.jupiter.version>5.3.1</junit.jupiter.version>
+        <junit.jupiter.version>5.4.2</junit.jupiter.version>
         <junit.platform.version>1.2.0</junit.platform.version>
         <junit.vintage.version>5.2.0</junit.vintage.version>
     </properties>

From aacd8866b0060934c56fee338f95ac52962fda29 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Mon, 6 May 2019 00:34:04 +0530
Subject: [PATCH 205/295] [BAEL-14249] - POM Properties Cleanup

---
 apache-meecrowave/pom.xml                             |  1 -
 apache-velocity/pom.xml                               |  1 -
 cdi/pom.xml                                           |  3 +--
 cloud-foundry-uaa/cf-uaa-oauth2-client/pom.xml        |  5 +----
 .../cf-uaa-oauth2-resource-server/pom.xml             |  4 ----
 ethereum/pom.xml                                      | 11 +++--------
 google-cloud/pom.xml                                  |  1 -
 google-web-toolkit/pom.xml                            |  1 -
 gson/pom.xml                                          |  1 -
 guest/junit5-example/pom.xml                          |  1 -
 guest/log4j2-example/pom.xml                          |  1 -
 guest/tomcat-app/pom.xml                              |  5 ++---
 httpclient-simple/pom.xml                             |  5 +----
 hystrix/pom.xml                                       |  2 --
 .../app-auth-basic-store-db/pom.xml                   |  6 +-----
 .../app-auth-custom-no-store/pom.xml                  |  6 +-----
 java-ee-8-security-api/pom.xml                        |  1 -
 java-numbers/pom.xml                                  |  4 +---
 java-streams-2/pom.xml                                |  5 ++---
 java-streams/pom.xml                                  |  5 ++---
 java-strings-2/pom.xml                                |  4 +---
 java-strings/pom.xml                                  |  6 ++----
 javax-servlets/pom.xml                                |  4 +---
 jee-7/pom.xml                                         |  3 ---
 jsf/pom.xml                                           |  7 +------
 jta/pom.xml                                           |  1 -
 libraries-apache-commons/pom.xml                      |  3 ---
 libraries-data/pom.xml                                |  2 --
 linkrest/pom.xml                                      |  1 -
 logging-modules/log-mdc/pom.xml                       |  7 ++-----
 logging-modules/log4j2/pom.xml                        |  2 --
 logging-modules/logback/pom.xml                       |  1 -
 lucene/pom.xml                                        |  2 --
 parent-spring-5/pom.xml                               |  1 -
 patterns/pom.xml                                      |  1 -
 performance-tests/pom.xml                             |  5 ++---
 persistence-modules/core-java-persistence/pom.xml     |  3 +--
 persistence-modules/deltaspike/pom.xml                |  1 -
 persistence-modules/flyway/pom.xml                    |  1 -
 persistence-modules/hibernate-mapping/pom.xml         |  3 +--
 persistence-modules/hibernate5/pom.xml                |  4 +---
 persistence-modules/influxdb/pom.xml                  |  1 -
 persistence-modules/java-jpa/pom.xml                  |  1 -
 persistence-modules/spring-boot-persistence/pom.xml   |  2 --
 .../spring-data-cassandra-reactive/pom.xml            |  1 -
 persistence-modules/spring-data-eclipselink/pom.xml   |  1 -
 persistence-modules/spring-hibernate-3/pom.xml        |  1 -
 persistence-modules/spring-hibernate-5/pom.xml        |  1 -
 persistence-modules/spring-hibernate4/pom.xml         |  1 -
 persistence-modules/spring-jpa/pom.xml                |  4 +---
 pom.xml                                               |  1 +
 ratpack/pom.xml                                       |  3 +--
 rxjava/pom.xml                                        |  1 -
 software-security/sql-injection-samples/pom.xml       |  4 ----
 spring-4/pom.xml                                      |  2 --
 spring-5-reactive-oauth/pom.xml                       |  1 -
 spring-activiti/pom.xml                               |  1 -
 spring-boot-angular-ecommerce/pom.xml                 |  1 -
 spring-boot-crud/pom.xml                              |  1 -
 spring-boot-exceptions/pom.xml                        |  4 ----
 spring-boot-vue/pom.xml                               |  1 -
 .../etl/customer-mongodb-sink/pom.xml                 |  1 -
 spring-cloud-data-flow/etl/customer-transform/pom.xml |  1 -
 .../spring-cloud-contract-consumer/pom.xml            |  1 -
 .../spring-cloud-contract-producer/pom.xml            |  1 -
 spring-cloud/spring-cloud-functions/pom.xml           |  1 -
 .../spring-cloud-kubernetes/client-service/pom.xml    |  1 -
 .../spring-cloud-kubernetes/liveness-example/pom.xml  |  1 -
 .../spring-cloud-kubernetes/readiness-example/pom.xml |  1 -
 .../travel-agency-service/pom.xml                     |  1 -
 spring-cloud/spring-cloud-vault/pom.xml               |  1 -
 spring-cloud/spring-cloud-zuul/pom.xml                |  1 -
 spring-exceptions/pom.xml                             |  2 --
 spring-freemarker/pom.xml                             |  3 +--
 spring-kafka/pom.xml                                  |  1 -
 spring-mvc-forms-jsp/pom.xml                          |  3 ---
 spring-mvc-simple/pom.xml                             |  3 ---
 spring-mvc-velocity/pom.xml                           |  2 --
 spring-mvc-webflow/pom.xml                            |  3 ---
 spring-security-cache-control/pom.xml                 |  4 ----
 spring-security-mvc-boot/pom.xml                      |  2 --
 spring-security-mvc-custom/pom.xml                    |  7 +------
 spring-security-mvc-digest-auth/pom.xml               |  6 +-----
 spring-security-mvc-login/pom.xml                     |  9 +--------
 spring-security-mvc-persisted-remember-me/pom.xml     |  1 -
 spring-security-mvc-session/pom.xml                   |  4 +---
 spring-security-mvc-socket/pom.xml                    |  1 -
 spring-security-react/pom.xml                         |  6 +-----
 spring-security-rest-basic-auth/pom.xml               |  6 +-----
 spring-security-rest/pom.xml                          |  3 ---
 spring-session/spring-session-jdbc/pom.xml            |  4 ----
 spring-static-resources/pom.xml                       |  4 ----
 .../spring-swagger-codegen-api-client/pom.xml         | 11 +++++------
 spring-userservice/pom.xml                            |  7 ++-----
 stripe/pom.xml                                        |  1 -
 struts-2/pom.xml                                      |  3 +--
 tensorflow-java/pom.xml                               |  1 -
 testing-modules/junit-5/pom.xml                       |  1 -
 testing-modules/rest-assured/pom.xml                  |  2 --
 testing-modules/rest-testing/pom.xml                  |  3 ---
 testing-modules/test-containers/pom.xml               |  1 -
 vaadin/pom.xml                                        |  1 -
 vavr/pom.xml                                          |  1 -
 video-tutorials/jackson-annotations/pom.xml           |  4 ----
 vraptor/pom.xml                                       |  4 +---
 105 files changed, 46 insertions(+), 243 deletions(-)

diff --git a/apache-meecrowave/pom.xml b/apache-meecrowave/pom.xml
index bb851577e2..4eb1094f94 100644
--- a/apache-meecrowave/pom.xml
+++ b/apache-meecrowave/pom.xml
@@ -60,7 +60,6 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-		<junit.version>4.10</junit.version>
 		<meecrowave-junit.version>1.2.0</meecrowave-junit.version>
 		<okhttp.version>3.10.0</okhttp.version>
 		<meecrowave-jpa.version>1.2.1</meecrowave-jpa.version>
diff --git a/apache-velocity/pom.xml b/apache-velocity/pom.xml
index a0a8389f7d..24ab0b861d 100644
--- a/apache-velocity/pom.xml
+++ b/apache-velocity/pom.xml
@@ -59,7 +59,6 @@
     </build>
 
     <properties>
-        <jstl.version>1.2</jstl.version>
         <org.apache.httpcomponents.version>4.5.2</org.apache.httpcomponents.version>
         <velocity-version>1.7</velocity-version>
         <velocity-tools-version>2.0</velocity-tools-version>
diff --git a/cdi/pom.xml b/cdi/pom.xml
index 85da8518d0..c98ad57495 100644
--- a/cdi/pom.xml
+++ b/cdi/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
-            <version>${hamcrest-core.version}</version>
+            <version>${org.hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -64,7 +64,6 @@
         <cdi-api.version>2.0.SP1</cdi-api.version>
         <weld-se-core.version>3.0.5.Final</weld-se-core.version>
         <aspectjweaver.version>1.9.2</aspectjweaver.version>
-        <hamcrest-core.version>1.3</hamcrest-core.version>
         <assertj-core.version>3.10.0</assertj-core.version>
         <spring.version>5.1.2.RELEASE</spring.version>
     </properties>
diff --git a/cloud-foundry-uaa/cf-uaa-oauth2-client/pom.xml b/cloud-foundry-uaa/cf-uaa-oauth2-client/pom.xml
index f650498b69..c6de00dbe9 100644
--- a/cloud-foundry-uaa/cf-uaa-oauth2-client/pom.xml
+++ b/cloud-foundry-uaa/cf-uaa-oauth2-client/pom.xml
@@ -34,8 +34,5 @@
             </plugin>
         </plugins>
     </build>
-
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
+	
 </project>
diff --git a/cloud-foundry-uaa/cf-uaa-oauth2-resource-server/pom.xml b/cloud-foundry-uaa/cf-uaa-oauth2-resource-server/pom.xml
index 710cecbd4e..56fb23e9d8 100644
--- a/cloud-foundry-uaa/cf-uaa-oauth2-resource-server/pom.xml
+++ b/cloud-foundry-uaa/cf-uaa-oauth2-resource-server/pom.xml
@@ -35,8 +35,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
 </project>
diff --git a/ethereum/pom.xml b/ethereum/pom.xml
index baa74b58a5..80e1c04676 100644
--- a/ethereum/pom.xml
+++ b/ethereum/pom.xml
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp.jstl</groupId>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>javax.servlet.jsp-api</artifactId>
-            <version>${javax-jsp.version}</version>
+            <version>${javax.servlet.jsp-api.version}</version>
         </dependency>
 
         <!-- Logging -->
@@ -160,7 +160,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>${hamcrest.version}</version>
+            <version>${org.hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -213,12 +213,7 @@
         <web3j.core.version>3.3.1</web3j.core.version>
         <spring.boot.version>1.5.6.RELEASE</spring.boot.version>
         <mockito.version>2.21.0</mockito.version>
-        <hamcrest.version>1.3</hamcrest.version>
-        <javax-jsp.version>2.3.1</javax-jsp.version>
-        <javax-servlet.version>3.1.0</javax-servlet.version>
         <jsonpath.version>2.4.0</jsonpath.version>
-        <jstl.version>1.2</jstl.version>
-        <junit.version>4.12</junit.version>
         <logback.version>1.2.3</logback.version>
         <slf4j.version>1.7.25</slf4j.version>
         <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
diff --git a/google-cloud/pom.xml b/google-cloud/pom.xml
index e39e186f05..ec53b78070 100644
--- a/google-cloud/pom.xml
+++ b/google-cloud/pom.xml
@@ -30,7 +30,6 @@
     </dependencies>
 
     <properties>
-        <lombok.version>1.16.18</lombok.version>
         <google-cloud-storage.version>1.16.0</google-cloud-storage.version>
     </properties>
 
diff --git a/google-web-toolkit/pom.xml b/google-web-toolkit/pom.xml
index f4c6a0ab39..0723cd3be2 100644
--- a/google-web-toolkit/pom.xml
+++ b/google-web-toolkit/pom.xml
@@ -120,7 +120,6 @@
 		<!-- Don't let your Mac use a crazy non-standard encoding -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<junit.version>4.11</junit.version>
 		<gwt.version>2.8.2</gwt.version>
 	</properties>
 	
diff --git a/gson/pom.xml b/gson/pom.xml
index 8222cb50e1..a21d783c39 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -67,7 +67,6 @@
         <commons-lang3.version>3.5</commons-lang3.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <joda-time.version>2.9.6</joda-time.version>
-        <lombok.version>1.16.10</lombok.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/guest/junit5-example/pom.xml b/guest/junit5-example/pom.xml
index 7c0cc3e776..c6370941d1 100644
--- a/guest/junit5-example/pom.xml
+++ b/guest/junit5-example/pom.xml
@@ -60,7 +60,6 @@
     <properties>
         <junit.jupiter.version>5.0.0-M4</junit.jupiter.version>
         <junit-vintage.version>4.12.0-M4</junit-vintage.version>
-        <h2.version>1.4.195</h2.version>
         <log4j-core.version>2.8.2</log4j-core.version>
         <junit-platform-surefire-provider.version>1.0.0-M4</junit-platform-surefire-provider.version>
     </properties>
diff --git a/guest/log4j2-example/pom.xml b/guest/log4j2-example/pom.xml
index 045ff7325b..31a32a4562 100644
--- a/guest/log4j2-example/pom.xml
+++ b/guest/log4j2-example/pom.xml
@@ -41,7 +41,6 @@
     </build>
 
     <properties>
-        <jackson.version>2.9.7</jackson.version>
         <log4j-core.version>2.8.2</log4j-core.version>
     </properties>
 
diff --git a/guest/tomcat-app/pom.xml b/guest/tomcat-app/pom.xml
index 9ce77c758a..ab18023f70 100644
--- a/guest/tomcat-app/pom.xml
+++ b/guest/tomcat-app/pom.xml
@@ -31,9 +31,9 @@
             <version>${rest-assured.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
+            <groupId>com.h2</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
+            <version>${h2.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -62,7 +62,6 @@
 
     <properties>
         <jersey-container-servlet.version>2.25.1</jersey-container-servlet.version>
-        <h2database.version>1.4.195</h2database.version>
         <rest-assured.version>3.0.3</rest-assured.version>
         <log4j-core.version>2.8.2</log4j-core.version>
         <javamelody-core.version>1.69.0</javamelody-core.version>
diff --git a/httpclient-simple/pom.xml b/httpclient-simple/pom.xml
index f3d00251d7..efcf0452e2 100644
--- a/httpclient-simple/pom.xml
+++ b/httpclient-simple/pom.xml
@@ -172,7 +172,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -295,9 +295,6 @@
     </profiles>
 
     <properties>
-        <!-- various -->
-        <jstl.version>1.2</jstl.version>
-        <javax.servlet.version>3.1.0</javax.servlet.version>
         <!-- util -->
         <guava.version>19.0</guava.version>
         <commons-lang3.version>3.5</commons-lang3.version>
diff --git a/hystrix/pom.xml b/hystrix/pom.xml
index fb044588de..7bb3e98246 100644
--- a/hystrix/pom.xml
+++ b/hystrix/pom.xml
@@ -64,8 +64,6 @@
         <!-- Hystrix -->
         <hystrix-core.version>1.5.8</hystrix-core.version>
         <rxjava-core.version>0.20.7</rxjava-core.version>
-        <!-- Testing -->
-        <hamcrest-all.version>1.3</hamcrest-all.version>
         <!-- maven plugins -->
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
diff --git a/java-ee-8-security-api/app-auth-basic-store-db/pom.xml b/java-ee-8-security-api/app-auth-basic-store-db/pom.xml
index cf92fe2ecd..582e82d8bb 100644
--- a/java-ee-8-security-api/app-auth-basic-store-db/pom.xml
+++ b/java-ee-8-security-api/app-auth-basic-store-db/pom.xml
@@ -53,7 +53,7 @@
                         <artifactItem>
                             <groupId>com.h2database</groupId>
                             <artifactId>h2</artifactId>
-                            <version>${h2-version}</version>
+                            <version>${h2.version}</version>
                             <type>jar</type>
                             <outputDirectory>
                                 ${project.build.directory}/liberty/wlp/usr/servers/defaultServer/lib/global
@@ -64,8 +64,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <properties>
-        <h2-version>1.4.197</h2-version>
-    </properties>
 </project>
diff --git a/java-ee-8-security-api/app-auth-custom-no-store/pom.xml b/java-ee-8-security-api/app-auth-custom-no-store/pom.xml
index f9d63f8623..51ee64097a 100644
--- a/java-ee-8-security-api/app-auth-custom-no-store/pom.xml
+++ b/java-ee-8-security-api/app-auth-custom-no-store/pom.xml
@@ -53,7 +53,7 @@
                         <artifactItem>
                             <groupId>com.h2database</groupId>
                             <artifactId>h2</artifactId>
-                            <version>${h2-version}</version>
+                            <version>${h2.version}</version>
                             <type>jar</type>
                             <outputDirectory>
                                 ${project.build.directory}/liberty/wlp/usr/servers/defaultServer/lib/global
@@ -64,8 +64,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <properties>
-        <h2-version>1.4.197</h2-version>
-    </properties>
 </project>
diff --git a/java-ee-8-security-api/pom.xml b/java-ee-8-security-api/pom.xml
index 0cce84e5f2..9b8356714f 100644
--- a/java-ee-8-security-api/pom.xml
+++ b/java-ee-8-security-api/pom.xml
@@ -72,7 +72,6 @@
         <javaee-version>8.0</javaee-version>
         <liberty-maven-plugin.version>2.3</liberty-maven-plugin.version>
         <openliberty-runtime.version>18.0.0.1</openliberty-runtime.version>
-        <h2-version>1.4.197</h2-version>
         
         <maven-war-plugin.version>3.2.2</maven-war-plugin.version>
     </properties>
diff --git a/java-numbers/pom.xml b/java-numbers/pom.xml
index eb75f85bf0..daed356f66 100644
--- a/java-numbers/pom.xml
+++ b/java-numbers/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh-generator-annprocess.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -127,8 +127,6 @@
 
         <org.slf4j.version>1.7.21</org.slf4j.version>
         <logback.version>1.1.7</logback.version>
-        <jmh-core.version>1.19</jmh-core.version>
-        <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
 
         <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
diff --git a/java-streams-2/pom.xml b/java-streams-2/pom.xml
index 5004249352..3e08e2f432 100644
--- a/java-streams-2/pom.xml
+++ b/java-streams-2/pom.xml
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -44,7 +44,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <jmh.version>1.21</jmh.version>
         <assertj.version>3.11.1</assertj.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/java-streams/pom.xml b/java-streams/pom.xml
index 00384eeead..b0c56ecdf9 100644
--- a/java-streams/pom.xml
+++ b/java-streams/pom.xml
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-generator.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -106,7 +106,6 @@
 
     <properties>
         <!-- util -->
-        <jmh.version>1.21</jmh.version>
         <commons-lang3.version>3.5</commons-lang3.version>
         <vavr.version>0.9.0</vavr.version>
         <protonpack.version>1.15</protonpack.version>
diff --git a/java-strings-2/pom.xml b/java-strings-2/pom.xml
index c314cd8cad..5279cf5777 100755
--- a/java-strings-2/pom.xml
+++ b/java-strings-2/pom.xml
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>${hamcrest-library.version}</version>
+            <version>${org.hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -136,12 +136,10 @@
         <commons-codec.version>1.10</commons-codec.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <jmh-core.version>1.19</jmh-core.version>
         <icu4j.version>61.1</icu4j.version>
         <guava.version>27.0.1-jre</guava.version>
         <emoji-java.version>4.0.0</emoji-java.version>
         <junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
-        <hamcrest-library.version>1.3</hamcrest-library.version>
         <passay.version>1.3.1</passay.version>
         <commons-text.version>1.4</commons-text.version>
         <ahocorasick.version>0.4.0</ahocorasick.version>
diff --git a/java-strings/pom.xml b/java-strings/pom.xml
index 4555b8ad4a..7f66b95355 100755
--- a/java-strings/pom.xml
+++ b/java-strings/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh-core.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
         <dependency>
             <groupId>com.ibm.icu</groupId>
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>${hamcrest-library.version}</version>
+            <version>${org.hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -132,12 +132,10 @@
         <commons-codec.version>1.10</commons-codec.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <jmh-core.version>1.19</jmh-core.version>
         <icu4j.version>61.1</icu4j.version>
         <guava.version>27.0.1-jre</guava.version>
 		<emoji-java.version>4.0.0</emoji-java.version>
 		<junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
-		<hamcrest-library.version>1.3</hamcrest-library.version>
 		<passay.version>1.3.1</passay.version>
 		<commons-text.version>1.4</commons-text.version>
 		<ahocorasick.version>0.4.0</ahocorasick.version>
diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml
index bf85feb7ce..e3d8a430d9 100644
--- a/javax-servlets/pom.xml
+++ b/javax-servlets/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>javax.servlet.jsp-api</artifactId>
-            <version>${jsp.version}</version>
+            <version>${javax.servlet.jsp-api.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -90,7 +90,5 @@
         <commons-fileupload.version>1.3.3</commons-fileupload.version>
         <commons-io.version>2.6</commons-io.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
-        <jstl.version>1.2</jstl.version>
-        <jsp.version>2.3.1</jsp.version>
     </properties>
 </project>
diff --git a/jee-7/pom.xml b/jee-7/pom.xml
index 62ccb9d313..d389b57cd5 100644
--- a/jee-7/pom.xml
+++ b/jee-7/pom.xml
@@ -527,10 +527,8 @@
 		<com.sun.faces.jsf.version>2.2.14</com.sun.faces.jsf.version>
 		<httpclient.version>4.5</httpclient.version>
 		<arquillian-drone-bom.version>2.0.1.Final</arquillian-drone-bom.version>
-		<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
 		<graphene-webdriver.version>2.1.0.Final</graphene-webdriver.version>
 		<maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
-		<jstl.version>1.2</jstl.version>
 		<jsp-api.version>2.2</jsp-api.version>
 		<ozark.version>20160715</ozark.version>
 		<jboss-batch-api.version>1.0.0.Final</jboss-batch-api.version>
@@ -538,7 +536,6 @@
 		<jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>
 		<jboss-marshalling.version>1.4.2.Final</jboss-marshalling.version>
 		<weld.version>2.1.1.Final</weld.version>
-		<h2.version>1.4.178</h2.version>
 		<jersey-container-jetty-servlet.version>2.22.1</jersey-container-jetty-servlet.version>
 	</properties>
 
diff --git a/jsf/pom.xml b/jsf/pom.xml
index fc6d4a0ee2..19f1265250 100644
--- a/jsf/pom.xml
+++ b/jsf/pom.xml
@@ -67,7 +67,7 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
         </dependency>
 
         <!-- Primefaces -->
@@ -99,11 +99,6 @@
         <com.sun.faces.version>2.2.14</com.sun.faces.version>
         <javax.el.version>3.0.0</javax.el.version>
 
-        <!--Tomcat -->
-        <javax.servlet.version>3.1.0</javax.servlet.version>
-
-        <jstl.version>1.2</jstl.version>
-
         <!-- maven plugins -->
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
 
diff --git a/jta/pom.xml b/jta/pom.xml
index 6a31733996..b7e39c66e1 100644
--- a/jta/pom.xml
+++ b/jta/pom.xml
@@ -83,7 +83,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
 		<hsqldb.version>2.4.1</hsqldb.version>
         <spring-boot.version>2.0.4.RELEASE</spring-boot.version>
     </properties>
diff --git a/libraries-apache-commons/pom.xml b/libraries-apache-commons/pom.xml
index c7ff918af9..cb5990df22 100644
--- a/libraries-apache-commons/pom.xml
+++ b/libraries-apache-commons/pom.xml
@@ -95,14 +95,11 @@
         <assertj.version>3.6.2</assertj.version>
         <commons.io.version>2.5</commons.io.version>
         <commons.dbutils.version>1.6</commons.dbutils.version>
-        <h2.version>1.4.196</h2.version>
         <commons.collections.version>4.1</commons.collections.version>
-        <junit.version>4.12</junit.version>
         <org.hamcrest.java-hamcrest.version>2.0.0.0</org.hamcrest.java-hamcrest.version>
         <commons-codec-version>1.10.L001</commons-codec-version>
         <xchart-version>3.5.2</xchart-version>
         <commons-net.version>3.6</commons-net.version>
-        <hamcrest-all.version>1.3</hamcrest-all.version>
         <common-math3.version>3.6.1</common-math3.version>
     </properties>
 
diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 85be66c067..3276ebcdbb 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -432,9 +432,7 @@
     <properties>
         <storm.version>1.2.2</storm.version>
         <kryo.version>4.0.1</kryo.version>
-        <h2.version>1.4.196</h2.version>
         <reladomo.version>16.5.1</reladomo.version>
-        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
         <ormlite.version>5.0</ormlite.version>
         <kafka.version>1.0.0</kafka.version>
         <ignite.version>2.4.0</ignite.version>
diff --git a/linkrest/pom.xml b/linkrest/pom.xml
index 073a173aff..b3d3bd374e 100644
--- a/linkrest/pom.xml
+++ b/linkrest/pom.xml
@@ -73,7 +73,6 @@
     <properties>
         <linkrest.version>2.9</linkrest.version>
         <cayenne.version>4.0.B1</cayenne.version>
-        <h2.version>1.4.196</h2.version>
         <jersey.version>2.25.1</jersey.version>
     </properties>
 
diff --git a/logging-modules/log-mdc/pom.xml b/logging-modules/log-mdc/pom.xml
index 3031274d0b..ae658e034e 100644
--- a/logging-modules/log-mdc/pom.xml
+++ b/logging-modules/log-mdc/pom.xml
@@ -29,13 +29,13 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.library}</version>
+            <version>${jackson.version}</version>
         </dependency>
 
         <!--log4j dependencies -->
@@ -98,12 +98,9 @@
     </build>
 
     <properties>
-        <log4j.version>1.2.17</log4j.version>
         <log4j2.version>2.7</log4j2.version>
         <disruptor.version>3.3.6</disruptor.version>
         <jbosslogging.version>3.3.0.Final</jbosslogging.version>
-        <javax.servlet.version>3.1.0</javax.servlet.version>
-        <jackson.library>2.9.7</jackson.library>
         <maven-war-plugin.version>2.4</maven-war-plugin.version>
     </properties>
 
diff --git a/logging-modules/log4j2/pom.xml b/logging-modules/log4j2/pom.xml
index 924abfd346..14420356de 100644
--- a/logging-modules/log4j2/pom.xml
+++ b/logging-modules/log4j2/pom.xml
@@ -115,8 +115,6 @@
     </profiles>
 
     <properties>
-        <jackson.version>2.9.7</jackson.version>
-        <h2.version>1.4.193</h2.version>
         <commons-dbcp2.version>2.1.1</commons-dbcp2.version>
         <log4j-core.version>2.11.0</log4j-core.version>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
diff --git a/logging-modules/logback/pom.xml b/logging-modules/logback/pom.xml
index 41a28ffd17..22a89124b5 100644
--- a/logging-modules/logback/pom.xml
+++ b/logging-modules/logback/pom.xml
@@ -58,7 +58,6 @@
     <properties>
         <logback.version>1.2.3</logback.version>
         <logback.contrib.version>0.1.5</logback.contrib.version>
-        <jackson.version>2.9.7</jackson.version>
         <docx4j.version>3.3.5</docx4j.version>
     </properties>
 
diff --git a/lucene/pom.xml b/lucene/pom.xml
index f427cfd8a7..3d1ce61782 100644
--- a/lucene/pom.xml
+++ b/lucene/pom.xml
@@ -32,8 +32,6 @@
     </dependencies>
 
     <properties>
-        <!-- lombok: https://projectlombok.org/changelog.html -->
-        <lombok.version>1.16.18</lombok.version>
         <!-- various -->
         <hibernate-jpa-2.1-api.version>1.0.0.Final</hibernate-jpa-2.1-api.version>
         <!-- delombok maven plugin -->
diff --git a/parent-spring-5/pom.xml b/parent-spring-5/pom.xml
index 3178682d34..84df8cf30a 100644
--- a/parent-spring-5/pom.xml
+++ b/parent-spring-5/pom.xml
@@ -31,7 +31,6 @@
     <properties>
         <spring.version>5.1.4.RELEASE</spring.version>
         <junit.jupiter.version>5.0.2</junit.jupiter.version>
-		<jackson.version>2.9.6</jackson.version>
 		<spring-security.version>5.1.4.RELEASE</spring-security.version>
     </properties>
 
diff --git a/patterns/pom.xml b/patterns/pom.xml
index bf302a7a74..875af67d55 100644
--- a/patterns/pom.xml
+++ b/patterns/pom.xml
@@ -51,7 +51,6 @@
     </build>
 
     <properties>
-        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
         <jetty-maven-plugin.version>9.4.0.v20161208</jetty-maven-plugin.version>
     </properties>
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 7d77c2a0e3..d7738780bf 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -46,12 +46,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
     </dependencies>
     
@@ -85,7 +85,6 @@
         <mapstruct-jdk8.version>1.2.0.Final</mapstruct-jdk8.version>
         <modelmapper.version>1.1.0</modelmapper.version>
         <jmapper.version>1.6.0.1</jmapper.version>
-        <jmh.version>1.20</jmh.version>
         <mapstruct-processor.version>1.2.0.Final</mapstruct-processor.version>
     </properties>
 
diff --git a/persistence-modules/core-java-persistence/pom.xml b/persistence-modules/core-java-persistence/pom.xml
index 2ad2083fec..2760489ce1 100644
--- a/persistence-modules/core-java-persistence/pom.xml
+++ b/persistence-modules/core-java-persistence/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
+            <version>${h2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -73,7 +73,6 @@
         <postgresql.version>42.2.5.jre7</postgresql.version>
         <mysql-connector.version>8.0.15</mysql-connector.version>
         <assertj-core.version>3.10.0</assertj-core.version>
-        <h2database.version>1.4.197</h2database.version>
         <commons-dbcp2.version>2.4.0</commons-dbcp2.version>
         <HikariCP.version>3.2.0</HikariCP.version>
         <c3p0.version>0.9.5.2</c3p0.version>
diff --git a/persistence-modules/deltaspike/pom.xml b/persistence-modules/deltaspike/pom.xml
index 9a4669102a..4dcef07695 100644
--- a/persistence-modules/deltaspike/pom.xml
+++ b/persistence-modules/deltaspike/pom.xml
@@ -317,7 +317,6 @@
         <war.plugin.version>2.6</war.plugin.version>
         <apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
         <jandex.version>1.2.5.Final-redhat-1</jandex.version>
-        <h2.version>1.4.197</h2.version>
         <commons-lang3.version>3.5</commons-lang3.version>
     </properties>
 
diff --git a/persistence-modules/flyway/pom.xml b/persistence-modules/flyway/pom.xml
index eb827f5675..99549ee3fc 100644
--- a/persistence-modules/flyway/pom.xml
+++ b/persistence-modules/flyway/pom.xml
@@ -65,7 +65,6 @@
     <properties>
         <flyway-core.version>5.0.2</flyway-core.version>
         <flyway-maven-plugin.version>5.0.2</flyway-maven-plugin.version>
-        <h2.version>1.4.195</h2.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/hibernate-mapping/pom.xml b/persistence-modules/hibernate-mapping/pom.xml
index fdc82a5275..6bab3c5b1f 100644
--- a/persistence-modules/hibernate-mapping/pom.xml
+++ b/persistence-modules/hibernate-mapping/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
+            <version>${h2.version}</version>
         </dependency>
 	    <!-- validation -->
         <dependency>
@@ -61,7 +61,6 @@
 
     <properties>
         <hibernate.version>5.3.7.Final</hibernate.version>
-        <h2database.version>1.4.196</h2database.version>
         <assertj-core.version>3.8.0</assertj-core.version>
         <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
         <javax.el-api.version>2.2.5</javax.el-api.version>
diff --git a/persistence-modules/hibernate5/pom.xml b/persistence-modules/hibernate5/pom.xml
index c7f08e50d5..8799317e9c 100644
--- a/persistence-modules/hibernate5/pom.xml
+++ b/persistence-modules/hibernate5/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
+            <version>${h2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -104,9 +104,7 @@
         <hibernate.version>5.3.7.Final</hibernate.version>
         <mysql.version>6.0.6</mysql.version>
         <mariaDB4j.version>2.2.3</mariaDB4j.version>
-        <h2database.version>1.4.196</h2database.version>
         <assertj-core.version>3.8.0</assertj-core.version>
-        <jackson.version>2.9.7</jackson.version>
         <openjdk-jmh.version>1.21</openjdk-jmh.version>
     </properties>
 
diff --git a/persistence-modules/influxdb/pom.xml b/persistence-modules/influxdb/pom.xml
index 8e1aeebe6d..a8ecaadd62 100644
--- a/persistence-modules/influxdb/pom.xml
+++ b/persistence-modules/influxdb/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         <influxdb.sdk.version>2.8</influxdb.sdk.version>
-        <lombok.version>1.16.18</lombok.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/java-jpa/pom.xml b/persistence-modules/java-jpa/pom.xml
index fa47d6bd9c..f23040fbdc 100644
--- a/persistence-modules/java-jpa/pom.xml
+++ b/persistence-modules/java-jpa/pom.xml
@@ -49,7 +49,6 @@
 
     <properties>
         <hibernate.version>5.4.0.Final</hibernate.version>
-        <h2.version>1.4.197</h2.version>
         <eclipselink.version>2.7.4-RC1</eclipselink.version>
         <postgres.version>42.2.5</postgres.version>
     </properties>
diff --git a/persistence-modules/spring-boot-persistence/pom.xml b/persistence-modules/spring-boot-persistence/pom.xml
index ca7c7306e7..e283759c75 100644
--- a/persistence-modules/spring-boot-persistence/pom.xml
+++ b/persistence-modules/spring-boot-persistence/pom.xml
@@ -79,10 +79,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
         <mysql-connector-java.version>8.0.12</mysql-connector-java.version>
         <tomcat-jdbc.version>9.0.10</tomcat-jdbc.version>
-        <h2database.version>1.4.197</h2database.version>
         <mockito.version>2.23.0</mockito.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
     </properties>
diff --git a/persistence-modules/spring-data-cassandra-reactive/pom.xml b/persistence-modules/spring-data-cassandra-reactive/pom.xml
index bc8f49862d..5a34d90c9f 100644
--- a/persistence-modules/spring-data-cassandra-reactive/pom.xml
+++ b/persistence-modules/spring-data-cassandra-reactive/pom.xml
@@ -52,7 +52,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8
         </project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <spring-data-cassandra.version>2.1.2.RELEASE</spring-data-cassandra.version>
     </properties>
 
diff --git a/persistence-modules/spring-data-eclipselink/pom.xml b/persistence-modules/spring-data-eclipselink/pom.xml
index 618fa83ee5..61c28dc26f 100644
--- a/persistence-modules/spring-data-eclipselink/pom.xml
+++ b/persistence-modules/spring-data-eclipselink/pom.xml
@@ -67,7 +67,6 @@
     <properties>
         <spring.version>1.5.9.RELEASE</spring.version>
         <eclipselink.version>2.7.0</eclipselink.version>
-        <h2.version>1.4.196</h2.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/spring-hibernate-3/pom.xml b/persistence-modules/spring-hibernate-3/pom.xml
index 6c1bdace30..ec35f35bb3 100644
--- a/persistence-modules/spring-hibernate-3/pom.xml
+++ b/persistence-modules/spring-hibernate-3/pom.xml
@@ -91,7 +91,6 @@
         <hibernate.version>3.6.10.Final</hibernate.version>
         <mysql-connector-java.version>5.1.40</mysql-connector-java.version>
         <tomcat-dbcp.version>8.5.8</tomcat-dbcp.version>
-        <h2.version>1.4.193</h2.version>
         <!-- util -->
         <guava.version>19.0</guava.version>
         <commons-lang3.version>3.5</commons-lang3.version>
diff --git a/persistence-modules/spring-hibernate-5/pom.xml b/persistence-modules/spring-hibernate-5/pom.xml
index 832cf8dca7..16e55cb0c0 100644
--- a/persistence-modules/spring-hibernate-5/pom.xml
+++ b/persistence-modules/spring-hibernate-5/pom.xml
@@ -143,7 +143,6 @@
         <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
         <jta.version>1.1</jta.version>
         <hsqldb.version>2.3.4</hsqldb.version>
-        <h2.version>1.4.195</h2.version>
 
         <!-- util -->
         <guava.version>21.0</guava.version>
diff --git a/persistence-modules/spring-hibernate4/pom.xml b/persistence-modules/spring-hibernate4/pom.xml
index fad84870df..4289c9c3d5 100644
--- a/persistence-modules/spring-hibernate4/pom.xml
+++ b/persistence-modules/spring-hibernate4/pom.xml
@@ -160,7 +160,6 @@
         <tomcat-dbcp.version>8.5.8</tomcat-dbcp.version>
         <jta.version>1.1</jta.version>
         <hsqldb.version>2.3.4</hsqldb.version>
-        <h2.version>1.4.193</h2.version>
 
         <!-- various -->
         <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
diff --git a/persistence-modules/spring-jpa/pom.xml b/persistence-modules/spring-jpa/pom.xml
index 3daba6cd55..0fdffad8db 100644
--- a/persistence-modules/spring-jpa/pom.xml
+++ b/persistence-modules/spring-jpa/pom.xml
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
-            <version>${javax.servlet.jstl.version}</version>
+            <version>${jstl.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -163,10 +163,8 @@
         <hibernate.version>5.2.17.Final</hibernate.version>
         <mysql-connector-java.version>6.0.6</mysql-connector-java.version>
         <spring-data-jpa.version>2.1.5.RELEASE</spring-data-jpa.version>
-        <h2.version>1.4.195</h2.version>
 
         <!-- web -->
-        <javax.servlet.jstl.version>1.2</javax.servlet.jstl.version>
         <javax.servlet.servlet-api.version>2.5</javax.servlet.servlet-api.version>
 
         <!-- various -->
diff --git a/pom.xml b/pom.xml
index 2af980325e..89c9416ebb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1560,5 +1560,6 @@
 		<!-- <maven-pmd-plugin.version>3.9.0</maven-pmd-plugin.version> -->
 		<maven-pmd-plugin.version>3.8</maven-pmd-plugin.version>
 		<lombok.version>1.16.12</lombok.version>
+		<h2.version>1.4.197</h2.version>
 	</properties>
 </project>
diff --git a/ratpack/pom.xml b/ratpack/pom.xml
index a4389275b6..7c145eff91 100644
--- a/ratpack/pom.xml
+++ b/ratpack/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
+            <version>${h2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -90,7 +90,6 @@
         <ratpack.version>1.5.4</ratpack.version>
         <httpclient.version>4.5.3</httpclient.version>
         <httpcore.version>4.4.6</httpcore.version>
-        <h2database.version>1.4.193</h2database.version>
         <hystrix.version>1.5.12</hystrix.version>
     </properties>
 
diff --git a/rxjava/pom.xml b/rxjava/pom.xml
index 596a5196da..85106d1127 100644
--- a/rxjava/pom.xml
+++ b/rxjava/pom.xml
@@ -62,7 +62,6 @@
         <rx.java.math.version>1.0.0</rx.java.math.version>
         <rx.java.string.version>1.1.1</rx.java.string.version>
         <awaitility.version>1.7.0</awaitility.version>
-        <h2.version>1.4.196</h2.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/software-security/sql-injection-samples/pom.xml b/software-security/sql-injection-samples/pom.xml
index 0a28a96a07..b982a34e75 100644
--- a/software-security/sql-injection-samples/pom.xml
+++ b/software-security/sql-injection-samples/pom.xml
@@ -64,8 +64,4 @@
 		</plugins>
 	</build>
 
-	<properties>
-		<java.version>1.8</java.version>
-	</properties>
-
 </project>
\ No newline at end of file
diff --git a/spring-4/pom.xml b/spring-4/pom.xml
index eb64c1839f..59b74782ec 100644
--- a/spring-4/pom.xml
+++ b/spring-4/pom.xml
@@ -88,8 +88,6 @@
     <properties>
         <start-class>com.baeldung.flips.ApplicationConfig</start-class>
         <flips-web.version>1.0.1</flips-web.version>
-        <lombok.version>1.16.18</lombok.version>
-        <h2database.version>1.4.197</h2database.version>
     </properties>
 
 </project>
diff --git a/spring-5-reactive-oauth/pom.xml b/spring-5-reactive-oauth/pom.xml
index ff076985e4..06ce817a02 100644
--- a/spring-5-reactive-oauth/pom.xml
+++ b/spring-5-reactive-oauth/pom.xml
@@ -69,7 +69,6 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
         <spring-boot.version>2.1.0.RELEASE</spring-boot.version>
 	</properties>
 
diff --git a/spring-activiti/pom.xml b/spring-activiti/pom.xml
index 3d67a2ab7b..e0196e807d 100644
--- a/spring-activiti/pom.xml
+++ b/spring-activiti/pom.xml
@@ -59,7 +59,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <activiti.version>6.0.0</activiti.version>
-        <java.version>1.8</java.version>
     </properties>
 
 </project>
diff --git a/spring-boot-angular-ecommerce/pom.xml b/spring-boot-angular-ecommerce/pom.xml
index a5296eade8..510e6c6ec3 100644
--- a/spring-boot-angular-ecommerce/pom.xml
+++ b/spring-boot-angular-ecommerce/pom.xml
@@ -75,7 +75,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <spring.boot.version>2.0.3.RELEASE</spring.boot.version>
         <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
     </properties>
diff --git a/spring-boot-crud/pom.xml b/spring-boot-crud/pom.xml
index 73635b0a1c..15ff6c5d11 100644
--- a/spring-boot-crud/pom.xml
+++ b/spring-boot-crud/pom.xml
@@ -60,7 +60,6 @@
     
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
     </properties>
     
 </project>
\ No newline at end of file
diff --git a/spring-boot-exceptions/pom.xml b/spring-boot-exceptions/pom.xml
index 105f60e295..01d6973642 100644
--- a/spring-boot-exceptions/pom.xml
+++ b/spring-boot-exceptions/pom.xml
@@ -17,10 +17,6 @@
     <name>pass-exception-to-client-json-spring-boot</name>
     <description>Baeldung article code on how to pass exceptions to client in JSON format using Spring Boot</description>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-vue/pom.xml b/spring-boot-vue/pom.xml
index 4e47a98d6f..5d19f01d1e 100644
--- a/spring-boot-vue/pom.xml
+++ b/spring-boot-vue/pom.xml
@@ -47,7 +47,6 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
 	</properties>
 
 </project>
diff --git a/spring-cloud-data-flow/etl/customer-mongodb-sink/pom.xml b/spring-cloud-data-flow/etl/customer-mongodb-sink/pom.xml
index 456caf480c..409db34829 100644
--- a/spring-cloud-data-flow/etl/customer-mongodb-sink/pom.xml
+++ b/spring-cloud-data-flow/etl/customer-mongodb-sink/pom.xml
@@ -63,7 +63,6 @@
     <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>Greenwich.RELEASE</spring-cloud.version>
     </properties>
 
diff --git a/spring-cloud-data-flow/etl/customer-transform/pom.xml b/spring-cloud-data-flow/etl/customer-transform/pom.xml
index b7376f7bd4..66f1d5e0d7 100644
--- a/spring-cloud-data-flow/etl/customer-transform/pom.xml
+++ b/spring-cloud-data-flow/etl/customer-transform/pom.xml
@@ -55,7 +55,6 @@
     <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>Greenwich.RELEASE</spring-cloud.version>
     </properties>
 
diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml b/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml
index 8ecda40d0a..afd045189c 100644
--- a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml
+++ b/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml
@@ -50,7 +50,6 @@
     <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>1.2.2.RELEASE</spring-cloud.version>
         <spring-boot.version>1.5.9.RELEASE</spring-boot.version>
     </properties>
diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml b/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml
index 47759a818a..07429687c7 100644
--- a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml
+++ b/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml
@@ -64,7 +64,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <spring-cloud.version>Edgware.SR1</spring-cloud.version>
         <spring-boot.version>1.5.9.RELEASE</spring-boot.version>
     </properties>
diff --git a/spring-cloud/spring-cloud-functions/pom.xml b/spring-cloud/spring-cloud-functions/pom.xml
index 4d03e07e89..7a44e4ae0f 100644
--- a/spring-cloud/spring-cloud-functions/pom.xml
+++ b/spring-cloud/spring-cloud-functions/pom.xml
@@ -85,7 +85,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <spring-cloud-function.version>1.0.1.RELEASE</spring-cloud-function.version>
         <aws-lambda-events.version>2.0.2</aws-lambda-events.version>
         <spring-boot.version>2.0.4.RELEASE</spring-boot.version>
diff --git a/spring-cloud/spring-cloud-kubernetes/client-service/pom.xml b/spring-cloud/spring-cloud-kubernetes/client-service/pom.xml
index a4de796ee3..41e09fa13b 100644
--- a/spring-cloud/spring-cloud-kubernetes/client-service/pom.xml
+++ b/spring-cloud/spring-cloud-kubernetes/client-service/pom.xml
@@ -88,7 +88,6 @@
     </build>
 
     <properties>
-        <java.version>1.8</java.version>
         <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
         <spring.cloud.k8s.version>1.0.0.RELEASE</spring.cloud.k8s.version>
     </properties>
diff --git a/spring-cloud/spring-cloud-kubernetes/liveness-example/pom.xml b/spring-cloud/spring-cloud-kubernetes/liveness-example/pom.xml
index 012a81bd8d..293b215918 100644
--- a/spring-cloud/spring-cloud-kubernetes/liveness-example/pom.xml
+++ b/spring-cloud/spring-cloud-kubernetes/liveness-example/pom.xml
@@ -44,7 +44,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <spring-boot.version>1.5.17.RELEASE</spring-boot.version>
     </properties>
 
diff --git a/spring-cloud/spring-cloud-kubernetes/readiness-example/pom.xml b/spring-cloud/spring-cloud-kubernetes/readiness-example/pom.xml
index 2b2e57a19c..07589e65b6 100644
--- a/spring-cloud/spring-cloud-kubernetes/readiness-example/pom.xml
+++ b/spring-cloud/spring-cloud-kubernetes/readiness-example/pom.xml
@@ -44,7 +44,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <spring-boot.version>1.5.17.RELEASE</spring-boot.version>
     </properties>
 
diff --git a/spring-cloud/spring-cloud-kubernetes/travel-agency-service/pom.xml b/spring-cloud/spring-cloud-kubernetes/travel-agency-service/pom.xml
index 19eea2612c..0d7639b179 100755
--- a/spring-cloud/spring-cloud-kubernetes/travel-agency-service/pom.xml
+++ b/spring-cloud/spring-cloud-kubernetes/travel-agency-service/pom.xml
@@ -68,7 +68,6 @@
     </build>
 
     <properties>
-        <java.version>1.8</java.version>
         <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
     </properties>
 
diff --git a/spring-cloud/spring-cloud-vault/pom.xml b/spring-cloud/spring-cloud-vault/pom.xml
index 3466f657be..9a1be3f5c0 100644
--- a/spring-cloud/spring-cloud-vault/pom.xml
+++ b/spring-cloud/spring-cloud-vault/pom.xml
@@ -68,7 +68,6 @@
     <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>Greenwich.RELEASE</spring-cloud.version>
     </properties>
 
diff --git a/spring-cloud/spring-cloud-zuul/pom.xml b/spring-cloud/spring-cloud-zuul/pom.xml
index 08990357d6..5d44ae9590 100644
--- a/spring-cloud/spring-cloud-zuul/pom.xml
+++ b/spring-cloud/spring-cloud-zuul/pom.xml
@@ -70,7 +70,6 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
 		<spring-cloud.version>Finchley.SR1</spring-cloud.version>
         <spring-boot.version>2.0.6.RELEASE</spring-boot.version>
 	</properties>
diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml
index 16f6286606..ff28ac89bb 100644
--- a/spring-exceptions/pom.xml
+++ b/spring-exceptions/pom.xml
@@ -179,7 +179,6 @@
         <org.springframework.version>4.3.4.RELEASE</org.springframework.version>
         <org.springframework.security.version>4.2.0.RELEASE</org.springframework.security.version>
         <javassist.version>3.21.0-GA</javassist.version>
-        <jstl.version>1.2</jstl.version>
 
         <!-- persistence -->
         <hibernate.version>5.2.5.Final</hibernate.version>
@@ -189,7 +188,6 @@
 
         <!-- various -->
         <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
-        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <javax.el.version>2.2</javax.el.version>
 
         <!-- util -->
diff --git a/spring-freemarker/pom.xml b/spring-freemarker/pom.xml
index 40558476ef..be34f84495 100644
--- a/spring-freemarker/pom.xml
+++ b/spring-freemarker/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${servletapi.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- Freemarker -->
@@ -57,7 +57,6 @@
     <properties>
         <spring.version>5.0.8.RELEASE</spring.version>
         <freemarker.version>2.3.28</freemarker.version>
-        <servletapi.version>3.1.0</servletapi.version>
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
     </properties>
diff --git a/spring-kafka/pom.xml b/spring-kafka/pom.xml
index b76d4f10c0..2fb4c776fe 100644
--- a/spring-kafka/pom.xml
+++ b/spring-kafka/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         <spring-kafka.version>2.2.2.RELEASE</spring-kafka.version>
-        <jackson.version>2.9.7</jackson.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-mvc-forms-jsp/pom.xml b/spring-mvc-forms-jsp/pom.xml
index e0539c3216..20912e71e5 100644
--- a/spring-mvc-forms-jsp/pom.xml
+++ b/spring-mvc-forms-jsp/pom.xml
@@ -100,9 +100,6 @@
 
     <properties>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
-        <jstl.version>1.2</jstl.version>
-        <javax.servlet.jsp-api.version>2.3.1</javax.servlet.jsp-api.version>
-        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
         <fileupload.version>1.3.3</fileupload.version>
         <hibernate.version>5.2.5.Final</hibernate.version>
diff --git a/spring-mvc-simple/pom.xml b/spring-mvc-simple/pom.xml
index cdd4a9e13a..a767cf3c37 100644
--- a/spring-mvc-simple/pom.xml
+++ b/spring-mvc-simple/pom.xml
@@ -163,9 +163,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven-war-plugin.version>3.2.0</maven-war-plugin.version>
-        <maven.compiler.version>3.7.0</maven.compiler.version>
         <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
-        <jstl.version>1.2</jstl.version>
         <javax.servlet.jsp-api.version>2.3.2-b02</javax.servlet.jsp-api.version>
         <javax.servlet-api.version>4.0.0</javax.servlet-api.version>
         <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
@@ -177,7 +175,6 @@
         <jade.version>1.2.5</jade.version>
         <junit.platform.version>1.0.2</junit.platform.version>
         <rome.version>1.9.0</rome.version>
-        <jackson.version>2.9.7</jackson.version>
         <xstream.version>1.4.9</xstream.version>
         <scribejava.version>5.1.0</scribejava.version>
         <json.version>20180130</json.version>
diff --git a/spring-mvc-velocity/pom.xml b/spring-mvc-velocity/pom.xml
index 60ac8b9c2f..df19b67e8e 100644
--- a/spring-mvc-velocity/pom.xml
+++ b/spring-mvc-velocity/pom.xml
@@ -110,8 +110,6 @@
 
         <httpcore.version>4.4.5</httpcore.version>
         <httpclient.version>4.5.2</httpclient.version>
-
-        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <velocity.version>1.7</velocity.version>
         <velocity-tools.version>2.0</velocity-tools.version>
         <rest-assured.version>2.9.0</rest-assured.version>
diff --git a/spring-mvc-webflow/pom.xml b/spring-mvc-webflow/pom.xml
index e1a279a787..c8de990da0 100644
--- a/spring-mvc-webflow/pom.xml
+++ b/spring-mvc-webflow/pom.xml
@@ -90,9 +90,6 @@
         <!-- Spring Web Flow -->
         <spring.webflow>2.5.0.RELEASE</spring.webflow>
 
-        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
-        <jstl.version>1.2</jstl.version>
-
         <httpcore.version>4.4.5</httpcore.version>
         <httpclient.version>4.5.2</httpclient.version>
 
diff --git a/spring-security-cache-control/pom.xml b/spring-security-cache-control/pom.xml
index c630774849..e68f92d2ee 100644
--- a/spring-security-cache-control/pom.xml
+++ b/spring-security-cache-control/pom.xml
@@ -65,8 +65,4 @@
 
     </dependencies>
 
-    <properties>
-        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/spring-security-mvc-boot/pom.xml b/spring-security-mvc-boot/pom.xml
index 00d8f032c2..4c25dc01e8 100644
--- a/spring-security-mvc-boot/pom.xml
+++ b/spring-security-mvc-boot/pom.xml
@@ -234,10 +234,8 @@
        <!-- <start-class>org.baeldung.ssl.HttpsEnabledApplication</start-class> -->
 
         <taglibs-standard.version>1.1.2</taglibs-standard.version>
-        <jstl.version>1.2</jstl.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <ehcache-core.version>2.6.11</ehcache-core.version>
-        <java.version>1.8</java.version>
     </properties>
 
 </project>
diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml
index 7c60a8e18a..4e932f3245 100644
--- a/spring-security-mvc-custom/pom.xml
+++ b/spring-security-mvc-custom/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -192,14 +192,9 @@
     </build>
 
     <properties>
-        <!-- various -->
-        <javax.servlet.version>3.1.0</javax.servlet.version>
-        <jstl.version>1.2</jstl.version>
-
         <!-- util -->
         <guava.version>19.0</guava.version>
         <commons-lang3.version>3.5</commons-lang3.version>
-        <jackson.version>2.9.7</jackson.version>
 
         <!-- Maven plugins -->
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml
index 33b3b5ff31..cf1de1730d 100644
--- a/spring-security-mvc-digest-auth/pom.xml
+++ b/spring-security-mvc-digest-auth/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -194,10 +194,6 @@
         <!-- Spring -->
         <org.springframework.security.version>4.2.6.RELEASE</org.springframework.security.version>
 
-        <!-- various -->
-        <jstl.version>1.2</jstl.version>
-        <javax.servlet.version>3.1.0</javax.servlet.version>
-
         <!-- util -->
         <guava.version>19.0</guava.version>
         <commons-lang3.version>3.5</commons-lang3.version>
diff --git a/spring-security-mvc-login/pom.xml b/spring-security-mvc-login/pom.xml
index 048297bbd4..02ed0e36f2 100644
--- a/spring-security-mvc-login/pom.xml
+++ b/spring-security-mvc-login/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -174,16 +174,9 @@
     </build>
 
     <properties>
-        <!-- Spring -->
-
-        <!-- various -->
-        <javax.servlet.version>3.1.0</javax.servlet.version>
-        <jstl.version>1.2</jstl.version>
-
         <!-- Maven plugins -->
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
-
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-mvc-persisted-remember-me/pom.xml b/spring-security-mvc-persisted-remember-me/pom.xml
index d10565255d..5e987dcb77 100644
--- a/spring-security-mvc-persisted-remember-me/pom.xml
+++ b/spring-security-mvc-persisted-remember-me/pom.xml
@@ -198,7 +198,6 @@
         <org.springframework.security.version>4.2.6.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
-        <h2.version>1.4.193</h2.version>
         <postgresql.version>9.4.1212</postgresql.version>
 
         <!-- various -->
diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc-session/pom.xml
index 03c75b99e2..c0e1527a24 100644
--- a/spring-security-mvc-session/pom.xml
+++ b/spring-security-mvc-session/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -171,8 +171,6 @@
 
         <!-- various -->
         <codahale.metrics.version>3.0.2</codahale.metrics.version>
-        <jstl.version>1.2</jstl.version>
-        <javax.servlet.version>3.1.0</javax.servlet.version>
 
         <!-- Maven plugins -->
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
diff --git a/spring-security-mvc-socket/pom.xml b/spring-security-mvc-socket/pom.xml
index b83f10d9fe..f1d28355fd 100644
--- a/spring-security-mvc-socket/pom.xml
+++ b/spring-security-mvc-socket/pom.xml
@@ -188,7 +188,6 @@
         <spring-data-jpa.version>1.11.3.RELEASE</spring-data-jpa.version>
         <h2database.version>1.4.196</h2database.version>
         <logback-classic.version>1.2.3</logback-classic.version>
-        <jackson.version>2.9.7</jackson.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-react/pom.xml b/spring-security-react/pom.xml
index eaf10791bc..c7b7c85be8 100644
--- a/spring-security-react/pom.xml
+++ b/spring-security-react/pom.xml
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -167,10 +167,6 @@
         <org.springframework.version>4.3.6.RELEASE</org.springframework.version>
         <org.springframework.security.version>4.2.1.RELEASE</org.springframework.security.version>
 
-        <!-- various -->
-        <javax.servlet.version>3.1.0</javax.servlet.version>
-        <jstl.version>1.2</jstl.version>
-
         <!-- util -->
         <guava.version>19.0</guava.version>
         <commons-lang3.version>3.5</commons-lang3.version>
diff --git a/spring-security-rest-basic-auth/pom.xml b/spring-security-rest-basic-auth/pom.xml
index 3c7f8eaa2b..8a90247386 100644
--- a/spring-security-rest-basic-auth/pom.xml
+++ b/spring-security-rest-basic-auth/pom.xml
@@ -142,7 +142,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -275,10 +275,6 @@
         <httpcore.version>4.4.11</httpcore.version>
         <httpclient.version>4.5.8</httpclient.version>
 
-        <!-- various -->
-        <jstl.version>1.2</jstl.version>
-        <javax.servlet.version>3.1.0</javax.servlet.version>
-
         <!-- util -->
         <guava.version>19.0</guava.version>
 
diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml
index b6039ce9d3..af38c1ffef 100644
--- a/spring-security-rest/pom.xml
+++ b/spring-security-rest/pom.xml
@@ -267,10 +267,7 @@
 
     <properties>
         <!-- various -->
-        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <javax.validation.version>1.1.0.Final</javax.validation.version>
-        <jstl.version>1.2</jstl.version>
-        <jackson.version>2.9.7</jackson.version>
 
         <!-- util -->
         <guava.version>26.0-jre</guava.version>
diff --git a/spring-session/spring-session-jdbc/pom.xml b/spring-session/spring-session-jdbc/pom.xml
index b46b549ce2..432715bc0e 100644
--- a/spring-session/spring-session-jdbc/pom.xml
+++ b/spring-session/spring-session-jdbc/pom.xml
@@ -48,8 +48,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <h2.version>1.4.197</h2.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/spring-static-resources/pom.xml b/spring-static-resources/pom.xml
index fc2b3336bc..f01e807919 100644
--- a/spring-static-resources/pom.xml
+++ b/spring-static-resources/pom.xml
@@ -199,14 +199,10 @@
         <org.aspectj-version>1.8.9</org.aspectj-version>
         <javax.servlet.jsp-api.version>2.3.2-b02</javax.servlet.jsp-api.version>
 
-        <!-- marshalling -->
-        <jackson.version>2.9.6</jackson.version>
-
         <!-- various 1.3.2 -->
         <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
         <handlebars.version>4.1.0</handlebars.version>
         <joda-time.version>2.10</joda-time.version>
-        <jstl.version>1.2</jstl.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <inject.version>1</inject.version>
 
diff --git a/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml b/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml
index 320745b6e5..cfbc90155c 100644
--- a/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml
+++ b/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml
@@ -158,27 +158,27 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${jackson-version}</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${jackson-version}</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson-version}</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>${jackson-version}</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>
-            <version>${jackson-version}</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -190,7 +190,6 @@
     <properties>
         <swagger-annotations-version>1.5.15</swagger-annotations-version>
         <spring-web-version>4.3.9.RELEASE</spring-web-version>
-        <jackson-version>2.9.7</jackson-version>
         <jodatime-version>2.9.9</jodatime-version>
         <maven-jar-plugin.version>2.2</maven-jar-plugin.version>
         <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
diff --git a/spring-userservice/pom.xml b/spring-userservice/pom.xml
index e562171103..e6e8553c80 100644
--- a/spring-userservice/pom.xml
+++ b/spring-userservice/pom.xml
@@ -176,7 +176,7 @@
         <dependency>
             <groupId>javax.servlet.jsp.jstl</groupId>
             <artifactId>jstl-api</artifactId>
-            <version>${jstl-api.version}</version>
+            <version>${jstl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -191,7 +191,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
         </dependency>
     </dependencies>
 
@@ -225,15 +225,12 @@
         <hibernate.version>5.2.10.Final</hibernate.version>
         <mysql-connector-java.version>5.1.40</mysql-connector-java.version>
         <spring-data-jpa.version>1.10.5.RELEASE</spring-data-jpa.version>
-        <h2.version>1.4.193</h2.version>
         <derby.version>10.13.1.1</derby.version>
 
         <!-- various -->
         <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
         <javax.el-api.version>2.2.5</javax.el-api.version>
         <taglibs-standard.version>1.1.2</taglibs-standard.version>
-        <jstl-api.version>1.2</jstl-api.version>
-        <javax.servlet.version>3.1.0</javax.servlet.version>
 
         <!-- util -->
         <guava.version>19.0</guava.version>
diff --git a/stripe/pom.xml b/stripe/pom.xml
index b0cb194bfe..86c6389f7f 100644
--- a/stripe/pom.xml
+++ b/stripe/pom.xml
@@ -40,7 +40,6 @@
     </dependencies>
     
     <properties>
-        <lombok.version>1.16.16</lombok.version>
         <stripe.version>4.2.0</stripe.version>
     </properties>
 
diff --git a/struts-2/pom.xml b/struts-2/pom.xml
index 7f0fba727d..7de688ff2c 100644
--- a/struts-2/pom.xml
+++ b/struts-2/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -69,7 +69,6 @@
     <properties>
         <struts2.version>2.5.5</struts2.version>
         <struts2-convention-plugin.version>2.5.8</struts2-convention-plugin.version>
-        <servlet.version>3.0.1</servlet.version>
         <spring.version>4.3.6.RELEASE</spring.version>
         <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
     </properties>
diff --git a/tensorflow-java/pom.xml b/tensorflow-java/pom.xml
index f52cd4a68f..f9abde737c 100644
--- a/tensorflow-java/pom.xml
+++ b/tensorflow-java/pom.xml
@@ -45,7 +45,6 @@
 	</build>
 
 	<properties>
-		<java.version>1.8</java.version>
 		<tensorflow.version>1.12.0</tensorflow.version>
 		<junit.jupiter.version>5.4.0</junit.jupiter.version>
 	</properties>
diff --git a/testing-modules/junit-5/pom.xml b/testing-modules/junit-5/pom.xml
index 1d1b0bc574..f27630a76d 100644
--- a/testing-modules/junit-5/pom.xml
+++ b/testing-modules/junit-5/pom.xml
@@ -128,7 +128,6 @@
         <junit.platform.version>1.4.2</junit.platform.version>
         <junit.vintage.version>5.4.2</junit.vintage.version>
         <log4j2.version>2.8.2</log4j2.version>
-        <h2.version>1.4.196</h2.version>
         <powermock.version>2.0.0-RC.1</powermock.version>
         <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
diff --git a/testing-modules/rest-assured/pom.xml b/testing-modules/rest-assured/pom.xml
index c528a34e21..4ed10f0641 100644
--- a/testing-modules/rest-assured/pom.xml
+++ b/testing-modules/rest-assured/pom.xml
@@ -197,8 +197,6 @@
         <jackson.version>2.9.7</jackson.version>
         <jackson-coreutils.version>1.8</jackson-coreutils.version>
         <guava.version>19.0</guava.version>
-
-        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <servlet-api.version>2.5</servlet-api.version>
         <javax.mail.version>1.4.7</javax.mail.version>
         <jetty.version>9.4.0.v20161208</jetty.version>
diff --git a/testing-modules/rest-testing/pom.xml b/testing-modules/rest-testing/pom.xml
index c3a9477a47..6dad3be117 100644
--- a/testing-modules/rest-testing/pom.xml
+++ b/testing-modules/rest-testing/pom.xml
@@ -149,9 +149,6 @@
     </build>
 
     <properties>
-        <!-- marshalling -->
-        <jackson.version>2.9.7</jackson.version>
-
         <!-- util -->
         <guava.version>19.0</guava.version>
         <commons-lang3.version>3.5</commons-lang3.version>
diff --git a/testing-modules/test-containers/pom.xml b/testing-modules/test-containers/pom.xml
index 1f4c483988..7ee002ea8b 100644
--- a/testing-modules/test-containers/pom.xml
+++ b/testing-modules/test-containers/pom.xml
@@ -103,7 +103,6 @@
         <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>
-        <h2.version>1.4.196</h2.version>
         <mockito.version>2.21.0</mockito.version>
         <spring.version>5.0.1.RELEASE</spring.version>
         <testcontainers.version>1.7.2</testcontainers.version>
diff --git a/vaadin/pom.xml b/vaadin/pom.xml
index ec69e240e2..648343fcd8 100644
--- a/vaadin/pom.xml
+++ b/vaadin/pom.xml
@@ -155,7 +155,6 @@
     </profiles>
 
     <properties>
-        <servlet.version>3.0.1</servlet.version>
         <vaadin.version>10.0.11</vaadin.version>
         <vaadin.plugin.version>10.0.11</vaadin.plugin.version>
         <vaadin-spring-boot-starter.version>10.0.11</vaadin-spring-boot-starter.version>
diff --git a/vavr/pom.xml b/vavr/pom.xml
index ae495e9830..a2c6e29cde 100644
--- a/vavr/pom.xml
+++ b/vavr/pom.xml
@@ -41,7 +41,6 @@
     </dependencies>
 
     <properties>
-        <java.version>1.8</java.version>
         <vavr.version>0.9.1</vavr.version>
         <awaitility.version>3.0.0</awaitility.version>
     </properties>
diff --git a/video-tutorials/jackson-annotations/pom.xml b/video-tutorials/jackson-annotations/pom.xml
index b0e1c7e8d9..2492951d1a 100644
--- a/video-tutorials/jackson-annotations/pom.xml
+++ b/video-tutorials/jackson-annotations/pom.xml
@@ -136,10 +136,6 @@
     </build>
 
     <properties>
-
-        <!-- marshalling -->
-        <jackson.version>2.9.7</jackson.version>
-
         <!-- various -->
         <joda-time.version>2.9.6</joda-time.version>
         <gson.version>2.8.0</gson.version>
diff --git a/vraptor/pom.xml b/vraptor/pom.xml
index 214a44cede..3904eb8c63 100644
--- a/vraptor/pom.xml
+++ b/vraptor/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -129,8 +129,6 @@
         <weld.version>2.1.2.Final</weld.version>
         <el.version>2.2</el.version>
         <hibernate-validator.version>5.1.1.Final</hibernate-validator.version>
-        <jstl.version>1.2</jstl.version>
-        <servlet.version>3.1.0</servlet.version>
         <slf4j-log4j12.version>1.7.5</slf4j-log4j12.version>
         <vraptor-freemarker.version>4.1.0-RC3</vraptor-freemarker.version>
         <vraptor-hibernate.version>4.0.4</vraptor-hibernate.version>

From e4abb5af731a988307fb00baeb8d94b67bc44d76 Mon Sep 17 00:00:00 2001
From: Shubhra Srivastava <shubhi.srvstv@gmail.com>
Date: Mon, 6 May 2019 06:58:23 +0530
Subject: [PATCH 206/295] BALE-2812 : JPA Basic Annotation (#6869)

* BALE-2812 : JPA Basic Annotation

* BAEL-2812 : JPA Basic Annotation moving code

* BAEL-2812 : Removing changes from hibernate5 module
---
 .../hibernate/basicannotation/Course.java     | 34 +++++++++++
 .../BasicAnnotationIntegrationTest.java       | 59 +++++++++++++++++++
 .../com/baeldung/hibernate/pojo/Course.java   |  6 +-
 3 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/basicannotation/Course.java
 create mode 100644 persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/basicannotation/BasicAnnotationIntegrationTest.java

diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/basicannotation/Course.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/basicannotation/Course.java
new file mode 100644
index 0000000000..e816fb0176
--- /dev/null
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/basicannotation/Course.java
@@ -0,0 +1,34 @@
+package com.baeldung.hibernate.basicannotation;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Course {
+
+    @Id
+    private int id;
+
+    @Basic(optional = false, fetch = FetchType.LAZY)
+    private String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
+
diff --git a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/basicannotation/BasicAnnotationIntegrationTest.java b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/basicannotation/BasicAnnotationIntegrationTest.java
new file mode 100644
index 0000000000..70f08b4ee3
--- /dev/null
+++ b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/basicannotation/BasicAnnotationIntegrationTest.java
@@ -0,0 +1,59 @@
+package com.baeldung.hibernate.basicannotation;
+
+import com.baeldung.hibernate.HibernateUtil;
+import com.baeldung.hibernate.basicannotation.Course;
+import com.baeldung.hibernate.Strategy;
+import org.hibernate.PropertyValueException;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.hibernate.SessionFactory;
+import org.junit.BeforeClass;
+
+import java.io.IOException;
+
+public class BasicAnnotationIntegrationTest {
+
+    private static SessionFactory sessionFactory;
+    private Session session;
+    private Transaction transaction;
+
+    @BeforeClass
+    public static void beforeTests() {
+        sessionFactory = HibernateUtil.getSessionFactory(Strategy.MAP_KEY_COLUMN_BASED);
+    }
+
+    @Before
+    public void setUp() throws IOException {
+        session = sessionFactory.openSession();
+        transaction = session.beginTransaction();
+    }
+
+    @After
+    public void tearDown() {
+        transaction.rollback();
+        session.close();
+    }
+
+    @Test
+    public void givenACourse_whenCourseNamePresent_shouldPersist() {
+        Course course = new Course();
+        course.setName("Computers");
+
+        session.save(course);
+        session.flush();
+        session.clear();
+
+    }
+
+    @Test(expected = PropertyValueException.class)
+    public void givenACourse_whenCourseNameAbsent_shouldFail() {
+        Course course = new Course();
+
+        session.save(course);
+        session.flush();
+        session.clear();
+    }
+}
diff --git a/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Course.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Course.java
index 97760acd3b..2214b9a56f 100644
--- a/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Course.java
+++ b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Course.java
@@ -20,8 +20,8 @@ public class Course {
     public void setCourseId(UUID courseId) {
         this.courseId = courseId;
     }
-    
-    
 
-   
+
+
+
 }

From d2102a76ff3c5a1258114961182a92cfb079b8da Mon Sep 17 00:00:00 2001
From: pcoates33 <pcoates33@users.noreply.github.com>
Date: Tue, 7 May 2019 05:37:38 +0100
Subject: [PATCH 207/295] BAEL-2890 (#6905)

---
 jackson-2/README.md                           |  1 +
 .../jackson/node/JsonNodeIterator.java        | 62 +++++++++++++++++++
 .../jackson/node/ExampleStructure.java        |  0
 .../node/JsonNodeIteratorUnitTest.java        | 37 +++++++++++
 .../com/baeldung/jackson/node/NodeBean.java   |  0
 .../jackson/node/NodeOperationUnitTest.java   |  0
 .../src/test/resources/node_example.json      | 18 ++++++
 jackson/README.md                             |  1 -
 jackson/src/main/resources/node_example.json  | 10 ---
 9 files changed, 118 insertions(+), 11 deletions(-)
 create mode 100644 jackson-2/src/main/java/com/baeldung/jackson/node/JsonNodeIterator.java
 rename {jackson => jackson-2}/src/test/java/com/baeldung/jackson/node/ExampleStructure.java (100%)
 create mode 100644 jackson-2/src/test/java/com/baeldung/jackson/node/JsonNodeIteratorUnitTest.java
 rename {jackson => jackson-2}/src/test/java/com/baeldung/jackson/node/NodeBean.java (100%)
 rename {jackson => jackson-2}/src/test/java/com/baeldung/jackson/node/NodeOperationUnitTest.java (100%)
 create mode 100644 jackson-2/src/test/resources/node_example.json
 delete mode 100644 jackson/src/main/resources/node_example.json

diff --git a/jackson-2/README.md b/jackson-2/README.md
index ec147f5fd9..96ed960ac2 100644
--- a/jackson-2/README.md
+++ b/jackson-2/README.md
@@ -7,3 +7,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
 - [Mapping Multiple JSON Fields to a Single Java Field](https://www.baeldung.com/json-multiple-fields-single-java-field)
+- [Working with Tree Model Nodes in Jackson](https://www.baeldung.com/jackson-json-node-tree-model)
diff --git a/jackson-2/src/main/java/com/baeldung/jackson/node/JsonNodeIterator.java b/jackson-2/src/main/java/com/baeldung/jackson/node/JsonNodeIterator.java
new file mode 100644
index 0000000000..f582772587
--- /dev/null
+++ b/jackson-2/src/main/java/com/baeldung/jackson/node/JsonNodeIterator.java
@@ -0,0 +1,62 @@
+package com.baeldung.jackson.node;
+
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+public class JsonNodeIterator {
+    
+    private static final String NEW_LINE = "\n";
+    private static final String FIELD_DELIMITER = ": ";
+    private static final String ARRAY_PREFIX = "- ";
+    private static final String YAML_PREFIX = "  ";
+    
+    public String toYaml(JsonNode root) {
+        StringBuilder yaml = new StringBuilder();
+        processNode(root, yaml, 0);
+        return yaml.toString();
+    }
+
+    private void processNode(JsonNode jsonNode, StringBuilder yaml, int depth) {
+        if (jsonNode.isValueNode()) {
+            yaml.append(jsonNode.asText());
+        }
+        else if (jsonNode.isArray()) {
+            for (JsonNode arrayItem : jsonNode) {
+                appendNodeToYaml(arrayItem, yaml, depth, true);
+            }
+        }
+        else if (jsonNode.isObject()) {
+            appendNodeToYaml(jsonNode, yaml, depth, false);
+        }
+    }
+    
+    private void appendNodeToYaml(JsonNode node, StringBuilder yaml, int depth, boolean isArrayItem) {
+        Iterator<Entry<String, JsonNode>> fields = node.fields();
+        boolean isFirst = true;
+        while (fields.hasNext()) {
+            Entry<String, JsonNode> jsonField = fields.next();
+            addFieldNameToYaml(yaml, jsonField.getKey(), depth, isArrayItem && isFirst);
+            processNode(jsonField.getValue(), yaml, depth+1);
+            isFirst = false;
+        }
+        
+    }
+
+private void addFieldNameToYaml(StringBuilder yaml, String fieldName, int depth, boolean isFirstInArray) {
+    if (yaml.length()>0) {
+        yaml.append(NEW_LINE);
+        int requiredDepth = (isFirstInArray) ? depth-1 : depth;
+        for(int i = 0; i < requiredDepth; i++) {
+            yaml.append(YAML_PREFIX);
+        }
+        if (isFirstInArray) {
+            yaml.append(ARRAY_PREFIX);
+        }
+    }
+    yaml.append(fieldName);
+    yaml.append(FIELD_DELIMITER);
+}
+
+}
diff --git a/jackson/src/test/java/com/baeldung/jackson/node/ExampleStructure.java b/jackson-2/src/test/java/com/baeldung/jackson/node/ExampleStructure.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/node/ExampleStructure.java
rename to jackson-2/src/test/java/com/baeldung/jackson/node/ExampleStructure.java
diff --git a/jackson-2/src/test/java/com/baeldung/jackson/node/JsonNodeIteratorUnitTest.java b/jackson-2/src/test/java/com/baeldung/jackson/node/JsonNodeIteratorUnitTest.java
new file mode 100644
index 0000000000..05426fc844
--- /dev/null
+++ b/jackson-2/src/test/java/com/baeldung/jackson/node/JsonNodeIteratorUnitTest.java
@@ -0,0 +1,37 @@
+package com.baeldung.jackson.node;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+public class JsonNodeIteratorUnitTest {
+
+    private JsonNodeIterator onTest = new JsonNodeIterator();
+    private static String expectedYaml = "name: \n" + 
+        "  first: Tatu\n" + 
+        "  last: Saloranta\n" + 
+        "title: Jackson founder\n" + 
+        "company: FasterXML\n" + 
+        "pets: \n" + 
+        "- type: dog\n" + 
+        "  number: 1\n" + 
+        "- type: fish\n" + 
+        "  number: 50";
+    
+@Test
+public void givenANodeTree_whenIteratingSubNodes_thenWeFindExpected() throws IOException {
+    final JsonNode rootNode = ExampleStructure.getExampleRoot();
+    
+    String yaml = onTest.toYaml(rootNode);
+    System.out.println(yaml.toString());
+
+    assertEquals(expectedYaml, yaml);
+    
+}
+
+
+}
diff --git a/jackson/src/test/java/com/baeldung/jackson/node/NodeBean.java b/jackson-2/src/test/java/com/baeldung/jackson/node/NodeBean.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/node/NodeBean.java
rename to jackson-2/src/test/java/com/baeldung/jackson/node/NodeBean.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/node/NodeOperationUnitTest.java b/jackson-2/src/test/java/com/baeldung/jackson/node/NodeOperationUnitTest.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/node/NodeOperationUnitTest.java
rename to jackson-2/src/test/java/com/baeldung/jackson/node/NodeOperationUnitTest.java
diff --git a/jackson-2/src/test/resources/node_example.json b/jackson-2/src/test/resources/node_example.json
new file mode 100644
index 0000000000..d57c1df6e3
--- /dev/null
+++ b/jackson-2/src/test/resources/node_example.json
@@ -0,0 +1,18 @@
+{
+    "name": {
+        "first": "Tatu",
+        "last": "Saloranta"
+    },
+    "title": "Jackson founder",
+    "company": "FasterXML",
+    "pets": [
+        {
+            "type": "dog",
+            "number": 1
+        },
+        {
+            "type": "fish",
+            "number": 50
+        }
+    ]
+}
\ No newline at end of file
diff --git a/jackson/README.md b/jackson/README.md
index 794ddc04d9..01d9419a27 100644
--- a/jackson/README.md
+++ b/jackson/README.md
@@ -15,7 +15,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Jackson JSON Tutorial](http://www.baeldung.com/jackson)
 - [Jackson – Working with Maps and nulls](http://www.baeldung.com/jackson-map-null-values-or-null-key)
 - [Jackson – Decide What Fields Get Serialized/Deserialized](http://www.baeldung.com/jackson-field-serializable-deserializable-or-not)
-- [Working with Tree Model Nodes in Jackson](http://www.baeldung.com/jackson-json-node-tree-model)
 - [Jackson vs Gson](http://www.baeldung.com/jackson-vs-gson)
 - [XML Serialization and Deserialization with Jackson](http://www.baeldung.com/jackson-xml-serialization-and-deserialization)
 - [More Jackson Annotations](http://www.baeldung.com/jackson-advanced-annotations)
diff --git a/jackson/src/main/resources/node_example.json b/jackson/src/main/resources/node_example.json
deleted file mode 100644
index 69d37efbf6..0000000000
--- a/jackson/src/main/resources/node_example.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"name": 
-	{
-		"first": "Tatu",
-		"last": "Saloranta"
-	},
-
-	"title": "Jackson founder",
-	"company": "FasterXML"
-}
\ No newline at end of file

From 51a9d7b0d62b4e4d1252930334e52e2bacd6938d Mon Sep 17 00:00:00 2001
From: Krzysztof Majewski <majewski.kielce@gmail.com>
Date: Tue, 7 May 2019 18:34:15 +0200
Subject: [PATCH 208/295] BAEL-2799 (#6904)

* BAEL-2799

* constructor name fix

* method name fix

* add database

* fix tests
---
 .../com/baeldung/jpa/defaultvalues}/User.java |   3 +-
 .../jpa/defaultvalues/UserRepository.java     |  36 +++
 .../main/resources/META-INF/persistence.xml   | 282 +++++++++---------
 .../UserDefaultValuesUnitTest.java            |  37 ++-
 .../application/Application.java              |  14 -
 .../application/UserRepository.java           |   8 -
 6 files changed, 208 insertions(+), 172 deletions(-)
 rename persistence-modules/{spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application => java-jpa/src/main/java/com/baeldung/jpa/defaultvalues}/User.java (93%)
 create mode 100644 persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/defaultvalues/UserRepository.java
 rename persistence-modules/{spring-boot-persistence/src/test/java/com/baeldung/jpadefaultvalues/application => java-jpa/src/test/java/com/baeldung/jpa/defautlvalues}/UserDefaultValuesUnitTest.java (59%)
 delete mode 100644 persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/Application.java
 delete mode 100644 persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/UserRepository.java

diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/User.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/defaultvalues/User.java
similarity index 93%
rename from persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/User.java
rename to persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/defaultvalues/User.java
index e271c01815..436c708d40 100644
--- a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/User.java
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/defaultvalues/User.java
@@ -1,4 +1,4 @@
-package com.baeldung.jpadefaultvalues.application;
+package com.baeldung.jpa.defaultvalues;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -9,7 +9,6 @@ import javax.persistence.Id;
 public class User {
 
     @Id
-    @GeneratedValue
     private Long id;
 
     @Column(columnDefinition = "varchar(255) default 'John Snow'")
diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/defaultvalues/UserRepository.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/defaultvalues/UserRepository.java
new file mode 100644
index 0000000000..52f9807cfb
--- /dev/null
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/defaultvalues/UserRepository.java
@@ -0,0 +1,36 @@
+package com.baeldung.jpa.defaultvalues;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+public class UserRepository {
+
+    private EntityManagerFactory emf = null;
+
+    public UserRepository() {
+        emf = Persistence.createEntityManagerFactory("entity-default-values");
+    }
+
+    public User find(Long id) {
+        EntityManager entityManager = emf.createEntityManager();
+        User user = entityManager.find(User.class, id);
+        entityManager.close();
+        return user;
+    }
+
+    public void save(User user, Long id) {
+        user.setId(id);
+
+        EntityManager entityManager = emf.createEntityManager();
+        entityManager.getTransaction().begin();
+        entityManager.persist(user);
+        entityManager.getTransaction().commit();
+        entityManager.close();
+    }
+
+    public void clean() {
+        emf.close();
+    }
+
+}
diff --git a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
index 5422afa4a3..21a757f490 100644
--- a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
@@ -1,133 +1,149 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
-             http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd"
-             version="2.2">
-
-    <persistence-unit name="java-jpa-scheduled-day">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.sqlresultsetmapping.ScheduledDay</class>
-        <class>com.baeldung.sqlresultsetmapping.Employee</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.jdbc.url"
-                      value="jdbc:h2:mem:test;INIT=RUNSCRIPT FROM 'classpath:database.sql'"/>
-            <property name="javax.persistence.jdbc.user" value="sa"/>
-            <property name="javax.persistence.jdbc.password" value=""/>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
-            <!--<property name="hibernate.hbm2ddl.auto" value="create-drop" />-->
-            <property name="show_sql" value="true"/>
-            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false"/>
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="jpa-h2">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.stringcast.Message</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
-            <property name="javax.persistence.jdbc.user" value="sa"/>
-            <property name="javax.persistence.jdbc.password" value=""/>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
-            <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-            <property name="show_sql" value="true"/>
-            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false"/>
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="jpa-db">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.model.Car</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/baeldung"/>
-            <property name="javax.persistence.jdbc.user" value="baeldung"/>
-            <property name="javax.persistence.jdbc.password" value="YourPassword"/>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
-            <property name="hibernate.show_sql" value="true"/>
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="entity-graph-pu" transaction-type="RESOURCE_LOCAL">
-        <class>com.baeldung.jpa.entitygraph.model.Post</class>
-        <class>com.baeldung.jpa.entitygraph.model.User</class>
-        <class>com.baeldung.jpa.entitygraph.model.Comment</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-
-            <!--H2-->
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.jdbc.url"
-                      value="jdbc:h2:mem:entitygraphdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE"/>
-
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-            <property name="javax.persistence.sql-load-script-source" value="data-init.sql"/>
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="java8-datetime-postgresql" transaction-type="RESOURCE_LOCAL">
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <class>com.baeldung.jpa.datetime.JPA22DateTimeEntity</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://localhost:5432/java8-datetime2"/>
-            <property name="javax.persistence.jdbc.user" value="postgres"/>
-            <property name="javax.persistence.jdbc.password" value="postgres"/>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-
-            <!-- configure logging -->
-            <property name="eclipselink.logging.level" value="INFO"/>
-            <property name="eclipselink.logging.level.sql" value="FINE"/>
-            <property name="eclipselink.logging.parameters" value="true"/>
-        </properties>
-    </persistence-unit>
-    
-    <persistence-unit name="jpa-h2-criteria">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.criteria.entity.Item</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver"
-                      value="org.h2.Driver" />
-            <property name="javax.persistence.jdbc.url"
-                      value="jdbc:h2:mem:test" />
-            <property name="javax.persistence.jdbc.user" value="sa" />
-            <property name="javax.persistence.jdbc.password" value="" />
-            <property name="hibernate.dialect"
-                      value="org.hibernate.dialect.H2Dialect" />
-            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
-            <property name="show_sql" value="true" />
-            <property name="hibernate.temp.use_jdbc_metadata_defaults"
-                      value="false" />
-            <property name="javax.persistence.sql-load-script-source" value="item.sql"/>
-        </properties>
-    </persistence-unit>
-        
-    <persistence-unit name="jpa-query-types">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.querytypes.UserEntity</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver"
-                      value="org.h2.Driver" />
-            <property name="javax.persistence.jdbc.url"
-                      value="jdbc:h2:mem:test" />
-            <property name="javax.persistence.jdbc.user" value="sa" />
-            <property name="javax.persistence.jdbc.password" value="" />
-            <property name="hibernate.dialect"
-                      value="org.hibernate.dialect.H2Dialect" />
-            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
-            <property name="show_sql" value="true" />
-            <property name="hibernate.temp.use_jdbc_metadata_defaults"
-                      value="false" />
-            <property name="javax.persistence.sql-load-script-source" value="users.sql"/>
-        </properties>
-    </persistence-unit>
-
-</persistence>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
+             http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd"
+             version="2.2">
+
+    <persistence-unit name="java-jpa-scheduled-day">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.sqlresultsetmapping.ScheduledDay</class>
+        <class>com.baeldung.sqlresultsetmapping.Employee</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="javax.persistence.jdbc.url"
+                      value="jdbc:h2:mem:test;INIT=RUNSCRIPT FROM 'classpath:database.sql'"/>
+            <property name="javax.persistence.jdbc.user" value="sa"/>
+            <property name="javax.persistence.jdbc.password" value=""/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+            <!--<property name="hibernate.hbm2ddl.auto" value="create-drop" />-->
+            <property name="show_sql" value="true"/>
+            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false"/>
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="jpa-h2">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.stringcast.Message</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
+            <property name="javax.persistence.jdbc.user" value="sa"/>
+            <property name="javax.persistence.jdbc.password" value=""/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+            <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+            <property name="show_sql" value="true"/>
+            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false"/>
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="jpa-db">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.model.Car</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/baeldung"/>
+            <property name="javax.persistence.jdbc.user" value="baeldung"/>
+            <property name="javax.persistence.jdbc.password" value="YourPassword"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
+            <property name="hibernate.show_sql" value="true"/>
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="entity-graph-pu" transaction-type="RESOURCE_LOCAL">
+        <class>com.baeldung.jpa.entitygraph.model.Post</class>
+        <class>com.baeldung.jpa.entitygraph.model.User</class>
+        <class>com.baeldung.jpa.entitygraph.model.Comment</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+
+            <!--H2-->
+            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="javax.persistence.jdbc.url"
+                      value="jdbc:h2:mem:entitygraphdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE"/>
+
+            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+            <property name="javax.persistence.sql-load-script-source" value="data-init.sql"/>
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="java8-datetime-postgresql" transaction-type="RESOURCE_LOCAL">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <class>com.baeldung.jpa.datetime.JPA22DateTimeEntity</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver"/>
+            <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://localhost:5432/java8-datetime2"/>
+            <property name="javax.persistence.jdbc.user" value="postgres"/>
+            <property name="javax.persistence.jdbc.password" value="postgres"/>
+            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+
+            <!-- configure logging -->
+            <property name="eclipselink.logging.level" value="INFO"/>
+            <property name="eclipselink.logging.level.sql" value="FINE"/>
+            <property name="eclipselink.logging.parameters" value="true"/>
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="jpa-h2-criteria">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.criteria.entity.Item</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver"
+                      value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url"
+                      value="jdbc:h2:mem:test" />
+            <property name="javax.persistence.jdbc.user" value="sa" />
+            <property name="javax.persistence.jdbc.password" value="" />
+            <property name="hibernate.dialect"
+                      value="org.hibernate.dialect.H2Dialect" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+            <property name="show_sql" value="true" />
+            <property name="hibernate.temp.use_jdbc_metadata_defaults"
+                      value="false" />
+            <property name="javax.persistence.sql-load-script-source" value="item.sql"/>
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="jpa-query-types">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.querytypes.UserEntity</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver"
+                      value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url"
+                      value="jdbc:h2:mem:test" />
+            <property name="javax.persistence.jdbc.user" value="sa" />
+            <property name="javax.persistence.jdbc.password" value="" />
+            <property name="hibernate.dialect"
+                      value="org.hibernate.dialect.H2Dialect" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+            <property name="show_sql" value="true" />
+            <property name="hibernate.temp.use_jdbc_metadata_defaults"
+                      value="false" />
+            <property name="javax.persistence.sql-load-script-source" value="users.sql"/>
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="entity-default-values">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.defaultvalues.User</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test" />
+            <property name="javax.persistence.jdbc.user" value="sa" />
+            <property name="javax.persistence.jdbc.password" value="" />
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+            <property name="show_sql" value="true" />
+            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false" />
+        </properties>
+    </persistence-unit>
+
+</persistence>
diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/jpadefaultvalues/application/UserDefaultValuesUnitTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/defautlvalues/UserDefaultValuesUnitTest.java
similarity index 59%
rename from persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/jpadefaultvalues/application/UserDefaultValuesUnitTest.java
rename to persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/defautlvalues/UserDefaultValuesUnitTest.java
index 52a5c4dcd6..dc41ff51f2 100644
--- a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/jpadefaultvalues/application/UserDefaultValuesUnitTest.java
+++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/defautlvalues/UserDefaultValuesUnitTest.java
@@ -1,31 +1,31 @@
-package com.baeldung.jpadefaultvalues.application;
+package com.baeldung.jpa.defaultvalues;
 
-import com.baeldung.jpadefaultvalues.application.User;
-import com.baeldung.jpadefaultvalues.application.UserRepository;
+import com.baeldung.jpa.defaultvalues.User;
+import com.baeldung.jpa.defaultvalues.UserRepository;
 
 import org.junit.Test;
 import org.junit.Ignore;
-import org.junit.runner.RunWith;
-
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 
 import static org.junit.Assert.*;
 
-@RunWith(SpringRunner.class)
-@SpringBootTest
 public class UserDefaultValuesUnitTest {
 
-    @Autowired
-    private UserRepository userRepository;
+    private static UserRepository userRepository = null;
+
+    @BeforeClass
+    public static void once() {
+        userRepository = new UserRepository();
+    }
 
     @Test
     @Ignore // SQL default values are also defined
     public void saveUser_shouldSaveWithDefaultFieldValues() {
         User user = new User();
-        user = userRepository.save(user);
+        userRepository.save(user, 1L);
 
+        user = userRepository.find(1L);
         assertEquals(user.getName(), "John Snow");
         assertEquals(25, (int) user.getAge());
         assertFalse(user.getLocked());
@@ -36,8 +36,9 @@ public class UserDefaultValuesUnitTest {
     public void saveUser_shouldSaveWithNullName() {
         User user = new User();
         user.setName(null);
-        user = userRepository.save(user);
+        userRepository.save(user, 2L);
 
+        user = userRepository.find(2L);
         assertNull(user.getName());
         assertEquals(25, (int) user.getAge());
         assertFalse(user.getLocked());
@@ -46,11 +47,17 @@ public class UserDefaultValuesUnitTest {
     @Test
     public void saveUser_shouldSaveWithDefaultSqlValues() {
         User user = new User();
-        user = userRepository.save(user);
+        userRepository.save(user, 3L);
 
+        user = userRepository.find(3L);
         assertEquals(user.getName(), "John Snow");
         assertEquals(25, (int) user.getAge());
         assertFalse(user.getLocked());
     }
 
+    @AfterClass
+    public static void destroy() {
+        userRepository.clean();
+    }
+
 }
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/Application.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/Application.java
deleted file mode 100644
index 3b96f68583..0000000000
--- a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/Application.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.baeldung.jpadefaultvalues.application;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
-
-@SpringBootApplication
-public class Application {
-    private static ApplicationContext applicationContext;
-
-    public static void main(String[] args) {
-        applicationContext = SpringApplication.run(Application.class, args);
-    }
-}
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/UserRepository.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/UserRepository.java
deleted file mode 100644
index ca0e4c4d71..0000000000
--- a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/jpadefaultvalues/application/UserRepository.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.baeldung.jpadefaultvalues.application;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface UserRepository extends JpaRepository<User, Long> {
-}

From 0fa8b6a24c0108d5a58b479dabf03a631a0f8a67 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Tue, 7 May 2019 22:42:38 +0300
Subject: [PATCH 209/295] Update README.md

---
 core-java-modules/core-java-9/README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core-java-modules/core-java-9/README.md b/core-java-modules/core-java-9/README.md
index 8fdc3f6ee2..63dc887931 100644
--- a/core-java-modules/core-java-9/README.md
+++ b/core-java-modules/core-java-9/README.md
@@ -19,7 +19,4 @@
 - [Immutable Set in Java](https://www.baeldung.com/java-immutable-set)
 - [Multi-Release Jar Files](https://www.baeldung.com/java-multi-release-jar)
 - [Ahead of Time Compilation (AoT)](https://www.baeldung.com/ahead-of-time-compilation)
-- [Java 9 Process API Improvements](https://www.baeldung.com/java-9-process-api)
-- [Guide to java.lang.Process API](https://www.baeldung.com/java-process-api)
-
 

From f51429bfe607932e70eff917f23f7314802b9336 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Tue, 7 May 2019 23:36:08 +0300
Subject: [PATCH 210/295] Update README.md

---
 testing-modules/mockito-2/README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/testing-modules/mockito-2/README.md b/testing-modules/mockito-2/README.md
index ee443df81a..5c9e8fc81a 100644
--- a/testing-modules/mockito-2/README.md
+++ b/testing-modules/mockito-2/README.md
@@ -2,7 +2,4 @@
 
 - [Mockito’s Java 8 Features](http://www.baeldung.com/mockito-2-java-8)
 - [Lazy Verification with Mockito 2](http://www.baeldung.com/mockito-2-lazy-verification)
-
-## Mockito 2 and Java 8 Tips
-
-Examples on how to leverage Java 8 new features with Mockito version 2
+- [Mockito Strict Stubbing and The UnnecessaryStubbingException](https://www.baeldung.com/mockito-unnecessary-stubbing-exception)

From 9863cee1f8f1df594be3e51f9590ecf19ce169d1 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Tue, 7 May 2019 23:42:06 +0300
Subject: [PATCH 211/295] Update README.md

---
 testing-modules/junit-5-configuration/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testing-modules/junit-5-configuration/README.md b/testing-modules/junit-5-configuration/README.md
index c274391766..a00e2a3f4a 100644
--- a/testing-modules/junit-5-configuration/README.md
+++ b/testing-modules/junit-5-configuration/README.md
@@ -1,2 +1,3 @@
 ### Relevant Articles:
-- 
+
+- [Get the Path of the /src/test/resources Directory in JUnit](https://www.baeldung.com/junit-src-test-resources-directory-path)

From a32176e25ba93a49f47a6f7d80fb914e9f732564 Mon Sep 17 00:00:00 2001
From: psevestre <phil@lighthouse.com.br>
Date: Wed, 8 May 2019 02:48:37 -0300
Subject: [PATCH 212/295] BAEL-1219 (#6724)

* BAEL-1381

* [BAEL-1381]

* [BAEL-1381] New module name

* [BAEL-1381] software-security module

* [BAEL-1381] Add JPA examples

* Workaround for spring-framework#21094

* Initial import

* [BAEL-1219] OLingo2 code

* Initial import

* [BAEL-1219] Code for Olingo V4 sample

* [BAEL-1219] Code polishing

* [BAEL-1219] Add Sample URLs
---
 apache-olingo/Samples.md                      |  21 ++
 apache-olingo/olingo2/.gitignore              |  29 ++
 apache-olingo/olingo2/pom.xml                 | 108 +++++++
 .../olingo2/CarsODataJPAServiceFactory.java   | 298 +++++++++++++++++
 .../examples/olingo2/JerseyConfig.java        | 125 +++++++
 .../olingo2/Olingo2SampleApplication.java     |  14 +
 .../examples/olingo2/domain/CarMaker.java     |  36 +++
 .../examples/olingo2/domain/CarModel.java     |  38 +++
 .../src/main/resources/application.yml        |  12 +
 .../olingo2/src/main/resources/data.sql       |  12 +
 .../Olingo2SampleApplicationTests.java        |  16 +
 .../src/test/resources/olingo2-queries.json   | 256 +++++++++++++++
 apache-olingo/olingo4/.gitignore              |  29 ++
 apache-olingo/olingo4/pom.xml                 |  95 ++++++
 .../examples/olingo4/DefaultODataFactory.java |  20 ++
 .../examples/olingo4/ODataFactory.java        |   8 +
 .../olingo4/ODataHttpHandlerFactory.java      |   8 +
 .../olingo4/ODataHttpHandlerFactoryImpl.java  |  42 +++
 .../olingo4/ODataServiceConfiguration.java    |  35 ++
 .../examples/olingo4/ODataServlet.java        |  38 +++
 .../olingo4/Olingo4SampleApplication.java     |  13 +
 .../examples/olingo4/domain/CarMaker.java     |  36 +++
 .../examples/olingo4/domain/CarModel.java     |  38 +++
 .../examples/olingo4/edm/EdmTypeMapper.java   |  46 +++
 .../examples/olingo4/edm/JpaEdmProvider.java  | 269 ++++++++++++++++
 .../JpaEntityCollectionProcessor.java         | 161 ++++++++++
 .../olingo4/processor/JpaEntityMapper.java    |  93 ++++++
 .../olingo4/processor/JpaEntityProcessor.java | 304 ++++++++++++++++++
 .../repository/CarMakerRepository.java        |  16 +
 .../repository/CarModelRepository.java        |  22 ++
 .../repository/EdmEntityRepository.java       |  17 +
 .../repository/RepositoryRegistry.java        |  29 ++
 .../src/main/resources/application.properties |   9 +
 .../olingo4/src/main/resources/data.sql       |  12 +
 .../Olingo4SampleApplicationTests.java        |  16 +
 .../sql-injection-samples/pom.xml             |   6 +
 spring-webflux-amqp/pom.xml                   | 116 ++++---
 .../amqp/SpringWebfluxAmqpApplication.java    |  21 ++
 .../src/main/resources/application.yml        |   2 +-
 39 files changed, 2414 insertions(+), 52 deletions(-)
 create mode 100644 apache-olingo/Samples.md
 create mode 100644 apache-olingo/olingo2/.gitignore
 create mode 100644 apache-olingo/olingo2/pom.xml
 create mode 100644 apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java
 create mode 100644 apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/JerseyConfig.java
 create mode 100644 apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/Olingo2SampleApplication.java
 create mode 100644 apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarMaker.java
 create mode 100644 apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarModel.java
 create mode 100644 apache-olingo/olingo2/src/main/resources/application.yml
 create mode 100644 apache-olingo/olingo2/src/main/resources/data.sql
 create mode 100644 apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationTests.java
 create mode 100644 apache-olingo/olingo2/src/test/resources/olingo2-queries.json
 create mode 100644 apache-olingo/olingo4/.gitignore
 create mode 100644 apache-olingo/olingo4/pom.xml
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/DefaultODataFactory.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataFactory.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataHttpHandlerFactory.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataHttpHandlerFactoryImpl.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataServiceConfiguration.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataServlet.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/Olingo4SampleApplication.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/domain/CarMaker.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/domain/CarModel.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/edm/EdmTypeMapper.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/edm/JpaEdmProvider.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/processor/JpaEntityCollectionProcessor.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/processor/JpaEntityMapper.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/processor/JpaEntityProcessor.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/CarMakerRepository.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/CarModelRepository.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/EdmEntityRepository.java
 create mode 100644 apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/RepositoryRegistry.java
 create mode 100644 apache-olingo/olingo4/src/main/resources/application.properties
 create mode 100644 apache-olingo/olingo4/src/main/resources/data.sql
 create mode 100644 apache-olingo/olingo4/src/test/java/org/baeldung/examples/olingo4/Olingo4SampleApplicationTests.java

diff --git a/apache-olingo/Samples.md b/apache-olingo/Samples.md
new file mode 100644
index 0000000000..def8971d64
--- /dev/null
+++ b/apache-olingo/Samples.md
@@ -0,0 +1,21 @@
+##  OData test URLs
+
+This following table contains test URLs that can be used with the Olingo V2 demo project.
+
+| URL                                      | Description                                     |
+|------------------------------------------|-------------------------------------------------|
+| `http://localhost:8180/odata/$metadata`  | fetch OData metadata document |
+| `http://localhost:8180/odata/CarMakers?$top=10&$skip=10` | Get 10 entities starting at offset 10 |
+| `http://localhost:8180/odata/CarMakers?$count` | Return total count of entities in this set |
+| `http://localhost:8180/odata/CarMakers?$filter=startswith(Name,'B')` | Return entities where the *Name* property starts with 'B' |
+| `http://localhost:8180/odata/CarModels?$filter=Year eq 2008 and CarMakerDetails/Name eq 'BWM'` | Return *CarModel* entities where the *Name* property of its maker  starts with 'B' |
+| `http://localhost:8180/odata/CarModels(1L)?$expand=CarMakerDetails` | Return the *CarModel* with primary key '1', along with its maker|
+| `http://localhost:8180/odata/CarModels(1L)?$select=Name,Sku` | Return the *CarModel* with primary key '1', returing only its *Name* and *Sku* properties |
+| `http://localhost:8180/odata/CarModels?$orderBy=Name asc,Sku desc` | Return *CarModel* entities, ordered by the their *Name* and *Sku* properties |
+| `http://localhost:8180/odata/CarModels?$format=json` | Return *CarModel* entities, using a JSON representation|
+
+
+
+
+
+
diff --git a/apache-olingo/olingo2/.gitignore b/apache-olingo/olingo2/.gitignore
new file mode 100644
index 0000000000..153c9335eb
--- /dev/null
+++ b/apache-olingo/olingo2/.gitignore
@@ -0,0 +1,29 @@
+HELP.md
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+
+### VS Code ###
+.vscode/
diff --git a/apache-olingo/olingo2/pom.xml b/apache-olingo/olingo2/pom.xml
new file mode 100644
index 0000000000..4fc81e5e49
--- /dev/null
+++ b/apache-olingo/olingo2/pom.xml
@@ -0,0 +1,108 @@
+<?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>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.1.3.RELEASE</version>
+		<relativePath /> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>org.baeldung.examples.olingo2</groupId>
+	<artifactId>olingo2-sample</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>olingo2-sample</name>
+	<description>Sample Olingo 2 Project</description>
+
+	<properties>
+		<java.version>1.8</java.version>
+		<olingo2.version>2.0.11</olingo2.version>
+	</properties>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jersey</artifactId>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+
+
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Olingo 2 Dependencies -->
+		<dependency>
+			<groupId>org.apache.olingo</groupId>
+			<artifactId>olingo-odata2-core</artifactId>
+			<version>${olingo2.version}</version>
+			<!-- Avoid jax-rs version conflict by excluding Olingo's version -->
+			<exclusions>
+				<exclusion>
+					<groupId>javax.ws.rs</groupId>
+					<artifactId>javax.ws.rs-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.olingo</groupId>
+			<artifactId>olingo-odata2-api</artifactId>
+			<version>${olingo2.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.olingo</groupId>
+			<artifactId>olingo-odata2-jpa-processor-api</artifactId>
+			<version>${olingo2.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.olingo</groupId>
+			<artifactId>olingo-odata2-jpa-processor-core</artifactId>
+			<version>${olingo2.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.olingo</groupId>
+			<artifactId>olingo-odata2-jpa-processor-ref</artifactId>
+			<version>${olingo2.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.eclipse.persistence</groupId>
+					<artifactId>eclipselink</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java b/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java
new file mode 100644
index 0000000000..65a0428154
--- /dev/null
+++ b/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java
@@ -0,0 +1,298 @@
+package org.baeldung.examples.olingo2;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.EntityGraph;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+import javax.persistence.Persistence;
+import javax.persistence.Query;
+import javax.persistence.StoredProcedureQuery;
+import javax.persistence.SynchronizationType;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaDelete;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.CriteriaUpdate;
+import javax.persistence.metamodel.Metamodel;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.olingo.odata2.api.processor.ODataContext;
+import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext;
+import org.apache.olingo.odata2.jpa.processor.api.ODataJPAServiceFactory;
+import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
+import org.baeldung.examples.olingo2.JerseyConfig.EntityManagerFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.orm.jpa.EntityManagerFactoryUtils;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.stereotype.Component;
+
+/**
+ * ODataJPAServiceFactory implementation for our sample domain 
+ * @author Philippe
+ *
+ */
+@Component
+public class CarsODataJPAServiceFactory extends ODataJPAServiceFactory {
+
+    private static final Logger log = LoggerFactory.getLogger(CarsODataJPAServiceFactory.class);
+
+    public CarsODataJPAServiceFactory() {
+        // Enable detailed error messages (useful for debugging)
+        setDetailErrors(true);
+    }
+
+    /**
+     * This method will be called by Olingo on every request to
+     * initialize the ODataJPAContext that will be used. 
+     */
+    @Override
+    public ODataJPAContext initializeODataJPAContext() throws ODataJPARuntimeException {
+
+        log.info("[I32] >>> initializeODataJPAContext()");
+        ODataJPAContext ctx = getODataJPAContext();
+        ODataContext octx = ctx.getODataContext();
+        HttpServletRequest request = (HttpServletRequest)octx.getParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT);
+        EntityManager em = (EntityManager)request.getAttribute(EntityManagerFilter.EM_REQUEST_ATTRIBUTE);
+                
+        // Here we're passing the EM that was created by the EntityManagerFilter (see JerseyConfig)
+        ctx.setEntityManager(new EntityManagerWrapper(em));
+        ctx.setPersistenceUnitName("default");
+        
+        // We're managing the EM's lifecycle, so we must inform Olingo that it should not
+        // try to manage transactions and/or persistence sessions
+        ctx.setContainerManaged(true);                
+        return ctx;
+    }
+
+    static class EntityManagerWrapper implements EntityManager {
+
+        private EntityManager delegate;
+
+        public void persist(Object entity) {
+            log.info("[I68] persist: entity.class=" + entity.getClass()
+                .getSimpleName());
+            delegate.persist(entity);
+            // delegate.flush();
+        }
+
+        public <T> T merge(T entity) {
+            log.info("[I74] merge: entity.class=" + entity.getClass()
+                .getSimpleName());
+            return delegate.merge(entity);
+        }
+
+        public void remove(Object entity) {
+            log.info("[I78] remove: entity.class=" + entity.getClass()
+                .getSimpleName());
+            delegate.remove(entity);
+        }
+
+        public <T> T find(Class<T> entityClass, Object primaryKey) {
+            return delegate.find(entityClass, primaryKey);
+        }
+
+        public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
+            return delegate.find(entityClass, primaryKey, properties);
+        }
+
+        public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode) {
+            return delegate.find(entityClass, primaryKey, lockMode);
+        }
+
+        public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode, Map<String, Object> properties) {
+            return delegate.find(entityClass, primaryKey, lockMode, properties);
+        }
+
+        public <T> T getReference(Class<T> entityClass, Object primaryKey) {
+            return delegate.getReference(entityClass, primaryKey);
+        }
+
+        public void flush() {
+            delegate.flush();
+        }
+
+        public void setFlushMode(FlushModeType flushMode) {
+            delegate.setFlushMode(flushMode);
+        }
+
+        public FlushModeType getFlushMode() {
+            return delegate.getFlushMode();
+        }
+
+        public void lock(Object entity, LockModeType lockMode) {
+            delegate.lock(entity, lockMode);
+        }
+
+        public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties) {
+            delegate.lock(entity, lockMode, properties);
+        }
+
+        public void refresh(Object entity) {
+            delegate.refresh(entity);
+        }
+
+        public void refresh(Object entity, Map<String, Object> properties) {
+            delegate.refresh(entity, properties);
+        }
+
+        public void refresh(Object entity, LockModeType lockMode) {
+            delegate.refresh(entity, lockMode);
+        }
+
+        public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties) {
+            delegate.refresh(entity, lockMode, properties);
+        }
+
+        public void clear() {
+            delegate.clear();
+        }
+
+        public void detach(Object entity) {
+            delegate.detach(entity);
+        }
+
+        public boolean contains(Object entity) {
+            return delegate.contains(entity);
+        }
+
+        public LockModeType getLockMode(Object entity) {
+            return delegate.getLockMode(entity);
+        }
+
+        public void setProperty(String propertyName, Object value) {
+            delegate.setProperty(propertyName, value);
+        }
+
+        public Map<String, Object> getProperties() {
+            return delegate.getProperties();
+        }
+
+        public Query createQuery(String qlString) {
+            return delegate.createQuery(qlString);
+        }
+
+        public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery) {
+            return delegate.createQuery(criteriaQuery);
+        }
+
+        public Query createQuery(CriteriaUpdate updateQuery) {
+            return delegate.createQuery(updateQuery);
+        }
+
+        public Query createQuery(CriteriaDelete deleteQuery) {
+            return delegate.createQuery(deleteQuery);
+        }
+
+        public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
+            return delegate.createQuery(qlString, resultClass);
+        }
+
+        public Query createNamedQuery(String name) {
+            return delegate.createNamedQuery(name);
+        }
+
+        public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
+            return delegate.createNamedQuery(name, resultClass);
+        }
+
+        public Query createNativeQuery(String sqlString) {
+            return delegate.createNativeQuery(sqlString);
+        }
+
+        public Query createNativeQuery(String sqlString, Class resultClass) {
+            return delegate.createNativeQuery(sqlString, resultClass);
+        }
+
+        public Query createNativeQuery(String sqlString, String resultSetMapping) {
+            return delegate.createNativeQuery(sqlString, resultSetMapping);
+        }
+
+        public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
+            return delegate.createNamedStoredProcedureQuery(name);
+        }
+
+        public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
+            return delegate.createStoredProcedureQuery(procedureName);
+        }
+
+        public StoredProcedureQuery createStoredProcedureQuery(String procedureName, Class... resultClasses) {
+            return delegate.createStoredProcedureQuery(procedureName, resultClasses);
+        }
+
+        public StoredProcedureQuery createStoredProcedureQuery(String procedureName, String... resultSetMappings) {
+            return delegate.createStoredProcedureQuery(procedureName, resultSetMappings);
+        }
+
+        public void joinTransaction() {
+            delegate.joinTransaction();
+        }
+
+        public boolean isJoinedToTransaction() {
+            return delegate.isJoinedToTransaction();
+        }
+
+        public <T> T unwrap(Class<T> cls) {
+            return delegate.unwrap(cls);
+        }
+
+        public Object getDelegate() {
+            return delegate.getDelegate();
+        }
+
+        public void close() {
+            log.info("[I229] close");
+            delegate.close();
+        }
+
+        public boolean isOpen() {
+            boolean isOpen = delegate.isOpen();
+            log.info("[I236] isOpen: " + isOpen);
+            return isOpen;
+        }
+
+        public EntityTransaction getTransaction() {
+            log.info("[I240] getTransaction()");
+            return delegate.getTransaction();
+        }
+
+        public EntityManagerFactory getEntityManagerFactory() {
+            return delegate.getEntityManagerFactory();
+        }
+
+        public CriteriaBuilder getCriteriaBuilder() {
+            return delegate.getCriteriaBuilder();
+        }
+
+        public Metamodel getMetamodel() {
+            return delegate.getMetamodel();
+        }
+
+        public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
+            return delegate.createEntityGraph(rootType);
+        }
+
+        public EntityGraph<?> createEntityGraph(String graphName) {
+            return delegate.createEntityGraph(graphName);
+        }
+
+        public EntityGraph<?> getEntityGraph(String graphName) {
+            return delegate.getEntityGraph(graphName);
+        }
+
+        public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
+            return delegate.getEntityGraphs(entityClass);
+        }
+
+        public EntityManagerWrapper(EntityManager delegate) {
+            this.delegate = delegate;
+        }
+
+    }
+
+}
diff --git a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/JerseyConfig.java b/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/JerseyConfig.java
new file mode 100644
index 0000000000..78caf99861
--- /dev/null
+++ b/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/JerseyConfig.java
@@ -0,0 +1,125 @@
+    package org.baeldung.examples.olingo2;
+
+import java.io.IOException;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.Path;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.ext.Provider;
+
+import org.apache.olingo.odata2.api.ODataServiceFactory;
+import org.apache.olingo.odata2.core.rest.ODataRootLocator;
+import org.apache.olingo.odata2.core.rest.app.ODataApplication;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * Jersey JAX-RS configuration
+ * @author Philippe
+ *
+ */
+@Component
+@ApplicationPath("/odata")
+public class JerseyConfig extends ResourceConfig {
+    
+    
+    public JerseyConfig(CarsODataJPAServiceFactory serviceFactory, EntityManagerFactory emf) {        
+        
+        ODataApplication app = new ODataApplication();
+        
+        app
+          .getClasses()
+          .forEach( c -> {
+              // Avoid using the default RootLocator, as we want
+              // a Spring Managed one
+              if ( !ODataRootLocator.class.isAssignableFrom(c)) {
+                  register(c);
+              }
+          });
+        
+        register(new CarsRootLocator(serviceFactory)); 
+        register( new EntityManagerFilter(emf));
+    }
+    
+    /**
+     * This filter handles the EntityManager transaction lifecycle.
+     * @author Philippe
+     *
+     */
+    @Provider
+    public static class EntityManagerFilter implements ContainerRequestFilter, ContainerResponseFilter {
+
+        private static final Logger log = LoggerFactory.getLogger(EntityManagerFilter.class);
+        public static final String EM_REQUEST_ATTRIBUTE = EntityManagerFilter.class.getName() + "_ENTITY_MANAGER";
+
+        private final EntityManagerFactory emf;
+
+        @Context
+        private HttpServletRequest httpRequest;
+
+        public EntityManagerFilter(EntityManagerFactory emf) {
+            this.emf = emf;
+        }
+
+        @Override
+        public void filter(ContainerRequestContext ctx) throws IOException {
+            log.info("[I60] >>> filter");
+            EntityManager em = this.emf.createEntityManager();
+            httpRequest.setAttribute(EM_REQUEST_ATTRIBUTE, em);
+
+            // Start a new transaction unless we have a simple GET
+            if (!"GET".equalsIgnoreCase(ctx.getMethod())) {
+                em.getTransaction()
+                    .begin();
+            }
+        }
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
+
+            log.info("[I68] <<< filter");
+            EntityManager em = (EntityManager) httpRequest.getAttribute(EM_REQUEST_ATTRIBUTE);
+
+            if (!"GET".equalsIgnoreCase(requestContext.getMethod())) {
+                EntityTransaction t = em.getTransaction();
+                if (t.isActive()) {
+                    if (!t.getRollbackOnly()) {
+                        t.commit();
+                    }
+                }
+            }
+
+            em.close();
+
+        }
+
+    }
+
+    @Path("/")
+    public static class CarsRootLocator extends ODataRootLocator {
+
+        private CarsODataJPAServiceFactory serviceFactory;
+
+        public CarsRootLocator(CarsODataJPAServiceFactory serviceFactory) {
+            this.serviceFactory = serviceFactory;
+        }
+
+        @Override
+        public ODataServiceFactory getServiceFactory() {
+            return this.serviceFactory;
+        }
+
+    }
+
+}
diff --git a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/Olingo2SampleApplication.java b/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/Olingo2SampleApplication.java
new file mode 100644
index 0000000000..fa58612088
--- /dev/null
+++ b/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/Olingo2SampleApplication.java
@@ -0,0 +1,14 @@
+package org.baeldung.examples.olingo2;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+@SpringBootApplication
+public class Olingo2SampleApplication extends SpringBootServletInitializer {
+
+    public static void main(String[] args) {        
+        SpringApplication.run(Olingo2SampleApplication.class);
+    }
+}
diff --git a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarMaker.java b/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarMaker.java
new file mode 100644
index 0000000000..42a3eaa59d
--- /dev/null
+++ b/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarMaker.java
@@ -0,0 +1,36 @@
+package org.baeldung.examples.olingo2.domain;
+
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+import lombok.Data;
+
+@Entity
+@Data
+@Table(name="car_maker")
+public class CarMaker {
+    
+    @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)    
+    private Long id;
+    
+    @NotNull
+    @Column(name="name")
+    private String name;
+    
+    @OneToMany(mappedBy="maker",
+      orphanRemoval = true,
+      cascade=CascadeType.ALL)
+    private List<CarModel> models;
+    
+
+}
diff --git a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarModel.java b/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarModel.java
new file mode 100644
index 0000000000..a4f2a04f6e
--- /dev/null
+++ b/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarModel.java
@@ -0,0 +1,38 @@
+package org.baeldung.examples.olingo2.domain;
+
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+import lombok.Data;
+
+@Entity
+@Data
+@Table(name="car_model")
+public class CarModel {
+
+    @Id
+    @GeneratedValue(strategy=GenerationType.AUTO)
+    private Long id;
+    
+    @NotNull
+    private String name;
+    
+    @NotNull
+    private Integer year;
+    
+    @NotNull
+    private String sku;
+    
+    @ManyToOne(optional=false, fetch= FetchType.LAZY)
+    @JoinColumn(name="maker_fk")
+    private CarMaker maker;
+
+}
diff --git a/apache-olingo/olingo2/src/main/resources/application.yml b/apache-olingo/olingo2/src/main/resources/application.yml
new file mode 100644
index 0000000000..21563a94fe
--- /dev/null
+++ b/apache-olingo/olingo2/src/main/resources/application.yml
@@ -0,0 +1,12 @@
+server:
+  port: 8180
+  
+spring:
+  jersey:
+    application-path: /odata
+    
+  jpa:
+    show-sql: true
+    open-in-view: false
+    hibernate:
+      ddl-auto: update
\ No newline at end of file
diff --git a/apache-olingo/olingo2/src/main/resources/data.sql b/apache-olingo/olingo2/src/main/resources/data.sql
new file mode 100644
index 0000000000..327f2688c5
--- /dev/null
+++ b/apache-olingo/olingo2/src/main/resources/data.sql
@@ -0,0 +1,12 @@
+insert into car_maker(id,name) values (1,'Special Motors');
+insert into car_maker(id,name) values (2,'BWM');
+insert into car_maker(id,name) values (3,'Dolores');
+
+insert into car_model(id,maker_fk,name,sku,year) values(1,1,'Muze','SM001',2018);
+insert into car_model(id,maker_fk,name,sku,year) values(2,1,'Empada','SM002',2008);
+
+insert into car_model(id,maker_fk,name,sku,year) values(4,2,'BWM-100','BWM100',2008);
+insert into car_model(id,maker_fk,name,sku,year) values(5,2,'BWM-200','BWM200',2009);
+insert into car_model(id,maker_fk,name,sku,year) values(6,2,'BWM-300','BWM300',2008);
+
+alter sequence hibernate_sequence restart with 100;
\ No newline at end of file
diff --git a/apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationTests.java b/apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationTests.java
new file mode 100644
index 0000000000..687f6ab1ff
--- /dev/null
+++ b/apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationTests.java
@@ -0,0 +1,16 @@
+package org.baeldung.examples.olingo2;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class Olingo2SampleApplicationTests {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}
diff --git a/apache-olingo/olingo2/src/test/resources/olingo2-queries.json b/apache-olingo/olingo2/src/test/resources/olingo2-queries.json
new file mode 100644
index 0000000000..9fdade6d10
--- /dev/null
+++ b/apache-olingo/olingo2/src/test/resources/olingo2-queries.json
@@ -0,0 +1,256 @@
+{
+	"info": {
+		"_postman_id": "afa8e1e5-ab0e-4f1d-8b99-b7d1f091f975",
+		"name": "OLingo2 - Cars",
+		"schema": "https://schema.getpostman.com/json/collection/v2.0.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "GET Metadata",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": "http://localhost:8080/odata/$metadata"
+			},
+			"response": []
+		},
+		{
+			"name": "GET All CarMakers",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": "http://localhost:8080/odata/CarMakers"
+			},
+			"response": []
+		},
+		{
+			"name": "GET Makers with Pagination",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": {
+					"raw": "http://localhost:8080/odata/CarMakers?$top=1&$orderby=Name&$skip=3",
+					"protocol": "http",
+					"host": [
+						"localhost"
+					],
+					"port": "8080",
+					"path": [
+						"odata",
+						"CarMakers"
+					],
+					"query": [
+						{
+							"key": "$top",
+							"value": "1"
+						},
+						{
+							"key": "$orderby",
+							"value": "Name"
+						},
+						{
+							"key": "$skip",
+							"value": "3"
+						}
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "GET Makers and Models",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": {
+					"raw": "http://localhost:8080/odata/CarMakers?$expand=CarModelDetails",
+					"protocol": "http",
+					"host": [
+						"localhost"
+					],
+					"port": "8080",
+					"path": [
+						"odata",
+						"CarMakers"
+					],
+					"query": [
+						{
+							"key": "$expand",
+							"value": "CarModelDetails"
+						}
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "GET Makers with filter",
+			"request": {
+				"method": "GET",
+				"header": [
+					{
+						"key": "Accept",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": {
+					"raw": "http://localhost:8080/odata/CarMakers?$filter=Name eq 'BWM'&$expand=CarModelDetails",
+					"protocol": "http",
+					"host": [
+						"localhost"
+					],
+					"port": "8080",
+					"path": [
+						"odata",
+						"CarMakers"
+					],
+					"query": [
+						{
+							"key": "$filter",
+							"value": "Name eq 'BWM'"
+						},
+						{
+							"key": "$expand",
+							"value": "CarModelDetails"
+						}
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Create CarMaker",
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"value": "application/atom+xml",
+						"type": "text"
+					},
+					{
+						"key": "Accept",
+						"value": "application/atom+xml",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "<?xml version=\"1.0\" encoding=\"utf-8\" ?> \r\n<entry xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\"\r\n    xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" \r\n    xmlns=\"http://www.w3.org/2005/Atom\">\r\n  <title type=\"text\"></title> \r\n  <updated>2019-04-02T21:36:47Z</updated>\r\n  <author> \r\n    <name /> \r\n  </author> \r\n  <category term=\"default.CarMaker\"\r\n      scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\" /> \r\n  <content type=\"application/xml\"> \r\n    <m:properties>\r\n      <d:Name>Lucien</d:Name>\r\n    </m:properties> \r\n  </content> \r\n</entry>"
+				},
+				"url": "http://localhost:8080/odata/CarMakers"
+			},
+			"response": []
+		},
+		{
+			"name": "Create CarModel",
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"type": "text",
+						"value": "application/atom+xml"
+					},
+					{
+						"key": "Accept",
+						"type": "text",
+						"value": "application/atom+xml"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "<?xml version=\"1.0\" encoding=\"utf-8\" ?> \r\n<entry xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\"\r\n    xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" \r\n    xmlns=\"http://www.w3.org/2005/Atom\">\r\n  <title type=\"text\"></title> \r\n  <updated>2019-04-02T21:36:47Z</updated>\r\n  <author> \r\n    <name /> \r\n  </author> \r\n  <link href=\"CarModels(1L)/CarMakerDetails\" \r\n    rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/CarMakerDetails\" \r\n    title=\"CarMakerDetails\" \r\n    type=\"application/atom+xml;type=entry\"></link>  \r\n  <category term=\"default.CarModel\"\r\n      scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\" /> \r\n  <content type=\"application/xml\"> \r\n    <m:properties>\r\n\t    <d:Name>Tata</d:Name>\r\n\t    <d:Sku>TT101</d:Sku>\r\n\t    <d:Year>2018</d:Year>\r\n    </m:properties> \r\n  </content> \r\n</entry>"
+				},
+				"url": "http://localhost:8080/odata/CarModels"
+			},
+			"response": []
+		},
+		{
+			"name": "Update CarMaker",
+			"request": {
+				"method": "PUT",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"type": "text",
+						"value": "application/atom+xml"
+					},
+					{
+						"key": "Accept",
+						"type": "text",
+						"value": "application/atom+xml"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "<?xml version=\"1.0\" encoding=\"utf-8\" ?> \r\n<entry xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\"\r\n    xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" \r\n    xmlns=\"http://www.w3.org/2005/Atom\">\r\n  <title type=\"text\"></title> \r\n  <updated>2019-04-02T21:36:47Z</updated>\r\n  <author> \r\n    <name /> \r\n  </author> \r\n  <category term=\"default.CarMaker\"\r\n      scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\" /> \r\n  <content type=\"application/xml\"> \r\n    <m:properties>\r\n      <d:Id>5</d:Id>\r\n      <d:Name>KaiserWagen</d:Name>\r\n    </m:properties> \r\n  </content> \r\n</entry>"
+				},
+				"url": "http://localhost:8080/odata/CarMakers(5L)"
+			},
+			"response": []
+		},
+		{
+			"name": "All CarModels",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": "http://localhost:8080/odata/CarModels"
+			},
+			"response": []
+		},
+		{
+			"name": "Delete CarModel",
+			"request": {
+				"method": "DELETE",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"type": "text",
+						"value": "application/atom+xml"
+					},
+					{
+						"key": "Accept",
+						"type": "text",
+						"value": "application/atom+xml"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": "http://localhost:8080/odata/CarModels(100L)"
+			},
+			"response": []
+		}
+	]
+}
\ No newline at end of file
diff --git a/apache-olingo/olingo4/.gitignore b/apache-olingo/olingo4/.gitignore
new file mode 100644
index 0000000000..153c9335eb
--- /dev/null
+++ b/apache-olingo/olingo4/.gitignore
@@ -0,0 +1,29 @@
+HELP.md
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+
+### VS Code ###
+.vscode/
diff --git a/apache-olingo/olingo4/pom.xml b/apache-olingo/olingo4/pom.xml
new file mode 100644
index 0000000000..794aee0711
--- /dev/null
+++ b/apache-olingo/olingo4/pom.xml
@@ -0,0 +1,95 @@
+<?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>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.1.3.RELEASE</version>
+		<relativePath /> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>org.baeldung.examples.olingo4</groupId>
+	<artifactId>olingo4-sample</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>olingo4-sample</name>
+	<description>Sample Olingo 4 Project</description>
+
+	<properties>
+		<java.version>1.8</java.version>
+		<odata.version>4.5.0</odata.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.olingo</groupId>
+			<artifactId>odata-server-api</artifactId>
+			<version>${odata.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.olingo</groupId>
+			<artifactId>odata-server-core</artifactId>
+			<version>${odata.version}</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.olingo</groupId>
+			<artifactId>odata-commons-api</artifactId>
+			<version>${odata.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.olingo</groupId>
+			<artifactId>odata-commons-core</artifactId>
+			<version>${odata.version}</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.9.3</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/DefaultODataFactory.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/DefaultODataFactory.java
new file mode 100644
index 0000000000..18f7f8ba24
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/DefaultODataFactory.java
@@ -0,0 +1,20 @@
+package org.baeldung.examples.olingo4;
+
+import org.apache.olingo.server.api.OData;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.stereotype.Component;
+
+/**
+ * Default implementation for ODataFactory 
+ * @author Philippe
+ *
+ */
+@Component
+public class DefaultODataFactory implements ODataFactory {
+
+    @Override
+    public OData newInstance() {
+        return OData.newInstance();
+    }
+
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataFactory.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataFactory.java
new file mode 100644
index 0000000000..9acb4b8c5e
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataFactory.java
@@ -0,0 +1,8 @@
+package org.baeldung.examples.olingo4;
+
+import org.apache.olingo.server.api.OData;
+
+public interface ODataFactory {
+
+    public OData newInstance();
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataHttpHandlerFactory.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataHttpHandlerFactory.java
new file mode 100644
index 0000000000..27d0737c24
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataHttpHandlerFactory.java
@@ -0,0 +1,8 @@
+package org.baeldung.examples.olingo4;
+
+import org.apache.olingo.server.api.ODataHttpHandler;
+
+public interface ODataHttpHandlerFactory {
+
+    ODataHttpHandler newInstance();
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataHttpHandlerFactoryImpl.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataHttpHandlerFactoryImpl.java
new file mode 100644
index 0000000000..68d39dc052
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataHttpHandlerFactoryImpl.java
@@ -0,0 +1,42 @@
+package org.baeldung.examples.olingo4;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider;
+import org.apache.olingo.server.api.OData;
+import org.apache.olingo.server.api.ODataHttpHandler;
+import org.apache.olingo.server.api.ServiceMetadata;
+import org.apache.olingo.server.api.processor.Processor;
+
+import lombok.Builder;
+
+@Builder
+public class ODataHttpHandlerFactoryImpl implements ODataHttpHandlerFactory {
+    
+    
+    private final ODataFactory odataFactory;
+    private final CsdlEdmProvider edmProvider;
+    private final List<Processor> processors;
+
+    public ODataHttpHandlerFactoryImpl(ODataFactory odataFactory,CsdlEdmProvider edmProvider, List<Processor> processors) {
+        this.odataFactory = odataFactory;
+        this.edmProvider = edmProvider;
+        this.processors = processors;
+    }
+
+    @Override
+    public ODataHttpHandler newInstance() {
+        
+        OData odata = odataFactory.newInstance();
+        ServiceMetadata metadata = odata.createServiceMetadata(edmProvider, Collections.emptyList());
+        ODataHttpHandler handler = odata.createHandler(metadata);
+        
+        // Register all available processors
+        processors.forEach(p -> handler.register(p));
+        
+        
+        return handler;
+    }
+
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataServiceConfiguration.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataServiceConfiguration.java
new file mode 100644
index 0000000000..0cde665359
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataServiceConfiguration.java
@@ -0,0 +1,35 @@
+package org.baeldung.examples.olingo4;
+
+import java.util.List;
+
+import javax.persistence.EntityManagerFactory;
+import javax.servlet.http.HttpServlet;
+
+import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider;
+import org.apache.olingo.server.api.processor.Processor;
+import org.baeldung.examples.olingo4.ODataHttpHandlerFactoryImpl.ODataHttpHandlerFactoryImplBuilder;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ODataServiceConfiguration {
+
+    @Bean
+    public ServletRegistrationBean<HttpServlet> odataServletRegistration(ODataHttpHandlerFactory factory) {
+        ServletRegistrationBean<HttpServlet> srb = 
+          new ServletRegistrationBean<>(new ODataServlet(factory), "/odata/*");
+        srb.setLoadOnStartup(1);
+        return srb;
+    }
+
+    @Bean
+    public ODataHttpHandlerFactory httpHandlerFactory(CsdlEdmProvider edmProvider, ODataFactory odataFactory, List<Processor> processors) {
+        return new ODataHttpHandlerFactoryImplBuilder()
+          .edmProvider(edmProvider)
+          .odataFactory(odataFactory)
+          .processors(processors)
+          .build();
+    }
+
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataServlet.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataServlet.java
new file mode 100644
index 0000000000..c379124541
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/ODataServlet.java
@@ -0,0 +1,38 @@
+/**
+ * 
+ */
+package org.baeldung.examples.olingo4;
+
+import java.io.IOException;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.olingo.server.api.ODataHttpHandler;
+
+/**
+ * @author Philippe
+ *
+ */
+public class ODataServlet extends HttpServlet {
+
+    private static final long serialVersionUID = 1L;
+    private final ODataHttpHandlerFactory odataHttpHandlerFactory;
+    
+    
+    public ODataServlet(ODataHttpHandlerFactory factory) {
+        this.odataHttpHandlerFactory = factory;
+    }
+
+    @Override
+    protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+
+        ODataHttpHandler handler = odataHttpHandlerFactory.newInstance();
+        handler.process(req, resp);
+    }
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/Olingo4SampleApplication.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/Olingo4SampleApplication.java
new file mode 100644
index 0000000000..1ac872ea0f
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/Olingo4SampleApplication.java
@@ -0,0 +1,13 @@
+package org.baeldung.examples.olingo4;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Olingo4SampleApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Olingo4SampleApplication.class, args);
+    }
+
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/domain/CarMaker.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/domain/CarMaker.java
new file mode 100644
index 0000000000..79825b4556
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/domain/CarMaker.java
@@ -0,0 +1,36 @@
+package org.baeldung.examples.olingo4.domain;
+
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+import lombok.Data;
+
+@Entity
+@Data
+@Table(name="car_maker")
+public class CarMaker {
+    
+    @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)    
+    private Long id;
+    
+    @NotNull
+    @Column(name="name")
+    private String name;
+    
+    @OneToMany(mappedBy="maker",
+      orphanRemoval = true,
+      cascade=CascadeType.ALL)
+    private List<CarModel> models;
+    
+
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/domain/CarModel.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/domain/CarModel.java
new file mode 100644
index 0000000000..a9254e48b9
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/domain/CarModel.java
@@ -0,0 +1,38 @@
+package org.baeldung.examples.olingo4.domain;
+
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+import lombok.Data;
+
+@Entity
+@Data
+@Table(name="car_model")
+public class CarModel {
+
+    @Id
+    @GeneratedValue(strategy=GenerationType.AUTO)
+    private Long id;
+    
+    @NotNull
+    private String name;
+    
+    @NotNull
+    private Integer year;
+    
+    @NotNull
+    private String sku;
+    
+    @ManyToOne(optional=false, fetch= FetchType.EAGER   )
+    @JoinColumn(name="maker_fk")
+    private CarMaker maker;
+
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/edm/EdmTypeMapper.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/edm/EdmTypeMapper.java
new file mode 100644
index 0000000000..95797752a2
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/edm/EdmTypeMapper.java
@@ -0,0 +1,46 @@
+package org.baeldung.examples.olingo4.edm;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.sql.Time;
+import java.util.AbstractMap.SimpleEntry;
+
+import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
+import org.springframework.stereotype.Component;
+
+@Component
+public class EdmTypeMapper {
+
+    public EdmPrimitiveTypeKind java2edm(Class<?> clazz) {
+        EdmPrimitiveTypeKind result = java2edm.get(clazz);
+        if ( result == null ) {
+            throw new IllegalArgumentException("[E19] Unsupported class mapping: class=" + clazz);
+        }
+        else {
+            return result;
+        }
+    }
+    
+    // Static map used generate attribute metadada based on Java types
+    static Map<Class<?>,EdmPrimitiveTypeKind> java2edm = Collections
+      .unmodifiableMap(Stream.of(
+        new SimpleEntry<>(Boolean.class,EdmPrimitiveTypeKind.Boolean),
+        new SimpleEntry<>(Byte.class,EdmPrimitiveTypeKind.SByte),
+        new SimpleEntry<>(Date.class,EdmPrimitiveTypeKind.Date),
+        new SimpleEntry<>(Time.class,EdmPrimitiveTypeKind.TimeOfDay),
+        new SimpleEntry<>(Number.class,EdmPrimitiveTypeKind.Decimal),
+        new SimpleEntry<>(Float.class,EdmPrimitiveTypeKind.Single),
+        new SimpleEntry<>(Double.class,EdmPrimitiveTypeKind.Double),
+        new SimpleEntry<>(UUID.class,EdmPrimitiveTypeKind.Guid),
+        new SimpleEntry<>(Short.class,EdmPrimitiveTypeKind.Int16),
+        new SimpleEntry<>(Integer.class,EdmPrimitiveTypeKind.Int32),
+        new SimpleEntry<>(Long.class,EdmPrimitiveTypeKind.Int64),
+        new SimpleEntry<>(String.class,EdmPrimitiveTypeKind.String)
+      
+      ).collect(Collectors.toMap((e)-> e.getKey(),(e)-> e.getValue())));
+
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/edm/JpaEdmProvider.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/edm/JpaEdmProvider.java
new file mode 100644
index 0000000000..4cd979e931
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/edm/JpaEdmProvider.java
@@ -0,0 +1,269 @@
+package org.baeldung.examples.olingo4.edm;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.metamodel.Attribute.PersistentAttributeType;
+import javax.persistence.metamodel.EntityType;
+import javax.persistence.metamodel.Metamodel;
+import javax.persistence.metamodel.PluralAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+
+import org.apache.olingo.commons.api.edm.FullQualifiedName;
+import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider;
+import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainer;
+import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainerInfo;
+import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet;
+import org.apache.olingo.commons.api.edm.provider.CsdlEntityType;
+import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty;
+import org.apache.olingo.commons.api.edm.provider.CsdlProperty;
+import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef;
+import org.apache.olingo.commons.api.edm.provider.CsdlSchema;
+import org.apache.olingo.commons.api.ex.ODataException;
+import org.springframework.stereotype.Component;
+
+@Component
+public class JpaEdmProvider extends CsdlAbstractEdmProvider {
+
+    EntityManagerFactory emf;
+
+    //
+    private EdmTypeMapper typeMapper;
+
+    // Service Namespace
+    public static final String NAMESPACE = "Baeldung.OData";
+
+    // EDM Container
+    public static final String CONTAINER_NAME = "Cars";
+    public static final FullQualifiedName CONTAINER = new FullQualifiedName(NAMESPACE, CONTAINER_NAME);
+    
+    // Caches of OData types by it fully qualified name
+    private Map<FullQualifiedName, CsdlEntityType> cdslName2Type = new HashMap<>();
+
+    public JpaEdmProvider(EntityManagerFactory emf, EdmTypeMapper mapper) {
+        this.emf = emf;
+        this.typeMapper = mapper;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider#getEntitySet(org.apache.olingo.commons.api.edm.FullQualifiedName, java.lang.String)
+     */
+    @Override
+    public CsdlEntitySet getEntitySet(FullQualifiedName entityContainer, String entitySetName) throws ODataException {
+
+        if (entityContainer.equals(CONTAINER)) {
+
+            EntityType<?> e = emf.getMetamodel()
+                .getEntities()
+                .stream()
+                .filter((ent) -> (ent.getName() + "s")
+                    .equals(entitySetName))
+                .findFirst()
+                .orElse(null);
+
+            if (e != null) {
+                CsdlEntitySet entitySet = new CsdlEntitySet();
+                entitySet
+                  .setName(entitySetName)
+                  .setType(new FullQualifiedName(NAMESPACE, e.getName()));
+                return entitySet;
+            }
+        }
+
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider#getEntityContainerInfo(org.apache.olingo.commons.api.edm.FullQualifiedName)
+     */
+    @Override
+    public CsdlEntityContainerInfo getEntityContainerInfo(FullQualifiedName entityContainerName) throws ODataException {
+
+        // This method is invoked when displaying the Service Document at e.g. http://localhost:8080/DemoService/DemoService.svc
+        if (entityContainerName == null || entityContainerName.equals(CONTAINER)) {
+            CsdlEntityContainerInfo entityContainerInfo = new CsdlEntityContainerInfo();
+            entityContainerInfo.setContainerName(CONTAINER);
+            return entityContainerInfo;
+        }
+
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider#getSchemas()
+     */
+    @Override
+    public List<CsdlSchema> getSchemas() throws ODataException {
+        // create Schema
+        CsdlSchema schema = new CsdlSchema();
+        schema.setNamespace(NAMESPACE);
+
+        // add EntityTypes
+        List<CsdlEntityType> entityTypes = emf.getMetamodel()
+            .getEntities()
+            .stream()
+            .map((e) -> {
+                try {
+                    return getEntityType(new FullQualifiedName(NAMESPACE, e.getName()));
+                } catch (ODataException oe) {
+                    throw new RuntimeException(oe);
+                }
+            })
+            .collect(Collectors.toList());
+
+        schema.setEntityTypes(entityTypes);
+
+        // add EntityContainer
+        schema.setEntityContainer(getEntityContainer());
+
+        // finally
+        List<CsdlSchema> schemas = new ArrayList<CsdlSchema>();
+        schemas.add(schema);
+
+        return schemas;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider#getEntityContainer()
+     */
+    @Override
+    public CsdlEntityContainer getEntityContainer() throws ODataException {
+        
+        
+        // add EntityTypes
+        List<CsdlEntitySet> entitySets = emf.getMetamodel()
+            .getEntities()
+            .stream()
+            .map((e) -> {
+                try {
+                    // Here we use a simple mapping strategy to map entity types to entity set names:
+                    return getEntitySet(CONTAINER, e.getName() + "s");
+                } catch (ODataException oe) {
+                    throw new RuntimeException(oe);
+                }
+            })
+            .collect(Collectors.toList());
+        
+        // create EntityContainer
+        CsdlEntityContainer entityContainer = new CsdlEntityContainer();
+        entityContainer.setName(CONTAINER_NAME);
+        entityContainer.setEntitySets(entitySets);
+
+        return entityContainer;
+    }
+
+    @Override
+    public CsdlEntityType getEntityType(FullQualifiedName entityTypeName) throws ODataException {
+        
+        CsdlEntityType result = cdslName2Type.get(entityTypeName);
+        if ( result != null ) {
+            return result;
+        }
+
+        Metamodel mm = emf.getMetamodel();
+        result = mm.getEntities()
+            .stream()
+            .filter(et -> entityTypeName.equals(new FullQualifiedName(NAMESPACE, et.getName())))
+            .map(et -> buildODataType(et))
+            .findFirst()
+            .orElse(null);
+
+        // save for future use
+        cdslName2Type.put(entityTypeName, result);
+        return result;
+        
+    }
+
+    /**
+     * Maps a JPA type to its OData counterpart.
+     * @param et
+     * @return
+     */
+    protected CsdlEntityType buildODataType(EntityType<?> et) {
+
+        CsdlEntityType result = new CsdlEntityType();
+        result.setName(et.getName());
+
+        // Process simple properties
+        List<CsdlProperty> properties = et.getDeclaredSingularAttributes()
+            .stream()
+            .filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.BASIC)
+            .map(attr -> buildBasicAttribute(et, attr))
+            .collect(Collectors.toList());
+
+        result.setProperties(properties);
+
+        // Process Ids
+        List<CsdlPropertyRef> ids = et.getDeclaredSingularAttributes()
+            .stream()
+            .filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.BASIC && attr.isId())
+            .map(attr -> buildRefAttribute(et, attr))
+            .collect(Collectors.toList());
+
+        result.setKey(ids);
+
+        // Process 1:N navs
+        List<CsdlNavigationProperty> navs = et.getDeclaredPluralAttributes()
+            .stream()
+            .map(attr -> buildNavAttribute(et, attr))
+            .collect(Collectors.toList());
+        result.setNavigationProperties(navs);
+        
+        // Process N:1 navs
+        List<CsdlNavigationProperty> navs2 = et.getDeclaredSingularAttributes()
+            .stream()
+            .filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.MANY_TO_ONE)
+            .map(attr -> buildNavAttribute(et, attr))
+            .collect(Collectors.toList());
+
+        result.getNavigationProperties().addAll(navs2);
+        
+
+        return result;
+    }
+
+    private CsdlProperty buildBasicAttribute(EntityType<?> et, SingularAttribute<?, ?> attr) {
+
+        CsdlProperty p = new CsdlProperty().setName(attr.getName())
+            .setType(typeMapper.java2edm(attr.getJavaType())
+                .getFullQualifiedName())
+            .setNullable(et.getDeclaredSingularAttribute(attr.getName())
+                .isOptional());
+
+        return p;
+    }
+
+    private CsdlPropertyRef buildRefAttribute(EntityType<?> et, SingularAttribute<?, ?> attr) {
+
+        CsdlPropertyRef p = new CsdlPropertyRef().setName(attr.getName());
+
+        return p;
+    }
+
+    // Build NavProperty for 1:N or M:N associations
+    private CsdlNavigationProperty buildNavAttribute(EntityType<?> et, PluralAttribute<?, ?, ?> attr) {
+
+        CsdlNavigationProperty p = new CsdlNavigationProperty().setName(attr.getName())
+            .setType(new FullQualifiedName(NAMESPACE, attr.getBindableJavaType().getSimpleName()))
+            .setCollection(true)
+            .setNullable(false); 
+
+        return p;
+    }
+
+    // Build NavProperty for N:1 associations
+    private CsdlNavigationProperty buildNavAttribute(EntityType<?> et, SingularAttribute<?, ?> attr) {
+
+        CsdlNavigationProperty p = new CsdlNavigationProperty().setName(attr.getName())
+            .setType(new FullQualifiedName(NAMESPACE, attr.getBindableJavaType().getSimpleName()))
+            .setCollection(false)
+            .setNullable(attr.isOptional());
+
+        return p;
+    }
+    
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/processor/JpaEntityCollectionProcessor.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/processor/JpaEntityCollectionProcessor.java
new file mode 100644
index 0000000000..4a4e5026f3
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/processor/JpaEntityCollectionProcessor.java
@@ -0,0 +1,161 @@
+package org.baeldung.examples.olingo4.processor;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Collection;
+import java.util.List;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.metamodel.EntityType;
+import javax.persistence.metamodel.SingularAttribute;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.olingo.commons.api.data.ContextURL;
+import org.apache.olingo.commons.api.data.Entity;
+import org.apache.olingo.commons.api.data.EntityCollection;
+import org.apache.olingo.commons.api.data.Property;
+import org.apache.olingo.commons.api.data.ValueType;
+import org.apache.olingo.commons.api.edm.EdmEntitySet;
+import org.apache.olingo.commons.api.edm.EdmEntityType;
+import org.apache.olingo.commons.api.edm.EdmNavigationProperty;
+import org.apache.olingo.commons.api.ex.ODataRuntimeException;
+import org.apache.olingo.commons.api.format.ContentType;
+import org.apache.olingo.commons.api.http.HttpHeader;
+import org.apache.olingo.commons.api.http.HttpStatusCode;
+import org.apache.olingo.server.api.OData;
+import org.apache.olingo.server.api.ODataApplicationException;
+import org.apache.olingo.server.api.ODataLibraryException;
+import org.apache.olingo.server.api.ODataRequest;
+import org.apache.olingo.server.api.ODataResponse;
+import org.apache.olingo.server.api.ServiceMetadata;
+import org.apache.olingo.server.api.processor.CountEntityCollectionProcessor;
+import org.apache.olingo.server.api.processor.EntityCollectionProcessor;
+import org.apache.olingo.server.api.serializer.EntityCollectionSerializerOptions;
+import org.apache.olingo.server.api.serializer.ODataSerializer;
+import org.apache.olingo.server.api.serializer.SerializerResult;
+import org.apache.olingo.server.api.uri.UriInfo;
+import org.apache.olingo.server.api.uri.UriParameter;
+import org.apache.olingo.server.api.uri.UriResource;
+import org.apache.olingo.server.api.uri.UriResourceEntitySet;
+import org.baeldung.examples.olingo4.repository.RepositoryRegistry;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Component;
+
+@Component
+public class JpaEntityCollectionProcessor implements CountEntityCollectionProcessor {
+
+    private OData odata;
+    private ServiceMetadata serviceMetadata;
+    private EntityManagerFactory emf;
+    private RepositoryRegistry repositoryRegistry;
+    private JpaEntityMapper entityMapper;
+
+    public JpaEntityCollectionProcessor(EntityManagerFactory emf, RepositoryRegistry repositoryRegistry, JpaEntityMapper entityMapper) {
+        this.emf = emf;
+        this.repositoryRegistry = repositoryRegistry;
+        this.entityMapper = entityMapper;
+    }
+
+    @Override
+    public void init(OData odata, ServiceMetadata serviceMetadata) {
+        this.odata = odata;
+        this.serviceMetadata = serviceMetadata;
+    }
+
+    @Override
+    public void readEntityCollection(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {
+
+        // 1st we have retrieve the requested EntitySet from the uriInfo object (representation of the parsed service URI)
+        List<UriResource> resourcePaths = uriInfo.getUriResourceParts();
+        UriResourceEntitySet uriResourceEntitySet = (UriResourceEntitySet) resourcePaths.get(0); // in our example, the first segment is the EntitySet
+        EdmEntitySet edmEntitySet = uriResourceEntitySet.getEntitySet();
+
+        // 2nd: fetch the data from backend for this requested EntitySetName
+        // it has to be delivered as EntitySet object
+        EntityCollection entitySet = getData(edmEntitySet, uriInfo);
+
+        // 3rd: create a serializer based on the requested format (json)
+        ODataSerializer serializer = odata.createSerializer(responseFormat);
+
+        // 4th: Now serialize the content: transform from the EntitySet object to InputStream
+        EdmEntityType edmEntityType = edmEntitySet.getEntityType();
+        ContextURL contextUrl = ContextURL.with()
+            .entitySet(edmEntitySet)
+            .build();
+
+        final String id = request.getRawBaseUri() + "/" + edmEntitySet.getName();
+        EntityCollectionSerializerOptions opts = EntityCollectionSerializerOptions.with()
+            .id(id)
+            .contextURL(contextUrl)
+            .build();
+        SerializerResult serializerResult = serializer.entityCollection(serviceMetadata, edmEntityType, entitySet, opts);
+        InputStream serializedContent = serializerResult.getContent();
+
+        // Finally: configure the response object: set the body, headers and status code
+        response.setContent(serializedContent);
+        response.setStatusCode(HttpStatusCode.OK.getStatusCode());
+        response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString());
+
+    }
+
+    @Override
+    public void countEntityCollection(ODataRequest request, ODataResponse response, UriInfo uriInfo) throws ODataApplicationException, ODataLibraryException {
+
+        // 1st we have retrieve the requested EntitySet from the uriInfo object (representation of the parsed service URI)
+        List<UriResource> resourcePaths = uriInfo.getUriResourceParts();
+        UriResourceEntitySet uriResourceEntitySet = (UriResourceEntitySet) resourcePaths.get(0); // in our example, the first segment is the EntitySet
+        EdmEntitySet edmEntitySet = uriResourceEntitySet.getEntitySet();
+
+        // 2nd: fetch the data from backend for this requested EntitySetName
+        Long count = getCount(edmEntitySet, uriInfo);
+
+        // Finally: configure the response object: set the body, headers and status code
+        response.setContent(new ByteArrayInputStream(count.toString().getBytes()));
+        response.setStatusCode(HttpStatusCode.OK.getStatusCode());
+        response.setHeader(HttpHeader.CONTENT_TYPE, "text/plain");
+
+    }
+
+    /**
+     * Helper method to retrieve all entities of an entity set from an the backend database
+     * @param edmEntitySet
+     * @param uriInfo
+     * @return
+     */
+    protected EntityCollection getData(EdmEntitySet edmEntitySet, UriInfo uriInfo) {
+
+        EdmEntityType type = edmEntitySet.getEntityType();
+        JpaRepository<?, ?> repo = (JpaRepository<?, ?>)repositoryRegistry.getRepositoryForEntity(type);
+        EntityCollection result = new EntityCollection();
+
+        repo.findAll()
+          .stream()
+          .forEach((it) -> result.getEntities()
+          .add(entityMapper.map2entity(edmEntitySet, it)));
+
+        return result;
+    }
+
+
+    /**
+     * Helper method to get the total size of an entity set
+     * @param edmEntitySet
+     * @param uriInfo
+     * @return
+     */
+    protected Long getCount(EdmEntitySet edmEntitySet, UriInfo uriInfo) {
+        
+        EdmEntityType type = edmEntitySet.getEntityType();
+        JpaRepository<?, ?> repo = (JpaRepository<?, ?>)repositoryRegistry.getRepositoryForEntity(type);
+        EntityCollection result = new EntityCollection();
+
+        return repo.count();
+    }
+    
+    
+
+
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/processor/JpaEntityMapper.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/processor/JpaEntityMapper.java
new file mode 100644
index 0000000000..1978aa4fd6
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/processor/JpaEntityMapper.java
@@ -0,0 +1,93 @@
+/**
+ * 
+ */
+package org.baeldung.examples.olingo4.processor;
+
+import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.metamodel.EntityType;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.olingo.commons.api.data.Entity;
+import org.apache.olingo.commons.api.data.Property;
+import org.apache.olingo.commons.api.data.ValueType;
+import org.apache.olingo.commons.api.edm.EdmEntitySet;
+import org.apache.olingo.commons.api.ex.ODataRuntimeException;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>Helper class that converts a JPA entity into an OData entity using
+ * available metadata from the JPA's EntityManagerFactory.</p>
+ * 
+ * @author Philippe
+ *
+ */
+@Component
+public class JpaEntityMapper {
+    
+    private EntityManagerFactory emf;
+
+    public JpaEntityMapper(EntityManagerFactory emf) {
+        this.emf = emf;
+    }
+    
+    
+    public Entity map2entity(EdmEntitySet edmEntitySet, Object entry) {
+
+        EntityType<?> et = emf.getMetamodel()
+            .entity(entry.getClass());
+
+
+        Entity e = new Entity();
+        try {
+            et.getDeclaredSingularAttributes().stream()
+              .forEach( (attr) -> {
+                 if ( !attr.isAssociation()) {
+                     Object v = getPropertyValue(entry,attr.getName());
+                     Property p = new Property(null, attr.getName(),ValueType.PRIMITIVE,v);
+                     e.addProperty(p);
+
+                     if ( attr.isId()) {
+                         e.setId(createId(edmEntitySet.getName(),v));                     
+                     }                     
+                 }                 
+              });
+        } catch (Exception ex) {
+            throw new ODataRuntimeException("[E141] Unable to create OData entity", ex);
+        }
+
+        return e;
+    }
+    
+    
+    public Object getPropertyValue(Object entry, String name) {
+        try {
+            return PropertyUtils.getProperty(entry,name);
+        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            throw new ODataRuntimeException("[E141] Unable to read property from entity, property=" + name, e);
+        }
+    }
+    
+    public void setPropertyValue(Object entry, String name,Object value) {
+        try {
+            PropertyUtils.setProperty(entry,name,value);
+        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            throw new ODataRuntimeException("[E141] Unable to read property from entity, property=" + name, e);
+        }
+    }
+    
+
+    private URI createId(String entitySetName, Object id)  {
+        try {
+            return new URI(entitySetName + "(" + String.valueOf(id) + ")");
+        } catch (URISyntaxException e) {
+            throw new ODataRuntimeException("[E177] Unable to create URI", e);
+        }
+    }
+    
+
+
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/processor/JpaEntityProcessor.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/processor/JpaEntityProcessor.java
new file mode 100644
index 0000000000..719e5de160
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/processor/JpaEntityProcessor.java
@@ -0,0 +1,304 @@
+/**
+ * 
+ */
+package org.baeldung.examples.olingo4.processor;
+
+import java.io.InputStream;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.metamodel.SingularAttribute;
+
+import org.apache.olingo.commons.api.data.ContextURL;
+import org.apache.olingo.commons.api.data.Entity;
+import org.apache.olingo.commons.api.edm.EdmEntitySet;
+import org.apache.olingo.commons.api.edm.EdmEntityType;
+import org.apache.olingo.commons.api.edm.EdmNavigationProperty;
+import org.apache.olingo.commons.api.ex.ODataRuntimeException;
+import org.apache.olingo.commons.api.format.ContentType;
+import org.apache.olingo.commons.api.http.HttpHeader;
+import org.apache.olingo.commons.api.http.HttpStatusCode;
+import org.apache.olingo.server.api.OData;
+import org.apache.olingo.server.api.ODataApplicationException;
+import org.apache.olingo.server.api.ODataLibraryException;
+import org.apache.olingo.server.api.ODataRequest;
+import org.apache.olingo.server.api.ODataResponse;
+import org.apache.olingo.server.api.ServiceMetadata;
+import org.apache.olingo.server.api.processor.EntityProcessor;
+import org.apache.olingo.server.api.serializer.EntitySerializerOptions;
+import org.apache.olingo.server.api.serializer.ODataSerializer;
+import org.apache.olingo.server.api.serializer.SerializerResult;
+import org.apache.olingo.server.api.uri.UriInfo;
+import org.apache.olingo.server.api.uri.UriParameter;
+import org.apache.olingo.server.api.uri.UriResource;
+import org.apache.olingo.server.api.uri.UriResourceEntitySet;
+import org.apache.olingo.server.api.uri.UriResourceNavigation;
+import org.baeldung.examples.olingo4.repository.EdmEntityRepository;
+import org.baeldung.examples.olingo4.repository.RepositoryRegistry;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Component;
+
+/**
+ * JpaEntityProcessor adapter. 
+ * <p>This implementation is heavily based on the Tutorial available
+ * at Olingo's site. It is meant to be an starting point for an actual implementation.</p>
+ * <p>Please note that many features from a full-fledged are missing
+ * @author Philippe
+ *
+ */
+@Component
+public class JpaEntityProcessor implements EntityProcessor {
+    
+    private EntityManagerFactory emf;
+    private OData odata;
+    private ServiceMetadata serviceMetadata;
+    private RepositoryRegistry registry;
+    private JpaEntityMapper entityMapper;
+
+    public JpaEntityProcessor(EntityManagerFactory emf, RepositoryRegistry registry, JpaEntityMapper entityMapper) {
+        this.emf = emf;
+        this.registry = registry;
+        this.entityMapper = entityMapper;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.olingo.server.api.processor.Processor#init(org.apache.olingo.server.api.OData, org.apache.olingo.server.api.ServiceMetadata)
+     */
+    @Override
+    public void init(OData odata, ServiceMetadata serviceMetadata) {
+        this.odata = odata;
+        this.serviceMetadata = serviceMetadata;
+        
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.olingo.server.api.processor.EntityProcessor#readEntity(org.apache.olingo.server.api.ODataRequest, org.apache.olingo.server.api.ODataResponse, org.apache.olingo.server.api.uri.UriInfo, org.apache.olingo.commons.api.format.ContentType)
+     */
+    @Override
+    public void readEntity(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {
+
+        // First, we have to figure out which entity is requested
+        List<UriResource> resourceParts = uriInfo.getUriResourceParts();
+        InputStream entityStream;
+        
+        UriResourceEntitySet rootResourceEntitySet = (UriResourceEntitySet) resourceParts.get(0);
+        EdmEntitySet rootEntitySet = rootResourceEntitySet.getEntitySet();        
+        List<UriParameter> rootPredicates = rootResourceEntitySet.getKeyPredicates();
+        
+        if ( resourceParts.size() == 1 ) {
+            entityStream = readRootEntity(rootEntitySet,rootPredicates,responseFormat);
+        }
+        else if ( resourceParts.size() == 2 ) {
+            UriResource part = resourceParts.get(1);
+            if ( !(part instanceof UriResourceNavigation)) {
+                throw new ODataRuntimeException("[E103] part type not supported: class=" + part.getClass().getName());
+            }
+
+            UriResourceNavigation navSegment = (UriResourceNavigation)part;
+            entityStream = readRelatedEntity(request, rootEntitySet,rootPredicates,navSegment.getProperty(),navSegment.getKeyPredicates(),responseFormat);                       
+        }
+        else {
+            // For now, we'll only allow navigation just to directly linked navs
+            throw new ODataApplicationException("[E109] Multi-level navigation not supported", HttpStatusCode.NOT_IMPLEMENTED.getStatusCode(), Locale.ROOT);
+        }
+
+        //4. configure the response object
+        response.setContent(entityStream);
+        response.setStatusCode(HttpStatusCode.OK.getStatusCode());
+        response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString());       
+        
+    }
+    
+
+    // Lookup the EntitySet associated with an EntityType
+    // In our example, we assume we have only one entityset for each entity type
+    private EdmEntitySet entitySetFromType(EdmEntityType type) {
+        return serviceMetadata
+          .getEdm()
+          .getEntityContainer()
+          .getEntitySets()
+          .stream()
+          .filter((s) -> s.getEntityType().getName().equals(type.getName()))
+          .findFirst()
+          .orElseThrow(() -> new ODataRuntimeException("[E144] No entity set found for type " + type.getFullQualifiedName()));
+    }
+
+    // 
+   // private boolean isOne2ManyProperty(EdmEntityType entityType, EdmNavigationProperty property) {        
+    //    return entityType.getProperty(property.getName()) != null && property.isCollection();
+    //}
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    private InputStream readRootEntity(EdmEntitySet entitySet, List<UriParameter> keyPredicates,ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {        
+        EdmEntityType type = entitySet.getEntityType();        
+        JpaRepository repo =  registry.getRepositoryForEntity(type);
+        
+        // Get key value
+        Long keyValue =  getEntityKey(keyPredicates);
+        Optional<Object> entry  = repo.findById(keyValue);
+        if ( !entry.isPresent()) {
+            throw new ODataApplicationException(
+              "[E116] NO entity found for the given key",
+              HttpStatusCode.NOT_FOUND.getStatusCode(), 
+              Locale.ENGLISH);
+        }
+      
+        Entity e = entityMapper.map2entity(entitySet, entry.get());        
+        return serializeEntity(entitySet,e,responseFormat);        
+    }
+    
+    private InputStream serializeEntity(EdmEntitySet entitySet, Entity entity,ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {
+        ContextURL contextUrl = ContextURL.with().entitySet(entitySet).build();
+        // expand and select currently not supported
+        EntitySerializerOptions options = EntitySerializerOptions
+          .with()
+          .contextURL(contextUrl)
+          .build();
+
+        ODataSerializer serializer = odata.createSerializer(responseFormat);
+        
+        SerializerResult serializerResult = serializer.entity(serviceMetadata, entitySet.getEntityType(), entity, options);
+        return serializerResult.getContent();
+        
+    }
+    
+//    @SuppressWarnings("unchecked")
+//    protected InputStream readRelatedEntities(EdmEntitySet rootEntitySet, List<UriParameter> rootPredicates, EdmNavigationProperty property, ContentType responseFormat) throws ODataApplicationException {
+//
+//        Object jpaEntity = readJPAEntity(rootEntitySet, rootPredicates);
+//        try {
+//            Collection<Object> set = (Collection<Object>)PropertyUtils.getProperty(jpaEntity, property.getName());
+//            EdmEntitySet entitySet = entitySetFromType(property.getType());
+//            ContextURL contextUrl = ContextURL
+//              .with()
+//              .entitySet(entitySet)
+//              .build();
+//            
+//            EntityCollectionSerializerOptions options = EntityCollectionSerializerOptions
+//              .with()
+//              .contextURL(contextUrl)
+//              .build();
+//            
+//            EntityCollection result = new EntityCollection();
+//            
+//            set.stream()
+//              .map((o) -> this.entityMapper.map2entity(entitySet, o))
+//              .forEach((e) -> result.getEntities().add(e));
+//
+//            ODataSerializer serializer = odata.createSerializer(responseFormat);            
+//            SerializerResult serializerResult = serializer.entityCollection(serviceMetadata, property.getType(), result, options);
+//            return serializerResult.getContent();
+//        }
+//        catch(Exception ex) {
+//            throw new ODataRuntimeException("[E181] Error accessing database", ex);
+//        }
+//    }
+    
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    private InputStream readRelatedEntity(ODataRequest request, EdmEntitySet entitySet, List<UriParameter> rootPredicates, EdmNavigationProperty property, List<UriParameter> parentPredicates, ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {
+
+
+        JpaRepository<Object,Object> repo =  (JpaRepository<Object,Object>)registry.getRepositoryForEntity(entitySet.getEntityType());
+        EdmEntityRepository<Object> relatedRepo =  (EdmEntityRepository<Object>)registry.getRepositoryForEntity(property.getType());
+
+        // We assume here that we have a bi-directional 1:N relationship, so we'll
+        // always have a property in the child entity that points to the parent
+        Class<?> rootClass = ((EdmEntityRepository)repo).getEntityClass();        
+        Class<?> relatedClass = ((EdmEntityRepository)relatedRepo).getEntityClass();
+        
+        SingularAttribute fk = emf.getMetamodel()
+          .entity(rootClass)
+          .getSingularAttributes()
+          .stream()
+          .filter((attr) -> {
+              boolean b = attr.isAssociation() && attr.getJavaType().isAssignableFrom(relatedClass);
+              return b;
+          })
+          .findFirst()
+          .orElse(null);
+        
+        if ( fk == null ) {
+            throw new ODataRuntimeException("[E230] No singular attribute of child class '" + relatedClass.getName() + "' found" );
+        }
+        
+        Long pkValue = getEntityKey(rootPredicates);  
+        EntityManager em = this.emf.createEntityManager();
+        try {
+            // Read data from DB 
+            Object root = em.find(rootClass, pkValue);            
+            Object related = this.entityMapper.getPropertyValue(root, fk.getName());
+                
+            EdmEntitySet relatedEntitySet = entitySetFromType(property.getType());        
+            Entity e = entityMapper.map2entity(relatedEntitySet, related);               
+            return serializeEntity(relatedEntitySet,e,responseFormat);
+        }
+        finally {
+            em.close();
+        }
+    }
+
+//    @SuppressWarnings("unchecked")
+//    private Object readJPAEntity(EdmEntitySet edmEntitySet, List<UriParameter> keyPredicates) throws ODataApplicationException {
+//        EdmEntityType type = edmEntitySet.getEntityType();        
+//        JpaRepository<Object,Object> repo =  (JpaRepository<Object,Object>)registry.getRepositoryForEntity(type);
+//        
+//        // Get key value
+//        Object keyValue =  getEntityKey(type,keyPredicates);
+//        Object entry = repo
+//          .findById(keyValue)
+//          .orElseThrow(
+//             () -> new ODataApplicationException("[E116] NO entity found for the given key",
+//                                       HttpStatusCode.NOT_FOUND.getStatusCode(), Locale.ENGLISH));
+//       
+//        return entry;
+//    }
+
+    private Long getEntityKey(List<UriParameter> keyPredicates) {
+        
+        if ( keyPredicates.size() > 1 ) {
+            throw new ODataRuntimeException("[E131] Composite keys are not supported");
+        }
+        
+        // For now, we'll assume we only have numeric keys.
+        UriParameter keyParam = keyPredicates.get(0);
+        try {
+            return Long.parseLong(keyParam.getText());
+        }
+        catch(NumberFormatException nfe) {
+            throw new ODataRuntimeException("[E140] Invalid key value. Only numeric keys are supported by this service");
+        }
+        
+        
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.olingo.server.api.processor.EntityProcessor#createEntity(org.apache.olingo.server.api.ODataRequest, org.apache.olingo.server.api.ODataResponse, org.apache.olingo.server.api.uri.UriInfo, org.apache.olingo.commons.api.format.ContentType, org.apache.olingo.commons.api.format.ContentType)
+     */
+    @Override
+    public void createEntity(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType requestFormat, ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {
+        // TODO Auto-generated method stub
+
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.olingo.server.api.processor.EntityProcessor#updateEntity(org.apache.olingo.server.api.ODataRequest, org.apache.olingo.server.api.ODataResponse, org.apache.olingo.server.api.uri.UriInfo, org.apache.olingo.commons.api.format.ContentType, org.apache.olingo.commons.api.format.ContentType)
+     */
+    @Override
+    public void updateEntity(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType requestFormat, ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {
+        // TODO Auto-generated method stub
+
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.olingo.server.api.processor.EntityProcessor#deleteEntity(org.apache.olingo.server.api.ODataRequest, org.apache.olingo.server.api.ODataResponse, org.apache.olingo.server.api.uri.UriInfo)
+     */
+    @Override
+    public void deleteEntity(ODataRequest request, ODataResponse response, UriInfo uriInfo) throws ODataApplicationException, ODataLibraryException {
+        // TODO Auto-generated method stub
+
+    }
+
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/CarMakerRepository.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/CarMakerRepository.java
new file mode 100644
index 0000000000..1bde9f148c
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/CarMakerRepository.java
@@ -0,0 +1,16 @@
+package org.baeldung.examples.olingo4.repository;
+
+import org.baeldung.examples.olingo4.domain.CarMaker;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CarMakerRepository extends EdmEntityRepository<CarMaker>, JpaRepository<CarMaker, Long>, JpaSpecificationExecutor<CarMaker> {
+
+    public default String getEdmEntityName() { return CarMaker.class.getSimpleName();}
+    @Override
+    default Class<CarMaker> getEntityClass() {
+        return CarMaker.class;
+    }
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/CarModelRepository.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/CarModelRepository.java
new file mode 100644
index 0000000000..247bf6e77b
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/CarModelRepository.java
@@ -0,0 +1,22 @@
+package org.baeldung.examples.olingo4.repository;
+
+import java.util.List;
+
+import org.baeldung.examples.olingo4.domain.CarModel;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CarModelRepository extends EdmEntityRepository<CarModel>, JpaRepository<CarModel, Long>, JpaSpecificationExecutor<CarModel> {
+
+    public List<CarModel> findByMakerId(Long makerId);
+    
+    public default String getEdmEntityName() { return CarModel.class.getSimpleName();}
+    
+    @Override
+    default Class<CarModel> getEntityClass() {
+        return CarModel.class;
+    }
+
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/EdmEntityRepository.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/EdmEntityRepository.java
new file mode 100644
index 0000000000..dbfd0e6f93
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/EdmEntityRepository.java
@@ -0,0 +1,17 @@
+/**
+ * 
+ */
+package org.baeldung.examples.olingo4.repository;
+
+
+/**
+ * @author Philippe
+ *
+ */
+public interface EdmEntityRepository<E>  {
+    
+    public String getEdmEntityName();
+    public Class<E> getEntityClass();
+
+
+}
diff --git a/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/RepositoryRegistry.java b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/RepositoryRegistry.java
new file mode 100644
index 0000000000..e3bb172e3a
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/repository/RepositoryRegistry.java
@@ -0,0 +1,29 @@
+package org.baeldung.examples.olingo4.repository;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.olingo.commons.api.edm.EdmEntityType;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RepositoryRegistry {
+    
+    private Map<String,JpaRepository<?,?>> repositoriesByClassName = new HashMap<>();
+
+    public RepositoryRegistry(List<EdmEntityRepository<?>> allRepositories) {
+        
+        allRepositories.stream()
+          .forEach((r) ->  
+            repositoriesByClassName.put(r.getEdmEntityName(),(JpaRepository<?,?>)r));
+        
+    }
+    
+    
+    public JpaRepository<?,?> getRepositoryForEntity(EdmEntityType entityType) {        
+        JpaRepository<?,?> repo = repositoriesByClassName.get(entityType.getName());
+        return repo;
+    }
+}
diff --git a/apache-olingo/olingo4/src/main/resources/application.properties b/apache-olingo/olingo4/src/main/resources/application.properties
new file mode 100644
index 0000000000..02c7fe5c4d
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/resources/application.properties
@@ -0,0 +1,9 @@
+server:
+	port: 8080
+	
+spring:    
+  jpa:
+    show-sql: true
+    open-in-view: true
+    hibernate:
+      ddl-auto: update
diff --git a/apache-olingo/olingo4/src/main/resources/data.sql b/apache-olingo/olingo4/src/main/resources/data.sql
new file mode 100644
index 0000000000..327f2688c5
--- /dev/null
+++ b/apache-olingo/olingo4/src/main/resources/data.sql
@@ -0,0 +1,12 @@
+insert into car_maker(id,name) values (1,'Special Motors');
+insert into car_maker(id,name) values (2,'BWM');
+insert into car_maker(id,name) values (3,'Dolores');
+
+insert into car_model(id,maker_fk,name,sku,year) values(1,1,'Muze','SM001',2018);
+insert into car_model(id,maker_fk,name,sku,year) values(2,1,'Empada','SM002',2008);
+
+insert into car_model(id,maker_fk,name,sku,year) values(4,2,'BWM-100','BWM100',2008);
+insert into car_model(id,maker_fk,name,sku,year) values(5,2,'BWM-200','BWM200',2009);
+insert into car_model(id,maker_fk,name,sku,year) values(6,2,'BWM-300','BWM300',2008);
+
+alter sequence hibernate_sequence restart with 100;
\ No newline at end of file
diff --git a/apache-olingo/olingo4/src/test/java/org/baeldung/examples/olingo4/Olingo4SampleApplicationTests.java b/apache-olingo/olingo4/src/test/java/org/baeldung/examples/olingo4/Olingo4SampleApplicationTests.java
new file mode 100644
index 0000000000..5d23a4148e
--- /dev/null
+++ b/apache-olingo/olingo4/src/test/java/org/baeldung/examples/olingo4/Olingo4SampleApplicationTests.java
@@ -0,0 +1,16 @@
+package org.baeldung.examples.olingo4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class Olingo4SampleApplicationTests {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}
diff --git a/software-security/sql-injection-samples/pom.xml b/software-security/sql-injection-samples/pom.xml
index b982a34e75..b12b479614 100644
--- a/software-security/sql-injection-samples/pom.xml
+++ b/software-security/sql-injection-samples/pom.xml
@@ -17,6 +17,7 @@
 
 	<dependencies>
 	
+	
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>
@@ -53,6 +54,11 @@
 		    <artifactId>hibernate-jpamodelgen</artifactId>
 		</dependency>
 
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/spring-webflux-amqp/pom.xml b/spring-webflux-amqp/pom.xml
index a8346458a0..88f5eff403 100755
--- a/spring-webflux-amqp/pom.xml
+++ b/spring-webflux-amqp/pom.xml
@@ -1,62 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.baeldung.spring</groupId>
-    <artifactId>spring-webflux-amqp</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>spring-webflux-amqp</name>
-    <packaging>jar</packaging>
-    <description>Spring WebFlux AMQP Sample</description>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.baeldung.spring</groupId>
+	<artifactId>spring-webflux-amqp</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<name>spring-webflux-amqp</name>
+	<packaging>jar</packaging>
+	<description>Spring WebFlux AMQP Sample</description>
 
-    <parent>
-        <artifactId>parent-boot-2</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
-    </parent>
+	<parent>
+		<artifactId>parent-boot-2</artifactId>
+		<groupId>com.baeldung</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../parent-boot-2</relativePath>
+	</parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-        </dependency>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<!-- Import dependency management from Spring Boot -->
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<!-- <version>2.0.4.RELEASE</version>  --><!-- works -->
+				<version>2.1.3.RELEASE</version>  <!-- Works with workaround applied -->
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-amqp</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
+		</dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
 
-        <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-test</artifactId>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-integration</artifactId>
-        </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-integration</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 
 </project>
diff --git a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java b/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
index 30614e7ee6..8a31299333 100755
--- a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
+++ b/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
@@ -3,6 +3,12 @@ package org.baeldung.spring.amqp;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilterChain;
+
+import reactor.core.publisher.Mono;
 
 @SpringBootApplication
 @EnableConfigurationProperties(DestinationsConfig.class)
@@ -12,4 +18,19 @@ public class SpringWebfluxAmqpApplication {
         SpringApplication.run(SpringWebfluxAmqpApplication.class, args);
     }
     
+    
+    /**
+     * This is a workaround for https://github.com/spring-projects/spring-framework/issues/21094
+     * @return
+     */
+    @Bean
+    public HiddenHttpMethodFilter hiddenHttpMethodFilter() {
+        return new HiddenHttpMethodFilter() {
+            @Override
+            public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
+                return chain.filter(exchange);
+            }
+        };
+    }
+    
 }
diff --git a/spring-webflux-amqp/src/main/resources/application.yml b/spring-webflux-amqp/src/main/resources/application.yml
index 702aaba357..3f527ce4c5 100755
--- a/spring-webflux-amqp/src/main/resources/application.yml
+++ b/spring-webflux-amqp/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   rabbitmq:
-    host: localhost
+    host: 192.168.99.100
     port: 5672
     username: guest
     password: guest

From 7eba063308336ddf31823682c3e8b7bf895f7490 Mon Sep 17 00:00:00 2001
From: Andrey Shcherbakov <veontomo@users.noreply.github.com>
Date: Wed, 8 May 2019 07:57:20 +0200
Subject: [PATCH 213/295] Place the code for BAEL-2876 to java-strings-2
 (#6911)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add the code for article BAEL-2876

* Move BAEL-2876 from core-java-8-2 to java-strings-2

* Remove ICU from the pom of core-java-8-2

* Replace the char é by its unicode encoding
---
 .../java/com/baeldung/localization/App.java   | 21 ++++++
 .../com/baeldung/localization/ICUFormat.java  | 29 ++++++++
 .../baeldung/localization/JavaSEFormat.java   | 24 ++++++
 .../baeldung/localization/Localization.java   | 18 +++++
 .../src/main/resources/formats_en.properties  |  2 +
 .../src/main/resources/formats_fr.properties  |  2 +
 .../src/main/resources/formats_it.properties  |  2 +
 .../src/main/resources/formats_pl.properties  |  2 +
 .../src/main/resources/messages_en.properties |  1 +
 .../src/main/resources/messages_fr.properties |  1 +
 .../src/main/resources/messages_it.properties |  1 +
 .../src/main/resources/messages_pl.properties |  1 +
 .../localization/ICUFormatUnitTest.java       | 74 +++++++++++++++++++
 13 files changed, 178 insertions(+)
 create mode 100644 java-strings-2/src/main/java/com/baeldung/localization/App.java
 create mode 100644 java-strings-2/src/main/java/com/baeldung/localization/ICUFormat.java
 create mode 100644 java-strings-2/src/main/java/com/baeldung/localization/JavaSEFormat.java
 create mode 100644 java-strings-2/src/main/java/com/baeldung/localization/Localization.java
 create mode 100644 java-strings-2/src/main/resources/formats_en.properties
 create mode 100644 java-strings-2/src/main/resources/formats_fr.properties
 create mode 100644 java-strings-2/src/main/resources/formats_it.properties
 create mode 100644 java-strings-2/src/main/resources/formats_pl.properties
 create mode 100644 java-strings-2/src/main/resources/messages_en.properties
 create mode 100644 java-strings-2/src/main/resources/messages_fr.properties
 create mode 100644 java-strings-2/src/main/resources/messages_it.properties
 create mode 100644 java-strings-2/src/main/resources/messages_pl.properties
 create mode 100644 java-strings-2/src/test/java/com/baeldung/localization/ICUFormatUnitTest.java

diff --git a/java-strings-2/src/main/java/com/baeldung/localization/App.java b/java-strings-2/src/main/java/com/baeldung/localization/App.java
new file mode 100644
index 0000000000..c2b687933d
--- /dev/null
+++ b/java-strings-2/src/main/java/com/baeldung/localization/App.java
@@ -0,0 +1,21 @@
+package com.baeldung.localization;
+
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
+public class App {
+
+    /**
+     * Runs all available formatter
+     * @throws ParseException 
+     */
+    public static void main(String[] args) {
+        List<Locale> locales = Arrays.asList(new Locale[] { Locale.UK, Locale.ITALY, Locale.FRANCE, Locale.forLanguageTag("pl-PL") });
+        Localization.run(locales);
+        JavaSEFormat.run(locales);
+        ICUFormat.run(locales);
+    }
+
+}
diff --git a/java-strings-2/src/main/java/com/baeldung/localization/ICUFormat.java b/java-strings-2/src/main/java/com/baeldung/localization/ICUFormat.java
new file mode 100644
index 0000000000..f7bc357933
--- /dev/null
+++ b/java-strings-2/src/main/java/com/baeldung/localization/ICUFormat.java
@@ -0,0 +1,29 @@
+package com.baeldung.localization;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import com.ibm.icu.text.MessageFormat;
+
+public class ICUFormat {
+
+    public static String getLabel(Locale locale, Object[] data) {
+        ResourceBundle bundle = ResourceBundle.getBundle("formats", locale);
+        String format = bundle.getString("label-icu");
+        MessageFormat formatter = new MessageFormat(format, locale);
+        return formatter.format(data);
+    }
+
+    public static void run(List<Locale> locales) {
+        System.out.println("ICU formatter");
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Alice", "female", 0 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Alice", "female", 1 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Alice", "female", 2 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Alice", "female", 3 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Bob", "male", 0 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Bob", "male", 1 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Bob", "male", 2 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { "Bob", "male", 3 })));
+    }
+}
diff --git a/java-strings-2/src/main/java/com/baeldung/localization/JavaSEFormat.java b/java-strings-2/src/main/java/com/baeldung/localization/JavaSEFormat.java
new file mode 100644
index 0000000000..c95dfffa13
--- /dev/null
+++ b/java-strings-2/src/main/java/com/baeldung/localization/JavaSEFormat.java
@@ -0,0 +1,24 @@
+package com.baeldung.localization;
+
+import java.text.MessageFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+public class JavaSEFormat {
+
+    public static String getLabel(Locale locale, Object[] data) {
+        ResourceBundle bundle = ResourceBundle.getBundle("formats", locale);
+        final String pattern = bundle.getString("label");
+        final MessageFormat formatter = new MessageFormat(pattern, locale);
+        return formatter.format(data);
+    }
+
+    public static void run(List<Locale> locales) {
+        System.out.println("Java formatter");
+        final Date date = new Date(System.currentTimeMillis());
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { date, "Alice", 0 })));
+        locales.forEach(locale -> System.out.println(getLabel(locale, new Object[] { date, "Alice", 2 })));
+    }
+}
diff --git a/java-strings-2/src/main/java/com/baeldung/localization/Localization.java b/java-strings-2/src/main/java/com/baeldung/localization/Localization.java
new file mode 100644
index 0000000000..17a6598ce0
--- /dev/null
+++ b/java-strings-2/src/main/java/com/baeldung/localization/Localization.java
@@ -0,0 +1,18 @@
+package com.baeldung.localization;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+public class Localization {
+
+    public static String getLabel(Locale locale) {
+        final ResourceBundle bundle = ResourceBundle.getBundle("messages", locale);
+        return bundle.getString("label");
+    }
+
+    public static void run(List<Locale> locales) {
+        locales.forEach(locale -> System.out.println(getLabel(locale)));
+    }
+
+}
diff --git a/java-strings-2/src/main/resources/formats_en.properties b/java-strings-2/src/main/resources/formats_en.properties
new file mode 100644
index 0000000000..4bea9a74bb
--- /dev/null
+++ b/java-strings-2/src/main/resources/formats_en.properties
@@ -0,0 +1,2 @@
+label=On {0, date, short} {1} has sent you {2, choice, 0#no messages|1#a message|2#two messages|2<{2,number,integer} messages}.
+label-icu={0} has sent you {2, plural, =0 {no messages} =1 {a message} other {{2, number, integer} messages}}.
diff --git a/java-strings-2/src/main/resources/formats_fr.properties b/java-strings-2/src/main/resources/formats_fr.properties
new file mode 100644
index 0000000000..7f509d494e
--- /dev/null
+++ b/java-strings-2/src/main/resources/formats_fr.properties
@@ -0,0 +1,2 @@
+label={0, date, short}, {1}{2, choice, 0# ne|0<} vous a envoy\u00e9 {2, choice, 0#aucun message|1#un message|2#deux messages|2<{2,number,integer} messages}.
+label-icu={0} {2, plural, =0 {ne } other {}}vous a envoy\u00e9 {2, plural, =0 {aucun message} =1 {un message} other {{2, number, integer} messages}}.
diff --git a/java-strings-2/src/main/resources/formats_it.properties b/java-strings-2/src/main/resources/formats_it.properties
new file mode 100644
index 0000000000..fe061ae1b6
--- /dev/null
+++ b/java-strings-2/src/main/resources/formats_it.properties
@@ -0,0 +1,2 @@
+label={0, date, short} {1} ti ha inviato {2, choice, 0#nessun messagio|1#un messaggio|2#due messaggi|2<{2, number, integer} messaggi}.
+label-icu={0} {2, plural, =0 {non } other {}}ti ha inviato {2, plural, =0 {nessun messaggio} =1 {un messaggio} other {{2, number, integer} messaggi}}.
diff --git a/java-strings-2/src/main/resources/formats_pl.properties b/java-strings-2/src/main/resources/formats_pl.properties
new file mode 100644
index 0000000000..9333ec3396
--- /dev/null
+++ b/java-strings-2/src/main/resources/formats_pl.properties
@@ -0,0 +1,2 @@
+label=W {0, date, short} {1}{2, choice, 0# nie|0<} wys\u0142a\u0142a ci {2, choice, 0#\u017Cadnych wiadomo\u015Bci|1#wiadomo\u015B\u0107|2#dwie wiadomo\u015Bci|2<{2, number, integer} wiadomo\u015Bci}.
+label-icu={0} {2, plural, =0 {nie } other {}}{1, select, male {wys\u0142a\u0142} female {wys\u0142a\u0142a} other {wys\u0142a\u0142o}} ci {2, plural, =0 {\u017Cadnej wiadomo\u015Bci} =1 {wiadomo\u015B\u0107} other {{2, number, integer} wiadomo\u015Bci}}.
diff --git a/java-strings-2/src/main/resources/messages_en.properties b/java-strings-2/src/main/resources/messages_en.properties
new file mode 100644
index 0000000000..bcbca9483c
--- /dev/null
+++ b/java-strings-2/src/main/resources/messages_en.properties
@@ -0,0 +1 @@
+label=Alice has sent you a message.
diff --git a/java-strings-2/src/main/resources/messages_fr.properties b/java-strings-2/src/main/resources/messages_fr.properties
new file mode 100644
index 0000000000..15ad031a30
--- /dev/null
+++ b/java-strings-2/src/main/resources/messages_fr.properties
@@ -0,0 +1 @@
+label=Alice vous a envoy\u00e9 un message.
diff --git a/java-strings-2/src/main/resources/messages_it.properties b/java-strings-2/src/main/resources/messages_it.properties
new file mode 100644
index 0000000000..93b99a9483
--- /dev/null
+++ b/java-strings-2/src/main/resources/messages_it.properties
@@ -0,0 +1 @@
+label=Alice ti ha inviato un messaggio.
diff --git a/java-strings-2/src/main/resources/messages_pl.properties b/java-strings-2/src/main/resources/messages_pl.properties
new file mode 100644
index 0000000000..a64066deea
--- /dev/null
+++ b/java-strings-2/src/main/resources/messages_pl.properties
@@ -0,0 +1 @@
+label=Alice wys\u0142a\u0142a ci wiadomo\u015B\u0107.
diff --git a/java-strings-2/src/test/java/com/baeldung/localization/ICUFormatUnitTest.java b/java-strings-2/src/test/java/com/baeldung/localization/ICUFormatUnitTest.java
new file mode 100644
index 0000000000..2c8f9b47f3
--- /dev/null
+++ b/java-strings-2/src/test/java/com/baeldung/localization/ICUFormatUnitTest.java
@@ -0,0 +1,74 @@
+package com.baeldung.localization;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Locale;
+
+import org.junit.Test;
+
+import com.baeldung.localization.ICUFormat;
+
+public class ICUFormatUnitTest {
+
+    @Test
+    public void givenInUK_whenAliceSendsNothing_thenCorrectMessage() {
+        assertEquals("Alice has sent you no messages.", ICUFormat.getLabel(Locale.UK, new Object[] { "Alice", "female", 0 }));
+    }
+
+    @Test
+    public void givenInUK_whenAliceSendsOneMessage_thenCorrectMessage() {
+        assertEquals("Alice has sent you a message.", ICUFormat.getLabel(Locale.UK, new Object[] { "Alice", "female", 1 }));
+    }
+
+    @Test
+    public void givenInUK_whenBobSendsSixMessages_thenCorrectMessage() {
+        assertEquals("Bob has sent you 6 messages.", ICUFormat.getLabel(Locale.UK, new Object[] { "Bob", "male", 6 }));
+    }
+
+    @Test
+    public void givenInItaly_whenAliceSendsNothing_thenCorrectMessage() {
+        assertEquals("Alice non ti ha inviato nessun messaggio.", ICUFormat.getLabel(Locale.ITALY, new Object[] { "Alice", "female", 0 }));
+    }
+
+    @Test
+    public void givenInItaly_whenAliceSendsOneMessage_thenCorrectMessage() {
+        assertEquals("Alice ti ha inviato un messaggio.", ICUFormat.getLabel(Locale.ITALY, new Object[] { "Alice", "female", 1 }));
+    }
+
+    @Test
+    public void givenInItaly_whenBobSendsSixMessages_thenCorrectMessage() {
+        assertEquals("Bob ti ha inviato 6 messaggi.", ICUFormat.getLabel(Locale.ITALY, new Object[] { "Bob", "male", 6 }));
+    }
+
+    @Test
+    public void givenInFrance_whenAliceSendsNothing_thenCorrectMessage() {
+        assertEquals("Alice ne vous a envoyé aucun message.", ICUFormat.getLabel(Locale.FRANCE, new Object[] { "Alice", "female", 0 }));
+    }
+    
+    @Test
+    public void givenInFrance_whenAliceSendsOneMessage_thenCorrectMessage() {
+        assertEquals("Alice vous a envoyé un message.", ICUFormat.getLabel(Locale.FRANCE, new Object[] { "Alice", "female", 1 }));
+    }
+
+    @Test
+    public void givenInFrance_whenBobSendsSixMessages_thenCorrectMessage() {
+        assertEquals("Bob vous a envoyé 6 messages.", ICUFormat.getLabel(Locale.FRANCE, new Object[] { "Bob", "male", 6 }));
+    }
+
+
+    @Test
+    public void givenInPoland_whenAliceSendsNothing_thenCorrectMessage() {
+        assertEquals("Alice nie wysłała ci żadnej wiadomości.", ICUFormat.getLabel(Locale.forLanguageTag("pl-PL"), new Object[] { "Alice", "female", 0 }));
+    }
+    
+    @Test
+    public void givenInPoland_whenAliceSendsOneMessage_thenCorrectMessage() {
+        assertEquals("Alice wysłała ci wiadomość.", ICUFormat.getLabel(Locale.forLanguageTag("pl-PL"), new Object[] { "Alice", "female", 1 }));
+    }
+    
+    @Test
+    public void givenInPoland_whenBobSendsSixMessages_thenCorrectMessage() {
+        assertEquals("Bob wysłał ci 6 wiadomości.", ICUFormat.getLabel(Locale.forLanguageTag("pl-PL"), new Object[] { "Bob", "male", 6 }));
+    }
+
+}

From 23c2b337f0f40eeab0ed74e230bc828d508ffe7a Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 12:25:32 +0530
Subject: [PATCH 214/295] Back-link added

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index 41381ab82a..51532418f5 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -4,3 +4,4 @@
 
 ### Relevant Articles: 
 - [Spring Data JPA – Derived Delete Methods](https://www.baeldung.com/spring-data-jpa-deleteby)
+- [The Exists Query in Spring Data](https://www.baeldung.com/spring-data-exists-query)

From 7b770cd188f178e838c038fcf163e20336c1236d Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 12:30:51 +0530
Subject: [PATCH 215/295] Back-link added

---
 algorithms-miscellaneous-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/algorithms-miscellaneous-2/README.md b/algorithms-miscellaneous-2/README.md
index d693a44f66..aca955c4bb 100644
--- a/algorithms-miscellaneous-2/README.md
+++ b/algorithms-miscellaneous-2/README.md
@@ -18,3 +18,4 @@
 - [Calculate Percentage in Java](https://www.baeldung.com/java-calculate-percentage)
 - [Converting Between Byte Arrays and Hexadecimal Strings in Java](https://www.baeldung.com/java-byte-arrays-hex-strings)
 - [Convert Latitude and Longitude to a 2D Point in Java](https://www.baeldung.com/java-convert-latitude-longitude)
+- [Find If Two Numbers Are Relatively Prime in Java](https://www.baeldung.com/java-two-relatively-prime-numbers)

From 0c4529373d1f52f2d989b23d9c1616222a36e039 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 12:32:37 +0530
Subject: [PATCH 216/295] Back-link added

---
 logging-modules/logback/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/logging-modules/logback/README.md b/logging-modules/logback/README.md
index df55492b69..58dc8ce541 100644
--- a/logging-modules/logback/README.md
+++ b/logging-modules/logback/README.md
@@ -1,3 +1,4 @@
 ### Relevant Articles:
 
 - [Get Log Output in JSON](https://www.baeldung.com/java-log-json-output)
+- [SLF4J Warning: Class Path Contains Multiple SLF4J Bindings](https://www.baeldung.com/slf4j-classpath-multiple-bindings)

From 4427b9ca222c4323ba2357c6f12fbff97335602b Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 12:36:35 +0530
Subject: [PATCH 217/295] Back-link added

---
 persistence-modules/java-jpa/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/java-jpa/README.md b/persistence-modules/java-jpa/README.md
index 5be1015942..ba4d9f0410 100644
--- a/persistence-modules/java-jpa/README.md
+++ b/persistence-modules/java-jpa/README.md
@@ -7,3 +7,4 @@
 - [JPA 2.2 Support for Java 8 Date/Time Types](https://www.baeldung.com/jpa-java-time)
 - [Converting Between LocalDate and SQL Date](https://www.baeldung.com/java-convert-localdate-sql-date)
 - [Combining JPA And/Or Criteria Predicates](https://www.baeldung.com/jpa-and-or-criteria-predicates)
+- [Types of JPA Queries](https://www.baeldung.com/jpa-queries)

From 74cc90da4092549a31371eaffcf8cc8ee32eef85 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 12:45:44 +0530
Subject: [PATCH 218/295] Back-link added

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

diff --git a/patterns/README.md b/patterns/README.md
index b3ece5e52b..3cf9081f4a 100644
--- a/patterns/README.md
+++ b/patterns/README.md
@@ -3,3 +3,4 @@
 - [Introduction to Intercepting Filter Pattern in Java](http://www.baeldung.com/intercepting-filter-pattern-in-java)
 - [Introduction to the Null Object Pattern](https://www.baeldung.com/java-null-object-pattern)
 - [The Dependency Inversion Principle in Java](https://www.baeldung.com/java-dependency-inversion-principle)
+- [The Dependency Inversion Principle in Java](https://www.baeldung.com/java-dependency-inversion-principle)

From 7ef65f7b7abcc59e1b52c01a3d825f5ee9effc17 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 12:47:42 +0530
Subject: [PATCH 219/295] Back-link added

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index 51532418f5..73be979e4a 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -5,3 +5,4 @@
 ### Relevant Articles: 
 - [Spring Data JPA – Derived Delete Methods](https://www.baeldung.com/spring-data-jpa-deleteby)
 - [The Exists Query in Spring Data](https://www.baeldung.com/spring-data-exists-query)
+- [Case Insensitive Queries with Spring Data Repository](https://www.baeldung.com/spring-data-case-insensitive-queries)

From a426c5df0694b6b4efc50e6f5c02ffff9d10d9ad Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 12:49:55 +0530
Subject: [PATCH 220/295] Back-link added

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

diff --git a/spring-boot-ops/README.md b/spring-boot-ops/README.md
index d5063f14e5..5be5c974d3 100644
--- a/spring-boot-ops/README.md
+++ b/spring-boot-ops/README.md
@@ -11,4 +11,4 @@
  - [Comparing Embedded Servlet Containers in Spring Boot](http://www.baeldung.com/spring-boot-servlet-containers)
  - [Programmatically Restarting a Spring Boot Application](https://www.baeldung.com/java-restart-spring-boot-app)
  - [Spring Properties File Outside jar](https://www.baeldung.com/spring-properties-file-outside-jar)
- 
+ - [EnvironmentPostProcessor in Spring Boot](https://www.baeldung.com/spring-boot-environmentpostprocessor)

From 51f9c58f4a5036f2dc0ea9f941aaf18cee8df018 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 12:55:43 +0530
Subject: [PATCH 221/295] Back-link added

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

diff --git a/patterns/README.md b/patterns/README.md
index 3cf9081f4a..c8e1957fe4 100644
--- a/patterns/README.md
+++ b/patterns/README.md
@@ -4,3 +4,4 @@
 - [Introduction to the Null Object Pattern](https://www.baeldung.com/java-null-object-pattern)
 - [The Dependency Inversion Principle in Java](https://www.baeldung.com/java-dependency-inversion-principle)
 - [The Dependency Inversion Principle in Java](https://www.baeldung.com/java-dependency-inversion-principle)
+- [Avoid Check for Null Statement in Java](https://www.baeldung.com/java-avoid-null-check)

From 4a154f2843f45108b1d21d94002cb96698978a01 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 12:58:34 +0530
Subject: [PATCH 222/295] Back-link added

---
 algorithms-miscellaneous-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/algorithms-miscellaneous-2/README.md b/algorithms-miscellaneous-2/README.md
index aca955c4bb..3eaa5d3eb4 100644
--- a/algorithms-miscellaneous-2/README.md
+++ b/algorithms-miscellaneous-2/README.md
@@ -19,3 +19,4 @@
 - [Converting Between Byte Arrays and Hexadecimal Strings in Java](https://www.baeldung.com/java-byte-arrays-hex-strings)
 - [Convert Latitude and Longitude to a 2D Point in Java](https://www.baeldung.com/java-convert-latitude-longitude)
 - [Find If Two Numbers Are Relatively Prime in Java](https://www.baeldung.com/java-two-relatively-prime-numbers)
+- [Reversing a Binary Tree in Java](https://www.baeldung.com/java-reversing-a-binary-tree)

From ff1316e6b07212125aae0b5d40564c4fcaccfc41 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 13:00:23 +0530
Subject: [PATCH 223/295] Back-link added

---
 spring-cloud-data-flow/README.MD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-cloud-data-flow/README.MD b/spring-cloud-data-flow/README.MD
index 17d0ec6286..9e5cef19af 100644
--- a/spring-cloud-data-flow/README.MD
+++ b/spring-cloud-data-flow/README.MD
@@ -1,3 +1,4 @@
 ### Relevant Articles:
 - [Batch Processing with Spring Cloud Data Flow](http://www.baeldung.com/spring-cloud-data-flow-batch-processing)
 - [Getting Started with Stream Processing with Spring Cloud Data Flow](http://www.baeldung.com/spring-cloud-data-flow-stream-processing)
+- [Spring Cloud Data Flow With Apache Spark](https://www.baeldung.com/spring-cloud-data-flow-spark)

From 820b45d6ea56edf0bdd4c9398c92ebcd3ecb11f0 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 13:02:15 +0530
Subject: [PATCH 224/295] Back-link added

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

diff --git a/spring-security-mvc-socket/README.md b/spring-security-mvc-socket/README.md
index 6c2ad7b985..d3f28af387 100644
--- a/spring-security-mvc-socket/README.md
+++ b/spring-security-mvc-socket/README.md
@@ -8,3 +8,4 @@ To login, use credentials from the data.sql file in src/main/resource, eg: user/
 ### Relevant Articles: 
 - [Intro to Security and WebSockets](http://www.baeldung.com/spring-security-websockets)
 - [Spring WebSockets: Build an User Chat](https://www.baeldung.com/spring-websockets-send-message-to-user)
+- [REST vs WebSockets](https://www.baeldung.com/rest-vs-websockets)

From 2360d26254bcc839acd1aeab686731f0063d9ba6 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 14:04:03 +0530
Subject: [PATCH 225/295] Back-link added

---
 spring-cloud/spring-cloud-kubernetes/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-cloud/spring-cloud-kubernetes/README.md b/spring-cloud/spring-cloud-kubernetes/README.md
index 2387758626..32bcbc59b8 100644
--- a/spring-cloud/spring-cloud-kubernetes/README.md
+++ b/spring-cloud/spring-cloud-kubernetes/README.md
@@ -2,3 +2,4 @@
 
 - [Running Spring Boot Applications With Minikube](https://www.baeldung.com/spring-boot-minikube)
 - [Self-Healing Applications with Kubernetes and Spring Boot](https://www.baeldung.com/spring-boot-kubernetes-self-healing-apps)
+- [Guide to Spring Cloud Kubernetes](https://www.baeldung.com/spring-cloud-kubernetes)

From fa56e969e0a82fd23dfea3c1b639eec95538a461 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 14:08:08 +0530
Subject: [PATCH 226/295] Back-link added

---
 java-collections-maps-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java-collections-maps-2/README.md b/java-collections-maps-2/README.md
index 8bcafccfe8..ff84e93ce4 100644
--- a/java-collections-maps-2/README.md
+++ b/java-collections-maps-2/README.md
@@ -1,2 +1,3 @@
 ## Relevant Articles:
 - [Map of Primitives in Java](https://www.baeldung.com/java-map-primitives)
+- [Copying a HashMap in Java](https://www.baeldung.com/java-copy-hashmap)

From 9532e7cacd0d49f911d522224fee41ed00d554dc Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 14:14:54 +0530
Subject: [PATCH 227/295] Back-link added

---
 spring-security-sso/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-security-sso/README.md b/spring-security-sso/README.md
index d0c1b2f7cf..88e3fbb2f7 100644
--- a/spring-security-sso/README.md
+++ b/spring-security-sso/README.md
@@ -1,2 +1,3 @@
 ### Relevant Articles:
 - [Simple Single Sign-On with Spring Security OAuth2](http://www.baeldung.com/sso-spring-security-oauth2)
+- [Spring Security Kerberos Integration](https://www.baeldung.com/spring-security-kerberos-integration)

From a28f6d4394ff22d1dc46cfb2428b7cfa8f5173e1 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 14:17:43 +0530
Subject: [PATCH 228/295] Back-link added

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index 73be979e4a..84257783e3 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -6,3 +6,4 @@
 - [Spring Data JPA – Derived Delete Methods](https://www.baeldung.com/spring-data-jpa-deleteby)
 - [The Exists Query in Spring Data](https://www.baeldung.com/spring-data-exists-query)
 - [Case Insensitive Queries with Spring Data Repository](https://www.baeldung.com/spring-data-case-insensitive-queries)
+- [JPA Join Types](https://www.baeldung.com/jpa-join-types)

From 07102c0199c3da4b75842d20d390cabf92ef9a8b Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 14:21:38 +0530
Subject: [PATCH 229/295] Back-link added

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index 84257783e3..872f979d8c 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -7,3 +7,4 @@
 - [The Exists Query in Spring Data](https://www.baeldung.com/spring-data-exists-query)
 - [Case Insensitive Queries with Spring Data Repository](https://www.baeldung.com/spring-data-case-insensitive-queries)
 - [JPA Join Types](https://www.baeldung.com/jpa-join-types)
+- [JPA @Embedded And @Embeddable](https://www.baeldung.com/jpa-embedded-embeddable)

From a205fb8b210ba320cf495002b5fdca6594958810 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 14:27:51 +0530
Subject: [PATCH 230/295] Back-link added

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index 872f979d8c..a4fb312033 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -8,3 +8,4 @@
 - [Case Insensitive Queries with Spring Data Repository](https://www.baeldung.com/spring-data-case-insensitive-queries)
 - [JPA Join Types](https://www.baeldung.com/jpa-join-types)
 - [JPA @Embedded And @Embeddable](https://www.baeldung.com/jpa-embedded-embeddable)
+- [Spring Data JPA Projections](https://www.baeldung.com/spring-data-jpa-projections)

From f44662ef1ed4721bbc280ad6dafb8b8ed4e32924 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 14:35:17 +0530
Subject: [PATCH 231/295] Back-link added

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index a4fb312033..aa06f6e58b 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -9,3 +9,4 @@
 - [JPA Join Types](https://www.baeldung.com/jpa-join-types)
 - [JPA @Embedded And @Embeddable](https://www.baeldung.com/jpa-embedded-embeddable)
 - [Spring Data JPA Projections](https://www.baeldung.com/spring-data-jpa-projections)
+- [Spring Data JPA and Null Parameters](https://www.baeldung.com/spring-data-jpa-null-parameters)

From 9cca03b0ca7492e1b3af5fed36966d4010b9e5de Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 15:36:24 +0530
Subject: [PATCH 232/295] Back-link added

---
 spring-boot-testing/README.MD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-boot-testing/README.MD b/spring-boot-testing/README.MD
index 144c3581f7..99d7db5743 100644
--- a/spring-boot-testing/README.MD
+++ b/spring-boot-testing/README.MD
@@ -5,3 +5,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 - [Testing with Spring and Spock](https://www.baeldung.com/spring-spock-testing)
 - [Exclude Auto-Configuration Classes in Spring Boot Tests](https://www.baeldung.com/spring-boot-exclude-auto-configuration-test)
+- [Setting the Log Level in Spring Boot when Testing](https://www.baeldung.com/spring-boot-testing-log-level)

From c01e93a144ad62d7f9a30e5ed6502707e5714ea8 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 16:03:12 +0530
Subject: [PATCH 233/295] Back-link added

---
 spring-boot-testing/README.MD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-boot-testing/README.MD b/spring-boot-testing/README.MD
index 99d7db5743..8db51e9b8e 100644
--- a/spring-boot-testing/README.MD
+++ b/spring-boot-testing/README.MD
@@ -6,3 +6,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Testing with Spring and Spock](https://www.baeldung.com/spring-spock-testing)
 - [Exclude Auto-Configuration Classes in Spring Boot Tests](https://www.baeldung.com/spring-boot-exclude-auto-configuration-test)
 - [Setting the Log Level in Spring Boot when Testing](https://www.baeldung.com/spring-boot-testing-log-level)
+- [Setting the Log Level in Spring Boot when Testing](https://www.baeldung.com/spring-boot-testing-log-level)

From 6b0676c98eadee5a8432ba90062e0285a2a70a2d Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 16:09:57 +0530
Subject: [PATCH 234/295] Back-link added

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

diff --git a/persistence-modules/README.md b/persistence-modules/README.md
index 2fbaf25f2f..34dbc4efa1 100644
--- a/persistence-modules/README.md
+++ b/persistence-modules/README.md
@@ -13,3 +13,4 @@
 - [Spring Data with Reactive Cassandra](https://www.baeldung.com/spring-data-cassandra-reactive)
 - [Spring Data JPA – Derived Delete Methods](https://www.baeldung.com/spring-data-jpa-deleteby)
 - [Difference Between save() and saveAndFlush() in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-save-saveandflush)
+- [Persisting Maps with Hibernate](https://www.baeldung.com/hibernate-persisting-maps)

From 529d462c03439910641d8889b7b79957e0be50e5 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 16:11:20 +0530
Subject: [PATCH 235/295] Update README.md

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

diff --git a/persistence-modules/core-java-persistence/README.md b/persistence-modules/core-java-persistence/README.md
index 26bd4bf00f..1187cc15c4 100644
--- a/persistence-modules/core-java-persistence/README.md
+++ b/persistence-modules/core-java-persistence/README.md
@@ -8,3 +8,4 @@
 - [Introduction to the JDBC RowSet Interface in Java](http://www.baeldung.com/java-jdbc-rowset)
 - [A Simple Guide to Connection Pooling in Java](https://www.baeldung.com/java-connection-pooling)
 - [Guide to the JDBC ResultSet Interface](https://www.baeldung.com/jdbc-resultset)
+- [Types of SQL Joins](https://www.baeldung.com/sql-joins)

From 203ae4f81e60c43c22fd50b65152f93c473de776 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 16:14:58 +0530
Subject: [PATCH 236/295] Back-link added

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index aa06f6e58b..b417836968 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -10,3 +10,4 @@
 - [JPA @Embedded And @Embeddable](https://www.baeldung.com/jpa-embedded-embeddable)
 - [Spring Data JPA Projections](https://www.baeldung.com/spring-data-jpa-projections)
 - [Spring Data JPA and Null Parameters](https://www.baeldung.com/spring-data-jpa-null-parameters)
+- [Spring Data JPA Repository Populators](https://www.baeldung.com/spring-data-jpa-repository-populators)

From cb39ba6e6c7a98e170bd945a24afa38f66673a17 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 16:21:52 +0530
Subject: [PATCH 237/295] Back-link added

---
 persistence-modules/spring-data-jpa-2/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index b417836968..0f5a826e05 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -11,3 +11,4 @@
 - [Spring Data JPA Projections](https://www.baeldung.com/spring-data-jpa-projections)
 - [Spring Data JPA and Null Parameters](https://www.baeldung.com/spring-data-jpa-null-parameters)
 - [Spring Data JPA Repository Populators](https://www.baeldung.com/spring-data-jpa-repository-populators)
+- [Spring Data JPA Delete and Relationships](https://www.baeldung.com/spring-data-jpa-delete)

From 5b94a7dc0197c59c0d05bf81163f05b0b9e07b43 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 16:26:35 +0530
Subject: [PATCH 238/295] Back-link added

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

diff --git a/testing-modules/rest-assured/README.md b/testing-modules/rest-assured/README.md
index d44fd08335..ec108353a0 100644
--- a/testing-modules/rest-assured/README.md
+++ b/testing-modules/rest-assured/README.md
@@ -2,3 +2,4 @@
 - [A Guide to REST-assured](http://www.baeldung.com/rest-assured-tutorial)
 - [REST-assured Support for Spring MockMvc](https://www.baeldung.com/spring-mock-mvc-rest-assured)
 - [Getting and Verifying Response Data with REST-assured](https://www.baeldung.com/rest-assured-response)
+- [REST Assured Authentication](https://www.baeldung.com/rest-assured-authentication)

From 2372ada22afd933eb928eb362e303e22beb2519f Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 16:36:29 +0530
Subject: [PATCH 239/295] Back-link added

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

diff --git a/jackson-2/README.md b/jackson-2/README.md
index ec147f5fd9..92fc11f61c 100644
--- a/jackson-2/README.md
+++ b/jackson-2/README.md
@@ -7,3 +7,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
 - [Mapping Multiple JSON Fields to a Single Java Field](https://www.baeldung.com/json-multiple-fields-single-java-field)
+- [How to Process YAML with Jackson](https://www.baeldung.com/jackson-yaml)

From cccba61e72a68bd38fc4a63583d5cdf61d94eb0f Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 16:42:48 +0530
Subject: [PATCH 240/295] Back-link added

---
 persistence-modules/java-mongodb/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/java-mongodb/README.md b/persistence-modules/java-mongodb/README.md
index ded2b220f1..6d31467db3 100644
--- a/persistence-modules/java-mongodb/README.md
+++ b/persistence-modules/java-mongodb/README.md
@@ -2,3 +2,4 @@
 
 - [A Guide to MongoDB with Java](http://www.baeldung.com/java-mongodb)
 - [A Simple Tagging Implementation with MongoDB](http://www.baeldung.com/mongodb-tagging)
+- [MongoDB BSON Guide](https://www.baeldung.com/mongodb-bson)

From ee477bbfa04dc289da08c1b8f999771360c72119 Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 16:45:57 +0530
Subject: [PATCH 241/295] Back-link added

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

diff --git a/persistence-modules/README.md b/persistence-modules/README.md
index 34dbc4efa1..f7819d5ee6 100644
--- a/persistence-modules/README.md
+++ b/persistence-modules/README.md
@@ -14,3 +14,4 @@
 - [Spring Data JPA – Derived Delete Methods](https://www.baeldung.com/spring-data-jpa-deleteby)
 - [Difference Between save() and saveAndFlush() in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-save-saveandflush)
 - [Persisting Maps with Hibernate](https://www.baeldung.com/hibernate-persisting-maps)
+- [Difference Between @Size, @Length, and @Column(length=value)](https://www.baeldung.com/jpa-size-length-column-differences)

From cb4a5944953062302cdf6777fdf2e753a733211d Mon Sep 17 00:00:00 2001
From: collaboratewithakash
 <38683470+collaboratewithakash@users.noreply.github.com>
Date: Wed, 8 May 2019 16:49:20 +0530
Subject: [PATCH 242/295] Back-link added

---
 spring-5-webflux/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-5-webflux/README.md b/spring-5-webflux/README.md
index 84c3d5a4ca..e84ee863bf 100644
--- a/spring-5-webflux/README.md
+++ b/spring-5-webflux/README.md
@@ -2,3 +2,4 @@
 
 - [Spring Boot Reactor Netty Configuration](https://www.baeldung.com/spring-boot-reactor-netty)
 - [How to Return 404 with Spring WebFlux](https://www.baeldung.com/spring-webflux-404)
+- [Spring WebClient Requests with Parameters](https://www.baeldung.com/webflux-webclient-parameters)

From 3010137d3aee97e61e041186cd1d14eeb3333667 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Wed, 8 May 2019 14:08:21 +0200
Subject: [PATCH 243/295] add dependencies and cleanup

---
 testing-modules/junit-5/pom.xml               | 14 ++++++++++++--
 .../java/com/baeldung/AssertionUnitTest.java  | 19 +++++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/testing-modules/junit-5/pom.xml b/testing-modules/junit-5/pom.xml
index 1d1b0bc574..c1c44791d1 100644
--- a/testing-modules/junit-5/pom.xml
+++ b/testing-modules/junit-5/pom.xml
@@ -21,24 +21,34 @@
             <artifactId>junit-platform-engine</artifactId>
             <version>${junit.platform.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.jupiter.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
             <version>${junit.jupiter.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.jupiter.version}</version>
+        </dependency>    
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-runner</artifactId>
             <version>${junit.platform.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
             <version>${junit.vintage.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-migrationsupport</artifactId>
             <version>${junit.vintage.version}</version>
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/AssertionUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/AssertionUnitTest.java
index 31b6e14d6c..f1f7c531f2 100644
--- a/testing-modules/junit-5/src/test/java/com/baeldung/AssertionUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/AssertionUnitTest.java
@@ -2,7 +2,21 @@ package com.baeldung;
 
 import static java.time.Duration.ofSeconds;
 import static java.util.Arrays.asList;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertIterableEquals;
+import static org.junit.jupiter.api.Assertions.assertLinesMatch;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -91,11 +105,12 @@ public class AssertionUnitTest {
 
     @Test
     public void givenMultipleAssertion_whenAssertingAll_thenOK() {
+        Object obj = null;
         assertAll(
            "heading",
            () -> assertEquals(4, 2 * 2, "4 is 2 times 2"),
            () -> assertEquals("java", "JAVA".toLowerCase()),
-           () -> assertEquals(null, null, "null is equal to null")
+           () -> assertEquals(obj, null, "null is equal to null")
         );
     }
 

From afac1b1e92032d8146ef95eedfbf2a4c056ac8b0 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Wed, 8 May 2019 14:09:01 +0200
Subject: [PATCH 244/295] add junit5 method order examples

---
 .../order/AlphanumericOrderUnitTest.java      | 33 +++++++++++++++++
 .../baeldung/junit5/order/CustomOrder.java    | 12 ++++++
 .../junit5/order/CustomOrderUnitTest.java     | 33 +++++++++++++++++
 .../junit5/order/OrderAnnotationUnitTest.java | 37 +++++++++++++++++++
 4 files changed, 115 insertions(+)
 create mode 100644 testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java
 create mode 100644 testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrder.java
 create mode 100644 testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java
 create mode 100644 testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java

diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java
new file mode 100644
index 0000000000..d62ca0c666
--- /dev/null
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.junit5.order;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.MethodOrderer.Alphanumeric;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+@TestMethodOrder(Alphanumeric.class)
+public class AlphanumericOrderUnitTest {
+    private static StringBuilder output = new StringBuilder("");
+    
+    @Test
+    public void myATest() {
+        output.append("A");
+    }
+    
+    @Test
+    public void myBTest() {
+        output.append("B");        
+    }
+    
+    @Test
+    public void myaTest() {
+        output.append("a");
+    }
+ 
+    @AfterAll
+    public static void assertOutput() {
+        assertEquals(output.toString(), "ABa");
+    }
+}
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrder.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrder.java
new file mode 100644
index 0000000000..e76230de63
--- /dev/null
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrder.java
@@ -0,0 +1,12 @@
+package com.baeldung.junit5.order;
+
+import org.junit.jupiter.api.MethodDescriptor;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.MethodOrdererContext;
+
+public class CustomOrder implements MethodOrderer{
+    @Override
+    public void orderMethods(MethodOrdererContext context) {
+        context.getMethodDescriptors().sort((MethodDescriptor m1, MethodDescriptor m2)->m1.getMethod().getName().compareToIgnoreCase(m2.getMethod().getName()));
+    }
+}
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java
new file mode 100644
index 0000000000..fa45921879
--- /dev/null
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.junit5.order;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+@TestMethodOrder(CustomOrder.class)
+public class CustomOrderUnitTest {
+    private static StringBuilder output = new StringBuilder("");
+    
+    @Test
+    public void myATest() {
+        output.append("A");
+    }
+    
+    @Test
+    public void myBTest() {
+        output.append("B");        
+    }
+    
+    @Test
+    public void myaTest() {
+        output.append("a");
+    }
+
+ 
+    @AfterAll
+    public static void assertOutput() {
+        assertEquals(output.toString(), "AaB");
+    }
+}
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java
new file mode 100644
index 0000000000..3d931a4158
--- /dev/null
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java
@@ -0,0 +1,37 @@
+package com.baeldung.junit5.order;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+@TestMethodOrder(OrderAnnotation.class)
+public class OrderAnnotationUnitTest {
+    private static StringBuilder output = new StringBuilder("");
+    
+    @Test
+    @Order(1)    
+    public void firstTest() {
+        output.append("a");
+    }
+    
+    @Test
+    @Order(2)    
+    public void secondTest() {
+        output.append("b");
+    }
+ 
+    @Test
+    @Order(3)    
+    public void thirdTest() {
+        output.append("c");
+    }
+ 
+    @AfterAll
+    public static void assertOutput() {
+        assertEquals(output.toString(), "abc");
+    }
+}

From 57ec69ad3b45a3d1f1431231c8c2b9deb1c00a3e Mon Sep 17 00:00:00 2001
From: Adrian Precub <adi.precub@gmail.com>
Date: Wed, 8 May 2019 17:26:17 +0300
Subject: [PATCH 245/295] BAEL-2587: create separate module for cognito (#6814)

* BAEL-2587: create separate module for cognito

* BAEL-2587: add separate module for cognito in parent pom

* BAEL-2587: remove cognito from spring-5-security-oauth module and correct pom.xml

* BAEL-2587: replace tabs with spaces in pom.xml to fix indentation

* BAEL-2587: fix pom indentation

* BAEL-2587: fix article link
---
 pom.xml                                       |  4 +-
 spring-5-security-cognito/README.md           |  3 +
 spring-5-security-cognito/pom.xml             | 74 +++++++++++++++++++
 .../cognito/CognitoWebConfiguration.java      |  2 +-
 .../cognito/SpringCognitoApplication.java     |  2 +-
 .../resources/cognito/application-cognito.yml |  0
 .../src/main/resources/cognito/home.html      |  0
 .../src/main/resources/cognito/style.css      |  0
 .../src/main/resources/logback.xml            | 13 ++++
 9 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 spring-5-security-cognito/README.md
 create mode 100644 spring-5-security-cognito/pom.xml
 rename {spring-5-security-oauth => spring-5-security-cognito}/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java (91%)
 rename {spring-5-security-oauth => spring-5-security-cognito}/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java (88%)
 rename spring-5-security-oauth/src/main/resources/cognito/application_cognito.yml => spring-5-security-cognito/src/main/resources/cognito/application-cognito.yml (100%)
 rename {spring-5-security-oauth => spring-5-security-cognito}/src/main/resources/cognito/home.html (100%)
 rename {spring-5-security-oauth => spring-5-security-cognito}/src/main/resources/cognito/style.css (100%)
 create mode 100644 spring-5-security-cognito/src/main/resources/logback.xml

diff --git a/pom.xml b/pom.xml
index 89c9416ebb..2ea5e4505c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -608,6 +608,7 @@
                 <module>spring-5-reactive-security</module>
                 <module>spring-5-security</module>
                 <module>spring-5-security-oauth</module>
+                <module>spring-5-security-cognito</module>
 
                 <module>spring-activiti</module>
                 <module>spring-akka</module>
@@ -819,6 +820,7 @@
 				<module>spring-5-reactive-security</module>
 				<module>spring-5-security</module>
 				<module>spring-5-security-oauth</module>
+				<module>spring-5-security-cognito</module>
 				<module>spring-activiti</module>
 				<module>spring-akka</module>
 				<module>spring-all</module>
@@ -1271,7 +1273,7 @@
                 <module>spring-5-reactive-security</module>
                 <module>spring-5-security</module>
                 <module>spring-5-security-oauth</module>
-
+                <module>spring-5-security-cognito</module>
                 <module>spring-activiti</module>
                 <module>spring-akka</module>
                 <module>spring-all</module>
diff --git a/spring-5-security-cognito/README.md b/spring-5-security-cognito/README.md
new file mode 100644
index 0000000000..0825882c05
--- /dev/null
+++ b/spring-5-security-cognito/README.md
@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Authenticating with Amazon Cognito Using Spring Security](https://www.baeldung.com/spring-security-oauth-cognito)
diff --git a/spring-5-security-cognito/pom.xml b/spring-5-security-cognito/pom.xml
new file mode 100644
index 0000000000..c7314d6f9f
--- /dev/null
+++ b/spring-5-security-cognito/pom.xml
@@ -0,0 +1,74 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-5-security-cognito</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-5-security-cognito</name>
+    <packaging>jar</packaging>
+    <description>spring 5 security oauth cognito sample project</description>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
+        </dependency>
+
+        <!-- oauth2 -->
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+            <version>${oauth-auto.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-oauth2-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-oauth2-jose</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <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>
+    </dependencies>
+	
+    <properties>
+        <spring-boot.version>2.1.0.RELEASE</spring-boot.version>
+        <oauth-auto.version>2.1.0.RELEASE</oauth-auto.version>
+        <start-class>com.baeldung.cognito.SpringCognitoApplication</start-class>
+    </properties>
+
+</project>
diff --git a/spring-5-security-oauth/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java b/spring-5-security-cognito/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java
similarity index 91%
rename from spring-5-security-oauth/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java
rename to spring-5-security-cognito/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java
index ae03e0a802..6841fa7a65 100644
--- a/spring-5-security-oauth/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java
+++ b/spring-5-security-cognito/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java
@@ -6,7 +6,7 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-@PropertySource("cognito/application_cognito.yml")
+@PropertySource("cognito/application-cognito.yml")
 public class CognitoWebConfiguration implements WebMvcConfigurer {
 
     @Override
diff --git a/spring-5-security-oauth/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java b/spring-5-security-cognito/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java
similarity index 88%
rename from spring-5-security-oauth/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java
rename to spring-5-security-cognito/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java
index 7f7b751cd9..eebe6d8f45 100644
--- a/spring-5-security-oauth/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java
+++ b/spring-5-security-cognito/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java
@@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
-@PropertySource("cognito/application_cognito.yml")
+@PropertySource("cognito/application-cognito.yml")
 public class SpringCognitoApplication {
 
     public static void main(String[] args) {
diff --git a/spring-5-security-oauth/src/main/resources/cognito/application_cognito.yml b/spring-5-security-cognito/src/main/resources/cognito/application-cognito.yml
similarity index 100%
rename from spring-5-security-oauth/src/main/resources/cognito/application_cognito.yml
rename to spring-5-security-cognito/src/main/resources/cognito/application-cognito.yml
diff --git a/spring-5-security-oauth/src/main/resources/cognito/home.html b/spring-5-security-cognito/src/main/resources/cognito/home.html
similarity index 100%
rename from spring-5-security-oauth/src/main/resources/cognito/home.html
rename to spring-5-security-cognito/src/main/resources/cognito/home.html
diff --git a/spring-5-security-oauth/src/main/resources/cognito/style.css b/spring-5-security-cognito/src/main/resources/cognito/style.css
similarity index 100%
rename from spring-5-security-oauth/src/main/resources/cognito/style.css
rename to spring-5-security-cognito/src/main/resources/cognito/style.css
diff --git a/spring-5-security-cognito/src/main/resources/logback.xml b/spring-5-security-cognito/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/spring-5-security-cognito/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file

From 8209ec4a1f9b7ed8df436031df8650051e8bfad7 Mon Sep 17 00:00:00 2001
From: enpy <enpy303@users.noreply.github.com>
Date: Wed, 8 May 2019 16:40:54 +0200
Subject: [PATCH 246/295] Difference between CDI and EJB singleton (#6915)

* Singleton injection examples and tests added

* code and tests implemented
---
 .../main/java/com/baeldung/singleton/Car.java |  28 ++++
 .../baeldung/singleton/CarServiceBean.java    |  23 +++
 .../singleton/CarServiceEjbSingleton.java     |  46 ++++++
 .../singleton/CarServiceSingleton.java        |  47 ++++++
 .../singleton/CarServiceIntegrationTest.java  | 142 ++++++++++++++++++
 5 files changed, 286 insertions(+)
 create mode 100644 jee-7/src/main/java/com/baeldung/singleton/Car.java
 create mode 100644 jee-7/src/main/java/com/baeldung/singleton/CarServiceBean.java
 create mode 100644 jee-7/src/main/java/com/baeldung/singleton/CarServiceEjbSingleton.java
 create mode 100644 jee-7/src/main/java/com/baeldung/singleton/CarServiceSingleton.java
 create mode 100644 jee-7/src/test/java/com/baeldung/singleton/CarServiceIntegrationTest.java

diff --git a/jee-7/src/main/java/com/baeldung/singleton/Car.java b/jee-7/src/main/java/com/baeldung/singleton/Car.java
new file mode 100644
index 0000000000..0cf7281294
--- /dev/null
+++ b/jee-7/src/main/java/com/baeldung/singleton/Car.java
@@ -0,0 +1,28 @@
+package com.baeldung.singleton;
+
+public class Car {
+    
+    private String type;
+    private String model;
+    private boolean serviced = false;
+    
+    public Car(String type, String model) {
+        super();
+        this.type = type;
+        this.model = model;
+    }
+
+    public boolean isServiced () {
+        return serviced;
+    }
+    
+    public void setServiced(Boolean serviced) {
+        this.serviced = serviced;
+    }
+
+    @Override
+    public String toString() {
+        return "Car [type=" + type + ", model=" + model + "]";
+    }
+    
+}
diff --git a/jee-7/src/main/java/com/baeldung/singleton/CarServiceBean.java b/jee-7/src/main/java/com/baeldung/singleton/CarServiceBean.java
new file mode 100644
index 0000000000..b824882d5d
--- /dev/null
+++ b/jee-7/src/main/java/com/baeldung/singleton/CarServiceBean.java
@@ -0,0 +1,23 @@
+package com.baeldung.singleton;
+
+import java.util.UUID;
+
+import javax.enterprise.context.Dependent;
+
+import org.springframework.web.context.annotation.RequestScope;
+
+@RequestScope
+public class CarServiceBean {
+
+    private UUID id = UUID.randomUUID();
+
+    public UUID getId() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "CarService [id=" + id + "]";
+    }
+
+}
diff --git a/jee-7/src/main/java/com/baeldung/singleton/CarServiceEjbSingleton.java b/jee-7/src/main/java/com/baeldung/singleton/CarServiceEjbSingleton.java
new file mode 100644
index 0000000000..1bbffdd61e
--- /dev/null
+++ b/jee-7/src/main/java/com/baeldung/singleton/CarServiceEjbSingleton.java
@@ -0,0 +1,46 @@
+package com.baeldung.singleton;
+
+import java.util.UUID;
+
+import javax.ejb.Singleton;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Singleton
+public class CarServiceEjbSingleton {
+
+    private static Logger LOG = LoggerFactory.getLogger(CarServiceEjbSingleton.class);
+
+    private UUID id = UUID.randomUUID();
+
+    private static int serviceQueue;
+
+    public UUID getId() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "CarServiceEjbSingleton [id=" + id + "]";
+    }
+
+    public int service(Car car) {
+        serviceQueue++;
+        LOG.info("Car {} is being serviced @ CarServiceEjbSingleton - serviceQueue: {}", car, serviceQueue);
+        simulateService(car);
+        serviceQueue--;
+        LOG.info("Car service for {} is completed - serviceQueue: {}", car, serviceQueue);
+        return serviceQueue;
+    }
+    
+    private void simulateService(Car car) {
+        try {
+            Thread.sleep(100);
+            car.setServiced(true);
+        } catch (InterruptedException e) {
+            LOG.error("CarServiceEjbSingleton::InterruptedException: {}", e);
+        }
+    }
+
+}
diff --git a/jee-7/src/main/java/com/baeldung/singleton/CarServiceSingleton.java b/jee-7/src/main/java/com/baeldung/singleton/CarServiceSingleton.java
new file mode 100644
index 0000000000..223d139346
--- /dev/null
+++ b/jee-7/src/main/java/com/baeldung/singleton/CarServiceSingleton.java
@@ -0,0 +1,47 @@
+package com.baeldung.singleton;
+
+import java.util.UUID;
+
+import javax.inject.Singleton;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Singleton
+public class CarServiceSingleton {
+
+    private static Logger LOG = LoggerFactory.getLogger(CarServiceSingleton.class);
+
+    private UUID id = UUID.randomUUID();
+
+    private static int serviceQueue;
+
+    public UUID getId() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "CarServiceSingleton [id=" + id + "]";
+    }
+
+    public int service(Car car) {
+        serviceQueue++;
+        LOG.info("Car {} is being serviced @ CarServiceSingleton - serviceQueue: {}", car, serviceQueue);
+        simulateService(car);
+        serviceQueue--;
+        LOG.info("Car service for {} is completed - serviceQueue: {}", car, serviceQueue);
+        return serviceQueue;
+
+    }
+
+    private void simulateService(Car car) {
+        try {
+            Thread.sleep(100);
+            car.setServiced(true);
+        } catch (InterruptedException e) {
+            LOG.error("CarServiceSingleton::InterruptedException: {}", e);
+        }
+    }
+
+}
diff --git a/jee-7/src/test/java/com/baeldung/singleton/CarServiceIntegrationTest.java b/jee-7/src/test/java/com/baeldung/singleton/CarServiceIntegrationTest.java
new file mode 100644
index 0000000000..b828296dca
--- /dev/null
+++ b/jee-7/src/test/java/com/baeldung/singleton/CarServiceIntegrationTest.java
@@ -0,0 +1,142 @@
+package com.baeldung.singleton;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.ejb.EJB;
+import javax.inject.Inject;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Before;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@RunWith(Arquillian.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class CarServiceIntegrationTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(CarServiceIntegrationTest.class);
+
+    @Deployment
+    public static JavaArchive createDeployment() {
+        return ShrinkWrap.create(JavaArchive.class)
+            .addClasses(CarServiceBean.class, CarServiceSingleton.class, CarServiceEjbSingleton.class, Car.class)
+            .addAsResource("META-INF/persistence.xml")
+            .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+    }
+
+    @Inject
+    private CarServiceBean carServiceBean;
+
+    @Inject
+    private CarServiceSingleton carServiceSingleton;
+
+    @EJB
+    private CarServiceEjbSingleton carServiceEjbSingleton;
+
+    private static Map<String, UUID> idMap = new HashMap<>();
+
+    @Before
+    public void setUp() {
+        // populate idMap only on first run
+        if (idMap.isEmpty()) {
+            LOG.info("setUp::carServiceBean: {}", carServiceBean.getId());
+            idMap.put("carServiceBeanId", carServiceBean.getId());
+
+            LOG.info("setUp::carServiceSingleton: {}", carServiceSingleton.getId());
+            idMap.put("carServiceSingletonId", carServiceSingleton.getId());
+
+            LOG.info("setUp::carServiceEjbSingleton: {}", carServiceEjbSingleton.getId());
+            idMap.put("carServiceEjbSingletonId", carServiceEjbSingleton.getId());
+        }
+    }
+
+    @Test
+    public void givenRun1_whenGetId_thenSingletonIdEqual() {
+        int testRun = 1;
+
+        assertNotNull(carServiceBean);
+        assertNotNull(carServiceSingleton);
+        assertNotNull(carServiceEjbSingleton);
+
+        UUID carServiceBeanId = carServiceBean.getId();
+        assertEquals(idMap.get("carServiceBeanId"), carServiceBeanId);
+        LOG.info("Test run {}::carServiceBeanId: {}", testRun, carServiceBeanId);
+
+        UUID carServiceSingletonId = carServiceSingleton.getId();
+        assertEquals(idMap.get("carServiceSingletonId"), carServiceSingletonId);
+        LOG.info("Test run {}::carServiceSingletonId: {}", testRun, carServiceSingletonId);
+
+        UUID carServiceEjbSingletonId = carServiceEjbSingleton.getId();
+        assertEquals(idMap.get("carServiceEjbSingletonId"), carServiceEjbSingletonId);
+        LOG.info("Test run {}::carServiceEjbSingletonId: {}", testRun, carServiceEjbSingletonId);
+    }
+
+    @Test
+    public void givenRun2_whenGetId_thenSingletonIdEqual() {
+        int testRun = 2;
+
+        assertNotNull(carServiceBean);
+        assertNotNull(carServiceSingleton);
+        assertNotNull(carServiceEjbSingleton);
+
+        UUID carServiceBeanId = carServiceBean.getId();
+        assertNotEquals(idMap.get("carServiceBeanId"), carServiceBeanId);
+        LOG.info("Test run {}::carServiceBeanId: {}", testRun, carServiceBeanId);
+
+        UUID carServiceSingletonId = carServiceSingleton.getId();
+        assertEquals(idMap.get("carServiceSingletonId"), carServiceSingletonId);
+        LOG.info("Test run {}::carServiceSingletonId: {}", testRun, carServiceSingletonId);
+
+        UUID carServiceEjbSingletonId = carServiceEjbSingleton.getId();
+        assertEquals(idMap.get("carServiceEjbSingletonId"), carServiceEjbSingletonId);
+        LOG.info("Test run {}::carServiceEjbSingletonId: {}", testRun, carServiceEjbSingletonId);
+    }
+
+    @Test
+    public void givenRun3_whenSingleton_thenNoLocking() {
+        for (int i = 0; i < 10; i++) {
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    String model = Double.toString(Math.round(Math.random() * 100));
+                    Car car = new Car("Speedster", model);
+                    int serviceQueue = carServiceSingleton.service(car);
+                    assertTrue(serviceQueue < 10);                     
+                }
+            }).start();
+        }
+        return;
+    }
+    
+    @Test
+    public void givenRun4_whenEjb_thenLocking() {
+        for (int i = 0; i < 10; i++) {
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    String model = Double.toString(Math.round(Math.random() * 100));
+                    Car car = new Car("Speedster", model);
+                    int serviceQueue = carServiceEjbSingleton.service(car);
+                    assertEquals(0, serviceQueue);
+                }
+            }).start();
+        }
+        return;
+    }
+
+}
\ No newline at end of file

From a905fe2fa505d84c73b6a980e04c9dfa2685be91 Mon Sep 17 00:00:00 2001
From: Alessio Stalla <alessiostalla@gmail.com>
Date: Wed, 8 May 2019 16:52:00 +0200
Subject: [PATCH 247/295] BAEL-868 (#6917)

* Tests for BAEL-868 (RxKotlin)

* BAEL-868 fix warnings

* Fix the build (?)

* Fix the build
---
 kotlin-libraries/build.gradle                 |   8 +-
 kotlin-libraries/pom.xml                      |   6 +
 .../baeldung/kotlin/rxkotlin/RxKotlinTest.kt  | 157 ++++++++++++++++++
 rule-engines/easy-rules/pom.xml               |   3 +-
 rule-engines/openl-tablets/pom.xml            |   3 +-
 rule-engines/rulebook/pom.xml                 |   3 +-
 6 files changed, 176 insertions(+), 4 deletions(-)
 create mode 100644 kotlin-libraries/src/test/kotlin/com/baeldung/kotlin/rxkotlin/RxKotlinTest.kt

diff --git a/kotlin-libraries/build.gradle b/kotlin-libraries/build.gradle
index b244df34b0..afb92de49e 100644
--- a/kotlin-libraries/build.gradle
+++ b/kotlin-libraries/build.gradle
@@ -7,6 +7,7 @@ version '1.0-SNAPSHOT'
 buildscript {
     ext.kotlin_version = '1.2.41'
     ext.ktor_version = '0.9.2'
+    ext.khttp_version = '0.1.0'
 
     repositories {
         mavenCentral()
@@ -47,11 +48,16 @@ dependencies {
     compile "io.ktor:ktor-server-netty:$ktor_version"
     compile "ch.qos.logback:logback-classic:1.2.1"
     compile "io.ktor:ktor-gson:$ktor_version"
+    compile "khttp:khttp:$khttp_version"
     testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'org.jetbrains.spek', name: 'spek-api', version: '1.1.5'
+    testCompile group: 'org.jetbrains.spek', name: 'spek-subject-extension', version: '1.1.5'
+    testCompile group: 'org.jetbrains.spek', name: 'spek-junit-platform-engine', version: '1.1.5'
     implementation 'com.beust:klaxon:3.0.1'
+    implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
 
 }
 task runServer(type: JavaExec) {
     main = 'APIServer'
    classpath = sourceSets.main.runtimeClasspath
-}
\ No newline at end of file
+}
diff --git a/kotlin-libraries/pom.xml b/kotlin-libraries/pom.xml
index 3d2c7337b0..b75c77f358 100644
--- a/kotlin-libraries/pom.xml
+++ b/kotlin-libraries/pom.xml
@@ -166,6 +166,12 @@
             <version>2.6</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>io.reactivex.rxjava2</groupId>
+            <artifactId>rxkotlin</artifactId>
+            <version>2.3.0</version>
+        </dependency>
     </dependencies>
 
     <properties>
diff --git a/kotlin-libraries/src/test/kotlin/com/baeldung/kotlin/rxkotlin/RxKotlinTest.kt b/kotlin-libraries/src/test/kotlin/com/baeldung/kotlin/rxkotlin/RxKotlinTest.kt
new file mode 100644
index 0000000000..979ed3f809
--- /dev/null
+++ b/kotlin-libraries/src/test/kotlin/com/baeldung/kotlin/rxkotlin/RxKotlinTest.kt
@@ -0,0 +1,157 @@
+package com.baeldung.kotlin.rxkotlin
+
+import io.reactivex.Maybe
+import io.reactivex.Observable
+import io.reactivex.functions.BiFunction
+import io.reactivex.rxkotlin.*
+import io.reactivex.subjects.PublishSubject
+import org.junit.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+
+class RxKotlinTest {
+
+    @Test
+    fun whenBooleanArrayToObserver_thenBooleanObserver() {
+        val observable = listOf(true, false, false).toObservable()
+        observable.test().assertValues(true, false, false)
+    }
+
+    @Test
+    fun whenBooleanArrayToFlowable_thenBooleanFlowable() {
+        val flowable = listOf(true, false, false).toFlowable()
+        flowable.buffer(2).test().assertValues(listOf(true, false), listOf(false))
+    }
+
+    @Test
+    fun whenIntArrayToObserver_thenIntObserver() {
+        val observable = listOf(1, 1, 2, 3).toObservable()
+        observable.test().assertValues(1, 1, 2, 3)
+    }
+
+    @Test
+    fun whenIntArrayToFlowable_thenIntFlowable() {
+        val flowable = listOf(1, 1, 2, 3).toFlowable()
+        flowable.buffer(2).test().assertValues(listOf(1, 1), listOf(2, 3))
+    }
+
+    @Test
+    fun whenObservablePairToMap_thenSingleNoDuplicates() {
+        val list = listOf(Pair("a", 1), Pair("b", 2), Pair("c", 3), Pair("a", 4))
+        val observable = list.toObservable()
+        val map = observable.toMap()
+        assertEquals(mapOf(Pair("a", 4), Pair("b", 2), Pair("c", 3)), map.blockingGet())
+    }
+
+    @Test
+    fun whenObservablePairToMap_thenSingleWithDuplicates() {
+        val list = listOf(Pair("a", 1), Pair("b", 2), Pair("c", 3), Pair("a", 4))
+        val observable = list.toObservable()
+        val map = observable.toMultimap()
+        assertEquals(
+                mapOf(Pair("a", listOf(1, 4)), Pair("b", listOf(2)), Pair("c", listOf(3))),
+                map.blockingGet())
+    }
+
+    @Test
+    fun whenMergeAll_thenStream() {
+        val subject = PublishSubject.create<Observable<String>>()
+        val observable = subject.mergeAll()
+        val testObserver = observable.test()
+        subject.onNext(Observable.just("first", "second"))
+        testObserver.assertValues("first", "second")
+        subject.onNext(Observable.just("third", "fourth"))
+        subject.onNext(Observable.just("fifth"))
+        testObserver.assertValues("first", "second", "third", "fourth", "fifth")
+    }
+
+    @Test
+    fun whenConcatAll_thenStream() {
+        val subject = PublishSubject.create<Observable<String>>()
+        val observable = subject.concatAll()
+        val testObserver = observable.test()
+        subject.onNext(Observable.just("first", "second"))
+        testObserver.assertValues("first", "second")
+        subject.onNext(Observable.just("third", "fourth"))
+        subject.onNext(Observable.just("fifth"))
+        testObserver.assertValues("first", "second", "third", "fourth", "fifth")
+    }
+
+    @Test
+    fun whenSwitchLatest_thenStream() {
+        val subject = PublishSubject.create<Observable<String>>()
+        val observable = subject.switchLatest()
+        val testObserver = observable.test()
+        subject.onNext(Observable.just("first", "second"))
+        testObserver.assertValues("first", "second")
+        subject.onNext(Observable.just("third", "fourth"))
+        subject.onNext(Observable.just("fifth"))
+        testObserver.assertValues("first", "second", "third", "fourth", "fifth")
+    }
+
+    @Test
+    fun whenMergeAllMaybes_thenObservable() {
+        val subject = PublishSubject.create<Maybe<Int>>()
+        val observable = subject.mergeAllMaybes()
+        val testObserver = observable.test()
+        subject.onNext(Maybe.just(1))
+        subject.onNext(Maybe.just(2))
+        subject.onNext(Maybe.empty())
+        testObserver.assertValues(1, 2)
+        subject.onNext(Maybe.error(Exception("")))
+        subject.onNext(Maybe.just(3))
+        testObserver.assertValues(1, 2).assertError(Exception::class.java)
+    }
+
+    @Test
+    fun whenMerge_thenStream() {
+        val observables = mutableListOf(Observable.just("first", "second"))
+        val observable = observables.merge()
+        observables.add(Observable.just("third", "fourth"))
+        observables.add(Observable.error(Exception("e")))
+        observables.add(Observable.just("fifth"))
+
+        observable.test().assertValues("first", "second", "third", "fourth").assertError(Exception::class.java)
+    }
+
+    @Test
+    fun whenMergeDelayError_thenStream() {
+        val observables = mutableListOf<Observable<String>>(Observable.error(Exception("e1")))
+        val observable = observables.mergeDelayError()
+        observables.add(Observable.just("1", "2"))
+        observables.add(Observable.error(Exception("e2")))
+        observables.add(Observable.just("3"))
+
+        observable.test().assertValues("1", "2", "3").assertError(Exception::class.java)
+    }
+
+    @Test
+    fun whenCast_thenUniformType() {
+        val observable = Observable.just<Number>(1, 1, 2, 3)
+        observable.cast<Int>().test().assertValues(1, 1, 2, 3)
+    }
+
+    @Test
+    fun whenOfType_thenFilter() {
+        val observable = Observable.just(1, "and", 2, "and")
+        observable.ofType<Int>().test().assertValues(1, 2)
+    }
+
+    @Test
+    fun whenFunction_thenCompletable() {
+        var value = 0
+        val completable = { value = 3 }.toCompletable()
+        assertFalse(completable.test().isCancelled)
+        assertEquals(3, value)
+    }
+
+    @Test
+    fun whenHelper_thenMoreIdiomaticKotlin() {
+        val zipWith = Observable.just(1).zipWith(Observable.just(2)) { a, b -> a + b }
+        zipWith.subscribeBy(onNext = { println(it) })
+        val zip = Observables.zip(Observable.just(1), Observable.just(2)) { a, b -> a + b }
+        zip.subscribeBy(onNext = { println(it) })
+        val zipOrig = Observable.zip(Observable.just(1), Observable.just(2), BiFunction<Int, Int, Int> { a, b -> a + b })
+        zipOrig.subscribeBy(onNext = { println(it) })
+    }
+}
diff --git a/rule-engines/easy-rules/pom.xml b/rule-engines/easy-rules/pom.xml
index 5b88ce4e94..369451c56c 100644
--- a/rule-engines/easy-rules/pom.xml
+++ b/rule-engines/easy-rules/pom.xml
@@ -10,6 +10,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
     </parent>
 
     <dependencies>
@@ -23,4 +24,4 @@
     <properties>
         <easy-rules.version>3.0.0</easy-rules.version>
     </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/rule-engines/openl-tablets/pom.xml b/rule-engines/openl-tablets/pom.xml
index 3bd6055fc9..b19ec8d3f1 100644
--- a/rule-engines/openl-tablets/pom.xml
+++ b/rule-engines/openl-tablets/pom.xml
@@ -10,6 +10,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
     </parent>
 
     <dependencies>
@@ -29,4 +30,4 @@
         <openl.version>5.19.4</openl.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/rule-engines/rulebook/pom.xml b/rule-engines/rulebook/pom.xml
index 90b5e55417..5e0b900bd9 100644
--- a/rule-engines/rulebook/pom.xml
+++ b/rule-engines/rulebook/pom.xml
@@ -10,6 +10,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
     </parent>
 
     <dependencies>
@@ -24,4 +25,4 @@
         <rulebook.version>0.6.2</rulebook.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>

From ce580fa7fb7cb2634df2e2bf11910a8b7e632599 Mon Sep 17 00:00:00 2001
From: Anshul Bansal <smartdiscover17@gmail.com>
Date: Wed, 8 May 2019 23:11:23 +0300
Subject: [PATCH 248/295] BAEL-2782 Template engines in groovy

---
 .../src/main/resources/articleEmail.template  |  5 +
 .../src/main/resources/email.template         |  3 +
 .../TemplateEnginesUnitTest.groovy            | 96 +++++++++++++++++++
 3 files changed, 104 insertions(+)
 create mode 100644 core-groovy-2/src/main/resources/articleEmail.template
 create mode 100644 core-groovy-2/src/main/resources/email.template
 create mode 100644 core-groovy-2/src/test/groovy/com/baeldung/templateengine/TemplateEnginesUnitTest.groovy

diff --git a/core-groovy-2/src/main/resources/articleEmail.template b/core-groovy-2/src/main/resources/articleEmail.template
new file mode 100644
index 0000000000..26488f6288
--- /dev/null
+++ b/core-groovy-2/src/main/resources/articleEmail.template
@@ -0,0 +1,5 @@
+Dear <% out << (user) %>,
+Please read the requested article below.
+<% out << (articleText) %>
+From,
+<% out << (signature) %>
\ No newline at end of file
diff --git a/core-groovy-2/src/main/resources/email.template b/core-groovy-2/src/main/resources/email.template
new file mode 100644
index 0000000000..fe4eaff851
--- /dev/null
+++ b/core-groovy-2/src/main/resources/email.template
@@ -0,0 +1,3 @@
+Dear $user,
+Thanks for subscribing our services.
+${signature}
\ No newline at end of file
diff --git a/core-groovy-2/src/test/groovy/com/baeldung/templateengine/TemplateEnginesUnitTest.groovy b/core-groovy-2/src/test/groovy/com/baeldung/templateengine/TemplateEnginesUnitTest.groovy
new file mode 100644
index 0000000000..1846ae664c
--- /dev/null
+++ b/core-groovy-2/src/test/groovy/com/baeldung/templateengine/TemplateEnginesUnitTest.groovy
@@ -0,0 +1,96 @@
+package com.baeldung.templateengine
+
+import groovy.text.SimpleTemplateEngine
+import groovy.text.StreamingTemplateEngine
+import groovy.text.GStringTemplateEngine
+import groovy.text.XmlTemplateEngine
+import groovy.text.XmlTemplateEngine
+import groovy.text.markup.MarkupTemplateEngine
+import groovy.text.markup.TemplateConfiguration
+
+class TemplateEnginesUnitTest extends GroovyTestCase {
+    
+    def bindMap = [user: "Norman", signature: "Baeldung"]
+    
+    void testSimpleTemplateEngine() {
+        def smsTemplate = 'Dear <% print user %>, Thanks for reading our Article. ${signature}'
+        def smsText = new SimpleTemplateEngine().createTemplate(smsTemplate).make(bindMap)
+
+        assert smsText.toString() == "Dear Norman, Thanks for reading our Article. Baeldung"
+    }
+    
+    void testStreamingTemplateEngine() {
+        def articleEmailTemplate = new File('src/main/resources/articleEmail.template')
+        bindMap.articleText = """1. Overview
+This is a tutorial article on Template Engines""" //can be a string larger than 64k
+        
+        def articleEmailText = new StreamingTemplateEngine().createTemplate(articleEmailTemplate).make(bindMap)
+        
+        assert articleEmailText.toString() == """Dear Norman,
+Please read the requested article below.
+1. Overview
+This is a tutorial article on Template Engines
+From,
+Baeldung"""
+        
+    }
+    
+    void testGStringTemplateEngine() {
+        def emailTemplate = new File('src/main/resources/email.template')
+        def emailText = new GStringTemplateEngine().createTemplate(emailTemplate).make(bindMap)
+        
+        assert emailText.toString() == "Dear Norman,\nThanks for subscribing our services.\nBaeldung"
+    }
+    
+    void testXmlTemplateEngine() {
+        def emailXmlTemplate = '''<xs xmlns:gsp='groovy-server-pages'>
+                                      <gsp:scriptlet>def emailContent = "Thanks for subscribing our services."</gsp:scriptlet>
+                                      <email>
+                                          <greet>Dear ${user}</greet>
+                                          <content><gsp:expression>emailContent</gsp:expression></content>
+                                          <signature>${signature}</signature>
+                                      </email>
+                                  </xs>'''
+        def emailXml = new XmlTemplateEngine().createTemplate(emailXmlTemplate).make(bindMap)
+        println emailXml.toString()
+    }
+    
+    void testMarkupTemplateEngineHtml() {
+        def emailHtmlTemplate = """html {
+                                       head {
+                                           title('Service Subscription Email')
+                                       }
+                                       body {
+                                           p('Dear Norman')
+                                           p('Thanks for subscribing our services.')
+                                           p('Baeldung')
+                                       }
+                                   }"""
+        
+        
+        def emailHtml = new MarkupTemplateEngine().createTemplate(emailHtmlTemplate).make()
+        println emailHtml.toString()
+        
+    }
+    
+    void testMarkupTemplateEngineXml() {
+        def emailXmlTemplate = """xmlDeclaration()  
+                                      xs{
+                                          email {
+                                              greet('Dear Norman')
+                                              content('Thanks for subscribing our services.')
+                                              signature('Baeldung')
+                                          }  
+                                      }
+                               """
+        TemplateConfiguration config = new TemplateConfiguration()
+        config.autoIndent = true
+        config.autoEscape = true
+        config.autoNewLine = true
+
+        def emailXml = new MarkupTemplateEngine(config).createTemplate(emailXmlTemplate).make()
+        
+        println emailXml.toString()
+    }
+    
+}
\ No newline at end of file

From d783aba7dc21aa951a283468822191f23206d79b Mon Sep 17 00:00:00 2001
From: Erhan Karakaya <erhan277@gmail.com>
Date: Thu, 9 May 2019 01:31:19 +0300
Subject: [PATCH 249/295] BAEL-2839 Added code samples (#6916)

---
 .../baeldung/derivedquery/entity/User.java    |  70 +++++++
 .../repository/UserRepository.java            |  60 ++++++
 .../repository/UserRepositoryTest.java        | 172 ++++++++++++++++++
 3 files changed, 302 insertions(+)
 create mode 100644 persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/derivedquery/entity/User.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/derivedquery/repository/UserRepository.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/derivedquery/repository/UserRepositoryTest.java

diff --git a/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/derivedquery/entity/User.java b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/derivedquery/entity/User.java
new file mode 100644
index 0000000000..e6d38f775b
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/derivedquery/entity/User.java
@@ -0,0 +1,70 @@
+package com.baeldung.derivedquery.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.time.ZonedDateTime;
+
+@Table(name = "users")
+@Entity
+public class User {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+    private String name;
+    private Integer age;
+    private ZonedDateTime birthDate;
+    private Boolean active;
+
+    public User() {
+    }
+
+    public User(String name, Integer age, ZonedDateTime birthDate, Boolean active) {
+        this.name = name;
+        this.age = age;
+        this.birthDate = birthDate;
+        this.active = active;
+    }
+
+    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;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    public ZonedDateTime getBirthDate() {
+        return birthDate;
+    }
+
+    public void setBirthDate(ZonedDateTime birthDate) {
+        this.birthDate = birthDate;
+    }
+
+    public Boolean getActive() {
+        return active;
+    }
+
+    public void setActive(Boolean active) {
+        this.active = active;
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/derivedquery/repository/UserRepository.java b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/derivedquery/repository/UserRepository.java
new file mode 100644
index 0000000000..a23855d96d
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/derivedquery/repository/UserRepository.java
@@ -0,0 +1,60 @@
+package com.baeldung.derivedquery.repository;
+
+import com.baeldung.derivedquery.entity.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.time.ZonedDateTime;
+import java.util.Collection;
+import java.util.List;
+
+public interface UserRepository extends JpaRepository<User, Integer> {
+
+    List<User> findByName(String name);
+
+    List<User> findByNameIs(String name);
+
+    List<User> findByNameEquals(String name);
+
+    List<User> findByNameIsNull();
+
+    List<User> findByNameNot(String name);
+
+    List<User> findByNameIsNot(String name);
+
+    List<User> findByNameStartingWith(String name);
+
+    List<User> findByNameEndingWith(String name);
+
+    List<User> findByNameContaining(String name);
+
+    List<User> findByNameLike(String name);
+
+    List<User> findByAgeLessThan(Integer age);
+
+    List<User> findByAgeLessThanEqual(Integer age);
+
+    List<User> findByAgeGreaterThan(Integer age);
+
+    List<User> findByAgeGreaterThanEqual(Integer age);
+
+    List<User> findByAgeBetween(Integer startAge, Integer endAge);
+
+    List<User> findByBirthDateAfter(ZonedDateTime birthDate);
+
+    List<User> findByBirthDateBefore(ZonedDateTime birthDate);
+
+    List<User> findByActiveTrue();
+
+    List<User> findByActiveFalse();
+
+    List<User> findByAgeIn(Collection<Integer> ages);
+
+    List<User> findByNameOrBirthDate(String name, ZonedDateTime birthDate);
+
+    List<User> findByNameOrBirthDateAndActive(String name, ZonedDateTime birthDate, Boolean active);
+
+    List<User> findByNameOrderByName(String name);
+
+    List<User> findByNameOrderByNameDesc(String name);
+
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/derivedquery/repository/UserRepositoryTest.java b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/derivedquery/repository/UserRepositoryTest.java
new file mode 100644
index 0000000000..188ed5d4d0
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/derivedquery/repository/UserRepositoryTest.java
@@ -0,0 +1,172 @@
+package com.baeldung.derivedquery.repository;
+
+import com.baeldung.Application;
+import com.baeldung.derivedquery.entity.User;
+import com.baeldung.derivedquery.repository.UserRepository;
+import java.time.ZonedDateTime;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.After;
+import org.junit.Before;
+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 static org.junit.Assert.assertEquals;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class UserRepositoryTest {
+
+    private static final String USER_NAME_ADAM = "Adam";
+    private static final String USER_NAME_EVE = "Eve";
+    private static final ZonedDateTime BIRTHDATE = ZonedDateTime.now();
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Before
+    public void setUp() {
+
+        User user1 = new User(USER_NAME_ADAM, 25, BIRTHDATE, true);
+        User user2 = new User(USER_NAME_ADAM, 20, BIRTHDATE, false);
+        User user3 = new User(USER_NAME_EVE, 20, BIRTHDATE, true);
+        User user4 = new User(null, 30, BIRTHDATE, false);
+
+        userRepository.saveAll(Arrays.asList(user1, user2, user3, user4));
+    }
+
+    @After
+    public void tearDown() {
+
+        userRepository.deleteAll();
+    }
+
+    @Test
+    public void whenFindByName_thenReturnsCorrectResult() {
+
+        assertEquals(2, userRepository.findByName(USER_NAME_ADAM).size());
+    }
+
+    @Test
+    public void whenFindByNameIsNull_thenReturnsCorrectResult() {
+
+        assertEquals(1, userRepository.findByNameIsNull().size());
+    }
+
+    @Test
+    public void whenFindByNameNot_thenReturnsCorrectResult() {
+
+        assertEquals(USER_NAME_EVE, userRepository.findByNameNot(USER_NAME_ADAM).get(0).getName());
+    }
+
+    @Test
+    public void whenFindByNameStartingWith_thenReturnsCorrectResult() {
+
+        assertEquals(2, userRepository.findByNameStartingWith("A").size());
+    }
+
+    @Test
+    public void whenFindByNameEndingWith_thenReturnsCorrectResult() {
+
+        assertEquals(1, userRepository.findByNameEndingWith("e").size());
+    }
+
+    @Test
+    public void whenByNameContaining_thenReturnsCorrectResult() {
+
+        assertEquals(1, userRepository.findByNameContaining("v").size());
+    }
+
+
+    @Test
+    public void whenByNameLike_thenReturnsCorrectResult() {
+
+        assertEquals(2, userRepository.findByNameEndingWith("%d%m").size());
+    }
+
+    @Test
+    public void whenByAgeLessThan_thenReturnsCorrectResult() {
+
+        assertEquals(2, userRepository.findByAgeLessThan(25).size());
+    }
+
+
+    @Test
+    public void whenByAgeLessThanEqual_thenReturnsCorrectResult() {
+
+        assertEquals(3, userRepository.findByAgeLessThanEqual(25).size());
+    }
+
+    @Test
+    public void whenByAgeGreaterThan_thenReturnsCorrectResult() {
+
+        assertEquals(1, userRepository.findByAgeGreaterThan(25).size());
+    }
+
+    @Test
+    public void whenByAgeGreaterThanEqual_thenReturnsCorrectResult() {
+
+        assertEquals(2, userRepository.findByAgeGreaterThanEqual(25).size());
+    }
+
+    @Test
+    public void whenByAgeBetween_thenReturnsCorrectResult() {
+
+        assertEquals(4, userRepository.findByAgeBetween(20, 30).size());
+    }
+
+    @Test
+    public void whenByBirthDateAfter_thenReturnsCorrectResult() {
+
+        final ZonedDateTime yesterday = BIRTHDATE.minusDays(1);
+        assertEquals(4, userRepository.findByBirthDateAfter(yesterday).size());
+    }
+
+    @Test
+    public void whenByBirthDateBefore_thenReturnsCorrectResult() {
+
+        final ZonedDateTime yesterday = BIRTHDATE.minusDays(1);
+        assertEquals(0, userRepository.findByBirthDateBefore(yesterday).size());
+    }
+
+    @Test
+    public void whenByActiveTrue_thenReturnsCorrectResult() {
+
+        assertEquals(2, userRepository.findByActiveTrue().size());
+    }
+
+    @Test
+    public void whenByActiveFalse_thenReturnsCorrectResult() {
+
+        assertEquals(2, userRepository.findByActiveFalse().size());
+    }
+
+
+    @Test
+    public void whenByAgeIn_thenReturnsCorrectResult() {
+
+        final List<Integer> ages = Arrays.asList(20, 25);
+        assertEquals(3, userRepository.findByAgeIn(ages).size());
+    }
+
+    @Test
+    public void whenByNameOrBirthDate() {
+
+        assertEquals(4, userRepository.findByNameOrBirthDate(USER_NAME_ADAM, BIRTHDATE).size());
+    }
+
+    @Test
+    public void whenByNameOrBirthDateAndActive() {
+
+        assertEquals(3, userRepository.findByNameOrBirthDateAndActive(USER_NAME_ADAM, BIRTHDATE, false).size());
+    }
+
+    @Test
+    public void whenByNameOrderByName() {
+
+        assertEquals(2, userRepository.findByNameOrderByName(USER_NAME_ADAM).size());
+    }
+}
\ No newline at end of file

From 9f17da240b24eeb574786ba47985c9a849352ee9 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 9 May 2019 15:15:47 +0800
Subject: [PATCH 250/295] Update README.md

---
 spring-security-kerberos/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spring-security-kerberos/README.md b/spring-security-kerberos/README.md
index f9594ca529..0338c2058c 100644
--- a/spring-security-kerberos/README.md
+++ b/spring-security-kerberos/README.md
@@ -8,4 +8,3 @@ mvn clean install
 
 ### Relevant Articles:
 - [Spring Security – Kerberos](http://www.baeldung.com/xxxxxx)
-- [Introduction to SPNEGO/Kerberos Authentication in Spring](https://www.baeldung.com/spring-security-kerberos)

From ebd29fa86a7ad84a023e9beaf4948b5a895b53e5 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 9 May 2019 15:19:43 +0800
Subject: [PATCH 251/295] Create README.md

---
 spring-security-sso/spring-security-sso-kerberos/README.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 spring-security-sso/spring-security-sso-kerberos/README.md

diff --git a/spring-security-sso/spring-security-sso-kerberos/README.md b/spring-security-sso/spring-security-sso-kerberos/README.md
new file mode 100644
index 0000000000..200b7868a3
--- /dev/null
+++ b/spring-security-sso/spring-security-sso-kerberos/README.md
@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Introduction to SPNEGO/Kerberos Authentication in Spring](https://www.baeldung.com/spring-security-kerberos)

From 1b20cd09a78951efd7fd9bab43b9411ed644c9f7 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 9 May 2019 15:22:03 +0800
Subject: [PATCH 252/295] Update README.md

---
 jhipster-5/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/jhipster-5/README.md b/jhipster-5/README.md
index a0437a3de6..0537f5b1a5 100644
--- a/jhipster-5/README.md
+++ b/jhipster-5/README.md
@@ -1,5 +1,3 @@
-# Groovy
-
 ## Relevant articles:
 
 - [Creating New APIs and Views in JHipster](https://www.baeldung.com/jhipster-new-apis-and-views)

From f5240599bbd25f8916dd7dfcec6e5cc923fe94ca Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Thu, 9 May 2019 15:25:47 +0800
Subject: [PATCH 253/295] Update README.md

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

diff --git a/testing-modules/junit-5/README.md b/testing-modules/junit-5/README.md
index 85fe460396..47db6587b4 100644
--- a/testing-modules/junit-5/README.md
+++ b/testing-modules/junit-5/README.md
@@ -1,7 +1,7 @@
 ### Relevant Articles:
 - [The Basics of JUnit 5 – A Preview](http://www.baeldung.com/junit-5-preview)
 - [A Guide to JUnit 5](http://www.baeldung.com/junit-5)
-- [A Guide to @RepeatedTest in JUnit 5](http://www.baeldung.com/junit-5-repeated-test)
+- [A Guide to @RepeatedTest in Junit 5](http://www.baeldung.com/junit-5-repeated-test)
 - [Guide to Dynamic Tests in Junit 5](http://www.baeldung.com/junit5-dynamic-tests)
 - [A Guide 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)

From f369ca1b0b8a7ed89be72908a67b3cc66a5045be Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date: Thu, 9 May 2019 16:30:22 +0200
Subject: [PATCH 254/295] rootCauseFinder moved to java-modules

---
 core-java-modules/core-java/pom.xml           |   2 +-
 .../baeldung/exceptions/RootCauseFinder.java  |   0
 .../exceptions/RootCauseFinderUnitTest.java   |   0
 core-java/pom.xml                             | 492 ------------------
 4 files changed, 1 insertion(+), 493 deletions(-)
 rename {core-java => core-java-modules/core-java}/src/main/java/com/baeldung/exceptions/RootCauseFinder.java (100%)
 rename {core-java => core-java-modules/core-java}/src/test/java/com/baeldung/exceptions/RootCauseFinderUnitTest.java (100%)
 delete mode 100644 core-java/pom.xml

diff --git a/core-java-modules/core-java/pom.xml b/core-java-modules/core-java/pom.xml
index b0f9fea26e..7942f3e7e2 100644
--- a/core-java-modules/core-java/pom.xml
+++ b/core-java-modules/core-java/pom.xml
@@ -454,7 +454,7 @@
         <gson.version>2.8.2</gson.version>
 
         <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
+        <commons-lang3.version>3.9</commons-lang3.version>
         <commons-io.version>2.5</commons-io.version>
         <commons-math3.version>3.6.1</commons-math3.version>
         <decimal4j.version>1.0.3</decimal4j.version>
diff --git a/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
rename to core-java-modules/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
diff --git a/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/exceptions/RootCauseFinderUnitTest.java
diff --git a/core-java/pom.xml b/core-java/pom.xml
deleted file mode 100644
index 661e787149..0000000000
--- a/core-java/pom.xml
+++ /dev/null
@@ -1,492 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>core-java</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>core-java</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
-    </parent>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.unix4j</groupId>
-            <artifactId>unix4j-command</artifactId>
-            <version>${unix4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.grep4j</groupId>
-            <artifactId>grep4j</artifactId>
-            <version>${grep4j.version}</version>
-        </dependency>
-        <!-- web -->
-        <!-- marshalling -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
-        <!-- logging -->
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- test scoped -->
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj-core.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.javamoney</groupId>
-            <artifactId>moneta</artifactId>
-            <version>${javamoney.moneta.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.owasp.esapi</groupId>
-            <artifactId>esapi</artifactId>
-            <version>${esapi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.messaging.mq</groupId>
-            <artifactId>fscontext</artifactId>
-            <version>${fscontext.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.codepoetics</groupId>
-            <artifactId>protonpack</artifactId>
-            <version>${protonpack.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>one.util</groupId>
-            <artifactId>streamex</artifactId>
-            <version>${streamex.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.vavr</groupId>
-            <artifactId>vavr</artifactId>
-            <version>${vavr.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-            <version>${jmh-core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh-generator-annprocess.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
-        </dependency>
-        <!-- instrumentation -->
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>${javaassist.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun</groupId>
-            <artifactId>tools</artifactId>
-            <version>${sun.tools.version}</version>
-            <scope>system</scope>
-            <systemPath>${java.home}/../lib/tools.jar</systemPath>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>core-java</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/libs</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven-jar-plugin.version}</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>libs/</classpathPrefix>
-                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
-                            <archive>
-                                <manifest>
-                                    <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
-                                </manifest>
-                            </archive>
-                            <descriptorRefs>
-                                <descriptorRef>jar-with-dependencies</descriptorRef>
-                            </descriptorRefs>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>${maven-shade-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>com.jolira</groupId>
-                <artifactId>onejar-maven-plugin</artifactId>
-                <version>${onejar-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
-                            <attachToBuild>true</attachToBuild>
-                            <filename>${project.build.finalName}-onejar.${project.packaging}</filename>
-                        </configuration>
-                        <goals>
-                            <goal>one-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>spring-boot</classifier>
-                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>${exec-maven-plugin.version}</version>
-                <configuration>
-                    <executable>java</executable>
-                    <mainClass>com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed</mainClass>
-                    <arguments>
-                        <argument>-Xmx300m</argument>
-                        <argument>-XX:+UseParallelGC</argument>
-                        <argument>-classpath</argument>
-                        <classpath />
-                        <argument>com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${maven-javadoc-plugin.version}</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>integration</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/*ManualTest.java</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/*IntegrationTest.java</include>
-                                        <include>**/*IntTest.java</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <test.mime>json</test.mime>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>${exec-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>run-benchmarks</id>
-                                <!-- <phase>integration-test</phase> -->
-                                <phase>none</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <classpathScope>test</classpathScope>
-                                    <executable>java</executable>
-                                    <arguments>
-                                        <argument>-classpath</argument>
-                                        <classpath />
-                                        <argument>org.openjdk.jmh.Main</argument>
-                                        <argument>.*</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <!-- java instrumentation profiles to build jars -->
-        <profile>
-            <id>buildAgentLoader</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                                <configuration>
-                                    <classifier>agentLoader</classifier>
-                                    <classesDirectory>target/classes</classesDirectory>
-                                    <archive>
-                                        <manifest>
-                                            <addClasspath>true</addClasspath>
-                                        </manifest>
-                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                                    </archive>
-
-                                    <includes>
-                                        <include>com/baeldung/instrumentation/application/AgentLoader.class</include>
-                                        <include>com/baeldung/instrumentation/application/Launcher.class</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>buildApplication</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                                <configuration>
-                                    <classifier>application</classifier>
-                                    <classesDirectory>target/classes</classesDirectory>
-                                    <archive>
-                                        <manifest>
-                                            <addClasspath>true</addClasspath>
-                                        </manifest>
-                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                                    </archive>
-
-                                    <includes>
-                                        <include>com/baeldung/instrumentation/application/MyAtm.class</include>
-                                        <include>com/baeldung/instrumentation/application/MyAtmApplication.class</include>
-                                        <include>com/baeldung/instrumentation/application/Launcher.class</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>buildAgent</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                                <configuration>
-                                    <classifier>agent</classifier>
-                                    <classesDirectory>target/classes</classesDirectory>
-                                    <archive>
-                                        <manifest>
-                                            <addClasspath>true</addClasspath>
-                                        </manifest>
-                                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                                    </archive>
-
-                                    <includes>
-                                        <include>com/baeldung/instrumentation/agent/AtmTransformer.class</include>
-                                        <include>com/baeldung/instrumentation/agent/MyInstrumentationAgent.class</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <properties>
-        
-        <!-- marshalling -->
-        <gson.version>2.8.2</gson.version>
-
-        <!-- util -->
-        <commons-lang3.version>3.9</commons-lang3.version>
-        <commons-io.version>2.5</commons-io.version>
-        <commons-math3.version>3.6.1</commons-math3.version>
-        <decimal4j.version>1.0.3</decimal4j.version>
-        <unix4j.version>0.4</unix4j.version>
-        <grep4j.version>1.8.7</grep4j.version>
-        <fscontext.version>4.6-b01</fscontext.version>
-        <protonpack.version>1.13</protonpack.version>
-        <streamex.version>0.6.5</streamex.version>
-        <vavr.version>0.9.0</vavr.version>
-
-        <!-- testing -->
-        <assertj-core.version>3.10.0</assertj-core.version>
-
-        <!-- maven plugins -->
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
-        
-        <javamoney.moneta.version>1.1</javamoney.moneta.version>
-        <h2database.version>1.4.197</h2database.version>
-        <esapi.version>2.1.0.1</esapi.version>
-        <jmh-core.version>1.19</jmh-core.version>
-       
-        <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
-        <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
-        <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
-        <onejar-maven-plugin.version>1.4.4</onejar-maven-plugin.version>
-        <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
-        <spring-boot-maven-plugin.version>2.0.3.RELEASE</spring-boot-maven-plugin.version>
-        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
-        <icu4j.version>61.1</icu4j.version>
-        <!-- instrumentation -->
-        <javaassist.version>3.21.0-GA</javaassist.version>
-        
-        <sun.tools.version>1.8.0</sun.tools.version>
-    </properties>
-</project>

From b9e437b77f0d3998863caaa133eb0d6d6d51429c Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date: Thu, 9 May 2019 16:44:04 +0200
Subject: [PATCH 255/295] RootCauseFinder changed to runtime exceptions

---
 .../java/com/baeldung/exceptions/RootCauseFinder.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
index 064ae27ac1..cf449110e6 100644
--- a/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
+++ b/core-java-modules/core-java/src/main/java/com/baeldung/exceptions/RootCauseFinder.java
@@ -30,7 +30,7 @@ public class RootCauseFinder {
         private AgeCalculator() {
         }
 
-        public static int calculateAge(String birthDate) throws CalculationException {
+        public static int calculateAge(String birthDate) {
             if (birthDate == null || birthDate.isEmpty()) {
                 throw new IllegalArgumentException();
             }
@@ -44,7 +44,7 @@ public class RootCauseFinder {
             }
         }
 
-        private static LocalDate parseDate(String birthDateAsString) throws DateParseException {
+        private static LocalDate parseDate(String birthDateAsString) {
 
             LocalDate birthDate;
             try {
@@ -62,14 +62,14 @@ public class RootCauseFinder {
 
     }
 
-    static class CalculationException extends Exception {
+    static class CalculationException extends RuntimeException {
 
         CalculationException(DateParseException ex) {
             super(ex);
         }
     }
 
-    static class DateParseException extends Exception {
+    static class DateParseException extends RuntimeException {
 
         DateParseException(String input) {
             super(input);

From 06047d428094c7e58d72d71dc37c3306e1ae0a60 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Fri, 10 May 2019 00:22:34 +0530
Subject: [PATCH 256/295] [BAEL-14315] - Added new module
 spring-persistence-simple and moved one article

---
 persistence-modules/pom.xml                   |   1 +
 persistence-modules/spring-jpa/README.md      |   1 -
 .../spring-persistence-simple/.gitignore      |  13 ++
 .../spring-persistence-simple/README.md       |  18 ++
 .../spring-persistence-simple/pom.xml         | 114 +++++++++++++
 .../baeldung/config/PersistenceJPAConfig.java |  87 ++++++++++
 .../persistence/dao/AbstractJpaDAO.java       |  46 +++++
 .../org/baeldung/persistence/dao/FooDao.java  |  17 ++
 .../org/baeldung/persistence/dao/IFooDao.java |  21 +++
 .../org/baeldung/persistence/model/Bar.java   | 102 ++++++++++++
 .../org/baeldung/persistence/model/Foo.java   |  92 ++++++++++
 .../persistence/service/FooService.java       |  36 ++++
 .../src/main/resources/logback.xml            |  19 +++
 .../main/resources/persistence-h2.properties  |  13 ++
 .../src/main/resources/persistence.xml        |  42 +++++
 ...oPaginationPersistenceIntegrationTest.java | 157 ++++++++++++++++++
 .../FooServicePersistenceIntegrationTest.java |  69 ++++++++
 .../FooServiceSortingIntegrationTest.java     | 118 +++++++++++++
 ...eSortingWitNullsManualIntegrationTest.java |  64 +++++++
 .../src/test/resources/.gitignore             |  13 ++
 20 files changed, 1042 insertions(+), 1 deletion(-)
 create mode 100644 persistence-modules/spring-persistence-simple/.gitignore
 create mode 100644 persistence-modules/spring-persistence-simple/README.md
 create mode 100644 persistence-modules/spring-persistence-simple/pom.xml
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/config/PersistenceJPAConfig.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/FooDao.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/IFooDao.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/model/Bar.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/model/Foo.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/service/FooService.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/resources/logback.xml
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/resources/persistence-h2.properties
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/resources/persistence.xml
 create mode 100644 persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooServiceSortingIntegrationTest.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/test/resources/.gitignore

diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index 67a5c36fed..ba3baf6636 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -55,5 +55,6 @@
         <module>spring-hibernate-5</module>
         <module>spring-hibernate4</module>
         <module>spring-jpa</module>
+        <module>spring-persistence-simple</module>
     </modules>
 </project>
diff --git a/persistence-modules/spring-jpa/README.md b/persistence-modules/spring-jpa/README.md
index 2f2a27e4ac..24cbb3ee8b 100644
--- a/persistence-modules/spring-jpa/README.md
+++ b/persistence-modules/spring-jpa/README.md
@@ -4,7 +4,6 @@
 
 
 ### Relevant Articles: 
-- [A Guide to JPA with Spring](https://www.baeldung.com/the-persistence-layer-with-spring-and-jpa)
 - [Transactions with Spring and JPA](https://www.baeldung.com/transaction-configuration-with-jpa-and-spring)
 - [The DAO with JPA and Spring](http://www.baeldung.com/spring-dao-jpa)
 - [JPA Pagination](http://www.baeldung.com/jpa-pagination)
diff --git a/persistence-modules/spring-persistence-simple/.gitignore b/persistence-modules/spring-persistence-simple/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/README.md b/persistence-modules/spring-persistence-simple/README.md
new file mode 100644
index 0000000000..2fcd05e84a
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/README.md
@@ -0,0 +1,18 @@
+=========
+
+## Spring Persistence Example Project
+
+
+### Relevant Articles: 
+- [A Guide to JPA with Spring](https://www.baeldung.com/the-persistence-layer-with-spring-and-jpa)
+
+
+### Eclipse Config 
+After importing the project into Eclipse, you may see the following error:  
+"No persistence xml file found in project"
+
+This can be ignored: 
+- Project -> Properties -> Java Persistance -> JPA -> Error/Warnings -> Select Ignore on "No persistence xml file found in project"
+Or: 
+- Eclipse -> Preferences - Validation - disable the "Build" execution of the JPA Validator 
+
diff --git a/persistence-modules/spring-persistence-simple/pom.xml b/persistence-modules/spring-persistence-simple/pom.xml
new file mode 100644
index 0000000000..e624af4ea6
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/pom.xml
@@ -0,0 +1,114 @@
+<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-persistence-simple</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-persistence-simple</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+
+    <dependencies>
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${org.springframework.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+
+        <!-- persistence -->
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql-connector-java.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>${spring-data-jpa.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+
+        <!-- utils -->
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+        </dependency>
+
+        <!-- test scoped -->
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${org.springframework.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>spring-persistence-simple</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+        <!-- Spring -->
+        <org.springframework.version>5.1.6.RELEASE</org.springframework.version>
+
+        <!-- persistence -->
+        <hibernate.version>5.4.2.Final</hibernate.version>
+        <mysql-connector-java.version>6.0.6</mysql-connector-java.version>
+        <spring-data-jpa.version>2.1.6.RELEASE</spring-data-jpa.version>
+
+        <!-- util -->
+        <guava.version>21.0</guava.version>
+        <commons-lang3.version>3.5</commons-lang3.version>
+        <assertj.version>3.8.0</assertj.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/config/PersistenceJPAConfig.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/config/PersistenceJPAConfig.java
new file mode 100644
index 0000000000..ec0d4bca3c
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/config/PersistenceJPAConfig.java
@@ -0,0 +1,87 @@
+package org.baeldung.config;
+
+import java.util.Properties;
+
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import com.google.common.base.Preconditions;
+
+@Configuration
+@EnableTransactionManagement
+@PropertySource({ "classpath:persistence-h2.properties" })
+@ComponentScan({ "org.baeldung.persistence" })
+@EnableJpaRepositories(basePackages = "org.baeldung.persistence.dao")
+public class PersistenceJPAConfig {
+
+    @Autowired
+    private Environment env;
+
+    public PersistenceJPAConfig() {
+        super();
+    }
+
+    // beans
+
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+        final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(dataSource());
+        em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
+
+        final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+        em.setJpaVendorAdapter(vendorAdapter);
+        em.setJpaProperties(additionalProperties());
+
+        return em;
+    }
+
+    @Bean
+    public DataSource dataSource() {
+        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
+        dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
+        dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user")));
+        dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass")));
+
+        return dataSource;
+    }
+
+    @Bean
+    public PlatformTransactionManager transactionManager(final EntityManagerFactory emf) {
+        final JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(emf);
+        return transactionManager;
+    }
+
+    @Bean
+    public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
+        return new PersistenceExceptionTranslationPostProcessor();
+    }
+
+    final Properties additionalProperties() {
+        final Properties hibernateProperties = new Properties();
+        hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
+        hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
+        hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", "false");
+        
+    
+        return hibernateProperties;
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java
new file mode 100644
index 0000000000..13007d9fcc
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java
@@ -0,0 +1,46 @@
+package org.baeldung.persistence.dao;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+public abstract class AbstractJpaDAO<T extends Serializable> {
+
+    private Class<T> clazz;
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    public final void setClazz(final Class<T> clazzToSet) {
+        this.clazz = clazzToSet;
+    }
+
+    public T findOne(final long id) {
+        return entityManager.find(clazz, id);
+    }
+
+    @SuppressWarnings("unchecked")
+    public List<T> findAll() {
+        return entityManager.createQuery("from " + clazz.getName()).getResultList();
+    }
+
+    public void create(final T entity) {
+        entityManager.persist(entity);
+    }
+
+    public T update(final T entity) {
+        return entityManager.merge(entity);
+    }
+
+    public void delete(final T entity) {
+        entityManager.remove(entity);
+    }
+
+    public void deleteById(final long entityId) {
+        final T entity = findOne(entityId);
+        delete(entity);
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/FooDao.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/FooDao.java
new file mode 100644
index 0000000000..77978c5cf2
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/FooDao.java
@@ -0,0 +1,17 @@
+package org.baeldung.persistence.dao;
+
+import org.baeldung.persistence.model.Foo;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class FooDao extends AbstractJpaDAO<Foo> implements IFooDao {
+
+    public FooDao() {
+        super();
+
+        setClazz(Foo.class);
+    }
+
+    // API
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/IFooDao.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/IFooDao.java
new file mode 100644
index 0000000000..f5799522e2
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/IFooDao.java
@@ -0,0 +1,21 @@
+package org.baeldung.persistence.dao;
+
+import java.util.List;
+
+import org.baeldung.persistence.model.Foo;
+
+public interface IFooDao {
+
+    Foo findOne(long id);
+
+    List<Foo> findAll();
+
+    void create(Foo entity);
+
+    Foo update(Foo entity);
+
+    void delete(Foo entity);
+
+    void deleteById(long entityId);
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/model/Bar.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/model/Bar.java
new file mode 100644
index 0000000000..b602e57562
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/model/Bar.java
@@ -0,0 +1,102 @@
+package org.baeldung.persistence.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+
+@Entity
+public class Bar implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+
+    @Column(nullable = false)
+    private String name;
+
+    @OneToMany(mappedBy = "bar", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+    @OrderBy("name ASC")
+    List<Foo> fooList;
+
+    public Bar() {
+        super();
+    }
+
+    public Bar(final String name) {
+        super();
+
+        this.name = name;
+    }
+
+    // API
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final long id) {
+
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public List<Foo> getFooList() {
+        return fooList;
+    }
+
+    public void setFooList(final List<Foo> fooList) {
+        this.fooList = fooList;
+    }
+
+    //
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        final Bar other = (Bar) obj;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("Bar [name=").append(name).append("]");
+        return builder.toString();
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/model/Foo.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/model/Foo.java
new file mode 100644
index 0000000000..5294860311
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/model/Foo.java
@@ -0,0 +1,92 @@
+package org.baeldung.persistence.model;
+
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Cacheable
+@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+public class Foo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public Foo() {
+        super();
+    }
+
+    public Foo(final String name) {
+        super();
+
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "ID")
+    private Long id;
+    @Column(name = "NAME")
+    private String name;
+
+    @ManyToOne(targetEntity = Bar.class, fetch = FetchType.EAGER)
+    @JoinColumn(name = "BAR_ID")
+    private Bar bar;
+
+    public Bar getBar() {
+        return bar;
+    }
+
+    public void setBar(final Bar bar) {
+        this.bar = bar;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(final Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        final Foo other = (Foo) obj;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("Foo [name=").append(name).append("]");
+        return builder.toString();
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/service/FooService.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/service/FooService.java
new file mode 100644
index 0000000000..6d1bb0adbe
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/service/FooService.java
@@ -0,0 +1,36 @@
+package org.baeldung.persistence.service;
+
+import java.util.List;
+
+import org.baeldung.persistence.dao.IFooDao;
+import org.baeldung.persistence.model.Foo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class FooService {
+
+    @Autowired
+    private IFooDao dao;
+
+    public FooService() {
+        super();
+    }
+
+    // API
+
+    public void create(final Foo entity) {
+        dao.create(entity);
+    }
+
+    public Foo findOne(final long id) {
+        return dao.findOne(id);
+    }
+
+    public List<Foo> findAll() {
+        return dao.findAll();
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/resources/logback.xml b/persistence-modules/spring-persistence-simple/src/main/resources/logback.xml
new file mode 100644
index 0000000000..ec0dc2469a
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/resources/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>web - %date [%thread] %-5level %logger{36} - %message%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.springframework" level="WARN" />
+    <logger name="org.springframework.transaction" level="WARN" />
+
+    <!-- in order to debug some marshalling issues, this needs to be TRACE -->
+    <logger name="org.springframework.web.servlet.mvc" level="WARN" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/main/resources/persistence-h2.properties b/persistence-modules/spring-persistence-simple/src/main/resources/persistence-h2.properties
new file mode 100644
index 0000000000..716a96fde3
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/resources/persistence-h2.properties
@@ -0,0 +1,13 @@
+# jdbc.X
+jdbc.driverClassName=org.h2.Driver
+jdbc.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
+jdbc.user=sa
+jdbc.pass=
+
+# hibernate.X
+hibernate.dialect=org.hibernate.dialect.H2Dialect
+hibernate.show_sql=true
+hibernate.hbm2ddl.auto=create-drop
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.use_query_cache=true
+hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/main/resources/persistence.xml b/persistence-modules/spring-persistence-simple/src/main/resources/persistence.xml
new file mode 100644
index 0000000000..6304fa0a65
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/resources/persistence.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:tx="http://www.springframework.org/schema/tx"
+    xsi:schemaLocation="
+      http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+      http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
+>
+
+    <context:property-placeholder location="classpath:persistence-h2.properties"/>
+
+    <bean id="myEmf" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+        <property name="dataSource" ref="dataSource"/>
+        <property name="packagesToScan" value="org.baeldung.persistence.model"/>
+        <property name="jpaVendorAdapter">
+            <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"/>
+            <!-- <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" /> <property name="generateDdl" value="${jpa.generateDdl}" /> <property name="databasePlatform" 
+                value="${persistence.dialect}" /> </bean> -->
+        </property>
+        <property name="jpaProperties">
+            <props>
+                <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
+                <prop key="hibernate.dialect">${hibernate.dialect}</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+        <property name="driverClassName" value="${jdbc.driverClassName}"/>
+        <property name="url" value="${jdbc.url}"/>
+        <property name="username" value="${jdbc.user}"/>
+        <property name="password" value="${jdbc.pass}"/>
+    </bean>
+
+    <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+        <property name="entityManagerFactory" ref="myEmf"/>
+    </bean>
+    <tx:annotation-driven/>
+
+    <bean id="persistenceExceptionTranslationPostProcessor" class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor"/>
+
+</beans>
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java
new file mode 100644
index 0000000000..76c34affb9
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java
@@ -0,0 +1,157 @@
+package org.baeldung.persistence.service;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.lessThan;
+import static org.junit.Assert.assertThat;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+
+import org.baeldung.config.PersistenceJPAConfig;
+import org.baeldung.persistence.model.Foo;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceJPAConfig.class }, loader = AnnotationConfigContextLoader.class)
+@DirtiesContext
+public class FooPaginationPersistenceIntegrationTest {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Autowired
+    private FooService fooService;
+
+    @Before
+    public final void before() {
+        final int minimalNumberOfEntities = 25;
+        if (fooService.findAll().size() <= minimalNumberOfEntities) {
+            for (int i = 0; i < minimalNumberOfEntities; i++) {
+                fooService.create(new Foo(randomAlphabetic(6)));
+            }
+        }
+    }
+
+    // tests
+
+    @Test
+    public final void whenContextIsBootstrapped_thenNoExceptions() {
+        //
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public final void givenEntitiesExist_whenRetrievingFirstPage_thenCorrect() {
+        final int pageSize = 10;
+
+        final Query query = entityManager.createQuery("From Foo");
+        configurePagination(query, 1, pageSize);
+
+        // When
+        final List<Foo> fooList = query.getResultList();
+
+        // Then
+        assertThat(fooList, hasSize(pageSize));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public final void givenEntitiesExist_whenRetrievingLastPage_thenCorrect() {
+        final int pageSize = 10;
+        final Query queryTotal = entityManager.createQuery("Select count(f.id) from Foo f");
+        final long countResult = (long) queryTotal.getSingleResult();
+
+        final Query query = entityManager.createQuery("Select f from Foo as f order by f.id");
+        final int lastPage = (int) ((countResult / pageSize) + 1);
+        configurePagination(query, lastPage, pageSize);
+        final List<Foo> fooList = query.getResultList();
+
+        // Then
+        assertThat(fooList, hasSize(lessThan(pageSize + 1)));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public final void givenEntitiesExist_whenRetrievingPage_thenCorrect() {
+        final int pageSize = 10;
+
+        final Query queryIds = entityManager.createQuery("Select f.id from Foo f order by f.name");
+        final List<Integer> fooIds = queryIds.getResultList();
+
+        final Query query = entityManager.createQuery("Select f from Foo as f where f.id in :ids");
+        query.setParameter("ids", fooIds.subList(0, pageSize));
+
+        final List<Foo> fooList = query.getResultList();
+
+        // Then
+        assertThat(fooList, hasSize(pageSize));
+    }
+
+    @Test
+    public final void givenEntitiesExist_whenRetrievingPageViaCriteria_thenCorrect() {
+        final int pageSize = 10;
+        final CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
+        final CriteriaQuery<Foo> criteriaQuery = criteriaBuilder.createQuery(Foo.class);
+        final Root<Foo> from = criteriaQuery.from(Foo.class);
+        final CriteriaQuery<Foo> select = criteriaQuery.select(from);
+        final TypedQuery<Foo> typedQuery = entityManager.createQuery(select);
+        typedQuery.setFirstResult(0);
+        typedQuery.setMaxResults(pageSize);
+        final List<Foo> fooList = typedQuery.getResultList();
+
+        // Then
+        assertThat(fooList, hasSize(pageSize));
+    }
+
+    @Test
+    public final void givenEntitiesExist_whenRetrievingPageViaCriteria_thenNoExceptions() {
+        int pageNumber = 1;
+        final int pageSize = 10;
+        final CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
+
+        final CriteriaQuery<Long> countQuery = criteriaBuilder.createQuery(Long.class);
+        countQuery.select(criteriaBuilder.count(countQuery.from(Foo.class)));
+        final Long count = entityManager.createQuery(countQuery).getSingleResult();
+
+        final CriteriaQuery<Foo> criteriaQuery = criteriaBuilder.createQuery(Foo.class);
+        final Root<Foo> from = criteriaQuery.from(Foo.class);
+        final CriteriaQuery<Foo> select = criteriaQuery.select(from);
+
+        TypedQuery<Foo> typedQuery;
+        while (pageNumber < count.intValue()) {
+            typedQuery = entityManager.createQuery(select);
+            typedQuery.setFirstResult(pageNumber - 1);
+            typedQuery.setMaxResults(pageSize);
+            System.out.println("Current page: " + typedQuery.getResultList());
+            pageNumber += pageSize;
+        }
+
+    }
+
+    // UTIL
+
+    final int determineLastPage(final int pageSize, final long countResult) {
+        return (int) (countResult / pageSize) + 1;
+    }
+
+    final void configurePagination(final Query query, final int pageNumber, final int pageSize) {
+        query.setFirstResult((pageNumber - 1) * pageSize);
+        query.setMaxResults(pageSize);
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
new file mode 100644
index 0000000000..e1b53c8ded
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
@@ -0,0 +1,69 @@
+package org.baeldung.persistence.service;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+
+import org.baeldung.config.PersistenceJPAConfig;
+import org.baeldung.persistence.model.Foo;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceJPAConfig.class }, loader = AnnotationConfigContextLoader.class)
+@DirtiesContext
+public class FooServicePersistenceIntegrationTest {
+
+    @Autowired
+    private FooService service;
+
+    // tests
+
+    @Test
+    public final void whenContextIsBootstrapped_thenNoExceptions() {
+        //
+    }
+
+    @Test
+    public final void whenEntityIsCreated_thenNoExceptions() {
+        service.create(new Foo(randomAlphabetic(6)));
+    }
+
+    @Test(expected = DataIntegrityViolationException.class)
+    public final void whenInvalidEntityIsCreated_thenDataException() {
+        service.create(new Foo(randomAlphabetic(2048)));
+    }
+
+    @Test(expected = DataIntegrityViolationException.class)
+    public final void whenEntityWithLongNameIsCreated_thenDataException() {
+        service.create(new Foo(randomAlphabetic(2048)));
+    }
+
+    @Test(expected = InvalidDataAccessApiUsageException.class)
+    public final void whenSameEntityIsCreatedTwice_thenDataException() {
+        final Foo entity = new Foo(randomAlphabetic(8));
+        service.create(entity);
+        service.create(entity);
+    }
+
+    @Test(expected = DataAccessException.class)
+    public final void temp_whenInvalidEntityIsCreated_thenDataException() {
+        service.create(new Foo(randomAlphabetic(2048)));
+    }
+
+    @Test
+    public final void whenEntityIsCreated_thenFound() {
+        final Foo fooEntity = new Foo("abc");
+        service.create(fooEntity);
+        final Foo found = service.findOne(fooEntity.getId());
+        Assert.assertNotNull(found);
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooServiceSortingIntegrationTest.java b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooServiceSortingIntegrationTest.java
new file mode 100644
index 0000000000..40249b4b30
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooServiceSortingIntegrationTest.java
@@ -0,0 +1,118 @@
+package org.baeldung.persistence.service;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+
+import org.baeldung.config.PersistenceJPAConfig;
+import org.baeldung.persistence.model.Bar;
+import org.baeldung.persistence.model.Foo;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceJPAConfig.class }, loader = AnnotationConfigContextLoader.class)
+@DirtiesContext
+@SuppressWarnings("unchecked")
+public class FooServiceSortingIntegrationTest {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    // tests
+
+    @Test
+    public final void whenSortingByOneAttributeDefaultOrder_thenPrintSortedResult() {
+        final String jql = "Select f from Foo as f order by f.id";
+        final Query sortQuery = entityManager.createQuery(jql);
+        final List<Foo> fooList = sortQuery.getResultList();
+        for (final Foo foo : fooList) {
+            System.out.println("Name:" + foo.getName() + "-------Id:" + foo.getId());
+        }
+    }
+
+    @Test
+    public final void whenSortingByOneAttributeSetOrder_thenSortedPrintResult() {
+        final String jql = "Select f from Foo as f order by f.id desc";
+        final Query sortQuery = entityManager.createQuery(jql);
+        final List<Foo> fooList = sortQuery.getResultList();
+        for (final Foo foo : fooList) {
+            System.out.println("Name:" + foo.getName() + "-------Id:" + foo.getId());
+        }
+    }
+
+    @Test
+    public final void whenSortingByTwoAttributes_thenPrintSortedResult() {
+        final String jql = "Select f from Foo as f order by f.name asc, f.id desc";
+        final Query sortQuery = entityManager.createQuery(jql);
+        final List<Foo> fooList = sortQuery.getResultList();
+        for (final Foo foo : fooList) {
+            System.out.println("Name:" + foo.getName() + "-------Id:" + foo.getId());
+        }
+    }
+
+    @Test
+    public final void whenSortingFooByBar_thenBarsSorted() {
+        final String jql = "Select f from Foo as f order by f.name, f.bar.id";
+        final Query barJoinQuery = entityManager.createQuery(jql);
+        final List<Foo> fooList = barJoinQuery.getResultList();
+        for (final Foo foo : fooList) {
+            System.out.println("Name:" + foo.getName());
+            if (foo.getBar() != null) {
+                System.out.print("-------BarId:" + foo.getBar().getId());
+            }
+        }
+    }
+
+    @Test
+    public final void whenSortinfBar_thenPrintBarsSortedWithFoos() {
+        final String jql = "Select b from Bar as b order by b.id";
+        final Query barQuery = entityManager.createQuery(jql);
+        final List<Bar> barList = barQuery.getResultList();
+        for (final Bar bar : barList) {
+            System.out.println("Bar Id:" + bar.getId());
+            for (final Foo foo : bar.getFooList()) {
+                System.out.println("FooName:" + foo.getName());
+            }
+        }
+    }
+
+    @Test
+    public final void whenSortingFooWithCriteria_thenPrintSortedFoos() {
+        final CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
+        final CriteriaQuery<Foo> criteriaQuery = criteriaBuilder.createQuery(Foo.class);
+        final Root<Foo> from = criteriaQuery.from(Foo.class);
+        final CriteriaQuery<Foo> select = criteriaQuery.select(from);
+        criteriaQuery.orderBy(criteriaBuilder.asc(from.get("name")));
+        final TypedQuery<Foo> typedQuery = entityManager.createQuery(select);
+        final List<Foo> fooList = typedQuery.getResultList();
+        for (final Foo foo : fooList) {
+            System.out.println("Name:" + foo.getName() + "--------Id:" + foo.getId());
+        }
+    }
+
+    @Test
+    public final void whenSortingFooWithCriteriaAndMultipleAttributes_thenPrintSortedFoos() {
+        final CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
+        final CriteriaQuery<Foo> criteriaQuery = criteriaBuilder.createQuery(Foo.class);
+        final Root<Foo> from = criteriaQuery.from(Foo.class);
+        final CriteriaQuery<Foo> select = criteriaQuery.select(from);
+        criteriaQuery.orderBy(criteriaBuilder.asc(from.get("name")), criteriaBuilder.desc(from.get("id")));
+        final TypedQuery<Foo> typedQuery = entityManager.createQuery(select);
+        final List<Foo> fooList = typedQuery.getResultList();
+        for (final Foo foo : fooList) {
+            System.out.println("Name:" + foo.getName() + "-------Id:" + foo.getId());
+        }
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java
new file mode 100644
index 0000000000..c530003ac1
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java
@@ -0,0 +1,64 @@
+package org.baeldung.persistence.service;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+import static org.junit.Assert.assertNull;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+
+import org.baeldung.config.PersistenceJPAConfig;
+import org.baeldung.persistence.model.Foo;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceJPAConfig.class }, loader = AnnotationConfigContextLoader.class)
+@DirtiesContext
+public class FooServiceSortingWitNullsManualIntegrationTest {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Autowired
+    private FooService service;
+
+    // tests
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public final void whenSortingByStringNullLast_thenLastNull() {
+        service.create(new Foo());
+        service.create(new Foo(randomAlphabetic(6)));
+
+        final String jql = "Select f from Foo as f order by f.name desc NULLS LAST";
+        final Query sortQuery = entityManager.createQuery(jql);
+        final List<Foo> fooList = sortQuery.getResultList();
+        assertNull(fooList.get(fooList.toArray().length - 1).getName());
+        for (final Foo foo : fooList) {
+            System.out.println("Name:" + foo.getName());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public final void whenSortingByStringNullFirst_thenFirstNull() {
+        service.create(new Foo());
+
+        final String jql = "Select f from Foo as f order by f.name desc NULLS FIRST";
+        final Query sortQuery = entityManager.createQuery(jql);
+        final List<Foo> fooList = sortQuery.getResultList();
+        assertNull(fooList.get(0).getName());
+        for (final Foo foo : fooList) {
+            System.out.println("Name:" + foo.getName());
+        }
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/test/resources/.gitignore b/persistence-modules/spring-persistence-simple/src/test/resources/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/resources/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file

From 80168d98ef203258be5007aca007ac893a62a967 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Thu, 9 May 2019 22:48:48 +0300
Subject: [PATCH 257/295] Update README.md

---
 core-kotlin-2/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core-kotlin-2/README.md b/core-kotlin-2/README.md
index 6d0b20135d..d75dd2208a 100644
--- a/core-kotlin-2/README.md
+++ b/core-kotlin-2/README.md
@@ -6,4 +6,5 @@
 - [Kotlin Scope Functions](https://www.baeldung.com/kotlin-scope-functions)
 - [Kotlin Annotations](https://www.baeldung.com/kotlin-annotations)
 - [Split a List into Parts in Kotlin](https://www.baeldung.com/kotlin-split-list-into-parts)
-- [String Comparison in Kotlin](https://www.baeldung.com/kotlin-string-comparison)
\ No newline at end of file
+- [String Comparison in Kotlin](https://www.baeldung.com/kotlin-string-comparison)
+- [Guide to JVM Platform Annotations in Kotlin](https://www.baeldung.com/kotlin-jvm-annotations)

From a7f347194bc16dc725b5dab6a29a27d7833133cd Mon Sep 17 00:00:00 2001
From: Shubhra Srivastava <shubhi.srvstv@gmail.com>
Date: Fri, 10 May 2019 09:42:58 +0530
Subject: [PATCH 258/295] Bael 2812 jpa basic annotation (#6922)

* BALE-2812 : JPA Basic Annotation

* BAEL-2812 : JPA Basic Annotation moving code

* BAEL-2812 : Removing changes from hibernate5 module

* BAEL-2812 : Moving files to java-jpa
---
 .../baeldung/jpa/basicannotation/Course.java  | 33 +++++++++++
 .../BasicAnnotationIntegrationTest.java       | 56 +++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/basicannotation/Course.java
 create mode 100644 persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/basicannotation/BasicAnnotationIntegrationTest.java

diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/basicannotation/Course.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/basicannotation/Course.java
new file mode 100644
index 0000000000..cc5a83420c
--- /dev/null
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/basicannotation/Course.java
@@ -0,0 +1,33 @@
+package com.baeldung.jpa.basicannotation;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+
+@Entity
+public class Course {
+
+    @Id
+    private int id;
+
+    @Basic(optional = false, fetch = FetchType.LAZY)
+    private String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
+
diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/basicannotation/BasicAnnotationIntegrationTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/basicannotation/BasicAnnotationIntegrationTest.java
new file mode 100644
index 0000000000..8580aa6602
--- /dev/null
+++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/basicannotation/BasicAnnotationIntegrationTest.java
@@ -0,0 +1,56 @@
+package com.baeldung.jpa.basicannotation;
+
+import org.hibernate.PropertyValueException;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.AfterClass;
+import org.junit.Test;
+
+import java.io.IOException;
+
+public class BasicAnnotationIntegrationTest {
+
+    private static EntityManager entityManager;
+    private static EntityManagerFactory entityManagerFactory;
+
+    @BeforeClass
+    public void setup() {
+        entityManagerFactory = Persistence.createEntityManagerFactory("java-jpa-scheduled-day");
+        entityManager = entityManagerFactory.createEntityManager();
+    }
+
+    @Test
+    public void givenACourse_whenCourseNamePresent_shouldPersist() {
+        Course course = new Course();
+        course.setName("Computers");
+
+        entityManager.persist(course);
+        entityManager.flush();
+        entityManager.clear();
+
+    }
+
+    @Test(expected = PropertyValueException.class)
+    public void givenACourse_whenCourseNameAbsent_shouldFail() {
+        Course course = new Course();
+
+        entityManager.persist(course);
+        entityManager.flush();
+        entityManager.clear();
+    }
+
+    @AfterClass
+    public void destroy() {
+
+        if (entityManager != null) {
+            entityManager.close();
+        }
+        if (entityManagerFactory != null) {
+            entityManagerFactory.close();
+        }
+    }
+}

From 4b7f9836a8ccba229b7017422a0111d4bfc151e3 Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 10 May 2019 16:06:19 +0800
Subject: [PATCH 259/295] Update README.md

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

diff --git a/spring-security-sso/README.md b/spring-security-sso/README.md
index 5f49ee9919..88e3fbb2f7 100644
--- a/spring-security-sso/README.md
+++ b/spring-security-sso/README.md
@@ -1,3 +1,3 @@
 ### Relevant Articles:
 - [Simple Single Sign-On with Spring Security OAuth2](http://www.baeldung.com/sso-spring-security-oauth2)
-- [Spring Security Kerberos Integration](http://www.baeldung.com/sso-spring-security-oauth2)
+- [Spring Security Kerberos Integration](https://www.baeldung.com/spring-security-kerberos-integration)

From ba8fce515b43d0b4e0843b072ad85905b41a088e Mon Sep 17 00:00:00 2001
From: sheryllresulta <48046330+sheryllresulta@users.noreply.github.com>
Date: Fri, 10 May 2019 16:07:18 +0800
Subject: [PATCH 260/295] Update README.md

---
 spring-security-sso/spring-security-sso-kerberos/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-security-sso/spring-security-sso-kerberos/README.md b/spring-security-sso/spring-security-sso-kerberos/README.md
index 200b7868a3..0227d9ac70 100644
--- a/spring-security-sso/spring-security-sso-kerberos/README.md
+++ b/spring-security-sso/spring-security-sso-kerberos/README.md
@@ -1,3 +1,4 @@
 ## Relevant articles:
 
 - [Introduction to SPNEGO/Kerberos Authentication in Spring](https://www.baeldung.com/spring-security-kerberos)
+- [Spring Security Kerberos Integration](https://www.baeldung.com/spring-security-kerberos-integration)

From 01492d167439739bbf0b06e466c33b5434d7df70 Mon Sep 17 00:00:00 2001
From: abhijoyful <abhijoyful@gmail.com>
Date: Fri, 10 May 2019 18:13:18 +0530
Subject: [PATCH 261/295] JIRA - BAEL-2773 (The Java NumberFormatException)
 (#6909)

* adding a generic core-java-exceptions module for number format excpetion and other java exceptions in future

* Update core-java-modules/core-java-exceptions/pom.xml

Co-Authored-By: abhijoyful <abhijoyful@gmail.com>

* add core-java-exceptions module in core-java-module pom

* replace tab with whitespaces

* cleanup code (refactor junit class name per convention, format code, remove blank javadoc)

* rename unit test class per convention to fix build failure
---
 .../core-java-exceptions/pom.xml              |  26 +++
 .../NumberFormatExceptionUnitTest.java        | 154 ++++++++++++++++++
 core-java-modules/pom.xml                     |   1 +
 3 files changed, 181 insertions(+)
 create mode 100644 core-java-modules/core-java-exceptions/pom.xml
 create mode 100644 core-java-modules/core-java-exceptions/src/test/java/com/baeldung/exception/numberformat/NumberFormatExceptionUnitTest.java

diff --git a/core-java-modules/core-java-exceptions/pom.xml b/core-java-modules/core-java-exceptions/pom.xml
new file mode 100644
index 0000000000..51c4e51341
--- /dev/null
+++ b/core-java-modules/core-java-exceptions/pom.xml
@@ -0,0 +1,26 @@
+<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.exception.numberformat</groupId>
+    <artifactId>core-java-exceptions</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>core-java-exceptions</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/core-java-modules/core-java-exceptions/src/test/java/com/baeldung/exception/numberformat/NumberFormatExceptionUnitTest.java b/core-java-modules/core-java-exceptions/src/test/java/com/baeldung/exception/numberformat/NumberFormatExceptionUnitTest.java
new file mode 100644
index 0000000000..a1e8c7c30f
--- /dev/null
+++ b/core-java-modules/core-java-exceptions/src/test/java/com/baeldung/exception/numberformat/NumberFormatExceptionUnitTest.java
@@ -0,0 +1,154 @@
+package com.baeldung.exception.numberformat;
+
+import static org.junit.Assert.assertEquals;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.util.Locale;
+import java.util.logging.Logger;
+
+import org.junit.Test;
+
+/**
+ * A set of examples tested to show cases where NumberFormatException is thrown and not thrown.
+ */
+public class NumberFormatExceptionUnitTest {
+
+    Logger LOG = Logger.getLogger(NumberFormatExceptionUnitTest.class.getName());
+
+    /* ---INTEGER FAIL CASES--- */
+    @Test(expected = NumberFormatException.class)
+    public void givenByteConstructor_whenAlphabetAsInput_thenFail() {
+        Byte byteInt = new Byte("one");
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void givenShortConstructor_whenSpaceInInput_thenFail() {
+        Short shortInt = new Short("2 ");
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void givenParseIntMethod_whenSpaceInInput_thenFail() {
+        Integer aIntPrim = Integer.parseInt("6000 ");
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void givenParseIntMethod_whenUnderscoreInInput_thenFail() {
+        int bIntPrim = Integer.parseInt("6_000");
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void givenIntegerValueOfMethod_whenCommaInInput_thenFail() {
+        Integer cIntPrim = Integer.valueOf("6,000");
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void givenBigIntegerConstructor_whenDecimalInInput_thenFail() {
+        BigInteger bigInteger = new BigInteger("4.0");
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void givenDecodeMethod_whenAlphabetInInput_thenFail() {
+        Long decodeInteger = Long.decode("64403L");
+    }
+
+    /* ---INTEGER PASS CASES--- */
+    @Test
+    public void givenInvalidNumberInputs_whenOptimized_thenPass() {
+        Byte byteInt = new Byte("1");
+        assertEquals(1, byteInt.intValue());
+
+        Short shortInt = new Short("2 ".trim());
+        assertEquals(2, shortInt.intValue());
+
+        Integer aIntObj = Integer.valueOf("6");
+        assertEquals(6, aIntObj.intValue());
+
+        BigInteger bigInteger = new BigInteger("4");
+        assertEquals(4, bigInteger.intValue());
+
+        int aIntPrim = Integer.parseInt("6000 ".trim());
+        assertEquals(6000, aIntPrim);
+
+        int bIntPrim = Integer.parseInt("6_000".replaceAll("_", ""));
+        assertEquals(6000, bIntPrim);
+
+        int cIntPrim = Integer.parseInt("-6000");
+        assertEquals(-6000, cIntPrim);
+
+        Long decodeInteger = Long.decode("644032334");
+        assertEquals(644032334L, decodeInteger.longValue());
+    }
+
+    /* ---DOUBLE FAIL CASES--- */
+    @Test(expected = NumberFormatException.class)
+    public void givenFloatConstructor_whenAlphabetInInput_thenFail() {
+        Float floatDecimalObj = new Float("one.1");
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void givenDoubleConstructor_whenAlphabetInInput_thenFail() {
+        Double doubleDecimalObj = new Double("two.2");
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void givenBigDecimalConstructor_whenSpecialCharsInInput_thenFail() {
+        BigDecimal bigDecimalObj = new BigDecimal("3_0.3");
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void givenParseDoubleMethod_whenCommaInInput_thenFail() {
+        double aDoublePrim = Double.parseDouble("4000,1");
+    }
+
+    /* ---DOUBLE PASS CASES--- */
+    @Test
+    public void givenDoubleConstructor_whenDecimalInInput_thenPass() {
+        Double doubleDecimalObj = new Double("2.2");
+        assertEquals(2.2, doubleDecimalObj.doubleValue(), 0);
+    }
+
+    @Test
+    public void givenDoubleValueOfMethod_whenMinusInInput_thenPass() {
+        Double aDoubleObj = Double.valueOf("-6000");
+        assertEquals(-6000, aDoubleObj.doubleValue(), 0);
+    }
+
+    @Test
+    public void givenUsDecimalNumber_whenParsedWithNumberFormat_thenPass() throws ParseException {
+        Number parsedNumber = parseNumberWithLocale("4000.1", Locale.US);
+        assertEquals(4000.1, parsedNumber);
+        assertEquals(4000.1, parsedNumber.doubleValue(), 0);
+        assertEquals(4000, parsedNumber.intValue());
+    }
+
+    /**
+     * In most European countries (for example, France), comma is used as decimal in place of period.
+     * @throws ParseException if the input string contains special characters other than comma or decimal. 
+     * In this test case, anything after decimal (period) is dropped when a European locale is set.
+     */
+    @Test
+    public void givenEuDecimalNumberHasComma_whenParsedWithNumberFormat_thenPass() throws ParseException {
+        Number parsedNumber = parseNumberWithLocale("4000,1", Locale.FRANCE);
+        LOG.info("Number parsed is: " + parsedNumber);
+        assertEquals(4000.1, parsedNumber);
+        assertEquals(4000.1, parsedNumber.doubleValue(), 0);
+        assertEquals(4000, parsedNumber.intValue());
+    }
+
+    /**
+     * Converts a string into a number retaining all decimals, and symbols valid in a locale.
+     * @param number the input string for a number.
+     * @param locale the locale to consider while parsing a number.
+     * @return the generic number object which can represent multiple number types.
+     * @throws ParseException when input contains invalid characters.
+     */
+    private Number parseNumberWithLocale(String number, Locale locale) throws ParseException {
+        locale = locale == null ? Locale.getDefault() : locale;
+        NumberFormat numberFormat = NumberFormat.getInstance(locale);
+        return numberFormat.parse(number);
+    }
+
+}
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index ed6a056448..2b563a7be4 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -15,6 +15,7 @@
 
     <modules>
         <module>pre-jpms</module>
+        <module>core-java-exceptions</module>
     </modules>
     
 </project>

From 1aed22713df657bd6cc825109bff30f07290e5b2 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 11 May 2019 00:33:30 +0530
Subject: [PATCH 262/295] [BAEL-14316] - Copied code for Bootstrapping
 Hibernate with Spring article

---
 persistence-modules/README.md                 |   1 -
 .../spring-persistence-simple/README.md       |   1 +
 .../spring-persistence-simple/pom.xml         |  19 +-
 .../hibernate/bootstrap/BarHibernateDAO.java  |  39 ++++
 .../hibernate/bootstrap/HibernateConf.java    |  61 ++++++
 .../hibernate/bootstrap/HibernateXMLConf.java |  24 +++
 .../hibernate/bootstrap/model/TestEntity.java |  29 +++
 .../src/main/resources/hibernate5Config.xml   |  34 ++++
 .../resources/hibernate5Configuration.xml     |  30 +++
 .../resources/persistence-mysql.properties    |  13 ++
 .../HibernateBootstrapIntegrationTest.java    | 185 ++++++++++++++++++
 .../HibernateXMLBootstrapIntegrationTest.java |  36 ++++
 12 files changed, 470 insertions(+), 2 deletions(-)
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/BarHibernateDAO.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/HibernateConf.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/HibernateXMLConf.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/model/TestEntity.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/resources/hibernate5Config.xml
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/resources/hibernate5Configuration.xml
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/resources/persistence-mysql.properties
 create mode 100644 persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/hibernate/bootstrap/HibernateBootstrapIntegrationTest.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/hibernate/bootstrap/HibernateXMLBootstrapIntegrationTest.java

diff --git a/persistence-modules/README.md b/persistence-modules/README.md
index 2fbaf25f2f..f6189392b1 100644
--- a/persistence-modules/README.md
+++ b/persistence-modules/README.md
@@ -5,7 +5,6 @@
 ### Relevant Articles:
 
 - [Introduction to Hibernate Search](http://www.baeldung.com/hibernate-search)
-- [Bootstrapping Hibernate 5 with Spring](http://www.baeldung.com/hibernate-5-spring)
 - [Introduction to Lettuce – the Java Redis Client](http://www.baeldung.com/java-redis-lettuce)
 - [A Guide to Jdbi](http://www.baeldung.com/jdbi)
 - [Pessimistic Locking in JPA](http://www.baeldung.com/jpa-pessimistic-locking)
diff --git a/persistence-modules/spring-persistence-simple/README.md b/persistence-modules/spring-persistence-simple/README.md
index 2fcd05e84a..aabbb3c248 100644
--- a/persistence-modules/spring-persistence-simple/README.md
+++ b/persistence-modules/spring-persistence-simple/README.md
@@ -5,6 +5,7 @@
 
 ### Relevant Articles: 
 - [A Guide to JPA with Spring](https://www.baeldung.com/the-persistence-layer-with-spring-and-jpa)
+- [Bootstrapping Hibernate 5 with Spring](http://www.baeldung.com/hibernate-5-spring)
 
 
 ### Eclipse Config 
diff --git a/persistence-modules/spring-persistence-simple/pom.xml b/persistence-modules/spring-persistence-simple/pom.xml
index e624af4ea6..4057db8033 100644
--- a/persistence-modules/spring-persistence-simple/pom.xml
+++ b/persistence-modules/spring-persistence-simple/pom.xml
@@ -32,7 +32,16 @@
         </dependency>
 
         <!-- persistence -->
-
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+            <version>${jta.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
@@ -55,6 +64,12 @@
             <version>${h2.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-dbcp</artifactId>
+            <version>${tomcat-dbcp.version}</version>
+        </dependency>
+
         <!-- utils -->
 
         <dependency>
@@ -104,6 +119,8 @@
         <hibernate.version>5.4.2.Final</hibernate.version>
         <mysql-connector-java.version>6.0.6</mysql-connector-java.version>
         <spring-data-jpa.version>2.1.6.RELEASE</spring-data-jpa.version>
+        <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
+        <jta.version>1.1</jta.version>
 
         <!-- util -->
         <guava.version>21.0</guava.version>
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/BarHibernateDAO.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/BarHibernateDAO.java
new file mode 100644
index 0000000000..5fc932b256
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/BarHibernateDAO.java
@@ -0,0 +1,39 @@
+package com.baeldung.hibernate.bootstrap;
+
+import com.baeldung.hibernate.bootstrap.model.TestEntity;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public abstract class BarHibernateDAO {
+
+    @Autowired
+    private SessionFactory sessionFactory;
+
+    public TestEntity findEntity(int id) {
+
+        return getCurrentSession().find(TestEntity.class, 1);
+    }
+
+    public void createEntity(TestEntity entity) {
+
+        getCurrentSession().save(entity);
+    }
+
+    public void createEntity(int id, String newDescription) {
+
+        TestEntity entity = findEntity(id);
+        entity.setDescription(newDescription);
+        getCurrentSession().save(entity);
+    }
+
+    public void deleteEntity(int id) {
+
+        TestEntity entity = findEntity(id);
+        getCurrentSession().delete(entity);
+    }
+
+    protected Session getCurrentSession() {
+        return sessionFactory.getCurrentSession();
+    }
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/HibernateConf.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/HibernateConf.java
new file mode 100644
index 0000000000..150e3778af
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/HibernateConf.java
@@ -0,0 +1,61 @@
+package com.baeldung.hibernate.bootstrap;
+
+import com.google.common.base.Preconditions;
+import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.sql.DataSource;
+import java.util.Properties;
+
+@Configuration
+@EnableTransactionManagement
+@PropertySource({ "classpath:persistence-h2.properties" })
+public class HibernateConf {
+
+    @Autowired
+    private Environment env;
+
+    @Bean
+    public LocalSessionFactoryBean sessionFactory() {
+        final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean();
+        sessionFactory.setDataSource(dataSource());
+        sessionFactory.setPackagesToScan(new String[] { "com.baeldung.hibernate.bootstrap.model" });
+        sessionFactory.setHibernateProperties(hibernateProperties());
+
+        return sessionFactory;
+    }
+
+    @Bean
+    public DataSource dataSource() {
+        final BasicDataSource dataSource = new BasicDataSource();
+        dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
+        dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
+        dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user")));
+        dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass")));
+
+        return dataSource;
+    }
+
+    @Bean
+    public PlatformTransactionManager hibernateTransactionManager() {
+        final HibernateTransactionManager transactionManager = new HibernateTransactionManager();
+        transactionManager.setSessionFactory(sessionFactory().getObject());
+        return transactionManager;
+    }
+
+    private final Properties hibernateProperties() {
+        final Properties hibernateProperties = new Properties();
+        hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
+        hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
+
+        return hibernateProperties;
+    }
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/HibernateXMLConf.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/HibernateXMLConf.java
new file mode 100644
index 0000000000..b3e979478f
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/HibernateXMLConf.java
@@ -0,0 +1,24 @@
+package com.baeldung.hibernate.bootstrap;
+
+import com.google.common.base.Preconditions;
+import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.sql.DataSource;
+import java.util.Properties;
+
+@Configuration
+@EnableTransactionManagement
+@ImportResource({ "classpath:hibernate5Configuration.xml" })
+public class HibernateXMLConf {
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/model/TestEntity.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/model/TestEntity.java
new file mode 100644
index 0000000000..cae41db831
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/bootstrap/model/TestEntity.java
@@ -0,0 +1,29 @@
+package com.baeldung.hibernate.bootstrap.model;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class TestEntity {
+
+    private int id;
+
+    private String description;
+
+    @Id
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/resources/hibernate5Config.xml b/persistence-modules/spring-persistence-simple/src/main/resources/hibernate5Config.xml
new file mode 100644
index 0000000000..bbb61cb3e0
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/resources/hibernate5Config.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="
+      http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
+>
+
+    <context:property-placeholder location="classpath:persistence-mysql.properties"/>
+
+    <bean id="sessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+        <property name="dataSource" ref="dataSource"/>
+        <property name="packagesToScan" value="com.baeldung.persistence.model"/>
+        <property name="hibernateProperties">
+            <props>
+                <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
+                <prop key="hibernate.dialect">${hibernate.dialect}</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="dataSource" class="org.apache.tomcat.dbcp.dbcp2.BasicDataSource">
+        <property name="driverClassName" value="${jdbc.driverClassName}"/>
+        <property name="url" value="${jdbc.url}"/>
+        <property name="username" value="${jdbc.eventGeneratedId}"/>
+        <property name="password" value="${jdbc.pass}"/>
+    </bean>
+
+    <bean id="txManager" class="org.springframework.orm.hibernate5.HibernateTransactionManager">
+        <property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+
+    <bean id="persistenceExceptionTranslationPostProcessor" class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor"/>
+
+</beans>
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/main/resources/hibernate5Configuration.xml b/persistence-modules/spring-persistence-simple/src/main/resources/hibernate5Configuration.xml
new file mode 100644
index 0000000000..cb6cf0aa5c
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/resources/hibernate5Configuration.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="
+      http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <context:property-placeholder location="classpath:persistence-h2.properties"/>
+
+    <bean id="sessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+        <property name="dataSource" ref="dataSource"/>
+        <property name="packagesToScan" value="com.baeldung.hibernate.bootstrap.model"/>
+        <property name="hibernateProperties">
+            <props>
+                <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
+                <prop key="hibernate.dialect">${hibernate.dialect}</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="dataSource" class="org.apache.tomcat.dbcp.dbcp2.BasicDataSource">
+        <property name="driverClassName" value="${jdbc.driverClassName}"/>
+        <property name="url" value="${jdbc.url}"/>
+        <property name="username" value="${jdbc.user}"/>
+        <property name="password" value="${jdbc.pass}"/>
+    </bean>
+
+    <bean id="txManager" class="org.springframework.orm.hibernate5.HibernateTransactionManager">
+        <property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/main/resources/persistence-mysql.properties b/persistence-modules/spring-persistence-simple/src/main/resources/persistence-mysql.properties
new file mode 100644
index 0000000000..b3cfd31f46
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/resources/persistence-mysql.properties
@@ -0,0 +1,13 @@
+# jdbc.X
+jdbc.driverClassName=com.mysql.cj.jdbc.Driver
+jdbc.url=jdbc:mysql://localhost:3306/spring_hibernate5_01?createDatabaseIfNotExist=true
+jdbc.eventGeneratedId=tutorialuser
+jdbc.pass=tutorialmy5ql
+
+# hibernate.X
+hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+hibernate.show_sql=false
+hibernate.hbm2ddl.auto=create-drop
+
+# envers.X
+envers.audit_table_suffix=_audit_log
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/hibernate/bootstrap/HibernateBootstrapIntegrationTest.java b/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/hibernate/bootstrap/HibernateBootstrapIntegrationTest.java
new file mode 100644
index 0000000000..c41423643a
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/hibernate/bootstrap/HibernateBootstrapIntegrationTest.java
@@ -0,0 +1,185 @@
+package com.baeldung.hibernate.bootstrap;
+
+import com.baeldung.hibernate.bootstrap.model.TestEntity;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.Commit;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.test.context.transaction.TestTransaction;
+import org.springframework.transaction.annotation.Transactional;
+
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { HibernateConf.class })
+@Transactional
+public class HibernateBootstrapIntegrationTest {
+
+    @Autowired
+    private SessionFactory sessionFactory;
+
+    @Test
+    public void whenBootstrapHibernateSession_thenNoException() {
+
+        Session session = sessionFactory.getCurrentSession();
+
+        TestEntity newEntity = new TestEntity();
+        newEntity.setId(1);
+        session.save(newEntity);
+
+        TestEntity searchEntity = session.find(TestEntity.class, 1);
+
+        Assert.assertNotNull(searchEntity);
+    }
+
+    @Test
+    public void whenProgrammaticTransactionCommit_thenEntityIsInDatabase() {
+        assertTrue(TestTransaction.isActive());
+
+        //Save an entity and commit.
+        Session session = sessionFactory.getCurrentSession();
+
+        TestEntity newEntity = new TestEntity();
+        newEntity.setId(1);
+        session.save(newEntity);
+
+        TestEntity searchEntity = session.find(TestEntity.class, 1);
+
+        Assert.assertNotNull(searchEntity);
+        assertTrue(TestTransaction.isFlaggedForRollback());
+
+        TestTransaction.flagForCommit();
+        TestTransaction.end();
+
+        assertFalse(TestTransaction.isFlaggedForRollback());
+        assertFalse(TestTransaction.isActive());
+
+        //Check that the entity is still there in a new transaction,
+        //then delete it, but don't commit.
+        TestTransaction.start();
+
+        assertTrue(TestTransaction.isFlaggedForRollback());
+        assertTrue(TestTransaction.isActive());
+
+        session = sessionFactory.getCurrentSession();
+        searchEntity = session.find(TestEntity.class, 1);
+
+        Assert.assertNotNull(searchEntity);
+
+        session.delete(searchEntity);
+        session.flush();
+
+        TestTransaction.end();
+
+        assertFalse(TestTransaction.isActive());
+
+        //Check that the entity is still there in a new transaction,
+        //then delete it and commit.
+        TestTransaction.start();
+
+        session = sessionFactory.getCurrentSession();
+        searchEntity = session.find(TestEntity.class, 1);
+
+        Assert.assertNotNull(searchEntity);
+
+        session.delete(searchEntity);
+        session.flush();
+
+        assertTrue(TestTransaction.isActive());
+
+        TestTransaction.flagForCommit();
+        TestTransaction.end();
+
+        assertFalse(TestTransaction.isActive());
+
+        //Check that the entity is no longer there in a new transaction.
+        TestTransaction.start();
+
+        assertTrue(TestTransaction.isActive());
+
+        session = sessionFactory.getCurrentSession();
+        searchEntity = session.find(TestEntity.class, 1);
+
+        Assert.assertNull(searchEntity);
+    }
+
+    @Test
+    @Commit
+    public void givenTransactionCommitDefault_whenProgrammaticTransactionCommit_thenEntityIsInDatabase() {
+        assertTrue(TestTransaction.isActive());
+
+        //Save an entity and commit.
+        Session session = sessionFactory.getCurrentSession();
+
+        TestEntity newEntity = new TestEntity();
+        newEntity.setId(1);
+        session.save(newEntity);
+
+        TestEntity searchEntity = session.find(TestEntity.class, 1);
+
+        Assert.assertNotNull(searchEntity);
+        assertFalse(TestTransaction.isFlaggedForRollback());
+
+        TestTransaction.end();
+
+        assertFalse(TestTransaction.isFlaggedForRollback());
+        assertFalse(TestTransaction.isActive());
+
+        //Check that the entity is still there in a new transaction,
+        //then delete it, but don't commit.
+        TestTransaction.start();
+
+        assertFalse(TestTransaction.isFlaggedForRollback());
+        assertTrue(TestTransaction.isActive());
+
+        session = sessionFactory.getCurrentSession();
+        searchEntity = session.find(TestEntity.class, 1);
+
+        Assert.assertNotNull(searchEntity);
+
+        session.delete(searchEntity);
+        session.flush();
+
+        TestTransaction.flagForRollback();
+        TestTransaction.end();
+
+        assertFalse(TestTransaction.isActive());
+
+        //Check that the entity is still there in a new transaction,
+        //then delete it and commit.
+        TestTransaction.start();
+
+        session = sessionFactory.getCurrentSession();
+        searchEntity = session.find(TestEntity.class, 1);
+
+        Assert.assertNotNull(searchEntity);
+
+        session.delete(searchEntity);
+        session.flush();
+
+        assertTrue(TestTransaction.isActive());
+
+        TestTransaction.end();
+
+        assertFalse(TestTransaction.isActive());
+
+        //Check that the entity is no longer there in a new transaction.
+        TestTransaction.start();
+
+        assertTrue(TestTransaction.isActive());
+
+        session = sessionFactory.getCurrentSession();
+        searchEntity = session.find(TestEntity.class, 1);
+
+        Assert.assertNull(searchEntity);
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/hibernate/bootstrap/HibernateXMLBootstrapIntegrationTest.java b/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/hibernate/bootstrap/HibernateXMLBootstrapIntegrationTest.java
new file mode 100644
index 0000000000..5b811ad576
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/hibernate/bootstrap/HibernateXMLBootstrapIntegrationTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.hibernate.bootstrap;
+
+import com.baeldung.hibernate.bootstrap.model.TestEntity;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { HibernateXMLConf.class })
+@Transactional
+public class HibernateXMLBootstrapIntegrationTest {
+
+    @Autowired
+    private SessionFactory sessionFactory;
+
+    @Test
+    public void whenBootstrapHibernateSession_thenNoException() {
+
+        Session session = sessionFactory.getCurrentSession();
+
+        TestEntity newEntity = new TestEntity();
+        newEntity.setId(1);
+        session.save(newEntity);
+
+        TestEntity searchEntity = session.find(TestEntity.class, 1);
+
+        Assert.assertNotNull(searchEntity);
+    }
+
+}

From ea797d5c5bb1070cb910d13ed2fbfce1d2e76b97 Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Fri, 10 May 2019 23:57:22 +0300
Subject: [PATCH 263/295] fix string test

---
 .../com/baeldung/java8/optional/OptionalChainingUnitTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalChainingUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalChainingUnitTest.java
index 70ec324cb3..3e0d752bb6 100644
--- a/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalChainingUnitTest.java
+++ b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalChainingUnitTest.java
@@ -101,7 +101,7 @@ public class OptionalChainingUnitTest {
     }
 
     private Optional<String> createOptional(String input) {
-        if (input == null || input == "" || input == "empty") {
+        if (input == null || "".equals(input) || "empty".equals(input)) {
             return Optional.empty();
         }
 

From deb33dfe58f5a0934b8a36a4fabbdae125d43011 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sat, 11 May 2019 09:21:38 +0300
Subject: [PATCH 264/295] Update README.MD

[skip ci]
---
 spring-boot-testing/README.MD | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spring-boot-testing/README.MD b/spring-boot-testing/README.MD
index 8db51e9b8e..99d7db5743 100644
--- a/spring-boot-testing/README.MD
+++ b/spring-boot-testing/README.MD
@@ -6,4 +6,3 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Testing with Spring and Spock](https://www.baeldung.com/spring-spock-testing)
 - [Exclude Auto-Configuration Classes in Spring Boot Tests](https://www.baeldung.com/spring-boot-exclude-auto-configuration-test)
 - [Setting the Log Level in Spring Boot when Testing](https://www.baeldung.com/spring-boot-testing-log-level)
-- [Setting the Log Level in Spring Boot when Testing](https://www.baeldung.com/spring-boot-testing-log-level)

From e877597d9db31977ea5d6641a05b5f7b9c1efac6 Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Sat, 11 May 2019 09:30:45 +0300
Subject: [PATCH 265/295] rename junit module

---
 .../{junit-5-configuration => junit-5-basics}/README.md     | 0
 .../{junit-5-configuration => junit-5-basics}/pom.xml       | 6 +++---
 .../main/java/com/baeldung/junit/tags/example/Employee.java | 0
 .../java/com/baeldung/junit/tags/example/EmployeeDAO.java   | 0
 .../com/baeldung/junit/tags/example/EmployeeRowMapper.java  | 0
 .../com/baeldung/junit/tags/example/SpringJdbcConfig.java   | 0
 .../src/main/resources/jdbc/schema.sql                      | 0
 .../src/main/resources/jdbc/springJdbc-config.xml           | 0
 .../src/main/resources/jdbc/test-data.sql                   | 0
 .../categories/EmployeeDAOCategoryIntegrationTest.java      | 0
 .../com/baeldung/categories/EmployeeDAOUnitTestSuite.java   | 0
 .../test/java/com/baeldung/categories/IntegrationTest.java  | 0
 .../src/test/java/com/baeldung/categories/UnitTest.java     | 0
 .../com/baeldung/example/EmployeeDAOIntegrationTest.java    | 0
 .../test/java/com/baeldung/example/EmployeeUnitTest.java    | 0
 .../resourcedirectory/ReadResourceDirectoryUnitTest.java    | 0
 .../java/com/baeldung/tags/EmployeeDAOIntegrationTest.java  | 0
 .../test/java/com/baeldung/tags/EmployeeDAOTestSuite.java   | 0
 .../src/test/resources/example_resource.txt                 | 0
 testing-modules/pom.xml                                     | 2 +-
 20 files changed, 4 insertions(+), 4 deletions(-)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/README.md (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/pom.xml (97%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/main/java/com/baeldung/junit/tags/example/Employee.java (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/main/resources/jdbc/schema.sql (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/main/resources/jdbc/springJdbc-config.xml (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/main/resources/jdbc/test-data.sql (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/test/java/com/baeldung/categories/IntegrationTest.java (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/test/java/com/baeldung/categories/UnitTest.java (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/test/java/com/baeldung/example/EmployeeDAOIntegrationTest.java (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/test/java/com/baeldung/example/EmployeeUnitTest.java (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java (100%)
 rename testing-modules/{junit-5-configuration => junit-5-basics}/src/test/resources/example_resource.txt (100%)

diff --git a/testing-modules/junit-5-configuration/README.md b/testing-modules/junit-5-basics/README.md
similarity index 100%
rename from testing-modules/junit-5-configuration/README.md
rename to testing-modules/junit-5-basics/README.md
diff --git a/testing-modules/junit-5-configuration/pom.xml b/testing-modules/junit-5-basics/pom.xml
similarity index 97%
rename from testing-modules/junit-5-configuration/pom.xml
rename to testing-modules/junit-5-basics/pom.xml
index 0f19bc19b7..28afcd6aac 100644
--- a/testing-modules/junit-5-configuration/pom.xml
+++ b/testing-modules/junit-5-basics/pom.xml
@@ -3,10 +3,10 @@
          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>junit-5-configuration</artifactId>
+    <artifactId>junit-5-basics</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <name>junit-5-configuration</name>
-    <description>Intro to JUnit 5 configuration</description>
+    <name>junit-5-basics</name>
+    <description>Intro to JUnit 5</description>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/Employee.java b/testing-modules/junit-5-basics/src/main/java/com/baeldung/junit/tags/example/Employee.java
similarity index 100%
rename from testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/Employee.java
rename to testing-modules/junit-5-basics/src/main/java/com/baeldung/junit/tags/example/Employee.java
diff --git a/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java b/testing-modules/junit-5-basics/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java
similarity index 100%
rename from testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java
rename to testing-modules/junit-5-basics/src/main/java/com/baeldung/junit/tags/example/EmployeeDAO.java
diff --git a/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java b/testing-modules/junit-5-basics/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java
similarity index 100%
rename from testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java
rename to testing-modules/junit-5-basics/src/main/java/com/baeldung/junit/tags/example/EmployeeRowMapper.java
diff --git a/testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java b/testing-modules/junit-5-basics/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java
similarity index 100%
rename from testing-modules/junit-5-configuration/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java
rename to testing-modules/junit-5-basics/src/main/java/com/baeldung/junit/tags/example/SpringJdbcConfig.java
diff --git a/testing-modules/junit-5-configuration/src/main/resources/jdbc/schema.sql b/testing-modules/junit-5-basics/src/main/resources/jdbc/schema.sql
similarity index 100%
rename from testing-modules/junit-5-configuration/src/main/resources/jdbc/schema.sql
rename to testing-modules/junit-5-basics/src/main/resources/jdbc/schema.sql
diff --git a/testing-modules/junit-5-configuration/src/main/resources/jdbc/springJdbc-config.xml b/testing-modules/junit-5-basics/src/main/resources/jdbc/springJdbc-config.xml
similarity index 100%
rename from testing-modules/junit-5-configuration/src/main/resources/jdbc/springJdbc-config.xml
rename to testing-modules/junit-5-basics/src/main/resources/jdbc/springJdbc-config.xml
diff --git a/testing-modules/junit-5-configuration/src/main/resources/jdbc/test-data.sql b/testing-modules/junit-5-basics/src/main/resources/jdbc/test-data.sql
similarity index 100%
rename from testing-modules/junit-5-configuration/src/main/resources/jdbc/test-data.sql
rename to testing-modules/junit-5-basics/src/main/resources/jdbc/test-data.sql
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java
similarity index 100%
rename from testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/categories/EmployeeDAOCategoryIntegrationTest.java
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java
similarity index 100%
rename from testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/categories/EmployeeDAOUnitTestSuite.java
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/IntegrationTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/categories/IntegrationTest.java
similarity index 100%
rename from testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/IntegrationTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/categories/IntegrationTest.java
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/UnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/categories/UnitTest.java
similarity index 100%
rename from testing-modules/junit-5-configuration/src/test/java/com/baeldung/categories/UnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/categories/UnitTest.java
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/example/EmployeeDAOIntegrationTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/example/EmployeeDAOIntegrationTest.java
similarity index 100%
rename from testing-modules/junit-5-configuration/src/test/java/com/baeldung/example/EmployeeDAOIntegrationTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/example/EmployeeDAOIntegrationTest.java
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/example/EmployeeUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/example/EmployeeUnitTest.java
similarity index 100%
rename from testing-modules/junit-5-configuration/src/test/java/com/baeldung/example/EmployeeUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/example/EmployeeUnitTest.java
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
similarity index 100%
rename from testing-modules/junit-5-configuration/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java
similarity index 100%
rename from testing-modules/junit-5-configuration/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/tags/EmployeeDAOIntegrationTest.java
diff --git a/testing-modules/junit-5-configuration/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java
similarity index 100%
rename from testing-modules/junit-5-configuration/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java
diff --git a/testing-modules/junit-5-configuration/src/test/resources/example_resource.txt b/testing-modules/junit-5-basics/src/test/resources/example_resource.txt
similarity index 100%
rename from testing-modules/junit-5-configuration/src/test/resources/example_resource.txt
rename to testing-modules/junit-5-basics/src/test/resources/example_resource.txt
diff --git a/testing-modules/pom.xml b/testing-modules/pom.xml
index 40ed63bc12..90ec857b7f 100644
--- a/testing-modules/pom.xml
+++ b/testing-modules/pom.xml
@@ -32,6 +32,6 @@
         <module>test-containers</module>
         <module>testing</module>
         <module>testng</module>
-        <module>junit-5-configuration</module>
+        <module>junit-5-basics</module>
     </modules>
 </project>

From 3c72fd048709d59f8ca8eba10e1c67c2a3414ed4 Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Sat, 11 May 2019 09:45:08 +0300
Subject: [PATCH 266/295] move code to boot data module

---
 pom.xml                                       |  3 --
 .../jsonexception/CustomException.java        |  0
 .../baeldung/jsonexception/ErrorHandler.java  |  0
 .../jsonexception/MainController.java         |  0
 .../MainControllerIntegrationTest.java        |  0
 spring-boot-exceptions/.gitignore             | 29 ----------------
 spring-boot-exceptions/pom.xml                | 33 -------------------
 .../jsonexception/JsonErrorApplication.java   | 13 --------
 .../src/main/resources/application.properties |  1 -
 .../src/main/resources/static/.gitignore      |  4 ---
 .../src/main/resources/templates/.gitignore   |  4 ---
 .../SpringContextIntegrationTest.java         | 16 ---------
 12 files changed, 103 deletions(-)
 rename {spring-boot-exceptions => spring-boot-data}/src/main/java/com/baeldung/jsonexception/CustomException.java (100%)
 rename {spring-boot-exceptions => spring-boot-data}/src/main/java/com/baeldung/jsonexception/ErrorHandler.java (100%)
 rename {spring-boot-exceptions => spring-boot-data}/src/main/java/com/baeldung/jsonexception/MainController.java (100%)
 rename {spring-boot-exceptions => spring-boot-data}/src/test/java/com/baeldung/jsonexception/MainControllerIntegrationTest.java (100%)
 delete mode 100644 spring-boot-exceptions/.gitignore
 delete mode 100644 spring-boot-exceptions/pom.xml
 delete mode 100644 spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/JsonErrorApplication.java
 delete mode 100644 spring-boot-exceptions/src/main/resources/application.properties
 delete mode 100644 spring-boot-exceptions/src/main/resources/static/.gitignore
 delete mode 100644 spring-boot-exceptions/src/main/resources/templates/.gitignore
 delete mode 100644 spring-boot-exceptions/src/test/java/com/baeldung/jsonexception/SpringContextIntegrationTest.java

diff --git a/pom.xml b/pom.xml
index 2ea5e4505c..9298c8ad17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -635,7 +635,6 @@
                 <module>spring-boot-custom-starter</module>
                 <module>spring-boot-disable-console-logging</module>
                 <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
-                <module>spring-boot-exceptions</module>
                 <module>spring-boot-jasypt</module>
                 <module>spring-boot-keycloak</module>
                 <module>spring-boot-logging-log4j2</module>
@@ -834,7 +833,6 @@
 				<module>spring-boot-camel</module>
 				<module>spring-boot-client</module>
 				<module>spring-boot-custom-starter</module>
-                                <module>spring-boot-exceptions</module>
 		 		<module>greeter-spring-boot-autoconfigure</module>
 				<module>greeter-spring-boot-sample-app</module>
 				<module>persistence-modules/spring-boot-h2/spring-boot-h2-database</module>
@@ -1297,7 +1295,6 @@
                 <module>spring-boot-ctx-fluent</module>
                 <module>spring-boot-custom-starter</module>
                 <module>spring-boot-disable-console-logging</module>
-                <module>spring-boot-exceptions</module>
                 <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
                 <module>spring-boot-jasypt</module>
                 <module>spring-boot-keycloak</module>
diff --git a/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/CustomException.java b/spring-boot-data/src/main/java/com/baeldung/jsonexception/CustomException.java
similarity index 100%
rename from spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/CustomException.java
rename to spring-boot-data/src/main/java/com/baeldung/jsonexception/CustomException.java
diff --git a/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/ErrorHandler.java b/spring-boot-data/src/main/java/com/baeldung/jsonexception/ErrorHandler.java
similarity index 100%
rename from spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/ErrorHandler.java
rename to spring-boot-data/src/main/java/com/baeldung/jsonexception/ErrorHandler.java
diff --git a/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/MainController.java b/spring-boot-data/src/main/java/com/baeldung/jsonexception/MainController.java
similarity index 100%
rename from spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/MainController.java
rename to spring-boot-data/src/main/java/com/baeldung/jsonexception/MainController.java
diff --git a/spring-boot-exceptions/src/test/java/com/baeldung/jsonexception/MainControllerIntegrationTest.java b/spring-boot-data/src/test/java/com/baeldung/jsonexception/MainControllerIntegrationTest.java
similarity index 100%
rename from spring-boot-exceptions/src/test/java/com/baeldung/jsonexception/MainControllerIntegrationTest.java
rename to spring-boot-data/src/test/java/com/baeldung/jsonexception/MainControllerIntegrationTest.java
diff --git a/spring-boot-exceptions/.gitignore b/spring-boot-exceptions/.gitignore
deleted file mode 100644
index 153c9335eb..0000000000
--- a/spring-boot-exceptions/.gitignore
+++ /dev/null
@@ -1,29 +0,0 @@
-HELP.md
-/target/
-!.mvn/wrapper/maven-wrapper.jar
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-/build/
-
-### VS Code ###
-.vscode/
diff --git a/spring-boot-exceptions/pom.xml b/spring-boot-exceptions/pom.xml
deleted file mode 100644
index 01d6973642..0000000000
--- a/spring-boot-exceptions/pom.xml
+++ /dev/null
@@ -1,33 +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>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
-    </parent>
-
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-boot-exceptions</artifactId>
-    <version>0.0.4-SNAPSHOT</version>
-    <name>pass-exception-to-client-json-spring-boot</name>
-    <description>Baeldung article code on how to pass exceptions to client in JSON format using Spring Boot</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/JsonErrorApplication.java b/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/JsonErrorApplication.java
deleted file mode 100644
index 188584bd7c..0000000000
--- a/spring-boot-exceptions/src/main/java/com/baeldung/jsonexception/JsonErrorApplication.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.baeldung.jsonexception;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class JsonErrorApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(JsonErrorApplication.class, args);
-    }
-
-}
\ No newline at end of file
diff --git a/spring-boot-exceptions/src/main/resources/application.properties b/spring-boot-exceptions/src/main/resources/application.properties
deleted file mode 100644
index 8b13789179..0000000000
--- a/spring-boot-exceptions/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/spring-boot-exceptions/src/main/resources/static/.gitignore b/spring-boot-exceptions/src/main/resources/static/.gitignore
deleted file mode 100644
index 5e7d2734cf..0000000000
--- a/spring-boot-exceptions/src/main/resources/static/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
diff --git a/spring-boot-exceptions/src/main/resources/templates/.gitignore b/spring-boot-exceptions/src/main/resources/templates/.gitignore
deleted file mode 100644
index 5e7d2734cf..0000000000
--- a/spring-boot-exceptions/src/main/resources/templates/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
diff --git a/spring-boot-exceptions/src/test/java/com/baeldung/jsonexception/SpringContextIntegrationTest.java b/spring-boot-exceptions/src/test/java/com/baeldung/jsonexception/SpringContextIntegrationTest.java
deleted file mode 100644
index aa91e242ab..0000000000
--- a/spring-boot-exceptions/src/test/java/com/baeldung/jsonexception/SpringContextIntegrationTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.baeldung.jsonexception;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class SpringContextIntegrationTest {
-
-    @Test
-    public void contextLoads() {
-    }
-
-}

From 1f077401bd56a0a9fd53dafcfdade52daca645d5 Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Sat, 11 May 2019 11:42:08 +0300
Subject: [PATCH 267/295] update restcontrolleradvice

---
 .../main/java/com/baeldung/jsonexception/ErrorHandler.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/spring-boot-data/src/main/java/com/baeldung/jsonexception/ErrorHandler.java b/spring-boot-data/src/main/java/com/baeldung/jsonexception/ErrorHandler.java
index a890dfa3a2..9f82c4fc57 100644
--- a/spring-boot-data/src/main/java/com/baeldung/jsonexception/ErrorHandler.java
+++ b/spring-boot-data/src/main/java/com/baeldung/jsonexception/ErrorHandler.java
@@ -1,13 +1,11 @@
 package com.baeldung.jsonexception;
 
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-@ControllerAdvice
-@ResponseBody
+@RestControllerAdvice
 public class ErrorHandler {
 
     @ExceptionHandler(CustomException.class)

From 170b28436da2acbdbd10d0cb73c26ba1b770c53e Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sat, 11 May 2019 11:43:20 +0300
Subject: [PATCH 268/295] Update README.md

---
 spring-boot-data/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-boot-data/README.md b/spring-boot-data/README.md
index d93b8c3e93..3fd1d17994 100644
--- a/spring-boot-data/README.md
+++ b/spring-boot-data/README.md
@@ -1,2 +1,3 @@
 ### Relevant Articles:
 - [Formatting JSON Dates in Spring Boot](https://www.baeldung.com/spring-boot-formatting-json-dates)
+- [Rendering Exceptions in JSON with Spring](https://www.baeldung.com/spring-exceptions-json)

From 7bb7f318f290a62e120ba57009bddc48c2acda8c Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 11 May 2019 14:36:36 +0530
Subject: [PATCH 269/295] [BAEL-14317] - Moved code for DAO with Spring and
 Hibernate article

---
 .../spring-hibernate4/README.md               |   1 -
 .../spring-persistence-simple/README.md       |   2 +
 .../persistence/dao/common/AbstractDao.java   |  14 ++
 .../dao/common/AbstractHibernateDao.java      |  59 +++++++++
 .../persistence/dao/common/IOperations.java   |  20 +++
 .../baeldung/persistence/dao/impl/FooDao.java |  20 +++
 .../baeldung/config/PersistenceConfig.java    | 118 +++++++++++++++++
 .../org/baeldung/persistence/model/Foo.java   |  18 ++-
 .../src/main/resources/stored_procedure.sql   |  20 +++
 .../service/FooStoredProceduresLiveTest.java  | 123 ++++++++++++++++++
 10 files changed, 391 insertions(+), 4 deletions(-)
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/AbstractDao.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateDao.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/IOperations.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/impl/FooDao.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/config/PersistenceConfig.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/resources/stored_procedure.sql
 create mode 100644 persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooStoredProceduresLiveTest.java

diff --git a/persistence-modules/spring-hibernate4/README.md b/persistence-modules/spring-hibernate4/README.md
index f2553ad229..6f8d83aa9d 100644
--- a/persistence-modules/spring-hibernate4/README.md
+++ b/persistence-modules/spring-hibernate4/README.md
@@ -4,7 +4,6 @@
 
 ### Relevant Articles: 
 - [Guide to Hibernate 4 with Spring](http://www.baeldung.com/hibernate-4-spring)
-- [The DAO with Spring and Hibernate](http://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
 - [Hibernate Pagination](http://www.baeldung.com/hibernate-pagination)
 - [Sorting with Hibernate](http://www.baeldung.com/hibernate-sort)
 - [Stored Procedures with Hibernate](http://www.baeldung.com/stored-procedures-with-hibernate-tutorial)
diff --git a/persistence-modules/spring-persistence-simple/README.md b/persistence-modules/spring-persistence-simple/README.md
index aabbb3c248..af4e4427c7 100644
--- a/persistence-modules/spring-persistence-simple/README.md
+++ b/persistence-modules/spring-persistence-simple/README.md
@@ -6,6 +6,8 @@
 ### Relevant Articles: 
 - [A Guide to JPA with Spring](https://www.baeldung.com/the-persistence-layer-with-spring-and-jpa)
 - [Bootstrapping Hibernate 5 with Spring](http://www.baeldung.com/hibernate-5-spring)
+- [The DAO with Spring and Hibernate](http://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
+
 
 
 ### Eclipse Config 
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/AbstractDao.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/AbstractDao.java
new file mode 100644
index 0000000000..5a6c76a93a
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/AbstractDao.java
@@ -0,0 +1,14 @@
+package com.baeldung.persistence.dao.common;
+
+import java.io.Serializable;
+
+import com.google.common.base.Preconditions;
+
+public abstract class AbstractDao<T extends Serializable> implements IOperations<T> {
+
+    protected Class<T> clazz;
+
+    protected final void setClazz(final Class<T> clazzToSet) {
+        clazz = Preconditions.checkNotNull(clazzToSet);
+    }
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateDao.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateDao.java
new file mode 100644
index 0000000000..f3ade67f80
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateDao.java
@@ -0,0 +1,59 @@
+package com.baeldung.persistence.dao.common;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.google.common.base.Preconditions;
+
+@SuppressWarnings("unchecked")
+public abstract class AbstractHibernateDao<T extends Serializable> extends AbstractDao<T> implements IOperations<T> {
+
+    @Autowired
+    protected SessionFactory sessionFactory;
+
+    // API
+
+    @Override
+    public T findOne(final long id) {
+        return (T) getCurrentSession().get(clazz, id);
+    }
+
+    @Override
+    public List<T> findAll() {
+        return getCurrentSession().createQuery("from " + clazz.getName()).list();
+    }
+
+    @Override
+    public void create(final T entity) {
+        Preconditions.checkNotNull(entity);
+        getCurrentSession().saveOrUpdate(entity);
+    }
+
+    @Override
+    public T update(final T entity) {
+        Preconditions.checkNotNull(entity);
+        return (T) getCurrentSession().merge(entity);
+    }
+
+    @Override
+    public void delete(final T entity) {
+        Preconditions.checkNotNull(entity);
+        getCurrentSession().delete(entity);
+    }
+
+    @Override
+    public void deleteById(final long entityId) {
+        final T entity = findOne(entityId);
+        Preconditions.checkState(entity != null);
+        delete(entity);
+    }
+
+    protected Session getCurrentSession() {
+        return sessionFactory.getCurrentSession();
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/IOperations.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/IOperations.java
new file mode 100644
index 0000000000..4ef99221ab
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/IOperations.java
@@ -0,0 +1,20 @@
+package com.baeldung.persistence.dao.common;
+
+import java.io.Serializable;
+import java.util.List;
+
+public interface IOperations<T extends Serializable> {
+
+    T findOne(final long id);
+
+    List<T> findAll();
+
+    void create(final T entity);
+
+    T update(final T entity);
+
+    void delete(final T entity);
+
+    void deleteById(final long entityId);
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/impl/FooDao.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/impl/FooDao.java
new file mode 100644
index 0000000000..2d940527e1
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/impl/FooDao.java
@@ -0,0 +1,20 @@
+package com.baeldung.persistence.dao.impl;
+
+import org.baeldung.persistence.dao.IFooDao;
+import org.baeldung.persistence.model.Foo;
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.persistence.dao.common.AbstractHibernateDao;
+
+@Repository
+public class FooDao extends AbstractHibernateDao<Foo> implements IFooDao {
+
+    public FooDao() {
+        super();
+
+        setClazz(Foo.class);
+    }
+
+    // API
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/config/PersistenceConfig.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/config/PersistenceConfig.java
new file mode 100644
index 0000000000..c454ab3b54
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/config/PersistenceConfig.java
@@ -0,0 +1,118 @@
+package org.baeldung.config;
+
+import java.util.Properties;
+
+import javax.sql.DataSource;
+
+import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
+import org.baeldung.persistence.dao.IFooDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.JpaVendorAdapter;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import com.baeldung.persistence.dao.impl.FooDao;
+import com.google.common.base.Preconditions;
+
+@Configuration
+@EnableTransactionManagement
+@EnableJpaRepositories(basePackages = { "com.baeldung.persistence" }, transactionManagerRef = "jpaTransactionManager")
+@EnableJpaAuditing
+@PropertySource({ "classpath:persistence-mysql.properties" })
+@ComponentScan({ "com.baeldung.persistence" })
+public class PersistenceConfig {
+
+    @Autowired
+    private Environment env;
+
+    public PersistenceConfig() {
+        super();
+    }
+
+    @Bean
+    public LocalSessionFactoryBean sessionFactory() {
+        final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean();
+        sessionFactory.setDataSource(restDataSource());
+        sessionFactory.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
+        sessionFactory.setHibernateProperties(hibernateProperties());
+
+        return sessionFactory;
+    }
+
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+        final LocalContainerEntityManagerFactoryBean emf = new LocalContainerEntityManagerFactoryBean();
+        emf.setDataSource(restDataSource());
+        emf.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
+
+        final JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+        emf.setJpaVendorAdapter(vendorAdapter);
+        emf.setJpaProperties(hibernateProperties());
+
+        return emf;
+    }
+
+    @Bean
+    public DataSource restDataSource() {
+        final BasicDataSource dataSource = new BasicDataSource();
+        dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
+        dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
+        dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user")));
+        dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass")));
+
+        return dataSource;
+    }
+
+    @Bean
+    public PlatformTransactionManager hibernateTransactionManager() {
+        final HibernateTransactionManager transactionManager = new HibernateTransactionManager();
+        transactionManager.setSessionFactory(sessionFactory().getObject());
+        return transactionManager;
+    }
+
+    @Bean
+    public PlatformTransactionManager jpaTransactionManager() {
+        final JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(entityManagerFactory().getObject());
+        return transactionManager;
+    }
+
+    @Bean
+    public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
+        return new PersistenceExceptionTranslationPostProcessor();
+    }
+
+    @Bean
+    public IFooDao fooHibernateDao() {
+        return new FooDao();
+    }
+
+    private final Properties hibernateProperties() {
+        final Properties hibernateProperties = new Properties();
+        hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
+        hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
+
+        hibernateProperties.setProperty("hibernate.show_sql", "true");
+        // hibernateProperties.setProperty("hibernate.format_sql", "true");
+        // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
+
+        // Envers properties
+        hibernateProperties.setProperty("org.hibernate.envers.audit_table_suffix", env.getProperty("envers.audit_table_suffix"));
+
+        return hibernateProperties;
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/model/Foo.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/model/Foo.java
index 5294860311..30635e9ef2 100644
--- a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/model/Foo.java
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/model/Foo.java
@@ -1,13 +1,25 @@
 package org.baeldung.persistence.model;
 
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
-import javax.persistence.*;
 import java.io.Serializable;
 
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedNativeQueries;
+import javax.persistence.NamedNativeQuery;
+
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
 @Entity
 @Cacheable
 @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+@NamedNativeQueries({ @NamedNativeQuery(name = "callGetAllFoos", query = "CALL GetAllFoos()", resultClass = Foo.class), @NamedNativeQuery(name = "callGetFoosByName", query = "CALL GetFoosByName(:fooName)", resultClass = Foo.class) })
 public class Foo implements Serializable {
 
     private static final long serialVersionUID = 1L;
diff --git a/persistence-modules/spring-persistence-simple/src/main/resources/stored_procedure.sql b/persistence-modules/spring-persistence-simple/src/main/resources/stored_procedure.sql
new file mode 100644
index 0000000000..9cedb75c37
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/resources/stored_procedure.sql
@@ -0,0 +1,20 @@
+DELIMITER //
+    CREATE PROCEDURE GetFoosByName(IN fooName VARCHAR(255))
+        LANGUAGE SQL
+        DETERMINISTIC
+        SQL SECURITY DEFINER
+        BEGIN
+            SELECT * FROM foo WHERE name = fooName;
+        END //
+DELIMITER ;
+
+
+DELIMITER //
+    CREATE PROCEDURE GetAllFoos()
+        LANGUAGE SQL
+        DETERMINISTIC
+        SQL SECURITY DEFINER
+        BEGIN
+            SELECT * FROM foo;
+        END //
+DELIMITER ;
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooStoredProceduresLiveTest.java b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooStoredProceduresLiveTest.java
new file mode 100644
index 0000000000..ded32e362e
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/persistence/service/FooStoredProceduresLiveTest.java
@@ -0,0 +1,123 @@
+package org.baeldung.persistence.service;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.baeldung.config.PersistenceConfig;
+import org.baeldung.persistence.model.Foo;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.exception.SQLGrammarException;
+import org.hibernate.query.NativeQuery;
+import org.hibernate.query.Query;
+import org.junit.After;
+import org.junit.Assume;
+import org.junit.Before;
+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.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class FooStoredProceduresLiveTest {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(FooStoredProceduresLiveTest.class);
+
+    @Autowired
+    private SessionFactory sessionFactory;
+
+    @Autowired
+    private FooService fooService;
+
+    private Session session;
+
+    @Before
+    public final void before() {
+        session = sessionFactory.openSession();
+        Assume.assumeTrue(getAllFoosExists());
+        Assume.assumeTrue(getFoosByNameExists());
+    }
+
+    private boolean getFoosByNameExists() {
+        try {
+            @SuppressWarnings("unchecked")
+            NativeQuery<Foo> sqlQuery = session.createSQLQuery("CALL GetAllFoos()").addEntity(Foo.class);
+            sqlQuery.list();
+            return true;
+        } catch (SQLGrammarException e) {
+            LOGGER.error("WARNING : GetFoosByName() Procedure is may be missing ", e);
+            return false;
+        }
+    }
+
+    private boolean getAllFoosExists() {
+        try {
+            @SuppressWarnings("unchecked")
+            NativeQuery<Foo> sqlQuery = session.createSQLQuery("CALL GetAllFoos()").addEntity(Foo.class);
+            sqlQuery.list();
+            return true;
+        } catch (SQLGrammarException e) {
+            LOGGER.error("WARNING : GetAllFoos() Procedure is may be missing ", e);
+            return false;
+        }
+    }
+
+    @After
+    public final void after() {
+        session.close();
+    }
+
+    @Test
+    public final void getAllFoosUsingStoredProcedures() {
+
+        fooService.create(new Foo(randomAlphabetic(6)));
+
+        // Stored procedure getAllFoos using createSQLQuery
+        @SuppressWarnings("unchecked")
+        NativeQuery<Foo> sqlQuery = session.createSQLQuery("CALL GetAllFoos()").addEntity(Foo.class);
+        List<Foo> allFoos = sqlQuery.list();
+        for (Foo foo : allFoos) {
+            LOGGER.info("getAllFoos() SQL Query result : {}", foo.getName());
+        }
+        assertEquals(allFoos.size(), fooService.findAll().size());
+
+        // Stored procedure getAllFoos using a Named Query
+        @SuppressWarnings("unchecked")
+        Query<Foo> namedQuery = session.getNamedQuery("callGetAllFoos");
+        List<Foo> allFoos2 = namedQuery.list();
+        for (Foo foo : allFoos2) {
+            LOGGER.info("getAllFoos() NamedQuery result : {}", foo.getName());
+        }
+        assertEquals(allFoos2.size(), fooService.findAll().size());
+    }
+
+    @Test
+    public final void getFoosByNameUsingStoredProcedures() {
+
+        fooService.create(new Foo("NewFooName"));
+
+        // Stored procedure getFoosByName using createSQLQuery()
+        @SuppressWarnings("unchecked")
+        Query<Foo> sqlQuery = session.createSQLQuery("CALL GetFoosByName(:fooName)").addEntity(Foo.class).setParameter("fooName", "NewFooName");
+        List<Foo> allFoosByName = sqlQuery.list();
+        for (Foo foo : allFoosByName) {
+            LOGGER.info("getFoosByName() using SQL Query : found => {}", foo.toString());
+        }
+
+        // Stored procedure getFoosByName using getNamedQuery()
+        @SuppressWarnings("unchecked")
+        Query<Foo> namedQuery = session.getNamedQuery("callGetFoosByName").setParameter("fooName", "NewFooName");
+        List<Foo> allFoosByName2 = namedQuery.list();
+        for (Foo foo : allFoosByName2) {
+            LOGGER.info("getFoosByName() using Native Query : found => {}", foo.toString());
+        }
+
+    }
+}

From 61890eb6cfa9217f399c646b2d1b728189cabd12 Mon Sep 17 00:00:00 2001
From: cdjole <djordje.cvijetic@gmail.com>
Date: Sat, 11 May 2019 16:52:38 +0200
Subject: [PATCH 270/295] [BAEL-2930] - array to stream conversion (#6931)

---
 .../conversions/StreamArrayConversion.java    | 52 ++++++++++++++
 .../StreamArrayConversionUnitTest.java        | 70 +++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 core-java-arrays/src/main/java/com/baeldung/array/conversions/StreamArrayConversion.java
 create mode 100644 core-java-arrays/src/test/java/com/baeldung/array/conversions/StreamArrayConversionUnitTest.java

diff --git a/core-java-arrays/src/main/java/com/baeldung/array/conversions/StreamArrayConversion.java b/core-java-arrays/src/main/java/com/baeldung/array/conversions/StreamArrayConversion.java
new file mode 100644
index 0000000000..26a4ca7ef4
--- /dev/null
+++ b/core-java-arrays/src/main/java/com/baeldung/array/conversions/StreamArrayConversion.java
@@ -0,0 +1,52 @@
+package com.baeldung.array.conversions;
+
+import java.util.Arrays;
+import java.util.function.IntFunction;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+public class StreamArrayConversion {
+
+    public static String[] stringStreamToStringArrayUsingFunctionalInterface(Stream<String> stringStream) {
+        IntFunction<String[]> intFunction = new IntFunction<String[]>() {
+            @Override
+            public String[] apply(int value) {
+                return new String[value];
+            }
+        };
+
+        return stringStream.toArray(intFunction);
+    }
+
+    public static String[] stringStreamToStringArrayUsingMethodReference(Stream<String> stringStream) {
+        return stringStream.toArray(String[]::new);
+    }
+
+    public static String[] stringStreamToStringArrayUsingLambda(Stream<String> stringStream) {
+        return stringStream.toArray(value -> new String[value]);
+    }
+
+    public static Integer[] integerStreamToIntegerArray(Stream<Integer> integerStream) {
+        return integerStream.toArray(Integer[]::new);
+    }
+
+    public static int[] intStreamToPrimitiveIntArray(Stream<Integer> integerStream) {
+        return integerStream.mapToInt(i -> i).toArray();
+    }
+
+    public static Stream<String> stringArrayToStreamUsingArraysStream(String[] stringArray) {
+        return Arrays.stream(stringArray);
+    }
+
+    public static Stream<String> stringArrayToStreamUsingStreamOf(String[] stringArray) {
+        return Stream.of(stringArray);
+    }
+
+    public static IntStream primitiveIntArrayToStreamUsingArraysStream(int[] intArray) {
+        return Arrays.stream(intArray);
+    }
+
+    public static Stream<int[]> primitiveIntArrayToStreamUsingStreamOf(int[] intArray) {
+        return Stream.of(intArray);
+    }
+}
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/conversions/StreamArrayConversionUnitTest.java b/core-java-arrays/src/test/java/com/baeldung/array/conversions/StreamArrayConversionUnitTest.java
new file mode 100644
index 0000000000..d2173fea5b
--- /dev/null
+++ b/core-java-arrays/src/test/java/com/baeldung/array/conversions/StreamArrayConversionUnitTest.java
@@ -0,0 +1,70 @@
+package com.baeldung.array.conversions;
+
+import static com.baeldung.array.conversions.StreamArrayConversion.intStreamToPrimitiveIntArray;
+import static com.baeldung.array.conversions.StreamArrayConversion.integerStreamToIntegerArray;
+import static com.baeldung.array.conversions.StreamArrayConversion.stringStreamToStringArrayUsingFunctionalInterface;
+import static com.baeldung.array.conversions.StreamArrayConversion.stringStreamToStringArrayUsingLambda;
+import static com.baeldung.array.conversions.StreamArrayConversion.stringStreamToStringArrayUsingMethodReference;
+import static com.baeldung.array.conversions.StreamArrayConversion.stringArrayToStreamUsingArraysStream;
+import static com.baeldung.array.conversions.StreamArrayConversion.stringArrayToStreamUsingStreamOf;
+import static com.baeldung.array.conversions.StreamArrayConversion.primitiveIntArrayToStreamUsingArraysStream;
+import static com.baeldung.array.conversions.StreamArrayConversion.primitiveIntArrayToStreamUsingStreamOf;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.Iterators;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+import org.junit.Test;
+
+public class StreamArrayConversionUnitTest {
+
+    private String[] stringArray = new String[]{"baeldung", "convert", "to", "string", "array"};
+    private Integer[] integerArray = new Integer[]{1, 2, 3, 4, 5, 6, 7};
+    private int[] intPrimitiveArray = new int[]{1, 2, 3, 4, 5, 6, 7};
+
+    @Test
+    public void givenStringStream_thenConvertToStringArrayUsingFunctionalInterface() {
+        Stream<String> stringStream = Stream.of("baeldung", "convert", "to", "string", "array");
+        assertArrayEquals(stringArray, stringStreamToStringArrayUsingFunctionalInterface(stringStream));
+    }
+
+    @Test
+    public void givenStringStream_thenConvertToStringArrayUsingMethodReference() {
+        Stream<String> stringStream = Stream.of("baeldung", "convert", "to", "string", "array");
+        assertArrayEquals(stringArray, stringStreamToStringArrayUsingMethodReference(stringStream));
+    }
+
+    @Test
+    public void givenStringStream_thenConvertToStringArrayUsingLambda() {
+        Stream<String> stringStream = Stream.of("baeldung", "convert", "to", "string", "array");
+        assertArrayEquals(stringArray, stringStreamToStringArrayUsingLambda(stringStream));
+    }
+
+    @Test
+    public void givenIntegerStream_thenConvertToIntegerArray() {
+        Stream<Integer> integerStream = Stream.of(1, 2, 3, 4, 5, 6, 7);
+        assertArrayEquals(integerArray, integerStreamToIntegerArray(integerStream));
+    }
+
+    @Test
+    public void givenIntStream_thenConvertToIntegerArray() {
+        Stream<Integer> integerStream = IntStream.rangeClosed(1, 7).boxed();
+        assertArrayEquals(intPrimitiveArray, intStreamToPrimitiveIntArray(integerStream));
+    }
+
+    @Test
+    public void givenStringArray_whenConvertedTwoWays_thenConvertedStreamsAreEqual() {
+        assertTrue(Iterators
+            .elementsEqual(stringArrayToStreamUsingArraysStream(stringArray).iterator(),
+                stringArrayToStreamUsingStreamOf(stringArray).iterator()));
+    }
+
+    @Test
+    public void givenPrimitiveArray_whenConvertedTwoWays_thenConvertedStreamsAreNotEqual() {
+        assertFalse(Iterators.elementsEqual(
+            primitiveIntArrayToStreamUsingArraysStream(intPrimitiveArray).iterator(),
+            primitiveIntArrayToStreamUsingStreamOf(intPrimitiveArray).iterator()));
+    }
+}

From ebf31697d9c11a1f36d3a858e62b72717ef9f808 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 11 May 2019 21:22:44 +0530
Subject: [PATCH 271/295] [BAEL-14318] - Moved code for DAO with Spring and
 Generics article

---
 .../spring-persistence-simple/README.md            |  1 +
 .../dao/common/GenericHibernateDao.java            | 13 +++++++++++++
 .../persistence/dao/common/GenericJpaDao.java      | 14 ++++++++++++++
 .../persistence/dao/common/IGenericDao.java        |  7 +++++++
 4 files changed, 35 insertions(+)
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/GenericHibernateDao.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/GenericJpaDao.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/IGenericDao.java

diff --git a/persistence-modules/spring-persistence-simple/README.md b/persistence-modules/spring-persistence-simple/README.md
index af4e4427c7..55f83379e9 100644
--- a/persistence-modules/spring-persistence-simple/README.md
+++ b/persistence-modules/spring-persistence-simple/README.md
@@ -7,6 +7,7 @@
 - [A Guide to JPA with Spring](https://www.baeldung.com/the-persistence-layer-with-spring-and-jpa)
 - [Bootstrapping Hibernate 5 with Spring](http://www.baeldung.com/hibernate-5-spring)
 - [The DAO with Spring and Hibernate](http://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
+- [DAO with Spring and Generics](https://www.baeldung.com/simplifying-the-data-access-layer-with-spring-and-java-generics)
 
 
 
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/GenericHibernateDao.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/GenericHibernateDao.java
new file mode 100644
index 0000000000..18b16fa033
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/GenericHibernateDao.java
@@ -0,0 +1,13 @@
+package com.baeldung.persistence.dao.common;
+
+import java.io.Serializable;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@Scope(BeanDefinition.SCOPE_PROTOTYPE)
+public class GenericHibernateDao<T extends Serializable> extends AbstractHibernateDao<T> implements IGenericDao<T> {
+    //
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/GenericJpaDao.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/GenericJpaDao.java
new file mode 100644
index 0000000000..5bcebed761
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/GenericJpaDao.java
@@ -0,0 +1,14 @@
+package com.baeldung.persistence.dao.common;
+
+import java.io.Serializable;
+
+import org.baeldung.persistence.dao.AbstractJpaDAO;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@Scope(BeanDefinition.SCOPE_PROTOTYPE)
+public class GenericJpaDao<T extends Serializable> extends AbstractJpaDAO<T> implements IGenericDao<T> {
+    //
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/IGenericDao.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/IGenericDao.java
new file mode 100644
index 0000000000..8d8af18394
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/IGenericDao.java
@@ -0,0 +1,7 @@
+package com.baeldung.persistence.dao.common;
+
+import java.io.Serializable;
+
+public interface IGenericDao<T extends Serializable> extends IOperations<T> {
+    //
+}

From 49fc6fe5ba285d69dc669e6c47bb2608b6d0c164 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 12 May 2019 00:04:18 +0530
Subject: [PATCH 272/295] [BAEL-14319] - Moved Transactions with Spring and JPA
 Article

---
 persistence-modules/spring-jpa/README.md                | 1 -
 persistence-modules/spring-persistence-simple/README.md | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/persistence-modules/spring-jpa/README.md b/persistence-modules/spring-jpa/README.md
index 24cbb3ee8b..e856e4808e 100644
--- a/persistence-modules/spring-jpa/README.md
+++ b/persistence-modules/spring-jpa/README.md
@@ -4,7 +4,6 @@
 
 
 ### Relevant Articles: 
-- [Transactions with Spring and JPA](https://www.baeldung.com/transaction-configuration-with-jpa-and-spring)
 - [The DAO with JPA and Spring](http://www.baeldung.com/spring-dao-jpa)
 - [JPA Pagination](http://www.baeldung.com/jpa-pagination)
 - [Sorting with JPA](http://www.baeldung.com/jpa-sort)
diff --git a/persistence-modules/spring-persistence-simple/README.md b/persistence-modules/spring-persistence-simple/README.md
index af4e4427c7..134cc53f5f 100644
--- a/persistence-modules/spring-persistence-simple/README.md
+++ b/persistence-modules/spring-persistence-simple/README.md
@@ -7,7 +7,7 @@
 - [A Guide to JPA with Spring](https://www.baeldung.com/the-persistence-layer-with-spring-and-jpa)
 - [Bootstrapping Hibernate 5 with Spring](http://www.baeldung.com/hibernate-5-spring)
 - [The DAO with Spring and Hibernate](http://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
-
+- [Transactions with Spring and JPA](https://www.baeldung.com/transaction-configuration-with-jpa-and-spring)
 
 
 ### Eclipse Config 

From 1cc6422c53de805af6fa94ca14b1e58de51263af Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 12 May 2019 15:29:26 +0530
Subject: [PATCH 273/295] [BAEL-14320] - Moved code for Intro to Spring Data
 JPA Article

---
 .../spring-persistence-simple/README.md       |   1 +
 .../dao/common/AbstractHibernateDao.java      |   3 +-
 .../persistence/dao/common/IOperations.java   |   2 +-
 .../persistence/dao/AbstractJpaDAO.java       |   3 +-
 .../org/baeldung/persistence/dao/IFooDao.java |   2 +-
 .../persistence/config/PersistenceConfig.java |  85 ++++++
 .../spring/data/persistence/dao/IFooDao.java  |  11 +
 .../spring/data/persistence/model/Foo.java    |  83 ++++++
 .../data/persistence/service/IFooService.java |  11 +
 .../service/common/AbstractService.java       |  56 ++++
 .../persistence/service/impl/FooService.java  |  38 +++
 .../main/java/org/baeldung/util/IDUtil.java   |  33 +++
 .../resources/springDataPersistenceConfig.xml |  12 +
 ...ractServicePersistenceIntegrationTest.java | 256 ++++++++++++++++++
 .../FooServicePersistenceIntegrationTest.java |  77 ++++++
 spring-rest-full/README.md                    |   1 -
 16 files changed, 669 insertions(+), 5 deletions(-)
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/config/PersistenceConfig.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/IFooDao.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/model/Foo.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/service/IFooService.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/service/common/AbstractService.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/service/impl/FooService.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/util/IDUtil.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/resources/springDataPersistenceConfig.xml
 create mode 100644 persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/service/AbstractServicePersistenceIntegrationTest.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/service/FooServicePersistenceIntegrationTest.java

diff --git a/persistence-modules/spring-persistence-simple/README.md b/persistence-modules/spring-persistence-simple/README.md
index 3ecd735091..06ccd452a1 100644
--- a/persistence-modules/spring-persistence-simple/README.md
+++ b/persistence-modules/spring-persistence-simple/README.md
@@ -9,6 +9,7 @@
 - [The DAO with Spring and Hibernate](http://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
 - [DAO with Spring and Generics](https://www.baeldung.com/simplifying-the-data-access-layer-with-spring-and-java-generics)
 - [Transactions with Spring and JPA](https://www.baeldung.com/transaction-configuration-with-jpa-and-spring)
+- [Introduction to Spring Data JPA](http://www.baeldung.com/the-persistence-layer-with-spring-data-jpa)
 
 
 ### Eclipse Config 
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateDao.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateDao.java
index f3ade67f80..e406f896dc 100644
--- a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateDao.java
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateDao.java
@@ -28,9 +28,10 @@ public abstract class AbstractHibernateDao<T extends Serializable> extends Abstr
     }
 
     @Override
-    public void create(final T entity) {
+    public T create(final T entity) {
         Preconditions.checkNotNull(entity);
         getCurrentSession().saveOrUpdate(entity);
+        return entity;
     }
 
     @Override
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/IOperations.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/IOperations.java
index 4ef99221ab..34c5e0f616 100644
--- a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/IOperations.java
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/IOperations.java
@@ -9,7 +9,7 @@ public interface IOperations<T extends Serializable> {
 
     List<T> findAll();
 
-    void create(final T entity);
+    T create(final T entity);
 
     T update(final T entity);
 
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java
index 13007d9fcc..decca35c08 100644
--- a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java
@@ -26,8 +26,9 @@ public abstract class AbstractJpaDAO<T extends Serializable> {
         return entityManager.createQuery("from " + clazz.getName()).getResultList();
     }
 
-    public void create(final T entity) {
+    public T create(final T entity) {
         entityManager.persist(entity);
+        return entity;
     }
 
     public T update(final T entity) {
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/IFooDao.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/IFooDao.java
index f5799522e2..ba188b9b3a 100644
--- a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/IFooDao.java
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/IFooDao.java
@@ -10,7 +10,7 @@ public interface IFooDao {
 
     List<Foo> findAll();
 
-    void create(Foo entity);
+    Foo create(Foo entity);
 
     Foo update(Foo entity);
 
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/config/PersistenceConfig.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/config/PersistenceConfig.java
new file mode 100644
index 0000000000..067bac2018
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/config/PersistenceConfig.java
@@ -0,0 +1,85 @@
+package org.baeldung.spring.data.persistence.config;
+
+import java.util.Properties;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import com.google.common.base.Preconditions;
+
+@Configuration
+@EnableTransactionManagement
+@PropertySource({ "classpath:persistence-${envTarget:h2}.properties" })
+@ComponentScan({ "org.baeldung.spring.data.persistence" })
+// @ImportResource("classpath*:springDataPersistenceConfig.xml")
+@EnableJpaRepositories(basePackages = "org.baeldung.spring.data.persistence.dao")
+public class PersistenceConfig {
+
+    @Autowired
+    private Environment env;
+
+    public PersistenceConfig() {
+        super();
+    }
+
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+        final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(dataSource());
+        em.setPackagesToScan(new String[] { "org.baeldung.spring.data.persistence.model" });
+
+        final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+        // vendorAdapter.set
+        em.setJpaVendorAdapter(vendorAdapter);
+        em.setJpaProperties(additionalProperties());
+
+        return em;
+    }
+
+    @Bean
+    public DataSource dataSource() {
+        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
+        dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
+        dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user")));
+        dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass")));
+
+        return dataSource;
+    }
+
+    @Bean
+    public PlatformTransactionManager transactionManager() {
+        final JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(entityManagerFactory().getObject());
+
+        return transactionManager;
+    }
+
+    @Bean
+    public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
+        return new PersistenceExceptionTranslationPostProcessor();
+    }
+
+    final Properties additionalProperties() {
+        final Properties hibernateProperties = new Properties();
+        hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
+        hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
+        // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
+        return hibernateProperties;
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/IFooDao.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/IFooDao.java
new file mode 100644
index 0000000000..2f74096e14
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/IFooDao.java
@@ -0,0 +1,11 @@
+package org.baeldung.spring.data.persistence.dao;
+
+import org.baeldung.spring.data.persistence.model.Foo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+public interface IFooDao extends JpaRepository<Foo, Long> {
+
+    @Query("SELECT f FROM Foo f WHERE LOWER(f.name) = LOWER(:name)")
+    Foo retrieveByName(@Param("name") String name);
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/model/Foo.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/model/Foo.java
new file mode 100644
index 0000000000..8f316ac55b
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/model/Foo.java
@@ -0,0 +1,83 @@
+package org.baeldung.spring.data.persistence.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Foo implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+
+    @Column(nullable = false)
+    private String name;
+
+    public Foo() {
+        super();
+    }
+
+    public Foo(final String name) {
+        super();
+
+        this.name = name;
+    }
+
+    // API
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    //
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        final Foo other = (Foo) obj;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("Foo [name=").append(name).append("]");
+        return builder.toString();
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/service/IFooService.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/service/IFooService.java
new file mode 100644
index 0000000000..26d0171551
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/service/IFooService.java
@@ -0,0 +1,11 @@
+package org.baeldung.spring.data.persistence.service;
+
+import org.baeldung.spring.data.persistence.model.Foo;
+
+import com.baeldung.persistence.dao.common.IOperations;
+
+public interface IFooService extends IOperations<Foo> {
+
+    Foo retrieveByName(String name);
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/service/common/AbstractService.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/service/common/AbstractService.java
new file mode 100644
index 0000000000..cf28d5e5c6
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/service/common/AbstractService.java
@@ -0,0 +1,56 @@
+package org.baeldung.spring.data.persistence.service.common;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baeldung.persistence.dao.common.IOperations;
+import com.google.common.collect.Lists;
+
+@Transactional
+public abstract class AbstractService<T extends Serializable> implements IOperations<T> {
+
+    // read - one
+
+    @Override
+    @Transactional(readOnly = true)
+    public T findOne(final long id) {
+        return getDao().findById(id).orElse(null);
+    }
+
+    // read - all
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<T> findAll() {
+        return Lists.newArrayList(getDao().findAll());
+    }
+
+    // write
+
+    @Override
+    public T create(final T entity) {
+        return getDao().save(entity);
+    }
+
+    @Override
+    public T update(final T entity) {
+        return getDao().save(entity);
+    }
+    
+    @Override
+    public void delete(T entity) {
+        getDao().delete(entity);
+    }
+    
+    @Override
+    public void deleteById(long entityId) {
+        T entity = findOne(entityId);
+        delete(entity);
+    }
+
+    protected abstract PagingAndSortingRepository<T, Long> getDao();
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/service/impl/FooService.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/service/impl/FooService.java
new file mode 100644
index 0000000000..b7ed496df1
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/service/impl/FooService.java
@@ -0,0 +1,38 @@
+package org.baeldung.spring.data.persistence.service.impl;
+
+
+import org.baeldung.spring.data.persistence.model.Foo;
+import org.baeldung.spring.data.persistence.dao.IFooDao;
+import org.baeldung.spring.data.persistence.service.IFooService;
+import org.baeldung.spring.data.persistence.service.common.AbstractService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class FooService extends AbstractService<Foo> implements IFooService {
+
+    @Autowired
+    private IFooDao dao;
+
+    public FooService() {
+        super();
+    }
+
+    // API
+
+    @Override
+    protected PagingAndSortingRepository<Foo, Long> getDao() {
+        return dao;
+    }
+
+    // custom methods
+
+    @Override
+    public Foo retrieveByName(final String name) {
+        return dao.retrieveByName(name);
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/util/IDUtil.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/util/IDUtil.java
new file mode 100644
index 0000000000..85ab623e5f
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/util/IDUtil.java
@@ -0,0 +1,33 @@
+package org.baeldung.util;
+
+import java.util.Random;
+
+public final class IDUtil {
+
+    private IDUtil() {
+        throw new AssertionError();
+    }
+
+    // API
+
+    public static String randomPositiveLongAsString() {
+        return Long.toString(randomPositiveLong());
+    }
+
+    public static String randomNegativeLongAsString() {
+        return Long.toString(randomNegativeLong());
+    }
+
+    public static long randomPositiveLong() {
+        long id = new Random().nextLong() * 10000;
+        id = (id < 0) ? (-1 * id) : id;
+        return id;
+    }
+
+    private static long randomNegativeLong() {
+        long id = new Random().nextLong() * 10000;
+        id = (id > 0) ? (-1 * id) : id;
+        return id;
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/resources/springDataPersistenceConfig.xml b/persistence-modules/spring-persistence-simple/src/main/resources/springDataPersistenceConfig.xml
new file mode 100644
index 0000000000..d6d0ec6e47
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/resources/springDataPersistenceConfig.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jpa="http://www.springframework.org/schema/data/jpa"
+    xsi:schemaLocation="
+    http://www.springframework.org/schema/beans 
+    http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/data/jpa 
+    http://www.springframework.org/schema/data/jpa/spring-jpa.xsd"
+>
+
+    <jpa:repositories base-package="org.baeldung.persistence.dao"/>
+
+</beans>
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/service/AbstractServicePersistenceIntegrationTest.java b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/service/AbstractServicePersistenceIntegrationTest.java
new file mode 100644
index 0000000000..acc73dfaf8
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/service/AbstractServicePersistenceIntegrationTest.java
@@ -0,0 +1,256 @@
+package org.baeldung.spring.data.persistence.service;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.baeldung.spring.data.persistence.model.Foo;
+import org.baeldung.util.IDUtil;
+import org.hamcrest.Matchers;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.springframework.dao.DataAccessException;
+
+import com.baeldung.persistence.dao.common.IOperations;
+
+public abstract class AbstractServicePersistenceIntegrationTest<T extends Serializable> {
+
+    // tests
+
+    // find - one
+
+    @Test
+    /**/public final void givenResourceDoesNotExist_whenResourceIsRetrieved_thenNoResourceIsReceived() {
+        // When
+        final Foo createdResource = getApi().findOne(IDUtil.randomPositiveLong());
+
+        // Then
+        assertNull(createdResource);
+    }
+
+    @Test
+    public void givenResourceExists_whenResourceIsRetrieved_thenNoExceptions() {
+        final Foo existingResource = persistNewEntity();
+        getApi().findOne(existingResource.getId());
+    }
+
+    @Test
+    public void givenResourceDoesNotExist_whenResourceIsRetrieved_thenNoExceptions() {
+        getApi().findOne(IDUtil.randomPositiveLong());
+    }
+
+    @Test
+    public void givenResourceExists_whenResourceIsRetrieved_thenTheResultIsNotNull() {
+        final Foo existingResource = persistNewEntity();
+        final Foo retrievedResource = getApi().findOne(existingResource.getId());
+        assertNotNull(retrievedResource);
+    }
+
+    @Test
+    public void givenResourceExists_whenResourceIsRetrieved_thenResourceIsRetrievedCorrectly() {
+        final Foo existingResource = persistNewEntity();
+        final Foo retrievedResource = getApi().findOne(existingResource.getId());
+        assertEquals(existingResource, retrievedResource);
+    }
+
+    // find - one - by name
+
+    // find - all
+
+    @Test
+    /**/public void whenAllResourcesAreRetrieved_thenNoExceptions() {
+        getApi().findAll();
+    }
+
+    @Test
+    /**/public void whenAllResourcesAreRetrieved_thenTheResultIsNotNull() {
+        final List<Foo> resources = getApi().findAll();
+
+        assertNotNull(resources);
+    }
+
+    @Test
+    /**/public void givenAtLeastOneResourceExists_whenAllResourcesAreRetrieved_thenRetrievedResourcesAreNotEmpty() {
+        persistNewEntity();
+
+        // When
+        final List<Foo> allResources = getApi().findAll();
+
+        // Then
+        assertThat(allResources, not(Matchers.<Foo> empty()));
+    }
+
+    @Test
+    /**/public void givenAnResourceExists_whenAllResourcesAreRetrieved_thenTheExistingResourceIsIndeedAmongThem() {
+        final Foo existingResource = persistNewEntity();
+
+        final List<Foo> resources = getApi().findAll();
+
+        assertThat(resources, hasItem(existingResource));
+    }
+
+    @Test
+    /**/public void whenAllResourcesAreRetrieved_thenResourcesHaveIds() {
+        persistNewEntity();
+
+        // When
+        final List<Foo> allResources = getApi().findAll();
+
+        // Then
+        for (final Foo resource : allResources) {
+            assertNotNull(resource.getId());
+        }
+    }
+
+    // create
+
+    @Test(expected = RuntimeException.class)
+    /**/public void whenNullResourceIsCreated_thenException() {
+        getApi().create(null);
+    }
+
+    @Test
+    /**/public void whenResourceIsCreated_thenNoExceptions() {
+        persistNewEntity();
+    }
+
+    @Test
+    /**/public void whenResourceIsCreated_thenResourceIsRetrievable() {
+        final Foo existingResource = persistNewEntity();
+
+        assertNotNull(getApi().findOne(existingResource.getId()));
+    }
+
+    @Test
+    /**/public void whenResourceIsCreated_thenSavedResourceIsEqualToOriginalResource() {
+        final Foo originalResource = createNewEntity();
+        final Foo savedResource = getApi().create(originalResource);
+
+        assertEquals(originalResource, savedResource);
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void whenResourceWithFailedConstraintsIsCreated_thenException() {
+        final Foo invalidResource = createNewEntity();
+        invalidate(invalidResource);
+
+        getApi().create(invalidResource);
+    }
+
+    /**
+     * -- specific to the persistence engine
+     */
+    @Test(expected = DataAccessException.class)
+    @Ignore("Hibernate simply ignores the id silently and still saved (tracking this)")
+    public void whenResourceWithIdIsCreated_thenDataAccessException() {
+        final Foo resourceWithId = createNewEntity();
+        resourceWithId.setId(IDUtil.randomPositiveLong());
+
+        getApi().create(resourceWithId);
+    }
+
+    // update
+
+    @Test(expected = RuntimeException.class)
+    /**/public void whenNullResourceIsUpdated_thenException() {
+        getApi().update(null);
+    }
+
+    @Test
+    /**/public void givenResourceExists_whenResourceIsUpdated_thenNoExceptions() {
+        // Given
+        final Foo existingResource = persistNewEntity();
+
+        // When
+        getApi().update(existingResource);
+    }
+
+    /**
+     * - can also be the ConstraintViolationException which now occurs on the update operation will not be translated; as a consequence, it will be a TransactionSystemException
+     */
+    @Test(expected = RuntimeException.class)
+    public void whenResourceIsUpdatedWithFailedConstraints_thenException() {
+        final Foo existingResource = persistNewEntity();
+        invalidate(existingResource);
+
+        getApi().update(existingResource);
+    }
+
+    @Test
+    /**/public void givenResourceExists_whenResourceIsUpdated_thenUpdatesArePersisted() {
+        // Given
+        final Foo existingResource = persistNewEntity();
+
+        // When
+        change(existingResource);
+        getApi().update(existingResource);
+
+        final Foo updatedResource = getApi().findOne(existingResource.getId());
+
+        // Then
+        assertEquals(existingResource, updatedResource);
+    }
+
+    // delete
+
+    // @Test(expected = RuntimeException.class)
+    // public void givenResourceDoesNotExists_whenResourceIsDeleted_thenException() {
+    // // When
+    // getApi().delete(IDUtil.randomPositiveLong());
+    // }
+    //
+    // @Test(expected = RuntimeException.class)
+    // public void whenResourceIsDeletedByNegativeId_thenException() {
+    // // When
+    // getApi().delete(IDUtil.randomNegativeLong());
+    // }
+    //
+    // @Test
+    // public void givenResourceExists_whenResourceIsDeleted_thenNoExceptions() {
+    // // Given
+    // final Foo existingResource = persistNewEntity();
+    //
+    // // When
+    // getApi().delete(existingResource.getId());
+    // }
+    //
+    // @Test
+    // /**/public final void givenResourceExists_whenResourceIsDeleted_thenResourceNoLongerExists() {
+    // // Given
+    // final Foo existingResource = persistNewEntity();
+    //
+    // // When
+    // getApi().delete(existingResource.getId());
+    //
+    // // Then
+    // assertNull(getApi().findOne(existingResource.getId()));
+    // }
+
+    // template method
+
+    protected Foo createNewEntity() {
+        return new Foo(randomAlphabetic(6));
+    }
+
+    protected abstract IOperations<Foo> getApi();
+
+    private final void invalidate(final Foo entity) {
+        entity.setName(null);
+    }
+
+    private final void change(final Foo entity) {
+        entity.setName(randomAlphabetic(6));
+    }
+
+    protected Foo persistNewEntity() {
+        return getApi().create(createNewEntity());
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/service/FooServicePersistenceIntegrationTest.java b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/service/FooServicePersistenceIntegrationTest.java
new file mode 100644
index 0000000000..8184a2320a
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/service/FooServicePersistenceIntegrationTest.java
@@ -0,0 +1,77 @@
+package org.baeldung.spring.data.persistence.service;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+import static org.junit.Assert.assertNotNull;
+
+import org.baeldung.spring.data.persistence.model.Foo;
+import org.baeldung.spring.data.persistence.config.PersistenceConfig;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.persistence.dao.common.IOperations;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class FooServicePersistenceIntegrationTest extends AbstractServicePersistenceIntegrationTest<Foo> {
+
+    @Autowired
+    private IFooService service;
+
+    // tests
+
+    @Test
+    public final void whenContextIsBootstrapped_thenNoExceptions() {
+        //
+    }
+
+    @Test
+    public final void whenEntityIsCreated_thenNoExceptions() {
+        service.create(new Foo(randomAlphabetic(6)));
+    }
+
+    @Test(expected = DataIntegrityViolationException.class)
+    public final void whenInvalidEntityIsCreated_thenDataException() {
+        service.create(new Foo());
+    }
+
+    @Test(expected = DataIntegrityViolationException.class)
+    public final void whenEntityWithLongNameIsCreated_thenDataException() {
+        service.create(new Foo(randomAlphabetic(2048)));
+    }
+
+    // custom Query method
+
+    @Test
+    public final void givenUsingCustomQuery_whenRetrievingEntity_thenFound() {
+        final String name = randomAlphabetic(6);
+        service.create(new Foo(name));
+
+        final Foo retrievedByName = service.retrieveByName(name);
+        assertNotNull(retrievedByName);
+    }
+
+    // work in progress
+
+    @Test(expected = InvalidDataAccessApiUsageException.class)
+    @Ignore("Right now, persist has saveOrUpdate semantics, so this will no longer fail")
+    public final void whenSameEntityIsCreatedTwice_thenDataException() {
+        final Foo entity = new Foo(randomAlphabetic(8));
+        service.create(entity);
+        service.create(entity);
+    }
+
+    // API
+
+    @Override
+    protected final IOperations<Foo> getApi() {
+        return service;
+    }
+
+}
diff --git a/spring-rest-full/README.md b/spring-rest-full/README.md
index e0d3a70626..b7b006d75e 100644
--- a/spring-rest-full/README.md
+++ b/spring-rest-full/README.md
@@ -9,7 +9,6 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
 
 ### Relevant Articles: 
 - [Integration Testing with the Maven Cargo plugin](http://www.baeldung.com/integration-testing-with-the-maven-cargo-plugin)
-- [Introduction to Spring Data JPA](http://www.baeldung.com/the-persistence-layer-with-spring-data-jpa)
 - [Project Configuration with Spring](http://www.baeldung.com/project-configuration-with-spring)
 - [Metrics for your Spring REST API](http://www.baeldung.com/spring-rest-api-metrics)
 - [Spring Security Expressions - hasRole Example](https://www.baeldung.com/spring-security-expressions-basic)

From 5e602ce4cf92e17521203b2036a46b5114aabadd Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 17:22:13 +0300
Subject: [PATCH 274/295] Update README.md

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

diff --git a/core-java-modules/core-java/README.md b/core-java-modules/core-java/README.md
index c2d1b4a06b..65fb5ddb9d 100644
--- a/core-java-modules/core-java/README.md
+++ b/core-java-modules/core-java/README.md
@@ -51,3 +51,4 @@
 - [Java Bitwise Operators](https://www.baeldung.com/java-bitwise-operators)
 - [Guide to Creating and Running a Jar File in Java](https://www.baeldung.com/java-create-jar)
 - [Making a JSON POST Request With HttpURLConnection](https://www.baeldung.com/httpurlconnection-post)
+- [Convert Hex to ASCII in Java](https://www.baeldung.com/java-convert-hex-to-ascii)

From b5c5648e7143b6aa898f5189c9f456d5ee1379c1 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 17:23:33 +0300
Subject: [PATCH 275/295] Update README.md

---
 core-java-modules/core-java-9/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core-java-modules/core-java-9/README.md b/core-java-modules/core-java-9/README.md
index ecad86ace2..5715520bae 100644
--- a/core-java-modules/core-java-9/README.md
+++ b/core-java-modules/core-java-9/README.md
@@ -20,7 +20,6 @@
 - [Multi-Release Jar Files](https://www.baeldung.com/java-multi-release-jar)
 - [Ahead of Time Compilation (AoT)](https://www.baeldung.com/ahead-of-time-compilation)
 - [Java 9 Process API Improvements](https://www.baeldung.com/java-9-process-api)
-- [Guide to java.lang.Process API](https://www.baeldung.com/java-process-api)
 - [Java 9 java.util.Objects Additions](https://www.baeldung.com/java-9-objects-new)
 - [Java 9 Reactive Streams](https://www.baeldung.com/java-9-reactive-streams)
 - [Java 9 Optional API Additions](https://www.baeldung.com/java-9-optional)
@@ -31,4 +30,4 @@
 - [A Guide to Java 9 Modularity](https://www.baeldung.com/java-9-modularity)
 - [Java 9 Platform Module API](https://www.baeldung.com/java-9-module-api)
 - [Java 9 Platform Logging API](https://www.baeldung.com/java-9-logging-api)
-
+- [Filtering a Stream of Optionals in Java](https://www.baeldung.com/java-filter-stream-of-optional)

From e8381f10f78b2cada56e49452be0095d7608d11d Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 17:24:14 +0300
Subject: [PATCH 276/295] Update README.md

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

diff --git a/core-java-modules/core-java-io/README.md b/core-java-modules/core-java-io/README.md
index 9ce39459dd..6737ad6eb9 100644
--- a/core-java-modules/core-java-io/README.md
+++ b/core-java-modules/core-java-io/README.md
@@ -40,3 +40,4 @@
 - [How to Write to a CSV File in Java](https://www.baeldung.com/java-csv)
 - [List Files in a Directory in Java](https://www.baeldung.com/java-list-directory-files)
 - [Java InputStream to Byte Array and ByteBuffer](https://www.baeldung.com/convert-input-stream-to-array-of-bytes)
+- [Introduction to the Java NIO Selector](https://www.baeldung.com/java-nio-selector)

From 169981e93c4539fa76297c73bfe9440a875ecf2d Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 17:28:09 +0300
Subject: [PATCH 277/295] Update README.md

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

diff --git a/java-dates-2/README.md b/java-dates-2/README.md
index a6b5c8e574..35286115d4 100644
--- a/java-dates-2/README.md
+++ b/java-dates-2/README.md
@@ -1,2 +1,3 @@
 ## Relevant Articles:
 - [Converting Between LocalDate and XMLGregorianCalendar](https://www.baeldung.com/java-localdate-to-xmlgregoriancalendar)
+- [Convert Time to Milliseconds in Java](https://www.baeldung.com/java-time-milliseconds)

From 365d096a3330b4e56841784e7312a0ead3a7f1b8 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 17:29:16 +0300
Subject: [PATCH 278/295] Create README.MD

---
 core-java-arrays/README.MD | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 core-java-arrays/README.MD

diff --git a/core-java-arrays/README.MD b/core-java-arrays/README.MD
new file mode 100644
index 0000000000..9ee6998784
--- /dev/null
+++ b/core-java-arrays/README.MD
@@ -0,0 +1,3 @@
+## Relevant Articles
+
+- [Extending an Array’s Length](https://www.baeldung.com/java-array-add-element-at-the-end)

From 33fbbeb4cae22586e7ac8f75a80b2bc6efd02eb1 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 17:29:53 +0300
Subject: [PATCH 279/295] Create README.MD

---
 java-strings-2/README.MD | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 java-strings-2/README.MD

diff --git a/java-strings-2/README.MD b/java-strings-2/README.MD
new file mode 100644
index 0000000000..2617105639
--- /dev/null
+++ b/java-strings-2/README.MD
@@ -0,0 +1,3 @@
+## Relevant Articles
+
+- [Check If a String Contains a Substring](https://www.baeldung.com/java-string-contains-substring)

From dd4887e3d685e5223d97c7a834240b8b71215f92 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 17:30:55 +0300
Subject: [PATCH 280/295] Create README.MD

---
 core-java-modules/pre-jpms/README.MD | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 core-java-modules/pre-jpms/README.MD

diff --git a/core-java-modules/pre-jpms/README.MD b/core-java-modules/pre-jpms/README.MD
new file mode 100644
index 0000000000..8c9af82ba5
--- /dev/null
+++ b/core-java-modules/pre-jpms/README.MD
@@ -0,0 +1,3 @@
+## Relevant Articles
+
+- [Java 9 Migration Issues and Resolutions](https://www.baeldung.com/java-9-migration-issue)

From 711e74c5aec056a372e4247be07971cd9da4dd86 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 17:31:37 +0300
Subject: [PATCH 281/295] Update README.md

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

diff --git a/libraries-2/README.md b/libraries-2/README.md
index 4bcfeaefa1..8243b9f82c 100644
--- a/libraries-2/README.md
+++ b/libraries-2/README.md
@@ -3,4 +3,5 @@
 
 - [A Guide to jBPM with Java](https://www.baeldung.com/jbpm-java)
 - [Guide to Classgraph Library](https://www.baeldung.com/classgraph)
+- [Create a Java Command Line Program with Picocli](https://www.baeldung.com/java-picocli-create-command-line-program)
 

From c654b7b44b26786f9f635ffffcf757fbc0b6dc28 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 17:32:16 +0300
Subject: [PATCH 282/295] Create README.MD

---
 core-java-modules/core-java-reflection/README.MD | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 core-java-modules/core-java-reflection/README.MD

diff --git a/core-java-modules/core-java-reflection/README.MD b/core-java-modules/core-java-reflection/README.MD
new file mode 100644
index 0000000000..c8766d6858
--- /dev/null
+++ b/core-java-modules/core-java-reflection/README.MD
@@ -0,0 +1,3 @@
+## Relevant Articles
+
+- [Void Type in Java](https://www.baeldung.com/java-void-type)

From c80627619dd45889b8d6c623a54e7094c051c9b2 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 17:33:42 +0300
Subject: [PATCH 283/295] Update README.md

---
 core-java-modules/core-java-8-2/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core-java-modules/core-java-8-2/README.md b/core-java-modules/core-java-8-2/README.md
index e2b12e8819..383fe5da34 100644
--- a/core-java-modules/core-java-8-2/README.md
+++ b/core-java-modules/core-java-8-2/README.md
@@ -3,4 +3,5 @@
 ## Core Java 8 Cookbooks and Examples (part 2)
 
 ### Relevant Articles: 
-- [Anonymous Classes in Java](http://www.baeldung.com/)
+- [Anonymous Classes in Java](https://www.baeldung.com/java-anonymous-classes)
+- [Run JAR Application With Command Line Arguments](https://www.baeldung.com/java-run-jar-with-arguments)

From 89aa57b5cf4adde41c316a26399c3f130fbbba14 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 17:34:31 +0300
Subject: [PATCH 284/295] Create README.MD

---
 java-strings-2/README.MD | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 java-strings-2/README.MD

diff --git a/java-strings-2/README.MD b/java-strings-2/README.MD
new file mode 100644
index 0000000000..061296382c
--- /dev/null
+++ b/java-strings-2/README.MD
@@ -0,0 +1,3 @@
+## Relevant Articles
+
+- [Java Localization – Formatting Messages](https://www.baeldung.com/java-localization-messages-formatting)

From 21f3c62bfa2036f885f43f7e12c6296a0ffe5991 Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 20:21:05 +0300
Subject: [PATCH 285/295] fix param validation

---
 spring-mvc-xml/pom.xml                           | 16 ++++++++--------
 .../com/baeldung/spring/ClientWebConfigJava.java |  8 ++++++++
 ...iableValidationControllerIntegrationTest.java |  3 ++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml
index beea8e5ee2..46af321d1b 100644
--- a/spring-mvc-xml/pom.xml
+++ b/spring-mvc-xml/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <version>0.1-SNAPSHOT</version>
@@ -20,12 +21,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <version>${org.springframework.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -50,7 +45,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <version>${hibernate-validator.version}</version>
         </dependency>
@@ -84,6 +79,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
+            <version>3.0.1-b08</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/spring-mvc-xml/src/main/java/com/baeldung/spring/ClientWebConfigJava.java b/spring-mvc-xml/src/main/java/com/baeldung/spring/ClientWebConfigJava.java
index 7925fa451d..09c34ccc80 100644
--- a/spring-mvc-xml/src/main/java/com/baeldung/spring/ClientWebConfigJava.java
+++ b/spring-mvc-xml/src/main/java/com/baeldung/spring/ClientWebConfigJava.java
@@ -5,8 +5,10 @@ import java.util.ResourceBundle;
 
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.support.MessageSourceResourceBundle;
 import org.springframework.context.support.ResourceBundleMessageSource;
+import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
 import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -15,6 +17,7 @@ import org.springframework.web.servlet.view.JstlView;
 
 //@EnableWebMvc
 //@Configuration
+@ComponentScan("com.baeldung.spring")
 public class ClientWebConfigJava implements WebMvcConfigurer {
 
     public ClientWebConfigJava() {
@@ -51,4 +54,9 @@ public class ClientWebConfigJava implements WebMvcConfigurer {
 
         return bean;
     }
+    
+    @Bean
+    public MethodValidationPostProcessor methodValidationPostProcessor() {
+        return new MethodValidationPostProcessor();
+    }
 }
\ No newline at end of file
diff --git a/spring-mvc-xml/src/test/java/com/baeldung/spring/controller/RequestAndPathVariableValidationControllerIntegrationTest.java b/spring-mvc-xml/src/test/java/com/baeldung/spring/controller/RequestAndPathVariableValidationControllerIntegrationTest.java
index 318a15d8f7..c4332dd879 100644
--- a/spring-mvc-xml/src/test/java/com/baeldung/spring/controller/RequestAndPathVariableValidationControllerIntegrationTest.java
+++ b/spring-mvc-xml/src/test/java/com/baeldung/spring/controller/RequestAndPathVariableValidationControllerIntegrationTest.java
@@ -12,12 +12,13 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
 import com.baeldung.spring.ClientWebConfig;
+import com.baeldung.spring.ClientWebConfigJava;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = ClientWebConfig.class)
+@ContextConfiguration(classes = ClientWebConfigJava.class)
 @WebAppConfiguration
 public class RequestAndPathVariableValidationControllerIntegrationTest {
 

From 8d5c894bc8c814d7f2b568b01635e49fe1882ec2 Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 20:24:35 +0300
Subject: [PATCH 286/295] fix readmes

---
 spring-mvc-simple/README.md | 1 -
 spring-mvc-xml/README.md    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-mvc-simple/README.md b/spring-mvc-simple/README.md
index cd4ad5aba2..755e0932fc 100644
--- a/spring-mvc-simple/README.md
+++ b/spring-mvc-simple/README.md
@@ -8,4 +8,3 @@
 - [Guide to Spring Email](http://www.baeldung.com/spring-email)
 - [Request Method Not Supported (405) in Spring](https://www.baeldung.com/spring-request-method-not-supported-405)
 - [Spring @RequestParam Annotation](https://www.baeldung.com/spring-request-param)
-- [Validating RequestParams and PathVariables in Spring](https://www.baeldung.com/spring-validate-requestparam-pathvariable)
diff --git a/spring-mvc-xml/README.md b/spring-mvc-xml/README.md
index 216517f52d..c8ec074d17 100644
--- a/spring-mvc-xml/README.md
+++ b/spring-mvc-xml/README.md
@@ -15,3 +15,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Exploring SpringMVC’s Form Tag Library](http://www.baeldung.com/spring-mvc-form-tags)
 - [web.xml vs Initializer with Spring](http://www.baeldung.com/spring-xml-vs-java-config)
 - [A Java Web Application Without a web.xml](https://www.baeldung.com/java-web-app-without-web-xml)
+- [Validating RequestParams and PathVariables in Spring](https://www.baeldung.com/spring-validate-requestparam-pathvariable)
\ No newline at end of file

From 5429e41e90218244077677eb2a58b6d35e304674 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 12 May 2019 20:29:27 +0300
Subject: [PATCH 287/295] Update README.md

---
 algorithms-miscellaneous-3/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/algorithms-miscellaneous-3/README.md b/algorithms-miscellaneous-3/README.md
index f299492d9c..4dd4b66ff2 100644
--- a/algorithms-miscellaneous-3/README.md
+++ b/algorithms-miscellaneous-3/README.md
@@ -4,4 +4,3 @@
 - [Implementing Simple State Machines with Java Enums](https://www.baeldung.com/java-enum-simple-state-machine)
 - [Converting Between Roman and Arabic Numerals in Java](http://www.baeldung.com/java-convert-roman-arabic)
 - [Practical Java Examples of the Big O Notation](http://www.baeldung.com/java-algorithm-complexity)
-- [An Introduction to the Theory of Big-O Notation](http://www.baeldung.com/big-o-notation)
\ No newline at end of file

From 3e0d3242d29901372ede60d20db68e67dc8156ff Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Mon, 13 May 2019 00:47:34 +0530
Subject: [PATCH 288/295] [BAEL-14321] - Moved @Query article code

---
 persistence-modules/spring-data-jpa/README.md |   1 -
 .../spring-persistence-simple/README.md       |   1 +
 .../spring-persistence-simple/pom.xml         |  31 +-
 .../persistence/dao/user/UserRepository.java  |  98 +++
 .../dao/user/UserRepositoryCustom.java        |  14 +
 .../dao/user/UserRepositoryCustomImpl.java    |  57 ++
 .../data/persistence/model/Possession.java    |  86 +++
 .../spring/data/persistence/model/User.java   | 132 +++++
 .../dao/user/UserRepositoryCommon.java        | 561 ++++++++++++++++++
 .../user/UserRepositoryIntegrationTest.java   |  38 ++
 10 files changed, 1017 insertions(+), 2 deletions(-)
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/user/UserRepository.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryCustom.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryCustomImpl.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/model/Possession.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/model/User.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryCommon.java
 create mode 100644 persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryIntegrationTest.java

diff --git a/persistence-modules/spring-data-jpa/README.md b/persistence-modules/spring-data-jpa/README.md
index 4e390c2faf..e85d8a8487 100644
--- a/persistence-modules/spring-data-jpa/README.md
+++ b/persistence-modules/spring-data-jpa/README.md
@@ -6,7 +6,6 @@
 - [Spring JPA – Multiple Databases](http://www.baeldung.com/spring-data-jpa-multiple-databases)
 - [Spring Data JPA – Adding a Method in All Repositories](http://www.baeldung.com/spring-data-jpa-method-in-all-repositories)
 - [An Advanced Tagging Implementation with JPA](http://www.baeldung.com/jpa-tagging-advanced)
-- [Spring Data JPA @Query](http://www.baeldung.com/spring-data-jpa-query)
 - [Spring Data Annotations](http://www.baeldung.com/spring-data-annotations)
 - [Spring Data Java 8 Support](http://www.baeldung.com/spring-data-java-8)
 - [A Simple Tagging Implementation with JPA](http://www.baeldung.com/jpa-tagging)
diff --git a/persistence-modules/spring-persistence-simple/README.md b/persistence-modules/spring-persistence-simple/README.md
index 06ccd452a1..c656efaa3b 100644
--- a/persistence-modules/spring-persistence-simple/README.md
+++ b/persistence-modules/spring-persistence-simple/README.md
@@ -10,6 +10,7 @@
 - [DAO with Spring and Generics](https://www.baeldung.com/simplifying-the-data-access-layer-with-spring-and-java-generics)
 - [Transactions with Spring and JPA](https://www.baeldung.com/transaction-configuration-with-jpa-and-spring)
 - [Introduction to Spring Data JPA](http://www.baeldung.com/the-persistence-layer-with-spring-data-jpa)
+- [Spring Data JPA @Query](http://www.baeldung.com/spring-data-jpa-query)
 
 
 ### Eclipse Config 
diff --git a/persistence-modules/spring-persistence-simple/pom.xml b/persistence-modules/spring-persistence-simple/pom.xml
index 4057db8033..5f48b267b5 100644
--- a/persistence-modules/spring-persistence-simple/pom.xml
+++ b/persistence-modules/spring-persistence-simple/pom.xml
@@ -98,7 +98,16 @@
             <version>${org.springframework.version}</version>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-jpa</artifactId>
+            <version>${querydsl.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-apt</artifactId>
+            <version>${querydsl.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -109,6 +118,25 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>com.mysema.maven</groupId>
+                <artifactId>apt-maven-plugin</artifactId>
+                <version>1.1.3</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/generated-sources</outputDirectory>
+                            <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>	
     </build>
 
     <properties>
@@ -121,6 +149,7 @@
         <spring-data-jpa.version>2.1.6.RELEASE</spring-data-jpa.version>
         <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
         <jta.version>1.1</jta.version>
+        <querydsl.version>4.2.1</querydsl.version>
 
         <!-- util -->
         <guava.version>21.0</guava.version>
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/user/UserRepository.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/user/UserRepository.java
new file mode 100644
index 0000000000..4d01376af7
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/user/UserRepository.java
@@ -0,0 +1,98 @@
+package org.baeldung.spring.data.persistence.dao.user;
+
+import java.time.LocalDate;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.baeldung.spring.data.persistence.model.User;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface UserRepository extends JpaRepository<User, Integer>, UserRepositoryCustom {
+
+    Stream<User> findAllByName(String name);
+
+    @Query("SELECT u FROM User u WHERE u.status = 1")
+    Collection<User> findAllActiveUsers();
+    
+    @Query("select u from User u where u.email like '%@gmail.com'")
+    List<User> findUsersWithGmailAddress();
+
+    @Query(value = "SELECT * FROM Users u WHERE u.status = 1", nativeQuery = true)
+    Collection<User> findAllActiveUsersNative();
+
+    @Query("SELECT u FROM User u WHERE u.status = ?1")
+    User findUserByStatus(Integer status);
+
+    @Query(value = "SELECT * FROM Users u WHERE u.status = ?1", nativeQuery = true)
+    User findUserByStatusNative(Integer status);
+
+    @Query("SELECT u FROM User u WHERE u.status = ?1 and u.name = ?2")
+    User findUserByStatusAndName(Integer status, String name);
+
+    @Query("SELECT u FROM User u WHERE u.status = :status and u.name = :name")
+    User findUserByStatusAndNameNamedParams(@Param("status") Integer status, @Param("name") String name);
+
+    @Query(value = "SELECT * FROM Users u WHERE u.status = :status AND u.name = :name", nativeQuery = true)
+    User findUserByStatusAndNameNamedParamsNative(@Param("status") Integer status, @Param("name") String name);
+
+    @Query("SELECT u FROM User u WHERE u.status = :status and u.name = :name")
+    User findUserByUserStatusAndUserName(@Param("status") Integer userStatus, @Param("name") String userName);
+
+    @Query("SELECT u FROM User u WHERE u.name like ?1%")
+    User findUserByNameLike(String name);
+
+    @Query("SELECT u FROM User u WHERE u.name like :name%")
+    User findUserByNameLikeNamedParam(@Param("name") String name);
+
+    @Query(value = "SELECT * FROM users u WHERE u.name LIKE ?1%", nativeQuery = true)
+    User findUserByNameLikeNative(String name);
+
+    @Query(value = "SELECT u FROM User u")
+    List<User> findAllUsers(Sort sort);
+
+    @Query(value = "SELECT u FROM User u ORDER BY id")
+    Page<User> findAllUsersWithPagination(Pageable pageable);
+
+    @Query(value = "SELECT * FROM Users ORDER BY id", countQuery = "SELECT count(*) FROM Users", nativeQuery = true)
+    Page<User> findAllUsersWithPaginationNative(Pageable pageable);
+
+    @Modifying
+    @Query("update User u set u.status = :status where u.name = :name")
+    int updateUserSetStatusForName(@Param("status") Integer status, @Param("name") String name);
+
+    @Modifying
+    @Query(value = "UPDATE Users u SET u.status = ? WHERE u.name = ?", nativeQuery = true)
+    int updateUserSetStatusForNameNative(Integer status, String name);
+
+    @Query(value = "INSERT INTO Users (name, age, email, status, active) VALUES (:name, :age, :email, :status, :active)", nativeQuery = true)
+    @Modifying
+    void insertUser(@Param("name") String name, @Param("age") Integer age, @Param("email") String email, @Param("status") Integer status, @Param("active") boolean active);
+    
+    @Modifying
+    @Query(value = "UPDATE Users u SET status = ? WHERE u.name = ?", nativeQuery = true)
+    int updateUserSetStatusForNameNativePostgres(Integer status, String name);
+    
+    @Query(value = "SELECT u FROM User u WHERE u.name IN :names")
+	  List<User> findUserByNameList(@Param("names") Collection<String> names);
+    
+    void deleteAllByCreationDateAfter(LocalDate date);
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("update User u set u.active = false where u.lastLoginDate < :date")
+    void deactivateUsersNotLoggedInSince(@Param("date") LocalDate date);
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("delete User u where u.active = false")
+    int deleteDeactivatedUsers();
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query(value = "alter table USERS add column deleted int(1) not null default 0", nativeQuery = true)
+    void addDeletedColumn();
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryCustom.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryCustom.java
new file mode 100644
index 0000000000..1a874fb5e5
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryCustom.java
@@ -0,0 +1,14 @@
+package org.baeldung.spring.data.persistence.dao.user;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
+
+import org.baeldung.spring.data.persistence.model.User;
+
+public interface UserRepositoryCustom {
+    List<User> findUserByEmails(Set<String> emails);
+    
+    List<User> findAllUsersByPredicates(Collection<Predicate<User>> predicates);
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryCustomImpl.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryCustomImpl.java
new file mode 100644
index 0000000000..c28050401c
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryCustomImpl.java
@@ -0,0 +1,57 @@
+package org.baeldung.spring.data.persistence.dao.user;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.baeldung.spring.data.persistence.model.User;
+
+public class UserRepositoryCustomImpl implements UserRepositoryCustom {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Override
+    public List<User> findUserByEmails(Set<String> emails) {
+        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+        CriteriaQuery<User> query = cb.createQuery(User.class);
+        Root<User> user = query.from(User.class);
+
+        Path<String> emailPath = user.get("email");
+
+        List<Predicate> predicates = new ArrayList<>();
+        for (String email : emails) {
+
+            predicates.add(cb.like(emailPath, email));
+
+        }
+        query.select(user)
+            .where(cb.or(predicates.toArray(new Predicate[predicates.size()])));
+
+        return entityManager.createQuery(query)
+            .getResultList();
+    }
+    
+    @Override
+    public List<User> findAllUsersByPredicates(Collection<java.util.function.Predicate<User>> predicates) {
+        List<User> allUsers = entityManager.createQuery("select u from User u", User.class).getResultList();
+        Stream<User> allUsersStream = allUsers.stream();
+        for (java.util.function.Predicate<User> predicate : predicates) {
+            allUsersStream = allUsersStream.filter(predicate);
+        }
+
+        return allUsersStream.collect(Collectors.toList());
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/model/Possession.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/model/Possession.java
new file mode 100644
index 0000000000..da64e78552
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/model/Possession.java
@@ -0,0 +1,86 @@
+package org.baeldung.spring.data.persistence.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table
+public class Possession {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    private String name;
+
+    public Possession() {
+        super();
+    }
+
+    public Possession(final String name) {
+        super();
+
+        this.name = name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = (prime * result) + (int) (id ^ (id >>> 32));
+        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;
+        }
+        final Possession other = (Possession) obj;
+        if (id != other.id) {
+            return false;
+        }
+        if (name == null) {
+            if (other.name != null) {
+                return false;
+            }
+        } else if (!name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("Possesion [id=").append(id).append(", name=").append(name).append("]");
+        return builder.toString();
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/model/User.java b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/model/User.java
new file mode 100644
index 0000000000..486ed046e5
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/spring/data/persistence/model/User.java
@@ -0,0 +1,132 @@
+package org.baeldung.spring.data.persistence.model;
+
+import javax.persistence.*;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+
+@Entity
+@Table(name = "users")
+public class User {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+    private String name;
+    private LocalDate creationDate;
+    private LocalDate lastLoginDate;
+    private boolean active;
+    private int age;
+    @Column(unique = true, nullable = false)
+    private String email;
+    private Integer status;
+    @OneToMany
+    List<Possession> possessionList;
+
+    public User() {
+        super();
+    }
+
+    public User(String name,  LocalDate creationDate,String email, Integer status) {
+        this.name = name;
+        this.creationDate = creationDate;
+        this.email = email;
+        this.status = status;
+        this.active = true;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(final String email) {
+        this.email = email;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(final int age) {
+        this.age = age;
+    }
+    
+    public LocalDate getCreationDate() {
+        return creationDate;
+    }
+
+    public List<Possession> getPossessionList() {
+        return possessionList;
+    }
+
+    public void setPossessionList(List<Possession> possessionList) {
+        this.possessionList = possessionList;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("User [name=").append(name).append(", id=").append(id).append("]");
+        return builder.toString();
+    }
+    
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        User user = (User) o;
+        return id == user.id &&
+          age == user.age &&
+          Objects.equals(name, user.name) &&
+          Objects.equals(creationDate, user.creationDate) &&
+          Objects.equals(email, user.email) &&
+          Objects.equals(status, user.status);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name, creationDate, age, email, status);
+    }
+
+    public LocalDate getLastLoginDate() {
+        return lastLoginDate;
+    }
+
+    public void setLastLoginDate(LocalDate lastLoginDate) {
+        this.lastLoginDate = lastLoginDate;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryCommon.java b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryCommon.java
new file mode 100644
index 0000000000..8f119a04e0
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryCommon.java
@@ -0,0 +1,561 @@
+package org.baeldung.spring.data.persistence.dao.user;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+import org.baeldung.spring.data.persistence.config.PersistenceConfig;
+import org.baeldung.spring.data.persistence.model.User;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.JpaSort;
+import org.springframework.data.mapping.PropertyReferenceException;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+@DirtiesContext
+public class UserRepositoryCommon {
+
+    final String USER_EMAIL = "email@example.com";
+    final String USER_EMAIL2 = "email2@example.com";
+    final String USER_EMAIL3 = "email3@example.com";
+    final String USER_EMAIL4 = "email4@example.com";
+    final Integer INACTIVE_STATUS = 0;
+    final Integer ACTIVE_STATUS = 1;
+    final String USER_EMAIL5 = "email5@example.com";
+    final String USER_EMAIL6 = "email6@example.com";
+    final String USER_NAME_ADAM = "Adam";
+    final String USER_NAME_PETER = "Peter";
+
+    @Autowired
+    protected UserRepository userRepository;
+    @Autowired
+    private EntityManager entityManager;
+
+    @Test
+    @Transactional
+    public void givenUsersWithSameNameInDB_WhenFindAllByName_ThenReturnStreamOfUsers() {
+        User user1 = new User();
+        user1.setName(USER_NAME_ADAM);
+        user1.setEmail(USER_EMAIL);
+        userRepository.save(user1);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_ADAM);
+        user2.setEmail(USER_EMAIL2);
+        userRepository.save(user2);
+
+        User user3 = new User();
+        user3.setName(USER_NAME_ADAM);
+        user3.setEmail(USER_EMAIL3);
+        userRepository.save(user3);
+
+        User user4 = new User();
+        user4.setName("SAMPLE");
+        user4.setEmail(USER_EMAIL4);
+        userRepository.save(user4);
+
+        try (Stream<User> foundUsersStream = userRepository.findAllByName(USER_NAME_ADAM)) {
+            assertThat(foundUsersStream.count()).isEqualTo(3l);
+        }
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindAllWithQueryAnnotation_ThenReturnCollectionWithActiveUsers() {
+        User user1 = new User();
+        user1.setName(USER_NAME_ADAM);
+        user1.setEmail(USER_EMAIL);
+        user1.setStatus(ACTIVE_STATUS);
+        userRepository.save(user1);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_ADAM);
+        user2.setEmail(USER_EMAIL2);
+        user2.setStatus(ACTIVE_STATUS);
+        userRepository.save(user2);
+
+        User user3 = new User();
+        user3.setName(USER_NAME_ADAM);
+        user3.setEmail(USER_EMAIL3);
+        user3.setStatus(INACTIVE_STATUS);
+        userRepository.save(user3);
+
+        Collection<User> allActiveUsers = userRepository.findAllActiveUsers();
+
+        assertThat(allActiveUsers.size()).isEqualTo(2);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindAllWithQueryAnnotationNative_ThenReturnCollectionWithActiveUsers() {
+        User user1 = new User();
+        user1.setName(USER_NAME_ADAM);
+        user1.setEmail(USER_EMAIL);
+        user1.setStatus(ACTIVE_STATUS);
+        userRepository.save(user1);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_ADAM);
+        user2.setEmail(USER_EMAIL2);
+        user2.setStatus(ACTIVE_STATUS);
+        userRepository.save(user2);
+
+        User user3 = new User();
+        user3.setName(USER_NAME_ADAM);
+        user3.setEmail(USER_EMAIL3);
+        user3.setStatus(INACTIVE_STATUS);
+        userRepository.save(user3);
+
+        Collection<User> allActiveUsers = userRepository.findAllActiveUsersNative();
+
+        assertThat(allActiveUsers.size()).isEqualTo(2);
+    }
+
+    @Test
+    public void givenUserInDB_WhenFindUserByStatusWithQueryAnnotation_ThenReturnActiveUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User userByStatus = userRepository.findUserByStatus(ACTIVE_STATUS);
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUserInDB_WhenFindUserByStatusWithQueryAnnotationNative_ThenReturnActiveUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User userByStatus = userRepository.findUserByStatusNative(ACTIVE_STATUS);
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByStatusAndNameWithQueryAnnotationIndexedParams_ThenReturnOneUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
+        user2.setStatus(ACTIVE_STATUS);
+        userRepository.save(user2);
+
+        User userByStatus = userRepository.findUserByStatusAndName(ACTIVE_STATUS, USER_NAME_ADAM);
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByStatusAndNameWithQueryAnnotationNamedParams_ThenReturnOneUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
+        user2.setStatus(ACTIVE_STATUS);
+        userRepository.save(user2);
+
+        User userByStatus = userRepository.findUserByStatusAndNameNamedParams(ACTIVE_STATUS, USER_NAME_ADAM);
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByStatusAndNameWithQueryAnnotationNativeNamedParams_ThenReturnOneUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
+        user2.setStatus(ACTIVE_STATUS);
+        userRepository.save(user2);
+
+        User userByStatus = userRepository.findUserByStatusAndNameNamedParamsNative(ACTIVE_STATUS, USER_NAME_ADAM);
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByStatusAndNameWithQueryAnnotationNamedParamsCustomNames_ThenReturnOneUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
+        user2.setStatus(ACTIVE_STATUS);
+        userRepository.save(user2);
+
+        User userByStatus = userRepository.findUserByUserStatusAndUserName(ACTIVE_STATUS, USER_NAME_ADAM);
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByNameLikeWithQueryAnnotationIndexedParams_ThenReturnUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User userByStatus = userRepository.findUserByNameLike("Ad");
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByNameLikeWithQueryAnnotationNamedParams_ThenReturnUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User userByStatus = userRepository.findUserByNameLikeNamedParam("Ad");
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindUserByNameLikeWithQueryAnnotationNative_ThenReturnUser() {
+        User user = new User();
+        user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
+        user.setStatus(ACTIVE_STATUS);
+        userRepository.save(user);
+
+        User userByStatus = userRepository.findUserByNameLikeNative("Ad");
+
+        assertThat(userByStatus.getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindAllWithSortByName_ThenReturnUsersSorted() {
+        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
+
+        List<User> usersSortByName = userRepository.findAll(new Sort(Sort.Direction.ASC, "name"));
+
+        assertThat(usersSortByName.get(0)
+          .getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test(expected = PropertyReferenceException.class)
+    public void givenUsersInDB_WhenFindAllSortWithFunction_ThenThrowException() {
+        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
+
+        userRepository.findAll(new Sort(Sort.Direction.ASC, "name"));
+
+        List<User> usersSortByNameLength = userRepository.findAll(Sort.by("LENGTH(name)"));
+
+        assertThat(usersSortByNameLength.get(0)
+          .getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindAllSortWithFunctionQueryAnnotationJPQL_ThenReturnUsersSorted() {
+        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
+
+        userRepository.findAllUsers(Sort.by("name"));
+
+        List<User> usersSortByNameLength = userRepository.findAllUsers(JpaSort.unsafe("LENGTH(name)"));
+
+        assertThat(usersSortByNameLength.get(0)
+          .getName()).isEqualTo(USER_NAME_ADAM);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindAllWithPageRequestQueryAnnotationJPQL_ThenReturnPageOfUsers() {
+        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL4, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE2", LocalDate.now(), USER_EMAIL5, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL6, INACTIVE_STATUS));
+
+        Page<User> usersPage = userRepository.findAllUsersWithPagination(PageRequest.of(1, 3));
+
+        assertThat(usersPage.getContent()
+          .get(0)
+          .getName()).isEqualTo("SAMPLE1");
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindAllWithPageRequestQueryAnnotationNative_ThenReturnPageOfUsers() {
+        userRepository.save(new User(USER_NAME_ADAM, LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL4, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE2", LocalDate.now(), USER_EMAIL5, INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL6, INACTIVE_STATUS));
+
+        Page<User> usersSortByNameLength = userRepository.findAllUsersWithPaginationNative(PageRequest.of(1, 3));
+
+        assertThat(usersSortByNameLength.getContent()
+          .get(0)
+          .getName()).isEqualTo(USER_NAME_PETER);
+    }
+
+    @Test
+    @Transactional
+    public void givenUsersInDB_WhenUpdateStatusForNameModifyingQueryAnnotationJPQL_ThenModifyMatchingUsers() {
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL4, ACTIVE_STATUS));
+
+        int updatedUsersSize = userRepository.updateUserSetStatusForName(INACTIVE_STATUS, "SAMPLE");
+
+        assertThat(updatedUsersSize).isEqualTo(2);
+    }
+
+    @Test
+    public void givenUsersInDB_WhenFindByEmailsWithDynamicQuery_ThenReturnCollection() {
+
+        User user1 = new User();
+        user1.setEmail(USER_EMAIL);
+        userRepository.save(user1);
+
+        User user2 = new User();
+        user2.setEmail(USER_EMAIL2);
+        userRepository.save(user2);
+
+        User user3 = new User();
+        user3.setEmail(USER_EMAIL3);
+        userRepository.save(user3);
+
+        Set<String> emails = new HashSet<>();
+        emails.add(USER_EMAIL2);
+        emails.add(USER_EMAIL3);
+
+        Collection<User> usersWithEmails = userRepository.findUserByEmails(emails);
+
+        assertThat(usersWithEmails.size()).isEqualTo(2);
+    }
+
+    @Test
+    public void givenUsersInDBWhenFindByNameListReturnCollection() {
+
+        User user1 = new User();
+        user1.setName(USER_NAME_ADAM);
+        user1.setEmail(USER_EMAIL);
+        userRepository.save(user1);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
+        userRepository.save(user2);
+
+        List<String> names = Arrays.asList(USER_NAME_ADAM, USER_NAME_PETER);
+
+        List<User> usersWithNames = userRepository.findUserByNameList(names);
+
+        assertThat(usersWithNames.size()).isEqualTo(2);
+    }
+
+
+    @Test
+    @Transactional
+    public void whenInsertedWithQuery_ThenUserIsPersisted() {
+        userRepository.insertUser(USER_NAME_ADAM, 1, USER_EMAIL, ACTIVE_STATUS, true);
+        userRepository.insertUser(USER_NAME_PETER, 1, USER_EMAIL2, ACTIVE_STATUS, true);
+
+        User userAdam = userRepository.findUserByNameLike(USER_NAME_ADAM);
+        User userPeter = userRepository.findUserByNameLike(USER_NAME_PETER);
+
+        assertThat(userAdam).isNotNull();
+        assertThat(userAdam.getEmail()).isEqualTo(USER_EMAIL);
+        assertThat(userPeter).isNotNull();
+        assertThat(userPeter.getEmail()).isEqualTo(USER_EMAIL2);
+    }
+
+
+    @Test
+    @Transactional
+    public void givenTwoUsers_whenFindByNameUsr01_ThenUserUsr01() {
+        User usr01 = new User("usr01", LocalDate.now(), "usr01@baeldung.com", 1);
+        User usr02 = new User("usr02", LocalDate.now(), "usr02@baeldung.com", 1);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        try (Stream<User> users = userRepository.findAllByName("usr01")) {
+            assertTrue(users.allMatch(usr -> usr.equals(usr01)));
+        }
+    }
+
+    @Test
+    @Transactional
+    public void givenTwoUsers_whenFindByNameUsr00_ThenNoUsers() {
+        User usr01 = new User("usr01", LocalDate.now(), "usr01@baeldung.com", 1);
+        User usr02 = new User("usr02", LocalDate.now(), "usr02@baeldung.com", 1);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        try (Stream<User> users = userRepository.findAllByName("usr00")) {
+            assertEquals(0, users.count());
+        }
+    }
+
+    @Test
+    public void givenTwoUsers_whenFindUsersWithGmailAddress_ThenUserUsr02() {
+        User usr01 = new User("usr01", LocalDate.now(), "usr01@baeldung.com", 1);
+        User usr02 = new User("usr02", LocalDate.now(), "usr02@gmail.com", 1);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        List<User> users = userRepository.findUsersWithGmailAddress();
+        assertEquals(1, users.size());
+        assertEquals(usr02, users.get(0));
+    }
+
+    @Test
+    @Transactional
+    public void givenTwoUsers_whenDeleteAllByCreationDateAfter_ThenOneUserRemains() {
+        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
+        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.com", 1);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        userRepository.deleteAllByCreationDateAfter(LocalDate.of(2018, 5, 1));
+
+        List<User> users = userRepository.findAll();
+
+        assertEquals(1, users.size());
+        assertEquals(usr01, users.get(0));
+    }
+
+    @Test
+    public void givenTwoUsers_whenFindAllUsersByPredicates_ThenUserUsr01() {
+        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
+        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.org", 1);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        List<Predicate<User>> predicates = new ArrayList<>();
+        predicates.add(usr -> usr.getCreationDate().isAfter(LocalDate.of(2017, 12, 31)));
+        predicates.add(usr -> usr.getEmail().endsWith(".com"));
+
+        List<User> users = userRepository.findAllUsersByPredicates(predicates);
+
+        assertEquals(1, users.size());
+        assertEquals(usr01, users.get(0));
+    }
+
+    @Test
+    @Transactional
+    public void givenTwoUsers_whenDeactivateUsersNotLoggedInSince_ThenUserUsr02Deactivated() {
+        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
+        usr01.setLastLoginDate(LocalDate.now());
+        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.org", 1);
+        usr02.setLastLoginDate(LocalDate.of(2018, 7, 20));
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        userRepository.deactivateUsersNotLoggedInSince(LocalDate.of(2018, 8, 1));
+
+        List<User> users = userRepository.findAllUsers(Sort.by(Sort.Order.asc("name")));
+        assertTrue(users.get(0).isActive());
+        assertFalse(users.get(1).isActive());
+    }
+
+    @Test
+    @Transactional
+    public void givenTwoUsers_whenDeleteDeactivatedUsers_ThenUserUsr02Deleted() {
+        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
+        usr01.setLastLoginDate(LocalDate.now());
+        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.com", 0);
+        usr02.setLastLoginDate(LocalDate.of(2018, 7, 20));
+        usr02.setActive(false);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        int deletedUsersCount = userRepository.deleteDeactivatedUsers();
+
+        List<User> users = userRepository.findAll();
+        assertEquals(1, users.size());
+        assertEquals(usr01, users.get(0));
+        assertEquals(1, deletedUsersCount);
+    }
+
+    @Test
+    @Transactional
+    public void givenTwoUsers_whenAddDeletedColumn_ThenUsersHaveDeletedColumn() {
+        User usr01 = new User("usr01", LocalDate.of(2018, 1, 1), "usr01@baeldung.com", 1);
+        usr01.setLastLoginDate(LocalDate.now());
+        User usr02 = new User("usr02", LocalDate.of(2018, 6, 1), "usr02@baeldung.org", 1);
+        usr02.setLastLoginDate(LocalDate.of(2018, 7, 20));
+        usr02.setActive(false);
+
+        userRepository.save(usr01);
+        userRepository.save(usr02);
+
+        userRepository.addDeletedColumn();
+
+        Query nativeQuery = entityManager.createNativeQuery("select deleted from USERS where NAME = 'usr01'");
+        assertEquals(0, nativeQuery.getResultList().get(0));
+    }
+
+    @After
+    public void cleanUp() {
+        userRepository.deleteAll();
+    }
+}
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryIntegrationTest.java b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryIntegrationTest.java
new file mode 100644
index 0000000000..b9b644f7e0
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/org/baeldung/spring/data/persistence/dao/user/UserRepositoryIntegrationTest.java
@@ -0,0 +1,38 @@
+package org.baeldung.spring.data.persistence.dao.user;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.LocalDate;
+
+import org.baeldung.spring.data.persistence.config.PersistenceConfig;
+import org.baeldung.spring.data.persistence.model.User;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Created by adam.
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+@DirtiesContext
+public class UserRepositoryIntegrationTest extends UserRepositoryCommon {
+
+    @Test
+    @Transactional
+    public void givenUsersInDBWhenUpdateStatusForNameModifyingQueryAnnotationNativeThenModifyMatchingUsers() {
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", LocalDate.now(), USER_EMAIL2, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", LocalDate.now(), USER_EMAIL3, ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", LocalDate.now(), USER_EMAIL4, ACTIVE_STATUS));
+        userRepository.flush();
+
+        int updatedUsersSize = userRepository.updateUserSetStatusForNameNative(INACTIVE_STATUS, "SAMPLE");
+
+        assertThat(updatedUsersSize).isEqualTo(2);
+    }
+}

From 0d24260e9b75b06a3d16178e916ec5d106aa5802 Mon Sep 17 00:00:00 2001
From: kwoyke <krzysztofwoyke@gmail.com>
Date: Tue, 14 May 2019 21:37:28 +0200
Subject: [PATCH 289/295] BAEL-2900 Persisting enums in JPA (#6958)

---
 .../java/com/baeldung/jpa/enums/Article.java  |  91 ++++++++++++++
 .../java/com/baeldung/jpa/enums/Category.java |  17 +++
 .../baeldung/jpa/enums/CategoryConverter.java |  28 +++++
 .../java/com/baeldung/jpa/enums/Priority.java |  24 ++++
 .../java/com/baeldung/jpa/enums/Status.java   |   5 +
 .../java/com/baeldung/jpa/enums/Type.java     |   5 +
 .../main/resources/META-INF/persistence.xml   |   4 +-
 .../baeldung/jpa/enums/ArticleUnitTest.java   | 118 ++++++++++++++++++
 8 files changed, 291 insertions(+), 1 deletion(-)
 create mode 100644 persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Article.java
 create mode 100644 persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Category.java
 create mode 100644 persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/CategoryConverter.java
 create mode 100644 persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Priority.java
 create mode 100644 persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Status.java
 create mode 100644 persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Type.java
 create mode 100644 persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java

diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Article.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Article.java
new file mode 100644
index 0000000000..d534f44e14
--- /dev/null
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Article.java
@@ -0,0 +1,91 @@
+package com.baeldung.jpa.enums;
+
+import javax.persistence.*;
+
+@Entity
+public class Article {
+
+    @Id
+    private int id;
+
+    private String title;
+
+    @Enumerated(EnumType.ORDINAL)
+    private Status status;
+
+    @Enumerated(EnumType.STRING)
+    private Type type;
+
+    @Basic
+    private int priorityValue;
+
+    @Transient
+    private Priority priority;
+
+    private Category category;
+
+    public Article() {
+    }
+
+    @PostLoad
+    void fillTransient() {
+        if (priorityValue > 0) {
+            this.priority = Priority.of(priorityValue);
+        }
+    }
+
+    @PrePersist
+    void fillPersistent() {
+        if (priority != null) {
+            this.priorityValue = priority.getPriority();
+        }
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Status getStatus() {
+        return status;
+    }
+
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public Priority getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Priority priority) {
+        this.priority = priority;
+    }
+
+    public Category getCategory() {
+        return category;
+    }
+
+    public void setCategory(Category category) {
+        this.category = category;
+    }
+}
diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Category.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Category.java
new file mode 100644
index 0000000000..83b81da01e
--- /dev/null
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Category.java
@@ -0,0 +1,17 @@
+package com.baeldung.jpa.enums;
+
+import java.util.stream.Stream;
+
+public enum Category {
+    SPORT("S"), MUSIC("M"), TECHNOLOGY("T");
+
+    private String code;
+
+    Category(String code) {
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}
diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/CategoryConverter.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/CategoryConverter.java
new file mode 100644
index 0000000000..98960f1569
--- /dev/null
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/CategoryConverter.java
@@ -0,0 +1,28 @@
+package com.baeldung.jpa.enums;
+
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+import java.util.stream.Stream;
+
+@Converter(autoApply = true)
+public class CategoryConverter implements AttributeConverter<Category, String> {
+    @Override
+    public String convertToDatabaseColumn(Category category) {
+        if (category == null) {
+            return null;
+        }
+        return category.getCode();
+    }
+
+    @Override
+    public Category convertToEntityAttribute(final String code) {
+        if (code == null) {
+            return null;
+        }
+
+        return Stream.of(Category.values())
+                .filter(c -> c.getCode().equals(code))
+                .findFirst()
+                .orElseThrow(IllegalArgumentException::new);
+    }
+}
diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Priority.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Priority.java
new file mode 100644
index 0000000000..42ee254303
--- /dev/null
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Priority.java
@@ -0,0 +1,24 @@
+package com.baeldung.jpa.enums;
+
+import java.util.stream.Stream;
+
+public enum Priority {
+    LOW(100), MEDIUM(200), HIGH(300);
+
+    private int priority;
+
+    private Priority(int priority) {
+        this.priority = priority;
+    }
+
+    public int getPriority() {
+        return priority;
+    }
+
+    public static Priority of(int priority) {
+        return Stream.of(Priority.values())
+                .filter(p -> p.getPriority() == priority)
+                .findFirst()
+                .orElseThrow(IllegalArgumentException::new);
+    }
+}
diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Status.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Status.java
new file mode 100644
index 0000000000..80d5662c7a
--- /dev/null
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Status.java
@@ -0,0 +1,5 @@
+package com.baeldung.jpa.enums;
+
+public enum Status {
+    OPEN, REVIEW, APPROVED, REJECTED;
+}
diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Type.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Type.java
new file mode 100644
index 0000000000..80459fbd3c
--- /dev/null
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Type.java
@@ -0,0 +1,5 @@
+package com.baeldung.jpa.enums;
+
+enum Type {
+    INTERNAL, EXTERNAL;
+}
diff --git a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
index 21a757f490..52cc1e01d9 100644
--- a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
@@ -26,6 +26,8 @@
     <persistence-unit name="jpa-h2">
         <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
         <class>com.baeldung.jpa.stringcast.Message</class>
+        <class>com.baeldung.jpa.enums.Article</class>
+        <class>com.baeldung.jpa.enums.CategoryConverter</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
             <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
@@ -146,4 +148,4 @@
         </properties>
     </persistence-unit>
 
-</persistence>
+</persistence>
\ No newline at end of file
diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java
new file mode 100644
index 0000000000..82f3abc04d
--- /dev/null
+++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java
@@ -0,0 +1,118 @@
+package com.baeldung.jpa.enums;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+import javax.persistence.Persistence;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ArticleUnitTest {
+
+    private static EntityManager em;
+    private static EntityManagerFactory emFactory;
+
+    @BeforeClass
+    public static void setup() {
+        Map properties = new HashMap();
+        properties.put("hibernate.show_sql", "true");
+        properties.put("hibernate.format_sql", "true");
+        emFactory = Persistence.createEntityManagerFactory("jpa-h2", properties);
+        em = emFactory.createEntityManager();
+    }
+
+    @Test
+    public void shouldPersistStatusEnumOrdinalValue() {
+        // given
+        Article article = new Article();
+        article.setId(1);
+        article.setTitle("ordinal title");
+        article.setStatus(Status.OPEN);
+
+        // when
+        EntityTransaction tx = em.getTransaction();
+        tx.begin();
+        em.persist(article);
+        tx.commit();
+
+        // then
+        Article persistedArticle = em.find(Article.class, 1);
+
+        assertEquals(1, persistedArticle.getId());
+        assertEquals("ordinal title", persistedArticle.getTitle());
+        assertEquals(Status.OPEN, persistedArticle.getStatus());
+    }
+
+    @Test
+    public void shouldPersistTypeEnumStringValue() {
+        // given
+        Article article = new Article();
+        article.setId(2);
+        article.setTitle("string title");
+        article.setType(Type.EXTERNAL);
+
+        // when
+        EntityTransaction tx = em.getTransaction();
+        tx.begin();
+        em.persist(article);
+        tx.commit();
+
+        // then
+        Article persistedArticle = em.find(Article.class, 2);
+
+        assertEquals(2, persistedArticle.getId());
+        assertEquals("string title", persistedArticle.getTitle());
+        assertEquals(Type.EXTERNAL, persistedArticle.getType());
+    }
+
+    @Test
+    public void shouldPersistPriorityIntValue() {
+        // given
+        Article article = new Article();
+        article.setId(3);
+        article.setTitle("callback title");
+        article.setPriority(Priority.HIGH);
+
+        // when
+        EntityTransaction tx = em.getTransaction();
+        tx.begin();
+        em.persist(article);
+        tx.commit();
+
+        // then
+        Article persistedArticle = em.find(Article.class, 3);
+
+        assertEquals(3, persistedArticle.getId());
+        assertEquals("callback title", persistedArticle.getTitle());
+        assertEquals(Priority.HIGH, persistedArticle.getPriority());
+
+    }
+
+    @Test
+    public void shouldPersistCategoryEnumConvertedValue() {
+        // given
+        Article article = new Article();
+        article.setId(4);
+        article.setTitle("converted title");
+        article.setCategory(Category.MUSIC);
+
+        // when
+        EntityTransaction tx = em.getTransaction();
+        tx.begin();
+        em.persist(article);
+        tx.commit();
+
+        // then
+        Article persistedArticle = em.find(Article.class, 4);
+
+        assertEquals(4, persistedArticle.getId());
+        assertEquals("converted title", persistedArticle.getTitle());
+        assertEquals(Category.MUSIC, persistedArticle.getCategory());
+    }
+
+}
\ No newline at end of file

From ef8b8232a798d2732f958937204fb849ffc7de17 Mon Sep 17 00:00:00 2001
From: Alessio Stalla <alessiostalla@gmail.com>
Date: Tue, 14 May 2019 22:41:48 +0200
Subject: [PATCH 290/295] Bael-868 (#6959)

* Tests for BAEL-868 (RxKotlin)

* BAEL-868 fix warnings

* Fix the build (?)

* Fix the build

* #BAEL-868 move RxKotlin test from kotlin-libraries project to kotlin-libraries-2
---
 kotlin-libraries-2/pom.xml                    |   8 +-
 .../baeldung/kotlin/rxkotlin/RxKotlinTest.kt  | 157 ++++++++++++++++++
 kotlin-libraries/build.gradle                 |   3 +-
 3 files changed, 163 insertions(+), 5 deletions(-)
 create mode 100644 kotlin-libraries-2/src/test/kotlin/com/baeldung/kotlin/rxkotlin/RxKotlinTest.kt

diff --git a/kotlin-libraries-2/pom.xml b/kotlin-libraries-2/pom.xml
index e2e261cb1b..14ac61a093 100644
--- a/kotlin-libraries-2/pom.xml
+++ b/kotlin-libraries-2/pom.xml
@@ -18,14 +18,16 @@
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.reactivex.rxjava2</groupId>
+            <artifactId>rxkotlin</artifactId>
+            <version>2.3.0</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-
-
-        
     </dependencies>
 
     <properties>
diff --git a/kotlin-libraries-2/src/test/kotlin/com/baeldung/kotlin/rxkotlin/RxKotlinTest.kt b/kotlin-libraries-2/src/test/kotlin/com/baeldung/kotlin/rxkotlin/RxKotlinTest.kt
new file mode 100644
index 0000000000..979ed3f809
--- /dev/null
+++ b/kotlin-libraries-2/src/test/kotlin/com/baeldung/kotlin/rxkotlin/RxKotlinTest.kt
@@ -0,0 +1,157 @@
+package com.baeldung.kotlin.rxkotlin
+
+import io.reactivex.Maybe
+import io.reactivex.Observable
+import io.reactivex.functions.BiFunction
+import io.reactivex.rxkotlin.*
+import io.reactivex.subjects.PublishSubject
+import org.junit.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+
+class RxKotlinTest {
+
+    @Test
+    fun whenBooleanArrayToObserver_thenBooleanObserver() {
+        val observable = listOf(true, false, false).toObservable()
+        observable.test().assertValues(true, false, false)
+    }
+
+    @Test
+    fun whenBooleanArrayToFlowable_thenBooleanFlowable() {
+        val flowable = listOf(true, false, false).toFlowable()
+        flowable.buffer(2).test().assertValues(listOf(true, false), listOf(false))
+    }
+
+    @Test
+    fun whenIntArrayToObserver_thenIntObserver() {
+        val observable = listOf(1, 1, 2, 3).toObservable()
+        observable.test().assertValues(1, 1, 2, 3)
+    }
+
+    @Test
+    fun whenIntArrayToFlowable_thenIntFlowable() {
+        val flowable = listOf(1, 1, 2, 3).toFlowable()
+        flowable.buffer(2).test().assertValues(listOf(1, 1), listOf(2, 3))
+    }
+
+    @Test
+    fun whenObservablePairToMap_thenSingleNoDuplicates() {
+        val list = listOf(Pair("a", 1), Pair("b", 2), Pair("c", 3), Pair("a", 4))
+        val observable = list.toObservable()
+        val map = observable.toMap()
+        assertEquals(mapOf(Pair("a", 4), Pair("b", 2), Pair("c", 3)), map.blockingGet())
+    }
+
+    @Test
+    fun whenObservablePairToMap_thenSingleWithDuplicates() {
+        val list = listOf(Pair("a", 1), Pair("b", 2), Pair("c", 3), Pair("a", 4))
+        val observable = list.toObservable()
+        val map = observable.toMultimap()
+        assertEquals(
+                mapOf(Pair("a", listOf(1, 4)), Pair("b", listOf(2)), Pair("c", listOf(3))),
+                map.blockingGet())
+    }
+
+    @Test
+    fun whenMergeAll_thenStream() {
+        val subject = PublishSubject.create<Observable<String>>()
+        val observable = subject.mergeAll()
+        val testObserver = observable.test()
+        subject.onNext(Observable.just("first", "second"))
+        testObserver.assertValues("first", "second")
+        subject.onNext(Observable.just("third", "fourth"))
+        subject.onNext(Observable.just("fifth"))
+        testObserver.assertValues("first", "second", "third", "fourth", "fifth")
+    }
+
+    @Test
+    fun whenConcatAll_thenStream() {
+        val subject = PublishSubject.create<Observable<String>>()
+        val observable = subject.concatAll()
+        val testObserver = observable.test()
+        subject.onNext(Observable.just("first", "second"))
+        testObserver.assertValues("first", "second")
+        subject.onNext(Observable.just("third", "fourth"))
+        subject.onNext(Observable.just("fifth"))
+        testObserver.assertValues("first", "second", "third", "fourth", "fifth")
+    }
+
+    @Test
+    fun whenSwitchLatest_thenStream() {
+        val subject = PublishSubject.create<Observable<String>>()
+        val observable = subject.switchLatest()
+        val testObserver = observable.test()
+        subject.onNext(Observable.just("first", "second"))
+        testObserver.assertValues("first", "second")
+        subject.onNext(Observable.just("third", "fourth"))
+        subject.onNext(Observable.just("fifth"))
+        testObserver.assertValues("first", "second", "third", "fourth", "fifth")
+    }
+
+    @Test
+    fun whenMergeAllMaybes_thenObservable() {
+        val subject = PublishSubject.create<Maybe<Int>>()
+        val observable = subject.mergeAllMaybes()
+        val testObserver = observable.test()
+        subject.onNext(Maybe.just(1))
+        subject.onNext(Maybe.just(2))
+        subject.onNext(Maybe.empty())
+        testObserver.assertValues(1, 2)
+        subject.onNext(Maybe.error(Exception("")))
+        subject.onNext(Maybe.just(3))
+        testObserver.assertValues(1, 2).assertError(Exception::class.java)
+    }
+
+    @Test
+    fun whenMerge_thenStream() {
+        val observables = mutableListOf(Observable.just("first", "second"))
+        val observable = observables.merge()
+        observables.add(Observable.just("third", "fourth"))
+        observables.add(Observable.error(Exception("e")))
+        observables.add(Observable.just("fifth"))
+
+        observable.test().assertValues("first", "second", "third", "fourth").assertError(Exception::class.java)
+    }
+
+    @Test
+    fun whenMergeDelayError_thenStream() {
+        val observables = mutableListOf<Observable<String>>(Observable.error(Exception("e1")))
+        val observable = observables.mergeDelayError()
+        observables.add(Observable.just("1", "2"))
+        observables.add(Observable.error(Exception("e2")))
+        observables.add(Observable.just("3"))
+
+        observable.test().assertValues("1", "2", "3").assertError(Exception::class.java)
+    }
+
+    @Test
+    fun whenCast_thenUniformType() {
+        val observable = Observable.just<Number>(1, 1, 2, 3)
+        observable.cast<Int>().test().assertValues(1, 1, 2, 3)
+    }
+
+    @Test
+    fun whenOfType_thenFilter() {
+        val observable = Observable.just(1, "and", 2, "and")
+        observable.ofType<Int>().test().assertValues(1, 2)
+    }
+
+    @Test
+    fun whenFunction_thenCompletable() {
+        var value = 0
+        val completable = { value = 3 }.toCompletable()
+        assertFalse(completable.test().isCancelled)
+        assertEquals(3, value)
+    }
+
+    @Test
+    fun whenHelper_thenMoreIdiomaticKotlin() {
+        val zipWith = Observable.just(1).zipWith(Observable.just(2)) { a, b -> a + b }
+        zipWith.subscribeBy(onNext = { println(it) })
+        val zip = Observables.zip(Observable.just(1), Observable.just(2)) { a, b -> a + b }
+        zip.subscribeBy(onNext = { println(it) })
+        val zipOrig = Observable.zip(Observable.just(1), Observable.just(2), BiFunction<Int, Int, Int> { a, b -> a + b })
+        zipOrig.subscribeBy(onNext = { println(it) })
+    }
+}
diff --git a/kotlin-libraries/build.gradle b/kotlin-libraries/build.gradle
index afb92de49e..db23a438a0 100644
--- a/kotlin-libraries/build.gradle
+++ b/kotlin-libraries/build.gradle
@@ -54,9 +54,8 @@ dependencies {
     testCompile group: 'org.jetbrains.spek', name: 'spek-subject-extension', version: '1.1.5'
     testCompile group: 'org.jetbrains.spek', name: 'spek-junit-platform-engine', version: '1.1.5'
     implementation 'com.beust:klaxon:3.0.1'
-    implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
-
 }
+
 task runServer(type: JavaExec) {
     main = 'APIServer'
    classpath = sourceSets.main.runtimeClasspath

From 0825c88d7ae49d114e3031724e5d6c57a6b22b42 Mon Sep 17 00:00:00 2001
From: cdjole <djordje.cvijetic@gmail.com>
Date: Tue, 14 May 2019 22:57:08 +0200
Subject: [PATCH 291/295] [BAEL-2963] - String initialization (#6962)

---
 .../StringInitializationUnitTest.java         | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 java-strings-2/src/test/java/com/baeldung/initialization/StringInitializationUnitTest.java

diff --git a/java-strings-2/src/test/java/com/baeldung/initialization/StringInitializationUnitTest.java b/java-strings-2/src/test/java/com/baeldung/initialization/StringInitializationUnitTest.java
new file mode 100644
index 0000000000..50d9a2b058
--- /dev/null
+++ b/java-strings-2/src/test/java/com/baeldung/initialization/StringInitializationUnitTest.java
@@ -0,0 +1,58 @@
+package com.baeldung.initialization;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
+
+public class StringInitializationUnitTest {
+
+    private String fieldString;
+
+    void printDeclaredOnlyString() {
+        String localVarString = null;
+
+        System.out.println(localVarString); // compilation error
+        System.out.println(fieldString);
+    }
+
+    @Test
+    public void givenDeclaredFeldStringAndNullString_thenCompareEquals() {
+        String localVarString = null;
+
+        assertEquals(fieldString, localVarString);
+    }
+
+    @Test
+    public void givenTwoStringsWithSameLiteral_thenCompareReferencesEquals() {
+        String literalOne = "Baeldung";
+        String literalTwo = "Baeldung";
+
+        assertTrue(literalOne == literalTwo);
+    }
+
+    @Test
+    public void givenTwoStringsUsingNew_thenCompareReferencesNotEquals() {
+        String newStringOne = new String("Baeldung");
+        String newStringTwo = new String("Baeldung");
+
+        assertFalse(newStringOne == newStringTwo);
+    }
+
+    @Test
+    public void givenEmptyLiteralStringsAndNewObject_thenCompareEquals() {
+        String emptyLiteral = "";
+        String emptyNewString = new String("");
+
+        assertEquals(emptyLiteral, emptyNewString);
+    }
+
+    @Test
+    public void givenEmptyStringObjects_thenCompareEquals() {
+        String emptyNewString = new String("");
+        String emptyNewStringTwo = new String();
+
+        assertEquals(emptyNewString, emptyNewStringTwo);
+    }
+}

From bf79c6100fde8cdf5fe1eb1a9065e037031cf279 Mon Sep 17 00:00:00 2001
From: Kumar Sushant <sushant57@gmail.com>
Date: Wed, 15 May 2019 21:21:42 +0300
Subject: [PATCH 292/295] Update GuavaSetOperationsUnitTest.java

---
 .../org/baeldung/guava/GuavaSetOperationsUnitTest.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java
index 07c99ba184..dfd90ad738 100644
--- a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java
+++ b/guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.assertTrue;
 public class GuavaSetOperationsUnitTest {
 
     @Test
-    public void whenCalculateUnionOfSets_thenCorrect() {
+    public void whenCalculatingUnionOfSets_thenCorrect() {
         final Set<Character> first = ImmutableSet.of('a', 'b', 'c');
         final Set<Character> second = ImmutableSet.of('b', 'c', 'd');
 
@@ -26,7 +26,7 @@ public class GuavaSetOperationsUnitTest {
     }
 
     @Test
-    public void whenCalculateSetsProduct_thenCorrect() {
+    public void whenCalculatingCartesianProductOfSets_thenCorrect() {
         final Set<Character> first = ImmutableSet.of('a', 'b');
         final Set<Character> second = ImmutableSet.of('c', 'd');
         final Set<List<Character>> result = Sets.cartesianProduct(ImmutableList.of(first, second));
@@ -75,7 +75,7 @@ public class GuavaSetOperationsUnitTest {
     }
 
     @Test
-    public void whenCreateRangeOfIntegersSet_thenCreated() {
+    public void whenCreatingRangeOfIntegersSet_thenCreated() {
         final int start = 10;
         final int end = 30;
         final ContiguousSet<Integer> set = ContiguousSet.create(Range.closed(start, end), DiscreteDomain.integers());
@@ -86,7 +86,7 @@ public class GuavaSetOperationsUnitTest {
     }
 
     @Test
-    public void whenCreateRangeSet_thenCreated() {
+    public void whenUsingRangeSet_thenCorrect() {
         final RangeSet<Integer> rangeSet = TreeRangeSet.create();
         rangeSet.add(Range.closed(1, 10));
         rangeSet.add(Range.closed(12, 15));
@@ -115,7 +115,7 @@ public class GuavaSetOperationsUnitTest {
     }
 
     @Test
-    public void whenGetTopUsingMultiSet_thenCorrect() {
+    public void whenGetTopOcurringElementsWithMultiSet_thenCorrect() {
         final Multiset<String> names = HashMultiset.create();
         names.add("John");
         names.add("Adam", 5);

From d93670a4065c931ed8e227d5b24465e9320eed6d Mon Sep 17 00:00:00 2001
From: Kumar Sushant <sushant57@gmail.com>
Date: Wed, 15 May 2019 21:26:32 +0300
Subject: [PATCH 293/295] Update README.md

---
 guava-collections-set/README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/guava-collections-set/README.md b/guava-collections-set/README.md
index ee03287680..77d8644ff3 100644
--- a/guava-collections-set/README.md
+++ b/guava-collections-set/README.md
@@ -1,5 +1,3 @@
-=========
-
 ## Guava Examples
 
 
@@ -8,4 +6,3 @@
 - [Guide to Guava RangeSet](http://www.baeldung.com/guava-rangeset)
 - [Guava Set + Function = Map](http://www.baeldung.com/guava-set-function-map-tutorial)
 - [Guide to Guava Multiset](https://www.baeldung.com/guava-multiset)
-=======

From 989b0a2bdb4b5dd8ea103b923078de3c304fdd49 Mon Sep 17 00:00:00 2001
From: Kumar Sushant <sushant57@gmail.com>
Date: Wed, 15 May 2019 21:28:11 +0300
Subject: [PATCH 294/295] Update README.md

---
 guava-collections-set/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guava-collections-set/README.md b/guava-collections-set/README.md
index 77d8644ff3..c36d9e0b61 100644
--- a/guava-collections-set/README.md
+++ b/guava-collections-set/README.md
@@ -1,7 +1,7 @@
-## Guava Examples
+# Guava
 
+## Relevant Articles:
 
-### Relevant Articles:
 - [Guava – Sets](http://www.baeldung.com/guava-sets)
 - [Guide to Guava RangeSet](http://www.baeldung.com/guava-rangeset)
 - [Guava Set + Function = Map](http://www.baeldung.com/guava-set-function-map-tutorial)

From d24015f5aaba3dc77855c89c38936893d342eb4e Mon Sep 17 00:00:00 2001
From: Amy DeGregorio <amy.m.degregorio@gmail.com>
Date: Thu, 16 May 2019 11:24:09 -0400
Subject: [PATCH 295/295] BAEL 2824 (#6971)

* BAEL-2727 Example Code

* Example code for BAEL-2824
---
 .../java/com/baeldung/like/model/Movie.java   | 58 ++++++++++++
 .../like/repository/MovieRepository.java      | 41 +++++++++
 .../like/MovieRepositoryIntegrationTest.java  | 88 +++++++++++++++++++
 .../src/test/resources/test-movie-cleanup.sql |  1 +
 .../src/test/resources/test-movie-data.sql    |  7 ++
 5 files changed, 195 insertions(+)
 create mode 100644 persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/like/model/Movie.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/like/repository/MovieRepository.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/like/MovieRepositoryIntegrationTest.java
 create mode 100644 persistence-modules/spring-data-jpa-2/src/test/resources/test-movie-cleanup.sql
 create mode 100644 persistence-modules/spring-data-jpa-2/src/test/resources/test-movie-data.sql

diff --git a/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/like/model/Movie.java b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/like/model/Movie.java
new file mode 100644
index 0000000000..bba8bd35c4
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/like/model/Movie.java
@@ -0,0 +1,58 @@
+package com.baeldung.like.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Movie {
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private Long id;
+    private String title;
+    private String director;
+    private String rating;
+    private int duration;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDirector() {
+        return director;
+    }
+
+    public void setDirector(String director) {
+        this.director = director;
+    }
+
+    public String getRating() {
+        return rating;
+    }
+
+    public void setRating(String rating) {
+        this.rating = rating;
+    }
+
+    public int getDuration() {
+        return duration;
+    }
+
+    public void setDuration(int duration) {
+        this.duration = duration;
+    }
+
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/like/repository/MovieRepository.java b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/like/repository/MovieRepository.java
new file mode 100644
index 0000000000..241bdd3306
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/like/repository/MovieRepository.java
@@ -0,0 +1,41 @@
+package com.baeldung.like.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
+
+import com.baeldung.like.model.Movie;
+
+public interface MovieRepository extends CrudRepository<Movie, Long> {
+
+    List<Movie> findByTitleContaining(String title);
+    
+    List<Movie> findByTitleLike(String title);
+
+    List<Movie> findByTitleContains(String title);
+
+    List<Movie> findByTitleIsContaining(String title);
+
+    List<Movie> findByRatingStartsWith(String rating);
+
+    List<Movie> findByDirectorEndsWith(String director);
+
+    List<Movie> findByTitleContainingIgnoreCase(String title);
+    
+    List<Movie> findByRatingNotContaining(String rating);
+    
+    List<Movie> findByDirectorNotLike(String director);
+    
+    @Query("SELECT m FROM Movie m WHERE m.title LIKE %:title%")
+    List<Movie> searchByTitleLike(@Param("title") String title);
+    
+    @Query("SELECT m FROM Movie m WHERE m.rating LIKE ?1%")
+    List<Movie> searchByRatingStartsWith(String rating);
+    
+    //Escaping works in SpringBoot >= 2.4.1
+    //@Query("SELECT m FROM Movie m WHERE m.director LIKE %?#{escape([0])} escape ?#{escapeCharacter()}")
+    @Query("SELECT m FROM Movie m WHERE m.director LIKE %:#{[0]}")
+    List<Movie> searchByDirectorEndsWith(String director);
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/like/MovieRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/like/MovieRepositoryIntegrationTest.java
new file mode 100644
index 0000000000..99d7080792
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/like/MovieRepositoryIntegrationTest.java
@@ -0,0 +1,88 @@
+package com.baeldung.like;
+
+import static org.junit.Assert.assertEquals;
+import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.AFTER_TEST_METHOD;
+
+import java.util.List;
+
+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.jdbc.Sql;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.like.model.Movie;
+import com.baeldung.like.repository.MovieRepository;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Sql(scripts = { "/test-movie-data.sql" })
+@Sql(scripts = "/test-movie-cleanup.sql", executionPhase = AFTER_TEST_METHOD)
+public class MovieRepositoryIntegrationTest {
+    @Autowired
+    private MovieRepository movieRepository;
+
+    @Test
+    public void givenPartialTitle_WhenFindByTitleContaining_ThenMoviesShouldReturn() {
+        List<Movie> results = movieRepository.findByTitleContaining("in");
+        assertEquals(3, results.size());
+        
+        results = movieRepository.findByTitleLike("%in%");
+        assertEquals(3, results.size());
+
+        results = movieRepository.findByTitleIsContaining("in");
+        assertEquals(3, results.size());
+
+        results = movieRepository.findByTitleContains("in");
+        assertEquals(3, results.size());
+    }
+
+    @Test
+    public void givenStartOfRating_WhenFindByRatingStartsWith_ThenMoviesShouldReturn() {
+        List<Movie> results = movieRepository.findByRatingStartsWith("PG");
+        assertEquals(6, results.size());
+    }
+
+    @Test
+    public void givenLastName_WhenFindByDirectorEndsWith_ThenMoviesShouldReturn() {
+        List<Movie> results = movieRepository.findByDirectorEndsWith("Burton");
+        assertEquals(1, results.size());
+    }
+
+    @Test
+    public void givenPartialTitle_WhenFindByTitleContainingIgnoreCase_ThenMoviesShouldReturn() {
+        List<Movie> results = movieRepository.findByTitleContainingIgnoreCase("the");
+        assertEquals(2, results.size());
+    }
+
+    @Test
+    public void givenPartialTitle_WhenSearchByTitleLike_ThenMoviesShouldReturn() {
+        List<Movie> results = movieRepository.searchByTitleLike("in");
+        assertEquals(3, results.size());
+    }
+    
+    @Test
+    public void givenStartOfRating_SearchFindByRatingStartsWith_ThenMoviesShouldReturn() {
+        List<Movie> results = movieRepository.searchByRatingStartsWith("PG");
+        assertEquals(6, results.size());
+    }
+    
+    @Test
+    public void givenLastName_WhenSearchByDirectorEndsWith_ThenMoviesShouldReturn() {
+        List<Movie> results = movieRepository.searchByDirectorEndsWith("Burton");
+        assertEquals(1, results.size());
+    }
+    
+    @Test
+    public void givenPartialRating_findByRatingNotContaining_ThenMoviesShouldReturn() {
+        List<Movie> results = movieRepository.findByRatingNotContaining("PG");
+        assertEquals(1, results.size());
+    }
+    
+    @Test
+    public void givenPartialDirector_WhenFindByDirectorNotLike_ThenMoviesShouldReturn() {
+        List<Movie> results = movieRepository.findByDirectorNotLike("An%");
+        assertEquals(5, results.size());
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-2/src/test/resources/test-movie-cleanup.sql b/persistence-modules/spring-data-jpa-2/src/test/resources/test-movie-cleanup.sql
new file mode 100644
index 0000000000..90aa15307c
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/test/resources/test-movie-cleanup.sql
@@ -0,0 +1 @@
+DELETE FROM Movie;
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-2/src/test/resources/test-movie-data.sql b/persistence-modules/spring-data-jpa-2/src/test/resources/test-movie-data.sql
new file mode 100644
index 0000000000..37f8e4fe64
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-2/src/test/resources/test-movie-data.sql
@@ -0,0 +1,7 @@
+INSERT INTO movie(id, title, director, rating, duration) VALUES(1, 'Godzilla: King of the Monsters', ' Michael Dougherty', 'PG-13', 132);
+INSERT INTO movie(id, title, director, rating, duration) VALUES(2, 'Avengers: Endgame', 'Anthony Russo', 'PG-13', 181);
+INSERT INTO movie(id, title, director, rating, duration) VALUES(3, 'Captain Marvel', 'Anna Boden', 'PG-13', 123);
+INSERT INTO movie(id, title, director, rating, duration) VALUES(4, 'Dumbo', 'Tim Burton', 'PG', 112);
+INSERT INTO movie(id, title, director, rating, duration) VALUES(5, 'Booksmart', 'Olivia Wilde', 'R', 102);
+INSERT INTO movie(id, title, director, rating, duration) VALUES(6, 'Aladdin', 'Guy Ritchie', 'PG', 128);
+INSERT INTO movie(id, title, director, rating, duration) VALUES(7, 'The Sun Is Also a Star', 'Ry Russo-Young', 'PG-13', 100);