From bb944171a6f0656fa72b1f13a8d919de601bbf02 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 2 Nov 2019 16:05:41 +0530
Subject: [PATCH 001/106] [BAEL-17317] - Check article code -
 https://www.baeldung.com/spring-boot-annotations

---
 spring-boot-mvc/pom.xml                       |  14 +++
 .../MySQLAutoconfiguration.java               | 118 ++++++++++++++++++
 .../src/main/resources/mysql.properties       |   5 +
 .../org/baeldung/SpringContextLiveTest.java   |  19 +++
 4 files changed, 156 insertions(+)
 create mode 100644 spring-boot-mvc/src/main/java/com/baeldung/autoconfiguration/MySQLAutoconfiguration.java
 create mode 100644 spring-boot-mvc/src/main/resources/mysql.properties
 create mode 100644 spring-boot-mvc/src/test/java/org/baeldung/SpringContextLiveTest.java

diff --git a/spring-boot-mvc/pom.xml b/spring-boot-mvc/pom.xml
index a414ed7bb2..c03a8e04ac 100644
--- a/spring-boot-mvc/pom.xml
+++ b/spring-boot-mvc/pom.xml
@@ -34,7 +34,21 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
 
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
         <!--JSF -->
         <dependency>
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/autoconfiguration/MySQLAutoconfiguration.java b/spring-boot-mvc/src/main/java/com/baeldung/autoconfiguration/MySQLAutoconfiguration.java
new file mode 100644
index 0000000000..295e0d74c9
--- /dev/null
+++ b/spring-boot-mvc/src/main/java/com/baeldung/autoconfiguration/MySQLAutoconfiguration.java
@@ -0,0 +1,118 @@
+package com.baeldung.autoconfiguration;
+
+import java.util.Arrays;
+import java.util.Properties;
+
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.boot.autoconfigure.condition.ConditionMessage;
+import org.springframework.boot.autoconfigure.condition.ConditionMessage.Style;
+import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
+import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.Ordered;
+import org.springframework.core.env.Environment;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+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.util.ClassUtils;
+
+@Configuration
+@ConditionalOnClass(DataSource.class)
+@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)
+@PropertySource("classpath:mysql.properties")
+public class MySQLAutoconfiguration {
+
+    @Autowired
+    private Environment env;
+
+    @Bean
+    @ConditionalOnProperty(name = "usemysql", havingValue = "local")
+    @ConditionalOnMissingBean
+    public DataSource dataSource() {
+        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
+
+        dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+        dataSource.setUrl("jdbc:mysql://localhost:3306/myDb?createDatabaseIfNotExist=true&&serverTimezone=UTC");
+        dataSource.setUsername("mysqluser");
+        dataSource.setPassword("mysqlpass");
+
+        return dataSource;
+    }
+
+    @Bean(name = "dataSource")
+    @ConditionalOnProperty(name = "usemysql", havingValue = "custom")
+    @ConditionalOnMissingBean
+    public DataSource dataSource2() {
+        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
+
+        dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+        dataSource.setUrl(env.getProperty("mysql.url"));
+        dataSource.setUsername(env.getProperty("mysql.user") != null ? env.getProperty("mysql.user") : "");
+        dataSource.setPassword(env.getProperty("mysql.pass") != null ? env.getProperty("mysql.pass") : "");
+
+        return dataSource;
+    }
+
+    @Bean
+    @ConditionalOnBean(name = "dataSource")
+    @ConditionalOnMissingBean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+        final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(dataSource());
+        em.setPackagesToScan("com.baeldung.autoconfiguration.example");
+        em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
+        if (additionalProperties() != null) {
+            em.setJpaProperties(additionalProperties());
+        }
+        return em;
+    }
+
+    @Bean
+    @ConditionalOnMissingBean(type = "JpaTransactionManager")
+    JpaTransactionManager transactionManager(final EntityManagerFactory entityManagerFactory) {
+        final JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(entityManagerFactory);
+        return transactionManager;
+    }
+
+    @ConditionalOnResource(resources = "classpath:mysql.properties")
+    @Conditional(HibernateCondition.class)
+    final Properties additionalProperties() {
+        final Properties hibernateProperties = new Properties();
+
+        hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("mysql-hibernate.hbm2ddl.auto"));
+        hibernateProperties.setProperty("hibernate.dialect", env.getProperty("mysql-hibernate.dialect"));
+        hibernateProperties.setProperty("hibernate.show_sql", env.getProperty("mysql-hibernate.show_sql") != null ? env.getProperty("mysql-hibernate.show_sql") : "false");
+
+        return hibernateProperties;
+    }
+
+    static class HibernateCondition extends SpringBootCondition {
+
+        private static final String[] CLASS_NAMES = { "org.hibernate.ejb.HibernateEntityManager", "org.hibernate.jpa.HibernateEntityManager" };
+
+        @Override
+        public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
+            ConditionMessage.Builder message = ConditionMessage.forCondition("Hibernate");
+
+            return Arrays.stream(CLASS_NAMES).filter(className -> ClassUtils.isPresent(className, context.getClassLoader())).map(className -> ConditionOutcome.match(message.found("class").items(Style.NORMAL, className))).findAny()
+                    .orElseGet(() -> ConditionOutcome.noMatch(message.didNotFind("class", "classes").items(Style.NORMAL, Arrays.asList(CLASS_NAMES))));
+        }
+
+    }
+}
diff --git a/spring-boot-mvc/src/main/resources/mysql.properties b/spring-boot-mvc/src/main/resources/mysql.properties
new file mode 100644
index 0000000000..74f1ee1373
--- /dev/null
+++ b/spring-boot-mvc/src/main/resources/mysql.properties
@@ -0,0 +1,5 @@
+usemysql=local
+
+mysql-hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+mysql-hibernate.show_sql=true
+mysql-hibernate.hbm2ddl.auto=create-drop
\ No newline at end of file
diff --git a/spring-boot-mvc/src/test/java/org/baeldung/SpringContextLiveTest.java b/spring-boot-mvc/src/test/java/org/baeldung/SpringContextLiveTest.java
new file mode 100644
index 0000000000..d3ced53483
--- /dev/null
+++ b/spring-boot-mvc/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -0,0 +1,19 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import com.baeldung.autoconfiguration.MySQLAutoconfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = MySQLAutoconfiguration.class)
+@WebAppConfiguration
+public class SpringContextLiveTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
\ No newline at end of file

From 017f467ba8f5398555a12e2ba543e4d10157d661 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 2 Nov 2019 16:30:09 +0530
Subject: [PATCH 002/106] [BAEL-17317] - Check article code -
 https://www.baeldung.com/rest-api-pagination-in-spring

---
 spring-boot-rest/pom.xml                      |  4 ++
 .../baeldung/modelmapper/model/Subject.java   | 37 +++++++++++++++++++
 .../repository/SubjectRepository.java         | 16 ++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Subject.java
 create mode 100644 spring-boot-rest/src/main/java/com/baeldung/modelmapper/repository/SubjectRepository.java

diff --git a/spring-boot-rest/pom.xml b/spring-boot-rest/pom.xml
index 598b589ea0..16150d061a 100644
--- a/spring-boot-rest/pom.xml
+++ b/spring-boot-rest/pom.xml
@@ -44,6 +44,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-rest</artifactId>
+        </dependency>
         
         <!-- Spring HATEOAS -->
         <dependency>
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Subject.java b/spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Subject.java
new file mode 100644
index 0000000000..9efa449dfe
--- /dev/null
+++ b/spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Subject.java
@@ -0,0 +1,37 @@
+package com.baeldung.modelmapper.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Subject {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(nullable = false)
+    private String name;
+
+    public Subject() {
+    }
+
+    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;
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/repository/SubjectRepository.java b/spring-boot-rest/src/main/java/com/baeldung/modelmapper/repository/SubjectRepository.java
new file mode 100644
index 0000000000..ddbf3334ec
--- /dev/null
+++ b/spring-boot-rest/src/main/java/com/baeldung/modelmapper/repository/SubjectRepository.java
@@ -0,0 +1,16 @@
+package com.baeldung.modelmapper.repository;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.data.rest.core.annotation.RestResource;
+
+import com.baeldung.modelmapper.model.Subject;
+
+public interface SubjectRepository extends PagingAndSortingRepository<Subject, Long> {
+
+    @RestResource(path = "nameContains")
+    public Page<Subject> findByNameContaining(@Param("name") String name, Pageable p);
+
+}
\ No newline at end of file

From 916aae0d91e517a924eba65e687f8cf885b4fd87 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 2 Nov 2019 20:19:01 +0530
Subject: [PATCH 003/106] [BAEL-17317] - Check article code -
 https://www.baeldung.com/spring-data-jpa-pagination-sorting

---
 .../dao/product/ProductRepository.java        |  6 +--
 .../{ProductMultipleDB.java => Product.java}  | 10 ++---
 .../JpaMultipleDBIntegrationTest.java         |  4 +-
 .../ProductRepositoryIntegrationTest.java     | 40 +++++++++----------
 4 files changed, 30 insertions(+), 30 deletions(-)
 rename persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/product/{ProductMultipleDB.java => Product.java} (80%)

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
index 022099eed0..6ce9bcad45 100755
--- 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
@@ -5,9 +5,9 @@ import java.util.List;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-import com.baeldung.multipledb.model.product.ProductMultipleDB;
+import com.baeldung.multipledb.model.product.Product;
 
-public interface ProductRepository extends PagingAndSortingRepository<ProductMultipleDB, Integer> {
+public interface ProductRepository extends PagingAndSortingRepository<Product, Integer> {
 
-    List<ProductMultipleDB> findAllByPrice(double price, Pageable pageable);
+    List<Product> findAllByPrice(double price, Pageable pageable);
 }
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/product/ProductMultipleDB.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/product/Product.java
similarity index 80%
rename from persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/product/ProductMultipleDB.java
rename to persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/product/Product.java
index 8bdff340ac..eaf471043c 100755
--- a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/product/ProductMultipleDB.java
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/model/product/Product.java
@@ -6,7 +6,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(schema = "products")
-public class ProductMultipleDB {
+public class Product {
 
     @Id
     private int id;
@@ -15,19 +15,19 @@ public class ProductMultipleDB {
 
     private double price;
 
-    public ProductMultipleDB() {
+    public Product() {
         super();
     }
 
-    private ProductMultipleDB(int id, String name, double price) {
+    private Product(int id, String name, double price) {
         super();
         this.id = id;
         this.name = name;
         this.price = price;
     }
 
-    public static ProductMultipleDB from(int id, String name, double price) {
-        return new ProductMultipleDB(id, name, price);
+    public static Product from(int id, String name, double price) {
+        return new Product(id, name, price);
     }
 
     public int getId() {
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 6ba10a4d49..a1f4a3fa2c 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
@@ -19,7 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 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.product.Product;
 import com.baeldung.multipledb.model.user.PossessionMultipleDB;
 import com.baeldung.multipledb.model.user.UserMultipleDB;
 
@@ -84,7 +84,7 @@ public class JpaMultipleDBIntegrationTest {
     @Test
     @Transactional("productTransactionManager")
     public void whenCreatingProduct_thenCreated() {
-        ProductMultipleDB product = new ProductMultipleDB();
+        Product product = new Product();
         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 2c965f72f3..9bfba61a3b 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
@@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.baeldung.multipledb.PersistenceProductConfiguration;
 import com.baeldung.multipledb.dao.product.ProductRepository;
-import com.baeldung.multipledb.model.product.ProductMultipleDB;
+import com.baeldung.multipledb.model.product.Product;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes=MultipleDbApplication.class)
@@ -38,22 +38,22 @@ public class ProductRepositoryIntegrationTest {
     @Before
     @Transactional("productTransactionManager")
     public void setUp() {
-        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));
+        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));
     }
 
     @Test
     public void whenRequestingFirstPageOfSizeTwo_ThenReturnFirstPage() {
         Pageable pageRequest = PageRequest.of(0, 2);
 
-        Page<ProductMultipleDB> result = productRepository.findAll(pageRequest);
+        Page<Product> result = productRepository.findAll(pageRequest);
 
         assertThat(result.getContent(), hasSize(2));
         assertTrue(result.stream()
-            .map(ProductMultipleDB::getId)
+            .map(Product::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<ProductMultipleDB> result = productRepository.findAll(pageRequest);
+        Page<Product> result = productRepository.findAll(pageRequest);
 
         assertThat(result.getContent(), hasSize(2));
         assertTrue(result.stream()
-            .map(ProductMultipleDB::getId)
+            .map(Product::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<ProductMultipleDB> result = productRepository.findAll(pageRequest);
+        Page<Product> result = productRepository.findAll(pageRequest);
 
         assertThat(result.getContent(), hasSize(1));
         assertTrue(result.stream()
-            .map(ProductMultipleDB::getId)
+            .map(Product::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<ProductMultipleDB> result = productRepository.findAll(pageRequest);
+        Page<Product> result = productRepository.findAll(pageRequest);
 
         assertThat(result.getContent(), hasSize(3));
         assertThat(result.getContent()
             .stream()
-            .map(ProductMultipleDB::getId)
+            .map(Product::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<ProductMultipleDB> result = productRepository.findAll(pageRequest);
+        Page<Product> result = productRepository.findAll(pageRequest);
 
         assertThat(result.getContent(), hasSize(3));
         assertThat(result.getContent()
             .stream()
-            .map(ProductMultipleDB::getId)
+            .map(Product::getId)
             .collect(Collectors.toList()), equalTo(Arrays.asList(1004, 1003, 1001)));
 
     }
@@ -119,12 +119,12 @@ public class ProductRepositoryIntegrationTest {
             .descending()
             .and(Sort.by("name")));
 
-        Page<ProductMultipleDB> result = productRepository.findAll(pageRequest);
+        Page<Product> result = productRepository.findAll(pageRequest);
 
         assertThat(result.getContent(), hasSize(5));
         assertThat(result.getContent()
             .stream()
-            .map(ProductMultipleDB::getId)
+            .map(Product::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<ProductMultipleDB> result = productRepository.findAllByPrice(10, pageRequest);
+        List<Product> result = productRepository.findAllByPrice(10, pageRequest);
 
         assertThat(result, hasSize(2));
         assertTrue(result.stream()
-            .map(ProductMultipleDB::getId)
+            .map(Product::getId)
             .allMatch(id -> Arrays.asList(1002, 1005)
                 .contains(id)));
     }

From 2ec45fe5b82d713df47c53d14a640b83eb01f41c Mon Sep 17 00:00:00 2001
From: priyank-sriv <priyank.srivastava@appdirect.com>
Date: Sun, 24 Nov 2019 00:27:53 +0530
Subject: [PATCH 004/106] init

---
 .../datastreammedian/DataStreamMedian.java    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/datastreammedian/DataStreamMedian.java

diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/datastreammedian/DataStreamMedian.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/datastreammedian/DataStreamMedian.java
new file mode 100644
index 0000000000..64f78227d5
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/datastreammedian/DataStreamMedian.java
@@ -0,0 +1,35 @@
+package com.baeldung.algorithms.datastreammedian;
+
+import java.util.PriorityQueue;
+import java.util.Queue;
+
+import static java.util.Comparator.reverseOrder;
+
+public class DataStreamMedian {
+
+    private Queue<Integer> minHeap, maxHeap;
+
+    DataStreamMedian() {
+        minHeap = new PriorityQueue<>();
+        maxHeap = new PriorityQueue<>(reverseOrder());
+    }
+
+    void add(int num) {
+        minHeap.offer(num);
+        maxHeap.offer(minHeap.poll());
+
+        if (minHeap.size() < maxHeap.size()) {
+            minHeap.offer(maxHeap.poll());
+        }
+    }
+
+    double getMedian() {
+        int median;
+        if (minHeap.size() > maxHeap.size()) {
+            median = minHeap.peek();
+        } else {
+            median = (minHeap.peek() + maxHeap.peek()) / 2;
+        }
+        return median;
+    }
+}

From d21a7b9e5cb8eca833717ea2982d8c833d8c1537 Mon Sep 17 00:00:00 2001
From: Anshul BANSAL <smartdiscover17@gmail.com>
Date: Sun, 1 Dec 2019 18:29:04 +0200
Subject: [PATCH 005/106] Initial commit

---
 ninja/pom.xml                                 | 197 ++++++++++++++++++
 ninja/src/main/java/assets/css/custom.css     |   3 +
 ninja/src/main/java/conf/Filters.java         |  30 +++
 ninja/src/main/java/conf/Module.java          |  37 ++++
 ninja/src/main/java/conf/Routes.java          |  47 +++++
 ninja/src/main/java/conf/application.conf     |  26 +++
 ninja/src/main/java/conf/messages.properties  |  21 ++
 .../controllers/ApplicationController.java    |  36 ++++
 ninja/src/main/java/ehcache.xml               |  15 ++
 ninja/src/main/java/logback.xml               |  33 +++
 ninja/src/main/java/services/UserService.java |   7 +
 .../main/java/services/UserServiceImpl.java   |  10 +
 .../ApplicationController/index.ftl.html      |   9 +
 .../java/views/layout/defaultLayout.ftl.html  |  58 ++++++
 .../main/java/views/layout/footer.ftl.html    |   5 +
 .../main/java/views/layout/header.ftl.html    |  18 ++
 .../java/views/system/403forbidden.ftl.html   |  18 ++
 .../java/views/system/404notFound.ftl.html    |  18 ++
 ninja/src/main/webapp/WEB-INF/web.xml         |  41 ++++
 .../ApiControllerDocTesterTest.java           |  78 +++++++
 20 files changed, 707 insertions(+)
 create mode 100644 ninja/pom.xml
 create mode 100644 ninja/src/main/java/assets/css/custom.css
 create mode 100644 ninja/src/main/java/conf/Filters.java
 create mode 100644 ninja/src/main/java/conf/Module.java
 create mode 100644 ninja/src/main/java/conf/Routes.java
 create mode 100644 ninja/src/main/java/conf/application.conf
 create mode 100644 ninja/src/main/java/conf/messages.properties
 create mode 100644 ninja/src/main/java/controllers/ApplicationController.java
 create mode 100644 ninja/src/main/java/ehcache.xml
 create mode 100644 ninja/src/main/java/logback.xml
 create mode 100644 ninja/src/main/java/services/UserService.java
 create mode 100644 ninja/src/main/java/services/UserServiceImpl.java
 create mode 100644 ninja/src/main/java/views/ApplicationController/index.ftl.html
 create mode 100644 ninja/src/main/java/views/layout/defaultLayout.ftl.html
 create mode 100644 ninja/src/main/java/views/layout/footer.ftl.html
 create mode 100644 ninja/src/main/java/views/layout/header.ftl.html
 create mode 100644 ninja/src/main/java/views/system/403forbidden.ftl.html
 create mode 100644 ninja/src/main/java/views/system/404notFound.ftl.html
 create mode 100644 ninja/src/main/webapp/WEB-INF/web.xml
 create mode 100644 ninja/src/test/java/controllers/ApiControllerDocTesterTest.java

diff --git a/ninja/pom.xml b/ninja/pom.xml
new file mode 100644
index 0000000000..962dabf1bd
--- /dev/null
+++ b/ninja/pom.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ninja</artifactId>
+    <!-- If you want to deploy to a war please -->
+    <!-- replace "jar" with "war" and -->
+    <!-- comment ninja-standalone dependency and  -->
+    <!-- uncomment the dependency for ninja-servlet -->
+    <packaging>jar</packaging>
+    <groupId>com.baeldung</groupId>
+    <version>1.0.0</version>
+
+    <url>http://www.ninjaframework.org</url>
+
+    <properties>
+        <ninja.version>6.5.0</ninja.version>
+        <jetty.version>9.4.18.v20190429</jetty.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.2</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.3.1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-banned-dependencies</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>commons-logging</exclude>
+                                    </excludes>
+                                </bannedDependencies>
+                            </rules>
+                            <fail>true</fail>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>${jetty.version}</version>
+                <configuration>
+                    <webApp>
+                        <contextPath>/</contextPath>
+                    </webApp>
+                    <stopKey>stop</stopKey>
+                    <stopPort>8889</stopPort>
+                    <scanIntervalSeconds>1</scanIntervalSeconds>
+                    <reload>automatic</reload>
+                    <scanTargetPatterns>
+                        <scanTargetPattern>
+                            <directory>target/classes</directory>
+                            <includes>
+                                <include>**/*</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/*.ftl.html</exclude>
+                                <exclude>assets/**</exclude>
+                            </excludes>
+                        </scanTargetPattern>
+                    </scanTargetPatterns>
+                    <systemProperties>
+                        <systemProperty>
+                            <name>ninja.mode</name>
+                            <value>dev</value>
+                        </systemProperty>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+            <!-- Allows you to run Ninja via the SuperDevMode. -->
+            <!-- run "mvn ninja:run" on the command line for the best -->
+            <!-- development experience. -->
+            <plugin>
+                <groupId>org.ninjaframework</groupId>
+                <artifactId>ninja-maven-plugin</artifactId>
+                <version>${ninja.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <createDependencyReducedPom>true</createDependencyReducedPom>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
+                                <exclude>META-INF/*.RSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>ninja.standalone.NinjaJetty</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>bootstrap</artifactId>
+            <version>3.3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery</artifactId>
+            <version>2.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.186</version>
+        </dependency>
+        <!-- If you want to deploy to a war please -->
+        <!-- comment ninja-standalone dependency and  -->
+        <!-- uncomment the dependency for ninja-servlet -->
+        <!--
+        <dependency>
+            <groupId>org.ninjaframework</groupId>
+            <artifactId>ninja-servlet</artifactId>
+            <version>${ninja.version}</version>
+        </dependency>
+        -->
+        <dependency>
+            <groupId>org.ninjaframework</groupId>
+            <artifactId>ninja-standalone</artifactId>
+            <version>${ninja.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ninjaframework</groupId>
+            <artifactId>ninja-test-utilities</artifactId>
+            <version>${ninja.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/ninja/src/main/java/assets/css/custom.css b/ninja/src/main/java/assets/css/custom.css
new file mode 100644
index 0000000000..41d249d3cb
--- /dev/null
+++ b/ninja/src/main/java/assets/css/custom.css
@@ -0,0 +1,3 @@
+/* Add additional stylesheets below
+-------------------------------------------------- */
+
diff --git a/ninja/src/main/java/conf/Filters.java b/ninja/src/main/java/conf/Filters.java
new file mode 100644
index 0000000000..cfd04e8ec2
--- /dev/null
+++ b/ninja/src/main/java/conf/Filters.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (C) 2012-2019 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.
+ */
+
+
+package conf;
+
+import java.util.List;
+import ninja.Filter;
+
+public class Filters implements ninja.application.ApplicationFilters {
+
+    @Override
+    public void addFilters(List<Class<? extends Filter>> filters) {
+        // Add your application - wide filters here
+        // filters.add(MyFilter.class);
+    }
+}
diff --git a/ninja/src/main/java/conf/Module.java b/ninja/src/main/java/conf/Module.java
new file mode 100644
index 0000000000..e5ec39d2de
--- /dev/null
+++ b/ninja/src/main/java/conf/Module.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (C) 2012-2019 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.
+ */
+
+
+package conf;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Singleton;
+
+import services.UserService;
+import services.UserServiceImpl;
+
+@Singleton
+public class Module extends AbstractModule {
+    
+
+    protected void configure() {
+        
+        // bind your injections here!
+        bind(UserService.class).to(UserServiceImpl.class);
+        
+    }
+
+}
diff --git a/ninja/src/main/java/conf/Routes.java b/ninja/src/main/java/conf/Routes.java
new file mode 100644
index 0000000000..7db2d7a107
--- /dev/null
+++ b/ninja/src/main/java/conf/Routes.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (C) 2012-2019 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.
+ */
+
+
+package conf;
+
+
+import ninja.AssetsController;
+import ninja.Router;
+import ninja.application.ApplicationRoutes;
+import controllers.ApplicationController;
+
+public class Routes implements ApplicationRoutes {
+
+    @Override
+    public void init(Router router) {  
+        
+        router.GET().route("/").with(ApplicationController::index);
+        router.GET().route("/hello_world.json").with(ApplicationController::helloWorldJson);
+        
+ 
+        ///////////////////////////////////////////////////////////////////////
+        // Assets (pictures / javascript)
+        ///////////////////////////////////////////////////////////////////////    
+        router.GET().route("/assets/webjars/{fileName: .*}").with(AssetsController::serveWebJars);
+        router.GET().route("/assets/{fileName: .*}").with(AssetsController::serveStatic);
+        
+        ///////////////////////////////////////////////////////////////////////
+        // Index / Catchall shows index page
+        ///////////////////////////////////////////////////////////////////////
+        router.GET().route("/.*").with(ApplicationController::index);
+    }
+
+}
diff --git a/ninja/src/main/java/conf/application.conf b/ninja/src/main/java/conf/application.conf
new file mode 100644
index 0000000000..3b2e96f702
--- /dev/null
+++ b/ninja/src/main/java/conf/application.conf
@@ -0,0 +1,26 @@
+# The main properties file to configure your application
+#
+# Properties can be prefixed by "%".
+# "%"" matches a mode you can set as system property. For instance when you
+# are using maven you can do: mvn -Dmode=test jetty:run
+#
+# Using that the following property:
+# %test.myproperty=test property
+# would overwrite the property
+# myproperty=my property
+#
+# You can define as many environments as you want. Simply set them in the mode.
+application.name=baeldung ninja application
+
+application.cookie.prefix=NINJA
+
+#ISO Language Code, optionally followed by a valid ISO Country Code. 
+application.languages=en
+
+application.session.expire_time_in_seconds=3600
+application.session.send_only_if_changed=true
+application.session.transferred_over_https_only=false
+
+# enable ssl with self-signed cert in dev & test modes
+ninja.ssl.port=8443
+application.secret = fxSjSL9Q017BSL7gBnkyo2Prln7uXaXIT35gotXRIED8c46OSa8s4QdoIQdTsEtj
diff --git a/ninja/src/main/java/conf/messages.properties b/ninja/src/main/java/conf/messages.properties
new file mode 100644
index 0000000000..f163d33260
--- /dev/null
+++ b/ninja/src/main/java/conf/messages.properties
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2012 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.
+#
+
+# This file is utf-8
+header.title=Hello World!
+header.home=BAM!
+hello.world=Hello World!
+hello.world.json=There is also Json rendering you can check out!
\ No newline at end of file
diff --git a/ninja/src/main/java/controllers/ApplicationController.java b/ninja/src/main/java/controllers/ApplicationController.java
new file mode 100644
index 0000000000..bd62e5fb84
--- /dev/null
+++ b/ninja/src/main/java/controllers/ApplicationController.java
@@ -0,0 +1,36 @@
+package controllers;
+
+import ninja.Result;
+import ninja.Results;
+import services.UserService;
+import javax.inject.Inject;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.google.inject.Singleton;
+
+@Singleton
+public class ApplicationController {
+    
+    private static Log logger = LogFactory.getLog(ApplicationController.class);
+    
+    @Inject
+    UserService userService;
+
+    public Result index() {
+        return Results.html();
+    }
+    
+    public Result helloWorldJson() {
+        SimplePojo simplePojo = new SimplePojo();
+        simplePojo.content = "Hello World! Hello Json!";
+        logger.info(userService.getUserName());
+        return Results.json().render(simplePojo);
+    }
+    
+    public static class SimplePojo {
+        public String content;
+    }
+    
+}
diff --git a/ninja/src/main/java/ehcache.xml b/ninja/src/main/java/ehcache.xml
new file mode 100644
index 0000000000..b401b61a36
--- /dev/null
+++ b/ninja/src/main/java/ehcache.xml
@@ -0,0 +1,15 @@
+<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../config/ehcache.xsd" updateCheck="false">
+
+    <defaultCache
+            maxElementsInMemory="10000"
+            eternal="false"
+            timeToIdleSeconds="120"
+            timeToLiveSeconds="120"
+            overflowToDisk="false"
+            maxElementsOnDisk="10000000"
+            diskPersistent="false"
+            diskExpiryThreadIntervalSeconds="120"
+            memoryStoreEvictionPolicy="LRU"
+    /> 
+    
+</ehcache>
diff --git a/ninja/src/main/java/logback.xml b/ninja/src/main/java/logback.xml
new file mode 100644
index 0000000000..ebdcf56f76
--- /dev/null
+++ b/ninja/src/main/java/logback.xml
@@ -0,0 +1,33 @@
+<configuration>
+
+  <!-- Uncomment to enable file-based logging with 
+       daily (or size exceeding) gzip archival.
+       Also uncomment the "ROLLING" reference in <root>.
+  <appender name="ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>mylog.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <FileNamePattern>mylog.%d{yyyy-MM-dd}.%i.log.gz</FileNamePattern>
+      <MaxHistory>30</MaxHistory>
+      <timeBasedFileNamingAndTriggeringPolicy
+        class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+        <maxFileSize>10MB</maxFileSize>
+      </timeBasedFileNamingAndTriggeringPolicy>
+    </rollingPolicy>
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender> -->
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+    <!-- <appender-ref ref="ROLLING" /> -->
+  </root>
+</configuration>
diff --git a/ninja/src/main/java/services/UserService.java b/ninja/src/main/java/services/UserService.java
new file mode 100644
index 0000000000..100761a2ab
--- /dev/null
+++ b/ninja/src/main/java/services/UserService.java
@@ -0,0 +1,7 @@
+package services;
+
+public interface UserService {
+    
+    String getUserName();
+
+}
diff --git a/ninja/src/main/java/services/UserServiceImpl.java b/ninja/src/main/java/services/UserServiceImpl.java
new file mode 100644
index 0000000000..a0dec61084
--- /dev/null
+++ b/ninja/src/main/java/services/UserServiceImpl.java
@@ -0,0 +1,10 @@
+package services;
+
+public class UserServiceImpl implements UserService {
+    
+    @Override
+    public String getUserName() {
+        return "Eugen Parashic";
+    }
+
+}
diff --git a/ninja/src/main/java/views/ApplicationController/index.ftl.html b/ninja/src/main/java/views/ApplicationController/index.ftl.html
new file mode 100644
index 0000000000..ab2edaf69b
--- /dev/null
+++ b/ninja/src/main/java/views/ApplicationController/index.ftl.html
@@ -0,0 +1,9 @@
+<#import "../layout/defaultLayout.ftl.html" as layout> 
+<@layout.myLayout "Home page">    
+
+
+<h1>${i18n("hello.world")}</h1>
+<p>${i18n("hello.world.json")}</p>
+<a href="/hello_world.json">Hello World Json</a>
+
+</@layout.myLayout>
\ No newline at end of file
diff --git a/ninja/src/main/java/views/layout/defaultLayout.ftl.html b/ninja/src/main/java/views/layout/defaultLayout.ftl.html
new file mode 100644
index 0000000000..a61edd19e6
--- /dev/null
+++ b/ninja/src/main/java/views/layout/defaultLayout.ftl.html
@@ -0,0 +1,58 @@
+<#macro myLayout title="Layout example">
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>${title}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <!-- Le styles -->
+    <link href="/assets/webjars/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
+    <!-- Optional theme -->
+    <link rel="stylesheet" href="/assets/webjars/bootstrap/3.3.4/css/bootstrap-theme.min.css">
+
+    <!-- Latest compiled and minified JavaScript -->
+    
+    <style type="text/css">
+      body {
+        padding-top: 60px;
+        padding-bottom: 40px;
+      }
+      .error-template {padding: 40px 15px;text-align: center;}
+    </style>
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+  </head>
+<body>
+
+    <div class="container">
+        
+        <#include "header.ftl.html"/>
+        
+        <#if (flash.error)??>
+            <div class="alert alert-danger">
+                ${flash.error}
+            </div>
+        </#if>
+        
+        <#if (flash.success)??>
+            <div class="alert alert-success">
+                ${flash.success}
+            </div>
+        </#if>
+
+        <#nested/>
+
+        <#include "footer.ftl.html"/>
+        
+    </div> <!-- /container -->
+    <script type="text/javascript" src="/assets/webjars/jquery/2.1.3/jquery.js"></script>
+    <script type="text/javascript" src="/assets/webjars/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+</body>
+</html>
+</#macro>
\ No newline at end of file
diff --git a/ninja/src/main/java/views/layout/footer.ftl.html b/ninja/src/main/java/views/layout/footer.ftl.html
new file mode 100644
index 0000000000..0a2cb2721e
--- /dev/null
+++ b/ninja/src/main/java/views/layout/footer.ftl.html
@@ -0,0 +1,5 @@
+<hr>
+<footer>
+Built with <a href="http://www.ninjaframework.org">Ninja framework</a>.
+</footer>
+
diff --git a/ninja/src/main/java/views/layout/header.ftl.html b/ninja/src/main/java/views/layout/header.ftl.html
new file mode 100644
index 0000000000..8794ee5c68
--- /dev/null
+++ b/ninja/src/main/java/views/layout/header.ftl.html
@@ -0,0 +1,18 @@
+<div class="navbar navbar-inverse navbar-fixed-top">
+	<div class="container">
+		<div class="navbar-header">
+			<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+				<span class="icon-bar"></span> 
+				<span class="icon-bar"></span> 
+				<span class="icon-bar"></span>
+			</button>
+			<a class="navbar-brand" href="/">${i18n("header.title")}</a>
+		</div>
+		<div class="navbar-collapse collapse">
+			<ul class="nav navbar-nav">
+				<li class="active"><a href="/">${i18n("header.home")}</a></li>
+			</ul>
+		</div>
+		<!--/.navbar-collapse -->
+	</div>
+</div>
\ No newline at end of file
diff --git a/ninja/src/main/java/views/system/403forbidden.ftl.html b/ninja/src/main/java/views/system/403forbidden.ftl.html
new file mode 100644
index 0000000000..0f4efd160a
--- /dev/null
+++ b/ninja/src/main/java/views/system/403forbidden.ftl.html
@@ -0,0 +1,18 @@
+<#import "../layout/defaultLayout.ftl.html" as layout>
+<@layout.myLayout "Error. Forbidden.">
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="error-template">
+                <h1>
+                    Oops!</h1>
+                <h2>
+                    403 Forbidden</h2>
+                <div class="error-details">
+                    Sorry, an error has occured. Requested page is forbidden!
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</@layout.myLayout>
\ No newline at end of file
diff --git a/ninja/src/main/java/views/system/404notFound.ftl.html b/ninja/src/main/java/views/system/404notFound.ftl.html
new file mode 100644
index 0000000000..c10e7c3949
--- /dev/null
+++ b/ninja/src/main/java/views/system/404notFound.ftl.html
@@ -0,0 +1,18 @@
+<#import "../layout/defaultLayout.ftl.html" as layout>
+<@layout.myLayout "Error. Not found.">
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="error-template">
+                <h1>
+                    Oops!</h1>
+                <h2>
+                    404 Not Found</h2>
+                <div class="error-details">
+                    Sorry, an error has occured. Requested page not found!
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</@layout.myLayout>
\ No newline at end of file
diff --git a/ninja/src/main/webapp/WEB-INF/web.xml b/ninja/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..fe4b2c95bf
--- /dev/null
+++ b/ninja/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2013 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.
+
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0"
+         metadata-complete="true">
+
+    <display-name>ninja</display-name>
+
+	<listener>
+		<listener-class>ninja.servlet.NinjaServletListener</listener-class>
+	</listener>
+
+	<filter>
+		<filter-name>guiceFilter</filter-name>
+		<filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>guiceFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+</web-app>
diff --git a/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java b/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
new file mode 100644
index 0000000000..af4f5ba85f
--- /dev/null
+++ b/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
@@ -0,0 +1,78 @@
+/**
+ * Copyright (C) 2012-2019 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.
+ */
+
+/**
+ * Copyright (C) 2013 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.
+ */
+
+package controllers;
+
+
+import org.junit.Test;
+
+import ninja.NinjaDocTester;
+import org.doctester.testbrowser.Request;
+import org.doctester.testbrowser.Response;
+import org.hamcrest.CoreMatchers;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
+
+public class ApiControllerDocTesterTest extends NinjaDocTester {
+    
+    String URL_INDEX = "/";
+    String URL_HELLO_WORLD_JSON = "/hello_world.json";
+    
+    @Test
+    public void testGetIndex() {
+    
+        Response response = makeRequest(
+                Request.GET().url(
+                        testServerUrl().path(URL_INDEX)));
+
+        assertThat(response.payload, containsString("Hello World!"));
+        assertThat(response.payload, containsString("BAM!"));
+
+
+    }
+    
+    @Test
+    public void testGetHelloWorldJson() {
+    
+        Response response = makeRequest(
+                Request.GET().url(
+                        testServerUrl().path(URL_HELLO_WORLD_JSON)));
+
+        ApplicationController.SimplePojo simplePojo 
+                = response.payloadJsonAs(ApplicationController.SimplePojo.class);
+        
+        assertThat(simplePojo.content, CoreMatchers.equalTo("Hello World! Hello Json!"));
+
+    
+    }
+
+}

From 76fa560184fccbe95e28595f641f1bcc8386de83 Mon Sep 17 00:00:00 2001
From: priyank-sriv <priyank.srivastava@appdirect.com>
Date: Mon, 2 Dec 2019 19:40:38 +0530
Subject: [PATCH 006/106] final solution with tests

---
 .../MedianOfIntegerStream.java                | 42 +++++++++++++++++++
 .../MedianOfIntegerStream2.java}              | 15 +++----
 .../MedianOfIntegerStreamTest.java            | 41 ++++++++++++++++++
 3 files changed, 91 insertions(+), 7 deletions(-)
 create mode 100644 algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java
 rename algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/{datastreammedian/DataStreamMedian.java => integerstreammedian/MedianOfIntegerStream2.java} (66%)
 create mode 100644 algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamTest.java

diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java
new file mode 100644
index 0000000000..9d3b699956
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java
@@ -0,0 +1,42 @@
+package com.baeldung.algorithms.integerstreammedian;
+
+import java.util.PriorityQueue;
+import java.util.Queue;
+
+import static java.util.Comparator.reverseOrder;
+
+public class MedianOfIntegerStream {
+
+    private Queue<Integer> minHeap, maxHeap;
+
+    MedianOfIntegerStream() {
+        minHeap = new PriorityQueue<>();
+        maxHeap = new PriorityQueue<>(reverseOrder());
+    }
+
+    void add(int num) {
+        if (!minHeap.isEmpty() && num < minHeap.peek()) {
+            maxHeap.offer(num);
+            if (maxHeap.size() > minHeap.size() + 1) {
+                minHeap.offer(maxHeap.poll());
+            }
+        } else {
+            minHeap.offer(num);
+            if (minHeap.size() > maxHeap.size() + 1) {
+                maxHeap.offer(minHeap.poll());
+            }
+        }
+    }
+
+    double getMedian() {
+        int median;
+        if (minHeap.size() < maxHeap.size()) {
+            median = maxHeap.peek();
+        } else if (minHeap.size() > maxHeap.size()) {
+            median = minHeap.peek();
+        } else {
+            median = (minHeap.peek() + maxHeap.peek()) / 2;
+        }
+        return median;
+    }
+}
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/datastreammedian/DataStreamMedian.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream2.java
similarity index 66%
rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/datastreammedian/DataStreamMedian.java
rename to algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream2.java
index 64f78227d5..8aa7e6f6af 100644
--- a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/datastreammedian/DataStreamMedian.java
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream2.java
@@ -1,25 +1,26 @@
-package com.baeldung.algorithms.datastreammedian;
+package com.baeldung.algorithms.integerstreammedian;
 
 import java.util.PriorityQueue;
 import java.util.Queue;
 
 import static java.util.Comparator.reverseOrder;
 
-public class DataStreamMedian {
+public class MedianOfIntegerStream2 {
 
     private Queue<Integer> minHeap, maxHeap;
 
-    DataStreamMedian() {
+    MedianOfIntegerStream2() {
         minHeap = new PriorityQueue<>();
         maxHeap = new PriorityQueue<>(reverseOrder());
     }
 
     void add(int num) {
-        minHeap.offer(num);
-        maxHeap.offer(minHeap.poll());
-
-        if (minHeap.size() < maxHeap.size()) {
+        if (minHeap.size() == maxHeap.size()) {
+            maxHeap.offer(num);
             minHeap.offer(maxHeap.poll());
+        } else {
+            minHeap.offer(num);
+            maxHeap.offer(minHeap.poll());
         }
     }
 
diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamTest.java b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamTest.java
new file mode 100644
index 0000000000..8c4e0f89b1
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamTest.java
@@ -0,0 +1,41 @@
+package com.baeldung.algorithms.integerstreammedian;
+
+import org.junit.Test;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class MedianOfIntegerStreamTest {
+
+    @Test
+    public void givenStreamOfIntegers_whenAnElementIsRead_thenMedianChangesWithApproach1() {
+        MedianOfIntegerStream mis = new MedianOfIntegerStream();
+        for (Map.Entry<Integer, Double> e : testcaseFixture().entrySet()) {
+            mis.add(e.getKey());
+            assertEquals(e.getValue(), (Double) mis.getMedian());
+        }
+    }
+
+    @Test
+    public void givenStreamOfIntegers_whenAnElementIsRead_thenMedianChangesWithApproach2() {
+        MedianOfIntegerStream2 mis = new MedianOfIntegerStream2();
+        for (Map.Entry<Integer, Double> e : testcaseFixture().entrySet()) {
+            mis.add(e.getKey());
+            assertEquals(e.getValue(), (Double) mis.getMedian());
+        }
+    }
+
+    private Map<Integer, Double> testcaseFixture() {
+        return new LinkedHashMap<Integer, Double>() {{
+            put(1, 1d);
+            put(7, 4d);
+            put(5, 5d);
+            put(8, 6d);
+            put(3, 5d);
+            put(9, 6d);
+            put(4, 5d);
+        }};
+    }
+}

From 123551a02b718d94b0f227c24465ff7b6371313d Mon Sep 17 00:00:00 2001
From: priyank-sriv <priyank.srivastava@appdirect.com>
Date: Mon, 2 Dec 2019 20:04:20 +0530
Subject: [PATCH 007/106] rename unit test

---
 ...ntegerStreamTest.java => MedianOfIntegerStreamUnitTest.java} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/{MedianOfIntegerStreamTest.java => MedianOfIntegerStreamUnitTest.java} (96%)

diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamTest.java b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java
similarity index 96%
rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamTest.java
rename to algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java
index 8c4e0f89b1..bcea4ebba8 100644
--- a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamTest.java
+++ b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java
@@ -7,7 +7,7 @@ import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 
-public class MedianOfIntegerStreamTest {
+public class MedianOfIntegerStreamUnitTest {
 
     @Test
     public void givenStreamOfIntegers_whenAnElementIsRead_thenMedianChangesWithApproach1() {

From 61ef5289a506ff3c5eb220be2657a3035c6b7698 Mon Sep 17 00:00:00 2001
From: Fabio Silva <silva_fabio@hotmail.com>
Date: Fri, 6 Dec 2019 10:02:29 -0300
Subject: [PATCH 008/106] Pre-compile the regex pattern into a Pattern object
 and reuse

---
 .../pattern/PatternJava11UnitTest.java        | 31 ++++++++
 .../pattern/PatternPerformanceComparison.java | 71 +++++++++++++++++++
 .../com/baeldung/pattern/PatternUnitTest.java | 68 ++++++++++++++++++
 3 files changed, 170 insertions(+)
 create mode 100644 core-java-modules/core-java-11/src/test/java/com/baeldung/pattern/PatternJava11UnitTest.java
 create mode 100644 core-java-modules/core-java-text/src/main/java/com/baeldung/pattern/PatternPerformanceComparison.java
 create mode 100644 core-java-modules/core-java-text/src/test/java/com/baeldung/pattern/PatternUnitTest.java

diff --git a/core-java-modules/core-java-11/src/test/java/com/baeldung/pattern/PatternJava11UnitTest.java b/core-java-modules/core-java-11/src/test/java/com/baeldung/pattern/PatternJava11UnitTest.java
new file mode 100644
index 0000000000..ebb8065a78
--- /dev/null
+++ b/core-java-modules/core-java-11/src/test/java/com/baeldung/pattern/PatternJava11UnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.pattern;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class PatternJava11UnitTest {
+
+    private static final String VALID_NAME = "Fabio Silva";
+    private static final String INVALID_NAME = "Fabio Luis Silva";
+    private static final List<String> NAMES_TO_VALIDATE = Arrays.asList(VALID_NAME, INVALID_NAME);
+    private static final Pattern FIRST_LAST_NAME_PRE_COMPILED_PATTERN = Pattern.compile("[a-zA-Z]{3,} [a-zA-Z]{3,}");
+
+    @Test
+    public void givenPreCompiledPattern_whenCallAsMatchPredicate_thenReturnMatchPredicateToMatchesThePatternInTheListElements() {
+        Predicate<String> patternAsMatchPredicate = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.asMatchPredicate();
+        List<String> validatedNames = NAMES_TO_VALIDATE.stream()
+                .filter(patternAsMatchPredicate)
+                .collect(Collectors.toList());
+
+        assertTrue(validatedNames.contains(VALID_NAME));
+        assertFalse(validatedNames.contains(INVALID_NAME));
+    }
+}
diff --git a/core-java-modules/core-java-text/src/main/java/com/baeldung/pattern/PatternPerformanceComparison.java b/core-java-modules/core-java-text/src/main/java/com/baeldung/pattern/PatternPerformanceComparison.java
new file mode 100644
index 0000000000..711ae3fa85
--- /dev/null
+++ b/core-java-modules/core-java-text/src/main/java/com/baeldung/pattern/PatternPerformanceComparison.java
@@ -0,0 +1,71 @@
+package com.baeldung.pattern;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class PatternPerformanceComparison {
+
+    private static final String PATTERN = "\\d*[02468]";
+    private static List<String> values;
+
+    public static void main(String[] args) {
+        loadValues();
+
+        // 5_000_000 Pattern objects created
+        // 5_000_000 Matcher objects created
+        Instant start = Instant.now();
+        for (String value : values) {
+            value.matches(PATTERN);
+        }
+        System.out.println(Duration.between(start, Instant.now()).toMillis() + "ms -> String.matchs(regex)");
+
+        // Above approach "value.matches(PATTERN)" makes this internally
+        // 5_000_000 Pattern objects created
+        // 5_000_000 Matcher objects created
+        start = Instant.now();
+        for (String value : values) {
+            Pattern.matches(PATTERN, value);
+        }
+        System.out.println(Duration.between(start, Instant.now()).toMillis() + "ms -> Pattern.matches(regex, charSequence)");
+
+        // Above approach "Pattern.matches(PATTERN, value)" makes this internally
+        // 5_000_000 Pattern objects created
+        // 5_000_000 Matcher objects created
+        start = Instant.now();
+        for (String value : values) {
+            Pattern.compile(PATTERN).matcher(value).matches();
+        }
+        System.out.println(Duration.between(start, Instant.now()).toMillis() + "ms -> Pattern.compile(regex).matcher(charSequence).matches()");
+
+        // With pre-compiled pattern
+        // 1         Pattern object created
+        // 5_000_000 Matcher objects created
+        Pattern preCompiledPattern = Pattern.compile(PATTERN);
+        start = Instant.now();
+        for (String value : values) {
+            preCompiledPattern.matcher(value).matches();
+        }
+        System.out.println(Duration.between(start, Instant.now()).toMillis() + "ms  -> preCompiledPattern.matcher(value).matches()");
+
+        //With pre-compiled pattern and reusing the matcher
+        // 1 Pattern object created
+        // 1 Matcher objects created
+        Matcher matcherFromPreCompiledPattern = preCompiledPattern.matcher("");
+        start = Instant.now();
+        for (String value : values) {
+            matcherFromPreCompiledPattern.reset(value).matches();
+        }
+        System.out.println(Duration.between(start, Instant.now()).toMillis() + "ms  -> matcherFromPreCompiledPattern.reset(value).matches()");
+    }
+
+    private static void loadValues() {
+        values = new ArrayList<>();
+        for (int x = 1; x <= 5_000_000; x++) {
+            values.add(String.valueOf(x));
+        }
+    }
+}
diff --git a/core-java-modules/core-java-text/src/test/java/com/baeldung/pattern/PatternUnitTest.java b/core-java-modules/core-java-text/src/test/java/com/baeldung/pattern/PatternUnitTest.java
new file mode 100644
index 0000000000..df5c7a3b1d
--- /dev/null
+++ b/core-java-modules/core-java-text/src/test/java/com/baeldung/pattern/PatternUnitTest.java
@@ -0,0 +1,68 @@
+package com.baeldung.pattern;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.Assert.*;
+
+public class PatternUnitTest {
+
+    private static final Pattern FIRST_LAST_NAME_PRE_COMPILED_PATTERN = Pattern.compile("[a-zA-Z]{3,} [a-zA-Z]{3,}");
+    private static final String VALID_NAME = "Fabio Silva";
+    private static final String INVALID_NAME = "Mr. Silva";
+    private static final List<String> NAMES_TO_VALIDATE = Arrays.asList(VALID_NAME, INVALID_NAME);
+
+    private static final Pattern SPLIT_PRE_COMPILED_PATTERN = Pattern.compile("__");
+    private static final String TEXT_TO_SPLIT = "My_Name__is__Fabio_Silva";
+
+    @Test
+    public void givenPreCompiledPattern_whenCallMatcher_thenReturnAMatcherToMatches() {
+        Matcher matcherName1 = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.matcher(VALID_NAME);
+        Matcher matcherName2 = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.matcher(INVALID_NAME);
+
+        boolean matchesName1 = matcherName1.matches();
+        boolean matchesName2 = matcherName2.matches();
+
+        assertTrue(matchesName1);
+        assertFalse(matchesName2);
+    }
+
+    @Test
+    public void givenPreCompiledPattern_whenCallAsPredicate_thenReturnPredicateToFindThePatternInTheListElements() {
+        Predicate<String> patternsAsPredicate = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.asPredicate();
+
+        List<String> validNames = NAMES_TO_VALIDATE.stream()
+                .filter(patternsAsPredicate)
+                .collect(Collectors.toList());
+
+        assertEquals(1,validNames.size());
+        assertTrue(validNames.contains(VALID_NAME));
+    }
+
+    @Test
+    public void givenPreCompiledPattern_whenCallSplit_thenReturnArrayWithValuesSplitByThePattern() {
+        String[] textSplit = SPLIT_PRE_COMPILED_PATTERN.split(TEXT_TO_SPLIT);
+
+        assertEquals("My_Name", textSplit[0]);
+        assertEquals("is", textSplit[1]);
+        assertEquals("Fabio_Silva", textSplit[2]);
+    }
+
+    @Test
+    public void givenPreCompiledPattern_whenCallSplitAsStream_thenReturnArrayWithValuesSplitByThePattern() {
+        Stream<String> textSplitAsStream = SPLIT_PRE_COMPILED_PATTERN.splitAsStream(TEXT_TO_SPLIT);
+        String[] textSplit = textSplitAsStream.toArray(String[]::new);
+
+        assertEquals("My_Name", textSplit[0]);
+        assertEquals("is", textSplit[1]);
+        assertEquals("Fabio_Silva", textSplit[2]);
+    }
+
+}

From e6f6fd1ca71e4dd545b0f728ac211e763b42db14 Mon Sep 17 00:00:00 2001
From: Anshul BANSAL <smartdiscover17@gmail.com>
Date: Sun, 8 Dec 2019 14:40:42 +0200
Subject: [PATCH 009/106] Ninja framework changes

---
 ninja/src/main/java/META-INF/persistence.xml  | 33 ++++++++
 ninja/src/main/java/conf/Filters.java         | 17 ----
 ninja/src/main/java/conf/Module.java          | 19 -----
 ninja/src/main/java/conf/Routes.java          | 32 ++-----
 ninja/src/main/java/conf/application.conf     | 12 ++-
 ninja/src/main/java/conf/messages.properties  | 23 +----
 .../src/main/java/conf/messages_fr.properties |  2 +
 .../controllers/ApplicationController.java    | 65 ++++++++++++--
 ninja/src/main/java/models/User.java          | 22 +++++
 ninja/src/main/java/services/UserService.java |  4 +-
 .../main/java/services/UserServiceImpl.java   | 11 ++-
 .../ApplicationController/index.ftl.html      |  6 +-
 .../main/java/views/layout/header.ftl.html    |  2 +-
 .../ApiControllerDocTesterTest.java           | 84 +++++--------------
 .../controllers/ApiControllerMockTest.java    | 41 +++++++++
 15 files changed, 209 insertions(+), 164 deletions(-)
 create mode 100644 ninja/src/main/java/META-INF/persistence.xml
 create mode 100644 ninja/src/main/java/conf/messages_fr.properties
 create mode 100644 ninja/src/main/java/models/User.java
 create mode 100644 ninja/src/test/java/controllers/ApiControllerMockTest.java

diff --git a/ninja/src/main/java/META-INF/persistence.xml b/ninja/src/main/java/META-INF/persistence.xml
new file mode 100644
index 0000000000..bfdd6ad8e8
--- /dev/null
+++ b/ninja/src/main/java/META-INF/persistence.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+    version="2.0">
+
+    <!-- Database settings for development-->
+    <persistence-unit name="dev_unit" transaction-type="RESOURCE_LOCAL">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+
+        <properties>
+            <property name="hibernate.connection.driver_class" value="org.h2.Driver"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
+
+            <property name="hibernate.show_sql" value="true" />
+            <property name="hibernate.format_sql" value="true" /> 
+            <property name="hibernate.hbm2ddl.auto" value="update" /> 
+            <property name="hibernate.connection.autocommit" value="true" /> 
+            
+            <!-- Connection Pooling settings -->
+            <property name="hibernate.connection.provider_class"
+                value="org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider" />
+
+            <property name="hibernate.c3p0.max_size" value="100" />
+            <property name="hibernate.c3p0.min_size" value="0" />
+            <property name="hibernate.c3p0.acquire_increment" value="1" />
+            <property name="hibernate.c3p0.idle_test_period" value="300" />
+            <property name="hibernate.c3p0.max_statements" value="0" />
+            <property name="hibernate.c3p0.timeout" value="100" />      
+        </properties>
+    </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/ninja/src/main/java/conf/Filters.java b/ninja/src/main/java/conf/Filters.java
index cfd04e8ec2..b201780fa1 100644
--- a/ninja/src/main/java/conf/Filters.java
+++ b/ninja/src/main/java/conf/Filters.java
@@ -1,20 +1,3 @@
-/**
- * Copyright (C) 2012-2019 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.
- */
-
-
 package conf;
 
 import java.util.List;
diff --git a/ninja/src/main/java/conf/Module.java b/ninja/src/main/java/conf/Module.java
index e5ec39d2de..f7c03a4b26 100644
--- a/ninja/src/main/java/conf/Module.java
+++ b/ninja/src/main/java/conf/Module.java
@@ -1,20 +1,3 @@
-/**
- * Copyright (C) 2012-2019 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.
- */
-
-
 package conf;
 
 import com.google.inject.AbstractModule;
@@ -26,10 +9,8 @@ import services.UserServiceImpl;
 @Singleton
 public class Module extends AbstractModule {
     
-
     protected void configure() {
         
-        // bind your injections here!
         bind(UserService.class).to(UserServiceImpl.class);
         
     }
diff --git a/ninja/src/main/java/conf/Routes.java b/ninja/src/main/java/conf/Routes.java
index 7db2d7a107..4f23fd37fe 100644
--- a/ninja/src/main/java/conf/Routes.java
+++ b/ninja/src/main/java/conf/Routes.java
@@ -1,23 +1,5 @@
-/**
- * Copyright (C) 2012-2019 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.
- */
-
-
 package conf;
 
-
 import ninja.AssetsController;
 import ninja.Router;
 import ninja.application.ApplicationRoutes;
@@ -29,19 +11,17 @@ public class Routes implements ApplicationRoutes {
     public void init(Router router) {  
         
         router.GET().route("/").with(ApplicationController::index);
-        router.GET().route("/hello_world.json").with(ApplicationController::helloWorldJson);
-        
+        router.GET().route("/hello").with(ApplicationController::helloWorld);
+        router.GET().route("/userJson").with(ApplicationController::userJson);
+        router.GET().route("/users").with(ApplicationController::fetchUsers);
  
-        ///////////////////////////////////////////////////////////////////////
-        // Assets (pictures / javascript)
-        ///////////////////////////////////////////////////////////////////////    
+        //Assets
         router.GET().route("/assets/webjars/{fileName: .*}").with(AssetsController::serveWebJars);
         router.GET().route("/assets/{fileName: .*}").with(AssetsController::serveStatic);
         
-        ///////////////////////////////////////////////////////////////////////
-        // Index / Catchall shows index page
-        ///////////////////////////////////////////////////////////////////////
+        //Index
         router.GET().route("/.*").with(ApplicationController::index);
+       
     }
 
 }
diff --git a/ninja/src/main/java/conf/application.conf b/ninja/src/main/java/conf/application.conf
index 3b2e96f702..3bfbc70e1a 100644
--- a/ninja/src/main/java/conf/application.conf
+++ b/ninja/src/main/java/conf/application.conf
@@ -15,12 +15,20 @@ application.name=baeldung ninja application
 application.cookie.prefix=NINJA
 
 #ISO Language Code, optionally followed by a valid ISO Country Code. 
-application.languages=en
+application.languages=fr,en
 
 application.session.expire_time_in_seconds=3600
 application.session.send_only_if_changed=true
 application.session.transferred_over_https_only=false
 
+ninja.port=8000
+
 # enable ssl with self-signed cert in dev & test modes
-ninja.ssl.port=8443
+ninja.ssl.port=8001
 application.secret = fxSjSL9Q017BSL7gBnkyo2Prln7uXaXIT35gotXRIED8c46OSa8s4QdoIQdTsEtj
+
+# h2 jpa configuration
+ninja.jpa.persistence_unit_name=dev_unit
+db.connection.url=jdbc:h2:./devDb
+db.connection.username=sa
+db.connection.password=
diff --git a/ninja/src/main/java/conf/messages.properties b/ninja/src/main/java/conf/messages.properties
index f163d33260..3bddfcd8c7 100644
--- a/ninja/src/main/java/conf/messages.properties
+++ b/ninja/src/main/java/conf/messages.properties
@@ -1,21 +1,2 @@
-#
-# Copyright (C) 2012 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.
-#
-
-# This file is utf-8
-header.title=Hello World!
-header.home=BAM!
-hello.world=Hello World!
-hello.world.json=There is also Json rendering you can check out!
\ No newline at end of file
+header.home=Home!
+helloMsg=Hello, welcome to Ninja Framework!
\ No newline at end of file
diff --git a/ninja/src/main/java/conf/messages_fr.properties b/ninja/src/main/java/conf/messages_fr.properties
new file mode 100644
index 0000000000..89264e0cb9
--- /dev/null
+++ b/ninja/src/main/java/conf/messages_fr.properties
@@ -0,0 +1,2 @@
+header.home=Accueil!
+helloMsg=Bonjour, bienvenue dans Ninja Framework!
\ No newline at end of file
diff --git a/ninja/src/main/java/controllers/ApplicationController.java b/ninja/src/main/java/controllers/ApplicationController.java
index bd62e5fb84..65c95e9204 100644
--- a/ninja/src/main/java/controllers/ApplicationController.java
+++ b/ninja/src/main/java/controllers/ApplicationController.java
@@ -1,36 +1,83 @@
 package controllers;
 
+import ninja.Context;
 import ninja.Result;
 import ninja.Results;
+import ninja.i18n.Lang;
+import ninja.i18n.Messages;
+import ninja.jpa.UnitOfWork;
 import services.UserService;
+
+import java.util.List;
+import java.util.Optional;
+
 import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.google.inject.Provider;
 import com.google.inject.Singleton;
 
+import models.User;
+import com.google.inject.persist.Transactional;
+
 @Singleton
 public class ApplicationController {
     
+    @Inject
+    Lang lang;
+
+    @Inject
+    Messages msg;
+    
     private static Log logger = LogFactory.getLog(ApplicationController.class);
     
+    @Inject 
+    Provider<EntityManager> entitiyManagerProvider;
+
     @Inject
     UserService userService;
 
     public Result index() {
-        return Results.html();
+        Result result = Results.html();
+        lang.setLanguage("fr", result);
+        return result;
+
+    }
+
+    public Result userJson() {
+        User user = userService.getUser();
+        logger.info(user);
+        return Results.json().render(user);
+    }
+
+    public Result helloWorld(Context context) {
+        Optional<String> language = Optional.of("en");        
+        String helloMsg = msg.get("helloMsg", language).get();
+        return Results.text().render(helloMsg);
     }
     
-    public Result helloWorldJson() {
-        SimplePojo simplePojo = new SimplePojo();
-        simplePojo.content = "Hello World! Hello Json!";
-        logger.info(userService.getUserName());
-        return Results.json().render(simplePojo);
+    @UnitOfWork
+    public Result fetchUsers() {
+        insertUser();
+        EntityManager entityManager = entitiyManagerProvider.get();
+        Query q = entityManager.createQuery("SELECT x FROM User x");
+        List<User> users = (List<User>) q.getResultList();
+        System.out.println(users);
+        return Results.text().render("Done");
     }
     
-    public static class SimplePojo {
-        public String content;
+    @Transactional
+    public Result insertUser() {
+        EntityManager entityManager = entitiyManagerProvider.get();
+        User user = userService.getUser();
+        entityManager.persist(user);
+        entityManager.flush();
+        
+        return Results.text().render("Inserted");
     }
-    
+
 }
diff --git a/ninja/src/main/java/models/User.java b/ninja/src/main/java/models/User.java
new file mode 100644
index 0000000000..d1b18cfa83
--- /dev/null
+++ b/ninja/src/main/java/models/User.java
@@ -0,0 +1,22 @@
+package models;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class User {
+    
+    @Id
+    @GeneratedValue(strategy=GenerationType.AUTO)
+    Long id;
+    
+    public String firstName;
+    public String email;
+    
+    public String toString() {
+        return firstName + " : " + email;
+    }
+    
+}
diff --git a/ninja/src/main/java/services/UserService.java b/ninja/src/main/java/services/UserService.java
index 100761a2ab..a549b48e48 100644
--- a/ninja/src/main/java/services/UserService.java
+++ b/ninja/src/main/java/services/UserService.java
@@ -1,7 +1,9 @@
 package services;
 
+import models.User;
+
 public interface UserService {
     
-    String getUserName();
+    User getUser();
 
 }
diff --git a/ninja/src/main/java/services/UserServiceImpl.java b/ninja/src/main/java/services/UserServiceImpl.java
index a0dec61084..3ffa53400f 100644
--- a/ninja/src/main/java/services/UserServiceImpl.java
+++ b/ninja/src/main/java/services/UserServiceImpl.java
@@ -1,10 +1,15 @@
 package services;
 
+import models.User;
+
 public class UserServiceImpl implements UserService {
-    
+
     @Override
-    public String getUserName() {
-        return "Eugen Parashic";
+    public User getUser() {
+        User user = new User();
+        user.firstName = "Norman";
+        user.email = "norman@email.com";
+        return user;
     }
 
 }
diff --git a/ninja/src/main/java/views/ApplicationController/index.ftl.html b/ninja/src/main/java/views/ApplicationController/index.ftl.html
index ab2edaf69b..10f6612d54 100644
--- a/ninja/src/main/java/views/ApplicationController/index.ftl.html
+++ b/ninja/src/main/java/views/ApplicationController/index.ftl.html
@@ -2,8 +2,8 @@
 <@layout.myLayout "Home page">    
 
 
-<h1>${i18n("hello.world")}</h1>
-<p>${i18n("hello.world.json")}</p>
-<a href="/hello_world.json">Hello World Json</a>
+<h1>${i18n("helloMsg")}</h1>
+
+<a href="/userJson">User Json</a>
 
 </@layout.myLayout>
\ No newline at end of file
diff --git a/ninja/src/main/java/views/layout/header.ftl.html b/ninja/src/main/java/views/layout/header.ftl.html
index 8794ee5c68..ebd55a9f4c 100644
--- a/ninja/src/main/java/views/layout/header.ftl.html
+++ b/ninja/src/main/java/views/layout/header.ftl.html
@@ -6,11 +6,11 @@
 				<span class="icon-bar"></span> 
 				<span class="icon-bar"></span>
 			</button>
-			<a class="navbar-brand" href="/">${i18n("header.title")}</a>
 		</div>
 		<div class="navbar-collapse collapse">
 			<ul class="nav navbar-nav">
 				<li class="active"><a href="/">${i18n("header.home")}</a></li>
+				<li class=""><a href="/hello">Hello</a></li>
 			</ul>
 		</div>
 		<!--/.navbar-collapse -->
diff --git a/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java b/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
index af4f5ba85f..e383859dfb 100644
--- a/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
+++ b/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
@@ -1,78 +1,38 @@
-/**
- * Copyright (C) 2012-2019 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.
- */
-
-/**
- * Copyright (C) 2013 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.
- */
-
 package controllers;
 
-
-import org.junit.Test;
-
-import ninja.NinjaDocTester;
-import org.doctester.testbrowser.Request;
-import org.doctester.testbrowser.Response;
-import org.hamcrest.CoreMatchers;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
 
+import javax.inject.Inject;
+
+import org.doctester.testbrowser.Request;
+import org.doctester.testbrowser.Response;
+import org.junit.Test;
+import org.mockito.Mock;
+
+import ninja.NinjaDocTester;
+import services.UserService;
+
 public class ApiControllerDocTesterTest extends NinjaDocTester {
     
     String URL_INDEX = "/";
-    String URL_HELLO_WORLD_JSON = "/hello_world.json";
+    String URL_HELLO = "/hello";
+    String URL_USER_JSON = "/userJson";
+    String URL_USERS = "/users";
+    
+    @Mock
+    UserService userService;
     
     @Test
     public void testGetIndex() {
-    
-        Response response = makeRequest(
-                Request.GET().url(
-                        testServerUrl().path(URL_INDEX)));
-
-        assertThat(response.payload, containsString("Hello World!"));
-        assertThat(response.payload, containsString("BAM!"));
-
-
+        Response response = makeRequest(Request.GET().url(testServerUrl().path(URL_INDEX)));
+        assertThat(response.payload, containsString("Bonjour, bienvenue dans Ninja Framework!"));
     }
     
     @Test
-    public void testGetHelloWorldJson() {
-    
-        Response response = makeRequest(
-                Request.GET().url(
-                        testServerUrl().path(URL_HELLO_WORLD_JSON)));
-
-        ApplicationController.SimplePojo simplePojo 
-                = response.payloadJsonAs(ApplicationController.SimplePojo.class);
-        
-        assertThat(simplePojo.content, CoreMatchers.equalTo("Hello World! Hello Json!"));
-
-    
+    public void testGetHello() {
+        Response response = makeRequest(Request.GET().url(testServerUrl().path(URL_HELLO)));
+        assertThat(response.payload, containsString("Hello, welcome to Ninja Framework!"));
     }
-
+    
 }
diff --git a/ninja/src/test/java/controllers/ApiControllerMockTest.java b/ninja/src/test/java/controllers/ApiControllerMockTest.java
new file mode 100644
index 0000000000..3057613d2e
--- /dev/null
+++ b/ninja/src/test/java/controllers/ApiControllerMockTest.java
@@ -0,0 +1,41 @@
+package controllers;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThat;
+
+import javax.inject.Inject;
+
+import org.doctester.testbrowser.Request;
+import org.doctester.testbrowser.Response;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+
+import ninja.NinjaRunner;
+import ninja.Result;
+import services.UserService;
+
+@RunWith(NinjaRunner.class)
+public class ApiControllerMockTest {
+
+    @Inject private UserService userService;
+
+    ApplicationController applicationController;
+
+    @Before
+    public void setupTest() {
+        applicationController = new ApplicationController();
+        applicationController.userService = userService;
+    }
+
+    @Test
+    public void testThatGetUserJson() {
+        Result result = applicationController.userJson();
+        System.out.println(result.getRenderable());
+        assertEquals(userService.getUser().toString(), result.getRenderable().toString());
+    }
+    
+}

From 9f78f6273205aa58c13c3161ac71ae0b9e6e9a60 Mon Sep 17 00:00:00 2001
From: Fabio Silva <silva_fabio@hotmail.com>
Date: Sun, 8 Dec 2019 15:57:34 -0300
Subject: [PATCH 010/106] =?UTF-8?q?Ruy=20Vil=C3=A3o=20suggestions:=20no=20?=
 =?UTF-8?q?point=20in=20declaring=20the=20variables=20for=20the=20match=20?=
 =?UTF-8?q?result,=20let's=20put=20them=20directly=20in=20the=20assert=20(?=
 =?UTF-8?q?to=20be=20fixed=20in=20both=20tutorial=20and=20code).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pattern/PatternJava11UnitTest.java        | 16 +++++++-------
 .../com/baeldung/pattern/PatternUnitTest.java | 21 +++++++------------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/core-java-modules/core-java-11/src/test/java/com/baeldung/pattern/PatternJava11UnitTest.java b/core-java-modules/core-java-11/src/test/java/com/baeldung/pattern/PatternJava11UnitTest.java
index ebb8065a78..029755820f 100644
--- a/core-java-modules/core-java-11/src/test/java/com/baeldung/pattern/PatternJava11UnitTest.java
+++ b/core-java-modules/core-java-11/src/test/java/com/baeldung/pattern/PatternJava11UnitTest.java
@@ -13,19 +13,17 @@ import static org.junit.Assert.assertTrue;
 
 public class PatternJava11UnitTest {
 
-    private static final String VALID_NAME = "Fabio Silva";
-    private static final String INVALID_NAME = "Fabio Luis Silva";
-    private static final List<String> NAMES_TO_VALIDATE = Arrays.asList(VALID_NAME, INVALID_NAME);
-    private static final Pattern FIRST_LAST_NAME_PRE_COMPILED_PATTERN = Pattern.compile("[a-zA-Z]{3,} [a-zA-Z]{3,}");
-
     @Test
     public void givenPreCompiledPattern_whenCallAsMatchPredicate_thenReturnMatchPredicateToMatchesThePatternInTheListElements() {
-        Predicate<String> patternAsMatchPredicate = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.asMatchPredicate();
-        List<String> validatedNames = NAMES_TO_VALIDATE.stream()
+        List<String> namesToValidate = Arrays.asList("Fabio Silva", "Fabio Luis Silva");
+        Pattern firstLastNamePreCompiledPattern = Pattern.compile("[a-zA-Z]{3,} [a-zA-Z]{3,}");
+
+        Predicate<String> patternAsMatchPredicate = firstLastNamePreCompiledPattern.asMatchPredicate();
+        List<String> validatedNames = namesToValidate.stream()
                 .filter(patternAsMatchPredicate)
                 .collect(Collectors.toList());
 
-        assertTrue(validatedNames.contains(VALID_NAME));
-        assertFalse(validatedNames.contains(INVALID_NAME));
+        assertTrue(validatedNames.contains("Fabio Silva"));
+        assertFalse(validatedNames.contains("Fabio Luis Silva"));
     }
 }
diff --git a/core-java-modules/core-java-text/src/test/java/com/baeldung/pattern/PatternUnitTest.java b/core-java-modules/core-java-text/src/test/java/com/baeldung/pattern/PatternUnitTest.java
index df5c7a3b1d..20c98480db 100644
--- a/core-java-modules/core-java-text/src/test/java/com/baeldung/pattern/PatternUnitTest.java
+++ b/core-java-modules/core-java-text/src/test/java/com/baeldung/pattern/PatternUnitTest.java
@@ -15,17 +15,12 @@ import static org.junit.Assert.*;
 public class PatternUnitTest {
 
     private static final Pattern FIRST_LAST_NAME_PRE_COMPILED_PATTERN = Pattern.compile("[a-zA-Z]{3,} [a-zA-Z]{3,}");
-    private static final String VALID_NAME = "Fabio Silva";
-    private static final String INVALID_NAME = "Mr. Silva";
-    private static final List<String> NAMES_TO_VALIDATE = Arrays.asList(VALID_NAME, INVALID_NAME);
-
     private static final Pattern SPLIT_PRE_COMPILED_PATTERN = Pattern.compile("__");
-    private static final String TEXT_TO_SPLIT = "My_Name__is__Fabio_Silva";
 
     @Test
     public void givenPreCompiledPattern_whenCallMatcher_thenReturnAMatcherToMatches() {
-        Matcher matcherName1 = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.matcher(VALID_NAME);
-        Matcher matcherName2 = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.matcher(INVALID_NAME);
+        Matcher matcherName1 = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.matcher("Fabio Silva");
+        Matcher matcherName2 = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.matcher("Mr. Silva");
 
         boolean matchesName1 = matcherName1.matches();
         boolean matchesName2 = matcherName2.matches();
@@ -36,19 +31,20 @@ public class PatternUnitTest {
 
     @Test
     public void givenPreCompiledPattern_whenCallAsPredicate_thenReturnPredicateToFindThePatternInTheListElements() {
+        List<String> namesToValidate = Arrays.asList("Fabio Silva", "Mr. Silva");
         Predicate<String> patternsAsPredicate = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.asPredicate();
 
-        List<String> validNames = NAMES_TO_VALIDATE.stream()
+        List<String> validNames = namesToValidate.stream()
                 .filter(patternsAsPredicate)
                 .collect(Collectors.toList());
 
-        assertEquals(1,validNames.size());
-        assertTrue(validNames.contains(VALID_NAME));
+        assertEquals(1, validNames.size());
+        assertTrue(validNames.contains("Fabio Silva"));
     }
 
     @Test
     public void givenPreCompiledPattern_whenCallSplit_thenReturnArrayWithValuesSplitByThePattern() {
-        String[] textSplit = SPLIT_PRE_COMPILED_PATTERN.split(TEXT_TO_SPLIT);
+        String[] textSplit = SPLIT_PRE_COMPILED_PATTERN.split("My_Name__is__Fabio_Silva");
 
         assertEquals("My_Name", textSplit[0]);
         assertEquals("is", textSplit[1]);
@@ -57,12 +53,11 @@ public class PatternUnitTest {
 
     @Test
     public void givenPreCompiledPattern_whenCallSplitAsStream_thenReturnArrayWithValuesSplitByThePattern() {
-        Stream<String> textSplitAsStream = SPLIT_PRE_COMPILED_PATTERN.splitAsStream(TEXT_TO_SPLIT);
+        Stream<String> textSplitAsStream = SPLIT_PRE_COMPILED_PATTERN.splitAsStream("My_Name__is__Fabio_Silva");
         String[] textSplit = textSplitAsStream.toArray(String[]::new);
 
         assertEquals("My_Name", textSplit[0]);
         assertEquals("is", textSplit[1]);
         assertEquals("Fabio_Silva", textSplit[2]);
     }
-
 }

From a3eabf82a8da3edbb490161f5805103e7211e42d Mon Sep 17 00:00:00 2001
From: Kert Pjatkin <kertpjatkin@gmail.com>
Date: Mon, 2 Dec 2019 01:58:50 +0200
Subject: [PATCH 011/106] BAEL-3302: Fix package name & get rid of 3-letter
 time zone

---
 .../ModifyDefaultTimezoneUnitTest.java                    | 5 +----
 .../ModifyTimezonePropertyUnitTest.java                   | 8 +++-----
 2 files changed, 4 insertions(+), 9 deletions(-)
 rename core-java-modules/core-java-date-operations/src/test/java/com/baeldung/{timezone => jvmtimezone}/ModifyDefaultTimezoneUnitTest.java (79%)
 rename core-java-modules/core-java-date-operations/src/test/java/com/baeldung/{timezone => jvmtimezone}/ModifyTimezonePropertyUnitTest.java (79%)

diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyDefaultTimezoneUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyDefaultTimezoneUnitTest.java
similarity index 79%
rename from core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyDefaultTimezoneUnitTest.java
rename to core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyDefaultTimezoneUnitTest.java
index 05d36d2c6c..7a266b46c3 100644
--- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyDefaultTimezoneUnitTest.java
+++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyDefaultTimezoneUnitTest.java
@@ -1,9 +1,8 @@
-package com.baeldung.timezone;
+package com.baeldung.jvmtimezone;
 
 import org.junit.Test;
 
 import java.util.Calendar;
-import java.util.Date;
 import java.util.TimeZone;
 
 import static org.junit.Assert.assertEquals;
@@ -13,9 +12,7 @@ public class ModifyDefaultTimezoneUnitTest {
     @Test
     public void givenDefaultTimezoneSet_thenDateTimezoneIsCorrect() {
         TimeZone.setDefault(TimeZone.getTimeZone("Portugal"));
-        Date date = new Date();
         Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
         assertEquals(calendar.getTimeZone(), TimeZone.getTimeZone("Portugal"));
     }
 
diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyTimezonePropertyUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyTimezonePropertyUnitTest.java
similarity index 79%
rename from core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyTimezonePropertyUnitTest.java
rename to core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyTimezonePropertyUnitTest.java
index 8f65f520f8..ec0d183e78 100644
--- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyTimezonePropertyUnitTest.java
+++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyTimezonePropertyUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.timezone;
+package com.baeldung.jvmtimezone;
 
 import org.junit.After;
 import org.junit.Before;
@@ -14,7 +14,7 @@ public class ModifyTimezonePropertyUnitTest {
 
     @Before
     public void setup() {
-        System.setProperty("user.timezone", "IST");
+        System.setProperty("user.timezone", "Asia/Kolkata");
         TimeZone.setDefault(null);
     }
 
@@ -25,10 +25,8 @@ public class ModifyTimezonePropertyUnitTest {
 
     @Test
     public void givenTimezonePropertySet_thenDateTimezoneIsCorrect() {
-        Date date = new Date();
         Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
-        assertEquals(calendar.getTimeZone(), TimeZone.getTimeZone("IST"));
+        assertEquals(calendar.getTimeZone(), TimeZone.getTimeZone("Asia/Kolkata"));
     }
 
 }
\ No newline at end of file

From 2d6be72eab939fc659811c12d19335cd674f5f62 Mon Sep 17 00:00:00 2001
From: Fabio Silva <silva_fabio@hotmail.com>
Date: Thu, 12 Dec 2019 09:52:43 -0300
Subject: [PATCH 012/106] Josh Cummings suggestions: Package renamed and
 Benchmark using JMH

---
 .../PatternJava11UnitTest.java                |   2 +-
 core-java-modules/core-java-text/pom.xml      |  13 +++
 .../PatternPerformanceComparison.java         | 108 +++++++++++-------
 .../PatternUnitTest.java                      |   2 +-
 4 files changed, 79 insertions(+), 46 deletions(-)
 rename core-java-modules/core-java-11/src/test/java/com/baeldung/{pattern => patternreuse}/PatternJava11UnitTest.java (96%)
 rename core-java-modules/core-java-text/src/main/java/com/baeldung/{pattern => patternreuse}/PatternPerformanceComparison.java (60%)
 rename core-java-modules/core-java-text/src/test/java/com/baeldung/{pattern => patternreuse}/PatternUnitTest.java (98%)

diff --git a/core-java-modules/core-java-11/src/test/java/com/baeldung/pattern/PatternJava11UnitTest.java b/core-java-modules/core-java-11/src/test/java/com/baeldung/patternreuse/PatternJava11UnitTest.java
similarity index 96%
rename from core-java-modules/core-java-11/src/test/java/com/baeldung/pattern/PatternJava11UnitTest.java
rename to core-java-modules/core-java-11/src/test/java/com/baeldung/patternreuse/PatternJava11UnitTest.java
index 029755820f..94c8a39c95 100644
--- a/core-java-modules/core-java-11/src/test/java/com/baeldung/pattern/PatternJava11UnitTest.java
+++ b/core-java-modules/core-java-11/src/test/java/com/baeldung/patternreuse/PatternJava11UnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern;
+package com.baeldung.patternreuse;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/core-java-modules/core-java-text/pom.xml b/core-java-modules/core-java-text/pom.xml
index 43b0df6309..f26dddfae4 100644
--- a/core-java-modules/core-java-text/pom.xml
+++ b/core-java-modules/core-java-text/pom.xml
@@ -13,6 +13,19 @@
         <relativePath>../../parent-java</relativePath>
     </parent>
 
+    <dependencies>
+        <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>
+    </dependencies>
+
     <build>
         <finalName>core-java-text</finalName>
         <resources>
diff --git a/core-java-modules/core-java-text/src/main/java/com/baeldung/pattern/PatternPerformanceComparison.java b/core-java-modules/core-java-text/src/main/java/com/baeldung/patternreuse/PatternPerformanceComparison.java
similarity index 60%
rename from core-java-modules/core-java-text/src/main/java/com/baeldung/pattern/PatternPerformanceComparison.java
rename to core-java-modules/core-java-text/src/main/java/com/baeldung/patternreuse/PatternPerformanceComparison.java
index 711ae3fa85..01a6121ad0 100644
--- a/core-java-modules/core-java-text/src/main/java/com/baeldung/pattern/PatternPerformanceComparison.java
+++ b/core-java-modules/core-java-text/src/main/java/com/baeldung/patternreuse/PatternPerformanceComparison.java
@@ -1,68 +1,88 @@
-package com.baeldung.pattern;
+package com.baeldung.patternreuse;
 
-import java.time.Duration;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.runner.RunnerException;
+
+import java.io.IOException;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Fork(value = 1, warmups = 1)
+@Warmup(iterations = 5)
+@State(Scope.Benchmark)
 public class PatternPerformanceComparison {
 
     private static final String PATTERN = "\\d*[02468]";
     private static List<String> values;
 
-    public static void main(String[] args) {
-        loadValues();
+    private static Matcher matcherFromPreCompiledPattern;
+    private static Pattern preCompiledPattern;
 
+    public static void main(String[] args) throws IOException, RunnerException {
+        org.openjdk.jmh.Main.main(args);
+    }
+
+    @Benchmark
+    public void matcherFromPreCompiledPatternResetMatches() {
+        //With pre-compiled pattern and reusing the matcher
+        // 1 Pattern object created
+        // 1 Matcher objects created
+        for (String value : values) {
+            matcherFromPreCompiledPattern.reset(value).matches();
+        }
+    }
+
+    @Benchmark
+    public void preCompiledPatternMatcherMatches() {
+        // With pre-compiled pattern
+        // 1         Pattern object created
+        // 5_000_000 Matcher objects created
+        for (String value : values) {
+            preCompiledPattern.matcher(value).matches();
+        }
+    }
+
+    @Benchmark
+    public void patternCompileMatcherMatches() {
+        // Above approach "Pattern.matches(PATTERN, value)" makes this internally
+        // 5_000_000 Pattern objects created
+        // 5_000_000 Matcher objects created
+        for (String value : values) {
+            Pattern.compile(PATTERN).matcher(value).matches();
+        }
+    }
+
+    @Benchmark
+    public void patternMatches() {
+        // Above approach "value.matches(PATTERN)" makes this internally
+        // 5_000_000 Pattern objects created
+        // 5_000_000 Matcher objects created
+        for (String value : values) {
+            Pattern.matches(PATTERN, value);
+        }
+    }
+
+    @Benchmark
+    public void stringMatchs() {
         // 5_000_000 Pattern objects created
         // 5_000_000 Matcher objects created
         Instant start = Instant.now();
         for (String value : values) {
             value.matches(PATTERN);
         }
-        System.out.println(Duration.between(start, Instant.now()).toMillis() + "ms -> String.matchs(regex)");
-
-        // Above approach "value.matches(PATTERN)" makes this internally
-        // 5_000_000 Pattern objects created
-        // 5_000_000 Matcher objects created
-        start = Instant.now();
-        for (String value : values) {
-            Pattern.matches(PATTERN, value);
-        }
-        System.out.println(Duration.between(start, Instant.now()).toMillis() + "ms -> Pattern.matches(regex, charSequence)");
-
-        // Above approach "Pattern.matches(PATTERN, value)" makes this internally
-        // 5_000_000 Pattern objects created
-        // 5_000_000 Matcher objects created
-        start = Instant.now();
-        for (String value : values) {
-            Pattern.compile(PATTERN).matcher(value).matches();
-        }
-        System.out.println(Duration.between(start, Instant.now()).toMillis() + "ms -> Pattern.compile(regex).matcher(charSequence).matches()");
-
-        // With pre-compiled pattern
-        // 1         Pattern object created
-        // 5_000_000 Matcher objects created
-        Pattern preCompiledPattern = Pattern.compile(PATTERN);
-        start = Instant.now();
-        for (String value : values) {
-            preCompiledPattern.matcher(value).matches();
-        }
-        System.out.println(Duration.between(start, Instant.now()).toMillis() + "ms  -> preCompiledPattern.matcher(value).matches()");
-
-        //With pre-compiled pattern and reusing the matcher
-        // 1 Pattern object created
-        // 1 Matcher objects created
-        Matcher matcherFromPreCompiledPattern = preCompiledPattern.matcher("");
-        start = Instant.now();
-        for (String value : values) {
-            matcherFromPreCompiledPattern.reset(value).matches();
-        }
-        System.out.println(Duration.between(start, Instant.now()).toMillis() + "ms  -> matcherFromPreCompiledPattern.reset(value).matches()");
     }
 
-    private static void loadValues() {
+    @Setup()
+    public void setUp() {
+        preCompiledPattern = Pattern.compile(PATTERN);
+        matcherFromPreCompiledPattern = preCompiledPattern.matcher("");
+
         values = new ArrayList<>();
         for (int x = 1; x <= 5_000_000; x++) {
             values.add(String.valueOf(x));
diff --git a/core-java-modules/core-java-text/src/test/java/com/baeldung/pattern/PatternUnitTest.java b/core-java-modules/core-java-text/src/test/java/com/baeldung/patternreuse/PatternUnitTest.java
similarity index 98%
rename from core-java-modules/core-java-text/src/test/java/com/baeldung/pattern/PatternUnitTest.java
rename to core-java-modules/core-java-text/src/test/java/com/baeldung/patternreuse/PatternUnitTest.java
index 20c98480db..70f5c59a95 100644
--- a/core-java-modules/core-java-text/src/test/java/com/baeldung/pattern/PatternUnitTest.java
+++ b/core-java-modules/core-java-text/src/test/java/com/baeldung/patternreuse/PatternUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern;
+package com.baeldung.patternreuse;
 
 import org.junit.jupiter.api.Test;
 

From 6cf81c0e0a17901754af7c3db9865575f409a437 Mon Sep 17 00:00:00 2001
From: sampada <sampada.wagde@gmail.com>
Date: Thu, 12 Dec 2019 19:49:29 +0530
Subject: [PATCH 013/106] BAEL-3589 : Improvement: Java Generate Random String

---
 .../randomstrings/RandomStringsUnitTest.java  | 173 ++++++++++--------
 1 file changed, 101 insertions(+), 72 deletions(-)

diff --git a/core-java-modules/core-java-strings/src/test/java/com/baeldung/randomstrings/RandomStringsUnitTest.java b/core-java-modules/core-java-strings/src/test/java/com/baeldung/randomstrings/RandomStringsUnitTest.java
index 2806635d03..aa2a2b76ff 100644
--- a/core-java-modules/core-java-strings/src/test/java/com/baeldung/randomstrings/RandomStringsUnitTest.java
+++ b/core-java-modules/core-java-strings/src/test/java/com/baeldung/randomstrings/RandomStringsUnitTest.java
@@ -1,72 +1,101 @@
-package com.baeldung.randomstrings;
-
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.charset.Charset;
-import java.util.Random;
-
-public class RandomStringsUnitTest {
-
-    private static final Logger LOG = LoggerFactory.getLogger(RandomStringsUnitTest.class);
-
-    @Test
-    public void givenUsingPlainJava_whenGeneratingRandomStringUnbounded_thenCorrect() {
-        final byte[] array = new byte[7]; // length is bounded by 7
-        new Random().nextBytes(array);
-        final String generatedString = new String(array, Charset.forName("UTF-8"));
-
-        LOG.debug(generatedString);
-    }
-
-    @Test
-    public void givenUsingPlainJava_whenGeneratingRandomStringBounded_thenCorrect() {
-        final int leftLimit = 97; // letter 'a'
-        final int rightLimit = 122; // letter 'z'
-        final int targetStringLength = 10;
-        final Random random = new Random();
-        final StringBuilder buffer = new StringBuilder(targetStringLength);
-
-        for (int i = 0; i < targetStringLength; i++) {
-            final int randomLimitedInt = leftLimit + (int) (random.nextFloat() * (rightLimit - leftLimit + 1));
-            buffer.append((char) randomLimitedInt);
-        }
-        final String generatedString = buffer.toString();
-
-        LOG.debug(generatedString);
-    }
-
-    @Test
-    public void givenUsingApache_whenGeneratingRandomString_thenCorrect() {
-        final String generatedString = RandomStringUtils.random(10);
-
-        LOG.debug(generatedString);
-    }
-
-    @Test
-    public void givenUsingApache_whenGeneratingRandomAlphabeticString_thenCorrect() {
-        final String generatedString = RandomStringUtils.randomAlphabetic(10);
-
-        LOG.debug(generatedString);
-    }
-
-    @Test
-    public void givenUsingApache_whenGeneratingRandomAlphanumericString_thenCorrect() {
-        final String generatedString = RandomStringUtils.randomAlphanumeric(10);
-
-        LOG.debug(generatedString);
-    }
-
-    @Test
-    public void givenUsingApache_whenGeneratingRandomStringBounded_thenCorrect() {
-        final int length = 10;
-        final boolean useLetters = true;
-        final boolean useNumbers = false;
-        final String generatedString = RandomStringUtils.random(length, useLetters, useNumbers);
-
-        LOG.debug(generatedString);
-    }
-
-}
+package com.baeldung.randomstrings;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.charset.Charset;
+import java.util.Random;
+
+public class RandomStringsUnitTest {
+
+    private static final Logger LOG = LoggerFactory.getLogger(RandomStringsUnitTest.class);
+
+    @Test
+    public void givenUsingPlainJava_whenGeneratingRandomStringUnbounded_thenCorrect() {
+        final byte[] array = new byte[7]; // length is bounded by 7
+        new Random().nextBytes(array);
+        final String generatedString = new String(array, Charset.forName("UTF-8"));
+
+        LOG.debug(generatedString);
+    }
+
+    @Test
+    public void givenUsingPlainJava_whenGeneratingRandomStringBounded_thenCorrect() {
+        final int leftLimit = 97; // letter 'a'
+        final int rightLimit = 122; // letter 'z'
+        final int targetStringLength = 10;
+        final Random random = new Random();
+        final StringBuilder buffer = new StringBuilder(targetStringLength);
+
+        for (int i = 0; i < targetStringLength; i++) {
+            final int randomLimitedInt = leftLimit + (int) (random.nextFloat() * (rightLimit - leftLimit + 1));
+            buffer.append((char) randomLimitedInt);
+        }
+        final String generatedString = buffer.toString();
+
+        LOG.debug(generatedString);
+    }
+
+    @Test
+    public void givenUsingJava8_whenGeneratingRandomAlphabeticString_thenCorrect() {
+        final int leftLimit = 97; // letter 'a'
+        final int rightLimit = 122; // letter 'z'
+        final int targetStringLength = 10;
+        final Random random = new Random();
+
+        final String generatedString = random.ints(targetStringLength, leftLimit, rightLimit + 1)
+            .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+            .toString();
+
+        LOG.debug(generatedString);
+    }
+
+    @Test
+    public void givenUsingJava8_whenGeneratingRandomAlphanumericString_thenCorrect() {
+        final int leftLimit = 48; // numeral '0'
+        final int rightLimit = 122; // letter 'z'
+        final int targetStringLength = 10;
+        final Random random = new Random();
+
+        final String generatedString = random.ints(targetStringLength, leftLimit, rightLimit + 1)
+            .filter(i -> (i < 57 || i > 65) && (i < 90 || i > 97))
+            .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+            .toString();
+
+        LOG.debug(generatedString);
+    }
+
+    @Test
+    public void givenUsingApache_whenGeneratingRandomString_thenCorrect() {
+        final String generatedString = RandomStringUtils.random(10);
+
+        LOG.debug(generatedString);
+    }
+
+    @Test
+    public void givenUsingApache_whenGeneratingRandomAlphabeticString_thenCorrect() {
+        final String generatedString = RandomStringUtils.randomAlphabetic(10);
+
+        LOG.debug(generatedString);
+    }
+
+    @Test
+    public void givenUsingApache_whenGeneratingRandomAlphanumericString_thenCorrect() {
+        final String generatedString = RandomStringUtils.randomAlphanumeric(10);
+
+        LOG.debug(generatedString);
+    }
+
+    @Test
+    public void givenUsingApache_whenGeneratingRandomStringBounded_thenCorrect() {
+        final int length = 10;
+        final boolean useLetters = true;
+        final boolean useNumbers = false;
+        final String generatedString = RandomStringUtils.random(length, useLetters, useNumbers);
+
+        LOG.debug(generatedString);
+    }
+
+}

From 32bae4023ba74e2c989a61294ddbdac51ac4e60d Mon Sep 17 00:00:00 2001
From: sampada <sampada.wagde@gmail.com>
Date: Fri, 13 Dec 2019 15:44:59 +0530
Subject: [PATCH 014/106] BAEL-3589 : Java random strings

---
 .../com/baeldung/randomstrings/RandomStringsUnitTest.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core-java-modules/core-java-strings/src/test/java/com/baeldung/randomstrings/RandomStringsUnitTest.java b/core-java-modules/core-java-strings/src/test/java/com/baeldung/randomstrings/RandomStringsUnitTest.java
index aa2a2b76ff..2d0f5183a9 100644
--- a/core-java-modules/core-java-strings/src/test/java/com/baeldung/randomstrings/RandomStringsUnitTest.java
+++ b/core-java-modules/core-java-strings/src/test/java/com/baeldung/randomstrings/RandomStringsUnitTest.java
@@ -45,7 +45,8 @@ public class RandomStringsUnitTest {
         final int targetStringLength = 10;
         final Random random = new Random();
 
-        final String generatedString = random.ints(targetStringLength, leftLimit, rightLimit + 1)
+        final String generatedString = random.ints(leftLimit, rightLimit + 1)
+            .limit(targetStringLength)
             .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
             .toString();
 
@@ -59,8 +60,9 @@ public class RandomStringsUnitTest {
         final int targetStringLength = 10;
         final Random random = new Random();
 
-        final String generatedString = random.ints(targetStringLength, leftLimit, rightLimit + 1)
-            .filter(i -> (i < 57 || i > 65) && (i < 90 || i > 97))
+        final String generatedString = random.ints(leftLimit, rightLimit + 1)
+            .filter(i -> (i <= 57 || i >= 65) && (i <= 90 || i >= 97))
+            .limit(targetStringLength)
             .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
             .toString();
 

From d44a2ada1f2777d77ee1cab968d5633f88749d60 Mon Sep 17 00:00:00 2001
From: Shubhra <shubhi.srvstv@gmail.com>
Date: Sat, 14 Dec 2019 15:40:01 +0530
Subject: [PATCH 015/106] BAEL-3500 Emails with Logback

---
 logging-modules/logback/pom.xml               | 11 ++++++
 .../logback/src/main/resources/logback.xml    | 38 +++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/logging-modules/logback/pom.xml b/logging-modules/logback/pom.xml
index 6ffc9e1235..ddf2df1972 100644
--- a/logging-modules/logback/pom.xml
+++ b/logging-modules/logback/pom.xml
@@ -50,6 +50,17 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4.7</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1.1</version>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <properties>
diff --git a/logging-modules/logback/src/main/resources/logback.xml b/logging-modules/logback/src/main/resources/logback.xml
index 37ae2adbb0..76ddc2e3ee 100644
--- a/logging-modules/logback/src/main/resources/logback.xml
+++ b/logging-modules/logback/src/main/resources/logback.xml
@@ -10,9 +10,47 @@
         </encoder>
     </appender>
 
+    <appender name="emailAppender" class="ch.qos.logback.classic.net.SMTPAppender">
+        <smtpHost>OUR-SMTP-HOST-ADDRESS</smtpHost>
+        <!-- one or more recipients are possible -->
+        <to>EMAIL-RECIPIENT-1</to>
+        <to>EMAIL-RECIPIENT-2</to>
+        <from>SENDER-EMAIL-ADDRESS</from>
+        <subject>BAELDUNG: %logger{20} - %msg</subject>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{35} - %msg%n</pattern>
+        </layout>
+    </appender>
+
+    <appender name="emailAppenderCustomBufferSize" class="ch.qos.logback.classic.net.SMTPAppender">
+        <smtpHost>OUR-SMTP-HOST-ADDRESS</smtpHost>
+        <to>EMAIL-RECIPIENT</to>
+        <from>SENDER-EMAIL-ADDRESS</from>
+        <subject>BAELDUNG: %logger{20} - %msg</subject>
+        <layout class="ch.qos.logback.classic.html.HTMLLayout"/>
+        <cyclicBufferTracker class="ch.qos.logback.core.spi.CyclicBufferTracker">
+            <!-- only 5 log entries on email -->
+            <bufferSize>5</bufferSize>
+        </cyclicBufferTracker>
+    </appender>
+
+    <appender name="emailAppenderGmail" class="ch.qos.logback.classic.net.SMTPAppender">
+        <smtpHost>smtp.gmail.com</smtpHost>
+        <smtpPort>587</smtpPort>
+        <STARTTLS>true</STARTTLS>
+        <asynchronousSending>false</asynchronousSending>
+        <username>SENDER-EMAIL@gmail.com</username>
+        <password>GMAIL-ACCT-PASSWORD</password>
+        <to>EMAIL-RECIPIENT</to>
+        <from>SENDER-EMAIL@gmail.com</from>
+        <subject>BAELDUNG: %logger{20} - %msg</subject>
+        <layout class="ch.qos.logback.classic.html.HTMLLayout"/>
+    </appender>
+
     <root level="info">
         <appender-ref ref="map"/>
         <appender-ref ref="out"/>
+        <appender-ref ref="emailAppender"/>
     </root>
 
 </configuration>
\ No newline at end of file

From 9edcc9e90ee5da92a491272fc08ab215271a5a99 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sat, 14 Dec 2019 16:25:39 +0200
Subject: [PATCH 016/106] 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 23a10258a3..00b785c1b2 100644
--- a/algorithms-miscellaneous-3/README.md
+++ b/algorithms-miscellaneous-3/README.md
@@ -15,5 +15,4 @@ This module contains articles about algorithms. Some classes of algorithms, e.g.
 - [Creating a Triangle with for Loops in Java](https://www.baeldung.com/java-print-triangle)
 - [Efficient Word Frequency Calculator in Java](https://www.baeldung.com/java-word-frequency)
 - [The K-Means Clustering Algorithm in Java](https://www.baeldung.com/java-k-means-clustering-algorithm)
-- [Creating a Custom Annotation in Java](https://www.baeldung.com/java-custom-annotation)
 - More articles: [[<-- prev]](/algorithms-miscellaneous-2) [[next -->]](/algorithms-miscellaneous-4)

From e0245937f866453c7b92025eb63b9e1125022d09 Mon Sep 17 00:00:00 2001
From: Anshul BANSAL <smartdiscover17@gmail.com>
Date: Sat, 14 Dec 2019 16:34:34 +0200
Subject: [PATCH 017/106] BAEL-3464 - Ninja framework

---
 ninja/pom.xml                                 | 14 ----
 ninja/src/main/java/META-INF/persistence.xml  | 30 ++++----
 ninja/src/main/java/conf/Routes.java          |  7 +-
 ninja/src/main/java/conf/application.conf     | 19 +----
 .../controllers/ApplicationController.java    | 73 ++++++++++++-------
 ninja/src/main/java/models/User.java          |  3 +
 ninja/src/main/java/services/UserService.java |  4 +-
 .../main/java/services/UserServiceImpl.java   | 12 +--
 .../ApplicationController/createUser.ftl.html | 12 +++
 .../views/ApplicationController/home.ftl.html |  9 +++
 .../ApplicationController/index.ftl.html      | 18 ++---
 .../main/java/views/layout/header.ftl.html    |  2 +
 .../ApiControllerDocTesterTest.java           | 15 +---
 .../controllers/ApiControllerMockTest.java    | 11 +--
 14 files changed, 114 insertions(+), 115 deletions(-)
 create mode 100644 ninja/src/main/java/views/ApplicationController/createUser.ftl.html
 create mode 100644 ninja/src/main/java/views/ApplicationController/home.ftl.html

diff --git a/ninja/pom.xml b/ninja/pom.xml
index 962dabf1bd..8ec2422d9f 100644
--- a/ninja/pom.xml
+++ b/ninja/pom.xml
@@ -4,10 +4,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ninja</artifactId>
-    <!-- If you want to deploy to a war please -->
-    <!-- replace "jar" with "war" and -->
-    <!-- comment ninja-standalone dependency and  -->
-    <!-- uncomment the dependency for ninja-servlet -->
     <packaging>jar</packaging>
     <groupId>com.baeldung</groupId>
     <version>1.0.0</version>
@@ -172,16 +168,6 @@
             <artifactId>h2</artifactId>
             <version>1.4.186</version>
         </dependency>
-        <!-- If you want to deploy to a war please -->
-        <!-- comment ninja-standalone dependency and  -->
-        <!-- uncomment the dependency for ninja-servlet -->
-        <!--
-        <dependency>
-            <groupId>org.ninjaframework</groupId>
-            <artifactId>ninja-servlet</artifactId>
-            <version>${ninja.version}</version>
-        </dependency>
-        -->
         <dependency>
             <groupId>org.ninjaframework</groupId>
             <artifactId>ninja-standalone</artifactId>
diff --git a/ninja/src/main/java/META-INF/persistence.xml b/ninja/src/main/java/META-INF/persistence.xml
index bfdd6ad8e8..e57cd5ecc0 100644
--- a/ninja/src/main/java/META-INF/persistence.xml
+++ b/ninja/src/main/java/META-INF/persistence.xml
@@ -1,33 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <persistence xmlns="http://java.sun.com/xml/ns/persistence"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
-    version="2.0">
-
-    <!-- Database settings for development-->
-    <persistence-unit name="dev_unit" transaction-type="RESOURCE_LOCAL">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+  version="2.0">
+    
+    <!-- Database settings for development -->
+    <persistence-unit name="dev_unit"
+        transaction-type="RESOURCE_LOCAL">
         <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-
         <properties>
-            <property name="hibernate.connection.driver_class" value="org.h2.Driver"/>
+            <property name="hibernate.connection.driver_class" value="org.h2.Driver" />
             <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
-
             <property name="hibernate.show_sql" value="true" />
-            <property name="hibernate.format_sql" value="true" /> 
-            <property name="hibernate.hbm2ddl.auto" value="update" /> 
-            <property name="hibernate.connection.autocommit" value="true" /> 
+            <property name="hibernate.format_sql" value="true" />
+            <property name="hibernate.hbm2ddl.auto" value="update" />
+            <property name="hibernate.connection.autocommit" value="true" />
             
             <!-- Connection Pooling settings -->
-            <property name="hibernate.connection.provider_class"
-                value="org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider" />
-
+            <property name="hibernate.connection.provider_class" value="org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider" />
             <property name="hibernate.c3p0.max_size" value="100" />
             <property name="hibernate.c3p0.min_size" value="0" />
             <property name="hibernate.c3p0.acquire_increment" value="1" />
             <property name="hibernate.c3p0.idle_test_period" value="300" />
             <property name="hibernate.c3p0.max_statements" value="0" />
-            <property name="hibernate.c3p0.timeout" value="100" />      
+            <property name="hibernate.c3p0.timeout" value="100" />
         </properties>
     </persistence-unit>
 </persistence>
\ No newline at end of file
diff --git a/ninja/src/main/java/conf/Routes.java b/ninja/src/main/java/conf/Routes.java
index 4f23fd37fe..a1727d55b0 100644
--- a/ninja/src/main/java/conf/Routes.java
+++ b/ninja/src/main/java/conf/Routes.java
@@ -10,10 +10,15 @@ public class Routes implements ApplicationRoutes {
     @Override
     public void init(Router router) {  
         
-        router.GET().route("/").with(ApplicationController::index);
+        router.GET().route("/index").with(ApplicationController::index);
+        router.GET().route("/home").with(ApplicationController::home);
         router.GET().route("/hello").with(ApplicationController::helloWorld);
         router.GET().route("/userJson").with(ApplicationController::userJson);
+        router.GET().route("/createUser").with(ApplicationController::createUser);
+        router.GET().route("/flash").with(ApplicationController::showFlashMsg);
+        
         router.GET().route("/users").with(ApplicationController::fetchUsers);
+        router.POST().route("/users").with(ApplicationController::insertUser);
  
         //Assets
         router.GET().route("/assets/webjars/{fileName: .*}").with(AssetsController::serveWebJars);
diff --git a/ninja/src/main/java/conf/application.conf b/ninja/src/main/java/conf/application.conf
index 3bfbc70e1a..0ae4c7ec40 100644
--- a/ninja/src/main/java/conf/application.conf
+++ b/ninja/src/main/java/conf/application.conf
@@ -1,20 +1,9 @@
-# The main properties file to configure your application
-#
-# Properties can be prefixed by "%".
-# "%"" matches a mode you can set as system property. For instance when you
-# are using maven you can do: mvn -Dmode=test jetty:run
-#
-# Using that the following property:
-# %test.myproperty=test property
-# would overwrite the property
-# myproperty=my property
-#
-# You can define as many environments as you want. Simply set them in the mode.
-application.name=baeldung ninja application
+application.name=baeldung ninja dev application 
+%test.application.name=baeldung ninja test application 
+%prod.application.name=baeldung ninja application
 
 application.cookie.prefix=NINJA
 
-#ISO Language Code, optionally followed by a valid ISO Country Code. 
 application.languages=fr,en
 
 application.session.expire_time_in_seconds=3600
@@ -22,8 +11,6 @@ application.session.send_only_if_changed=true
 application.session.transferred_over_https_only=false
 
 ninja.port=8000
-
-# enable ssl with self-signed cert in dev & test modes
 ninja.ssl.port=8001
 application.secret = fxSjSL9Q017BSL7gBnkyo2Prln7uXaXIT35gotXRIED8c46OSa8s4QdoIQdTsEtj
 
diff --git a/ninja/src/main/java/controllers/ApplicationController.java b/ninja/src/main/java/controllers/ApplicationController.java
index 65c95e9204..cd8ad9d160 100644
--- a/ninja/src/main/java/controllers/ApplicationController.java
+++ b/ninja/src/main/java/controllers/ApplicationController.java
@@ -1,14 +1,8 @@
 package controllers;
 
-import ninja.Context;
-import ninja.Result;
-import ninja.Results;
-import ninja.i18n.Lang;
-import ninja.i18n.Messages;
-import ninja.jpa.UnitOfWork;
-import services.UserService;
-
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import javax.inject.Inject;
@@ -20,9 +14,19 @@ import org.apache.commons.logging.LogFactory;
 
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
+import com.google.inject.persist.Transactional;
 
 import models.User;
-import com.google.inject.persist.Transactional;
+import ninja.Context;
+import ninja.Result;
+import ninja.Results;
+import ninja.i18n.Lang;
+import ninja.i18n.Messages;
+import ninja.jpa.UnitOfWork;
+import ninja.session.FlashScope;
+import ninja.validation.JSR303Validation;
+import ninja.validation.Validation;
+import services.UserService;
 
 @Singleton
 public class ApplicationController {
@@ -40,44 +44,59 @@ public class ApplicationController {
 
     @Inject
     UserService userService;
-
+    
     public Result index() {
-        Result result = Results.html();
-        lang.setLanguage("fr", result);
-        return result;
-
+        return Results.html();
     }
 
     public Result userJson() {
-        User user = userService.getUser();
-        logger.info(user);
-        return Results.json().render(user);
+        HashMap<String, String> userMap = userService.getUserMap();
+        logger.info(userMap);
+        return Results.json().render(userMap);
     }
 
     public Result helloWorld(Context context) {
-        Optional<String> language = Optional.of("en");        
+        Optional<String> language = Optional.of("fr");        
         String helloMsg = msg.get("helloMsg", language).get();
         return Results.text().render(helloMsg);
     }
     
+    public Result showFlashMsg(FlashScope flashScope) {
+        flashScope.success("Success message");
+        flashScope.error("Error message");
+        return Results.redirect("/home");
+    }
+    
+    public Result home() {
+        return Results.html();
+    }
+    
+    public Result createUser() {
+        return Results.html();
+    }
+    
     @UnitOfWork
     public Result fetchUsers() {
-        insertUser();
         EntityManager entityManager = entitiyManagerProvider.get();
         Query q = entityManager.createQuery("SELECT x FROM User x");
         List<User> users = (List<User>) q.getResultList();
-        System.out.println(users);
-        return Results.text().render("Done");
+        return Results.json().render(users);
     }
     
     @Transactional
-    public Result insertUser() {
-        EntityManager entityManager = entitiyManagerProvider.get();
-        User user = userService.getUser();
-        entityManager.persist(user);
-        entityManager.flush();
+    public Result insertUser(FlashScope flashScope, @JSR303Validation User user, Validation validation) {
+        logger.info("Inserting User : " +user);
+            
+        if (validation.getViolations().size() > 0) {
+            flashScope.error("Validation Error: User can't be created");
+        } else {
+            EntityManager entityManager = entitiyManagerProvider.get();
+            entityManager.persist(user);
+            entityManager.flush();
+            flashScope.success("User '" + user + "' is created successfully");
+        }
         
-        return Results.text().render("Inserted");
+        return Results.redirect("/home");
     }
 
 }
diff --git a/ninja/src/main/java/models/User.java b/ninja/src/main/java/models/User.java
index d1b18cfa83..e021567bca 100644
--- a/ninja/src/main/java/models/User.java
+++ b/ninja/src/main/java/models/User.java
@@ -4,6 +4,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.validation.constraints.NotNull;
 
 @Entity
 public class User {
@@ -12,7 +13,9 @@ public class User {
     @GeneratedValue(strategy=GenerationType.AUTO)
     Long id;
     
+    @NotNull
     public String firstName;
+
     public String email;
     
     public String toString() {
diff --git a/ninja/src/main/java/services/UserService.java b/ninja/src/main/java/services/UserService.java
index a549b48e48..10d625c66f 100644
--- a/ninja/src/main/java/services/UserService.java
+++ b/ninja/src/main/java/services/UserService.java
@@ -1,9 +1,9 @@
 package services;
 
-import models.User;
+import java.util.HashMap;
 
 public interface UserService {
     
-    User getUser();
+    HashMap<String, String> getUserMap();
 
 }
diff --git a/ninja/src/main/java/services/UserServiceImpl.java b/ninja/src/main/java/services/UserServiceImpl.java
index 3ffa53400f..0f8c2214cf 100644
--- a/ninja/src/main/java/services/UserServiceImpl.java
+++ b/ninja/src/main/java/services/UserServiceImpl.java
@@ -1,15 +1,15 @@
 package services;
 
-import models.User;
+import java.util.HashMap;
 
 public class UserServiceImpl implements UserService {
 
     @Override
-    public User getUser() {
-        User user = new User();
-        user.firstName = "Norman";
-        user.email = "norman@email.com";
-        return user;
+    public HashMap<String, String> getUserMap() {
+        HashMap<String, String> userMap = new HashMap<>();
+        userMap.put("name", "Norman Lewis");
+        userMap.put("email", "norman@email.com");
+        return userMap;
     }
 
 }
diff --git a/ninja/src/main/java/views/ApplicationController/createUser.ftl.html b/ninja/src/main/java/views/ApplicationController/createUser.ftl.html
new file mode 100644
index 0000000000..9156f7dbf2
--- /dev/null
+++ b/ninja/src/main/java/views/ApplicationController/createUser.ftl.html
@@ -0,0 +1,12 @@
+<#import "../layout/defaultLayout.ftl.html" as layout> 
+<@layout.myLayout "Create User">    
+
+<form method="post" action="users">
+	
+	First Name : <input type="text" name="firstName"/>
+	<br/>
+	Email : <input type="text" name="email"/>
+	<br/>
+	<input type="submit" value="Create"/>
+
+</@layout.myLayout>
\ No newline at end of file
diff --git a/ninja/src/main/java/views/ApplicationController/home.ftl.html b/ninja/src/main/java/views/ApplicationController/home.ftl.html
new file mode 100644
index 0000000000..10f6612d54
--- /dev/null
+++ b/ninja/src/main/java/views/ApplicationController/home.ftl.html
@@ -0,0 +1,9 @@
+<#import "../layout/defaultLayout.ftl.html" as layout> 
+<@layout.myLayout "Home page">    
+
+
+<h1>${i18n("helloMsg")}</h1>
+
+<a href="/userJson">User Json</a>
+
+</@layout.myLayout>
\ No newline at end of file
diff --git a/ninja/src/main/java/views/ApplicationController/index.ftl.html b/ninja/src/main/java/views/ApplicationController/index.ftl.html
index 10f6612d54..25d0a31229 100644
--- a/ninja/src/main/java/views/ApplicationController/index.ftl.html
+++ b/ninja/src/main/java/views/ApplicationController/index.ftl.html
@@ -1,9 +1,9 @@
-<#import "../layout/defaultLayout.ftl.html" as layout> 
-<@layout.myLayout "Home page">    
-
-
-<h1>${i18n("helloMsg")}</h1>
-
-<a href="/userJson">User Json</a>
-
-</@layout.myLayout>
\ No newline at end of file
+<html>  
+<head>
+	<title>Ninja: Index</title>
+</head>
+<body>
+	<h1>${i18n("helloMsg")}</h1>
+	<a href="/userJson">User Json</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/ninja/src/main/java/views/layout/header.ftl.html b/ninja/src/main/java/views/layout/header.ftl.html
index ebd55a9f4c..af79449bf2 100644
--- a/ninja/src/main/java/views/layout/header.ftl.html
+++ b/ninja/src/main/java/views/layout/header.ftl.html
@@ -11,6 +11,8 @@
 			<ul class="nav navbar-nav">
 				<li class="active"><a href="/">${i18n("header.home")}</a></li>
 				<li class=""><a href="/hello">Hello</a></li>
+				<li class=""><a href="/users">List User</a></li>
+				<li class=""><a href="/createUser">Create User</a></li>
 			</ul>
 		</div>
 		<!--/.navbar-collapse -->
diff --git a/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java b/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
index e383859dfb..d5f4f1811c 100644
--- a/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
+++ b/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
@@ -2,37 +2,26 @@ package controllers;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
-
-import javax.inject.Inject;
-
 import org.doctester.testbrowser.Request;
 import org.doctester.testbrowser.Response;
 import org.junit.Test;
-import org.mockito.Mock;
-
 import ninja.NinjaDocTester;
-import services.UserService;
 
 public class ApiControllerDocTesterTest extends NinjaDocTester {
     
     String URL_INDEX = "/";
     String URL_HELLO = "/hello";
-    String URL_USER_JSON = "/userJson";
-    String URL_USERS = "/users";
-    
-    @Mock
-    UserService userService;
     
     @Test
     public void testGetIndex() {
         Response response = makeRequest(Request.GET().url(testServerUrl().path(URL_INDEX)));
-        assertThat(response.payload, containsString("Bonjour, bienvenue dans Ninja Framework!"));
+        assertThat(response.payload, containsString("Hello, welcome to Ninja Framework!"));
     }
     
     @Test
     public void testGetHello() {
         Response response = makeRequest(Request.GET().url(testServerUrl().path(URL_HELLO)));
-        assertThat(response.payload, containsString("Hello, welcome to Ninja Framework!"));
+        assertThat(response.payload, containsString("Bonjour, bienvenue dans Ninja Framework!"));
     }
     
 }
diff --git a/ninja/src/test/java/controllers/ApiControllerMockTest.java b/ninja/src/test/java/controllers/ApiControllerMockTest.java
index 3057613d2e..2466e54b2a 100644
--- a/ninja/src/test/java/controllers/ApiControllerMockTest.java
+++ b/ninja/src/test/java/controllers/ApiControllerMockTest.java
@@ -1,19 +1,10 @@
 package controllers;
 
-import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThat;
-
 import javax.inject.Inject;
-
-import org.doctester.testbrowser.Request;
-import org.doctester.testbrowser.Response;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
 import ninja.NinjaRunner;
 import ninja.Result;
 import services.UserService;
@@ -35,7 +26,7 @@ public class ApiControllerMockTest {
     public void testThatGetUserJson() {
         Result result = applicationController.userJson();
         System.out.println(result.getRenderable());
-        assertEquals(userService.getUser().toString(), result.getRenderable().toString());
+        assertEquals(userService.getUserMap().toString(), result.getRenderable().toString());
     }
     
 }

From 6d631f096ee10164812747319af551ac61d2d461 Mon Sep 17 00:00:00 2001
From: Anshul BANSAL <smartdiscover17@gmail.com>
Date: Mon, 16 Dec 2019 11:51:03 +0200
Subject: [PATCH 018/106] ninja module added to the pom.xml

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

diff --git a/pom.xml b/pom.xml
index 508b6921a7..b841b757d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -589,7 +589,7 @@
                 <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
                 <module>mustache</module>
                 <module>mybatis</module>
-
+				<module>ninja</module>
                 <module>netflix</module>
 
                 <module>optaplanner</module>
@@ -670,6 +670,7 @@
             </build>
 
             <modules>
+				<module>ninja</module>
                 <module>netflix</module>
 
                 <module>parent-boot-1</module>

From 42a0aa8ddd69ef93eadc20102949b2581b24fe41 Mon Sep 17 00:00:00 2001
From: Anshul BANSAL <smartdiscover17@gmail.com>
Date: Mon, 16 Dec 2019 12:27:31 +0200
Subject: [PATCH 019/106] ninja module added to the pom.xml

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

diff --git a/pom.xml b/pom.xml
index b841b757d8..0d4b11fc45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -670,7 +670,7 @@
             </build>
 
             <modules>
-				<module>ninja</module>
+
                 <module>netflix</module>
 
                 <module>parent-boot-1</module>
@@ -1224,7 +1224,7 @@
                 <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
                 <module>mustache</module>
                 <module>mybatis</module>
-
+				<module>ninja</module>
                 <module>netflix</module>
 
                 <module>optaplanner</module>

From 93c79bf9c759f5c4de37310fdc387d673cb30879 Mon Sep 17 00:00:00 2001
From: catalin-burcea <burcea.iulian.catalin@gmail.com>
Date: Mon, 16 Dec 2019 16:26:38 +0200
Subject: [PATCH 020/106] [BAEL-19883] - Move articles out of core-kotlin part2

---
 core-kotlin-2/README.md                          |  3 ---
 core-kotlin-modules/core-kotlin-lang-2/README.md | 13 +++++++++++++
 core-kotlin-modules/core-kotlin-lang-2/pom.xml   | 16 ++++++++++++++++
 .../lazy/ClassWithHeavyInitialization.java       |  0
 .../main/kotlin/com/baeldung/lambda/Lambda.kt    |  0
 .../com/baeldung/lazy}/LazyJavaUnitTest.java     |  4 +---
 .../ArrayInitializationTest.kt                   |  2 +-
 .../com/baeldung}/constant/ConstantUnitTest.kt   |  4 ++--
 .../constant/TestKotlinConstantClass.kt          |  2 +-
 .../constant/TestKotlinConstantObject.kt         |  2 +-
 .../infixfunctions}/InfixFunctionsTest.kt        |  2 +-
 .../baeldung/lambda/LambdaKotlinUnitTest.java    |  0
 .../kotlin/com/baeldung/lambda/LambdaTest.kt     |  1 +
 .../kotlin/com/baeldung/lazy}/LazyUnitTest.kt    |  2 +-
 .../com/baeldung/nullsafety}/NullSafetyTest.kt   |  3 ++-
 .../structuraljump}/StructuralJumpUnitTest.kt    |  2 +-
 core-kotlin-modules/core-kotlin-lang/README.md   | 16 ++++++++++++++++
 core-kotlin-modules/core-kotlin-lang/pom.xml     | 16 ++++++++++++++++
 .../baeldung/destructuringdeclarations/Person.kt |  0
 .../baeldung/destructuringdeclarations/Result.kt |  0
 .../destructuringdeclarations/Sandbox.kt         |  2 --
 .../com/baeldung/equalityoperators}/User.kt      |  2 +-
 .../main/kotlin/com/baeldung/forEach/forEach.kt  |  0
 .../main/kotlin/com/baeldung/inline}/Inline.kt   |  2 +-
 .../main/kotlin/com/baeldung/operators/Money.kt  |  0
 .../main/kotlin/com/baeldung/operators/Page.kt   |  0
 .../main/kotlin/com/baeldung/operators/Point.kt  |  0
 .../main/kotlin/com/baeldung/operators/Utils.kt  |  0
 .../main/kotlin/com/baeldung/range/CharRange.kt  |  0
 .../src/main/kotlin/com/baeldung/range/Color.kt  |  0
 .../src/main/kotlin/com/baeldung/range/Filter.kt |  0
 .../main/kotlin/com/baeldung/range/FirstLast.kt  |  0
 .../com/baeldung/range/OtherRangeFunctions.kt    |  0
 .../src/main/kotlin/com/baeldung/range/Range.kt  |  0
 .../kotlin/com/baeldung/range/ReverseRange.kt    |  0
 .../src/main/kotlin/com/baeldung/range/Step.kt   |  0
 .../main/kotlin/com/baeldung/range/UntilRange.kt |  0
 .../com/baeldung/rangeiterator}/CustomColor.kt   |  6 +++---
 .../com/baeldung/whenblock}/WhenBlockTypes.kt    |  2 +-
 .../baeldung/equalityoperators}/EqualityTest.kt  |  2 +-
 .../kotlin/com/baeldung/operators/PageTest.kt    |  0
 .../kotlin/com/baeldung/operators/PointTest.kt   |  0
 .../kotlin/com/baeldung/operators/UtilsTest.kt   |  0
 .../kotlin/com/baeldung/range/CharRangeTest.kt   |  0
 .../test/kotlin/com/baeldung/range/ColorTest.kt  |  0
 .../test/kotlin/com/baeldung/range/FilterTest.kt |  0
 .../kotlin/com/baeldung/range/FirstLastTest.kt   |  0
 .../baeldung/range/OtherRangeFunctionsTest.kt    |  0
 .../test/kotlin/com/baeldung/range/RangeTest.kt  |  0
 .../com/baeldung/range/ReverseRangeTest.kt       |  0
 .../test/kotlin/com/baeldung/range/StepTest.kt   |  0
 .../kotlin/com/baeldung/range/UntilRangeTest.kt  |  0
 .../baeldung/rangeiterator}/CustomColorTest.kt   |  2 +-
 .../com/baeldung/trywithresource}/UseTest.kt     |  2 +-
 .../com/baeldung}/voidtypes/VoidTypesUnitTest.kt |  0
 .../com/baeldung/whenblock}/WhenBlockUnitTest.kt |  2 +-
 core-kotlin-modules/pom.xml                      |  2 ++
 core-kotlin/README.md                            | 14 --------------
 58 files changed, 85 insertions(+), 41 deletions(-)
 create mode 100644 core-kotlin-modules/core-kotlin-lang-2/README.md
 create mode 100644 core-kotlin-modules/core-kotlin-lang-2/pom.xml
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang-2}/src/main/java/com/baeldung/lazy/ClassWithHeavyInitialization.java (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang-2}/src/main/kotlin/com/baeldung/lambda/Lambda.kt (100%)
 rename {core-kotlin/src/test/java/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang-2/src/test/java/com/baeldung/lazy}/LazyJavaUnitTest.java (86%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/arrayinitialization}/ArrayInitializationTest.kt (96%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung}/constant/ConstantUnitTest.kt (79%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung}/constant/TestKotlinConstantClass.kt (74%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung}/constant/TestKotlinConstantObject.kt (86%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/infixfunctions}/InfixFunctionsTest.kt (97%)
 rename {core-kotlin/src/test/java => core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin}/com/baeldung/lambda/LambdaKotlinUnitTest.java (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang-2}/src/test/kotlin/com/baeldung/lambda/LambdaTest.kt (99%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/lazy}/LazyUnitTest.kt (98%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/nullsafety}/NullSafetyTest.kt (98%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/structuraljump}/StructuralJumpUnitTest.kt (98%)
 create mode 100644 core-kotlin-modules/core-kotlin-lang/README.md
 create mode 100644 core-kotlin-modules/core-kotlin-lang/pom.xml
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/destructuringdeclarations/Person.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/destructuringdeclarations/Result.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/destructuringdeclarations/Sandbox.kt (94%)
 rename {core-kotlin/src/main/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/equalityoperators}/User.kt (66%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/forEach/forEach.kt (100%)
 rename {core-kotlin/src/main/kotlin/com/baeldung/functions => core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/inline}/Inline.kt (88%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/operators/Money.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/operators/Page.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/operators/Point.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/operators/Utils.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/range/CharRange.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/range/Color.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/range/Filter.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/range/FirstLast.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/range/OtherRangeFunctions.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/range/Range.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/range/ReverseRange.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/range/Step.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/main/kotlin/com/baeldung/range/UntilRange.kt (100%)
 rename {core-kotlin-2/src/main/kotlin/com/baeldung/range => core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/rangeiterator}/CustomColor.kt (84%)
 rename {core-kotlin/src/main/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/whenblock}/WhenBlockTypes.kt (95%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/equalityoperators}/EqualityTest.kt (97%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang}/src/test/kotlin/com/baeldung/operators/PageTest.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang}/src/test/kotlin/com/baeldung/operators/PointTest.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-lang}/src/test/kotlin/com/baeldung/operators/UtilsTest.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/test/kotlin/com/baeldung/range/CharRangeTest.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/test/kotlin/com/baeldung/range/ColorTest.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/test/kotlin/com/baeldung/range/FilterTest.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/test/kotlin/com/baeldung/range/FirstLastTest.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/test/kotlin/com/baeldung/range/OtherRangeFunctionsTest.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/test/kotlin/com/baeldung/range/RangeTest.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/test/kotlin/com/baeldung/range/ReverseRangeTest.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/test/kotlin/com/baeldung/range/StepTest.kt (100%)
 rename {core-kotlin-2 => core-kotlin-modules/core-kotlin-lang}/src/test/kotlin/com/baeldung/range/UntilRangeTest.kt (100%)
 rename {core-kotlin-2/src/test/kotlin/com/baeldung/range => core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/rangeiterator}/CustomColorTest.kt (95%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/trywithresource}/UseTest.kt (98%)
 rename {core-kotlin-2/src/test/kotlin => core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung}/voidtypes/VoidTypesUnitTest.kt (100%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/whenblock}/WhenBlockUnitTest.kt (99%)

diff --git a/core-kotlin-2/README.md b/core-kotlin-2/README.md
index 5a443c1831..89e30bc5fe 100644
--- a/core-kotlin-2/README.md
+++ b/core-kotlin-2/README.md
@@ -4,9 +4,6 @@ This module contains articles about core Kotlin.
 
 ### Relevant articles:
 
-- [Void Type in Kotlin](https://www.baeldung.com/kotlin-void-type)
-- [How to use Kotlin Range Expressions](https://www.baeldung.com/kotlin-ranges)
-- [Creating a Kotlin Range Iterator on a Custom Object](https://www.baeldung.com/kotlin-custom-range-iterator)
 - [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)
diff --git a/core-kotlin-modules/core-kotlin-lang-2/README.md b/core-kotlin-modules/core-kotlin-lang-2/README.md
new file mode 100644
index 0000000000..e64a39cb9b
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin-lang-2/README.md
@@ -0,0 +1,13 @@
+## Core Kotlin Lang
+
+This module contains articles about core features in the Kotlin language.
+
+### Relevant articles:
+- [Kotlin return, break, continue Keywords](https://www.baeldung.com/kotlin-return-break-continue)
+- [Infix Functions in Kotlin](https://www.baeldung.com/kotlin-infix-functions)
+- [Lambda Expressions in Kotlin](https://www.baeldung.com/kotlin-lambda-expressions)
+- [Creating Java static final Equivalents in Kotlin](https://www.baeldung.com/kotlin-java-static-final)
+- [Initializing Arrays in Kotlin](https://www.baeldung.com/kotlin-initialize-array)
+- [Lazy Initialization in Kotlin](https://www.baeldung.com/kotlin-lazy-initialization)
+- [Comprehensive Guide to Null Safety in Kotlin](https://www.baeldung.com/kotlin-null-safety)
+- [[<-- Prev]](/core-kotlin-modules/core-kotlin-lang)
diff --git a/core-kotlin-modules/core-kotlin-lang-2/pom.xml b/core-kotlin-modules/core-kotlin-lang-2/pom.xml
new file mode 100644
index 0000000000..753147728d
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin-lang-2/pom.xml
@@ -0,0 +1,16 @@
+<?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-kotlin-lang-2</artifactId>
+    <name>core-kotlin-lang-2</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-kotlin-modules</groupId>
+        <artifactId>core-kotlin-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+</project>
\ No newline at end of file
diff --git a/core-kotlin/src/main/java/com/baeldung/lazy/ClassWithHeavyInitialization.java b/core-kotlin-modules/core-kotlin-lang-2/src/main/java/com/baeldung/lazy/ClassWithHeavyInitialization.java
similarity index 100%
rename from core-kotlin/src/main/java/com/baeldung/lazy/ClassWithHeavyInitialization.java
rename to core-kotlin-modules/core-kotlin-lang-2/src/main/java/com/baeldung/lazy/ClassWithHeavyInitialization.java
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/lambda/Lambda.kt b/core-kotlin-modules/core-kotlin-lang-2/src/main/kotlin/com/baeldung/lambda/Lambda.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/lambda/Lambda.kt
rename to core-kotlin-modules/core-kotlin-lang-2/src/main/kotlin/com/baeldung/lambda/Lambda.kt
diff --git a/core-kotlin/src/test/java/com/baeldung/kotlin/LazyJavaUnitTest.java b/core-kotlin-modules/core-kotlin-lang-2/src/test/java/com/baeldung/lazy/LazyJavaUnitTest.java
similarity index 86%
rename from core-kotlin/src/test/java/com/baeldung/kotlin/LazyJavaUnitTest.java
rename to core-kotlin-modules/core-kotlin-lang-2/src/test/java/com/baeldung/lazy/LazyJavaUnitTest.java
index e2fe58d537..01c87d9543 100644
--- a/core-kotlin/src/test/java/com/baeldung/kotlin/LazyJavaUnitTest.java
+++ b/core-kotlin-modules/core-kotlin-lang-2/src/test/java/com/baeldung/lazy/LazyJavaUnitTest.java
@@ -1,7 +1,5 @@
-package com.baeldung.kotlin;
+package com.baeldung.lazy;
 
-
-import com.baeldung.lazy.ClassWithHeavyInitialization;
 import org.junit.Test;
 
 import static junit.framework.TestCase.assertTrue;
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/ArrayInitializationTest.kt b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/arrayinitialization/ArrayInitializationTest.kt
similarity index 96%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/ArrayInitializationTest.kt
rename to core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/arrayinitialization/ArrayInitializationTest.kt
index ba3694c831..d4b9d607fb 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/ArrayInitializationTest.kt
+++ b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/arrayinitialization/ArrayInitializationTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.arrayinitialization
 
 import org.junit.Test
 import kotlin.test.assertEquals
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/ConstantUnitTest.kt b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/constant/ConstantUnitTest.kt
similarity index 79%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/ConstantUnitTest.kt
rename to core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/constant/ConstantUnitTest.kt
index 51d45b8df0..d9bf433208 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/ConstantUnitTest.kt
+++ b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/constant/ConstantUnitTest.kt
@@ -1,5 +1,5 @@
-import com.baeldung.kotlin.constant.TestKotlinConstantClass
-import com.baeldung.kotlin.constant.TestKotlinConstantObject
+package com.baeldung.constant
+
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/TestKotlinConstantClass.kt b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/constant/TestKotlinConstantClass.kt
similarity index 74%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/TestKotlinConstantClass.kt
rename to core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/constant/TestKotlinConstantClass.kt
index 8bcc327999..3c4d4db220 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/TestKotlinConstantClass.kt
+++ b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/constant/TestKotlinConstantClass.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.constant
+package com.baeldung.constant
 
 
 class TestKotlinConstantClass {
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/TestKotlinConstantObject.kt b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/constant/TestKotlinConstantObject.kt
similarity index 86%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/TestKotlinConstantObject.kt
rename to core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/constant/TestKotlinConstantObject.kt
index 815fdeaf14..a6951b4481 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/TestKotlinConstantObject.kt
+++ b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/constant/TestKotlinConstantObject.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.constant
+package com.baeldung.constant
 
 
 object TestKotlinConstantObject {
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/InfixFunctionsTest.kt b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/infixfunctions/InfixFunctionsTest.kt
similarity index 97%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/InfixFunctionsTest.kt
rename to core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/infixfunctions/InfixFunctionsTest.kt
index fc4286460a..0b09d34013 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/InfixFunctionsTest.kt
+++ b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/infixfunctions/InfixFunctionsTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.infixfunctions
 
 import org.junit.Assert
 import org.junit.Test
diff --git a/core-kotlin/src/test/java/com/baeldung/lambda/LambdaKotlinUnitTest.java b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/lambda/LambdaKotlinUnitTest.java
similarity index 100%
rename from core-kotlin/src/test/java/com/baeldung/lambda/LambdaKotlinUnitTest.java
rename to core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/lambda/LambdaKotlinUnitTest.java
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/lambda/LambdaTest.kt b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/lambda/LambdaTest.kt
similarity index 99%
rename from core-kotlin/src/test/kotlin/com/baeldung/lambda/LambdaTest.kt
rename to core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/lambda/LambdaTest.kt
index 3af00c98ff..bddabee462 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/lambda/LambdaTest.kt
+++ b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/lambda/LambdaTest.kt
@@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 
 class LambdaTest {
+
     @Test
     fun whenCallingALambda_thenPerformTheAction() {
         assertEquals(9, inferredType(3))
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LazyUnitTest.kt b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/lazy/LazyUnitTest.kt
similarity index 98%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/LazyUnitTest.kt
rename to core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/lazy/LazyUnitTest.kt
index 1169fb9193..b9b21ed4d9 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LazyUnitTest.kt
+++ b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/lazy/LazyUnitTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.lazy
 
 import org.junit.Test
 import java.util.concurrent.CountDownLatch
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/NullSafetyTest.kt b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/nullsafety/NullSafetyTest.kt
similarity index 98%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/NullSafetyTest.kt
rename to core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/nullsafety/NullSafetyTest.kt
index 0ecc74b6fb..66fc043581 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/NullSafetyTest.kt
+++ b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/nullsafety/NullSafetyTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.nullsafety
 
 import org.junit.Test
 import kotlin.test.assertEquals
@@ -8,6 +8,7 @@ import kotlin.test.assertTrue
 
 
 class NullSafetyTest {
+
     @Test
     fun givenNonNullableField_whenAssignValueToIt_thenNotNeedToCheckAgainstNull() {
         //given
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpUnitTest.kt b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/structuraljump/StructuralJumpUnitTest.kt
similarity index 98%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpUnitTest.kt
rename to core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/structuraljump/StructuralJumpUnitTest.kt
index 436dc9e2ba..88011ab396 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpUnitTest.kt
+++ b/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/structuraljump/StructuralJumpUnitTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.structuraljump
 
 import org.junit.Test
 import kotlin.test.assertEquals
diff --git a/core-kotlin-modules/core-kotlin-lang/README.md b/core-kotlin-modules/core-kotlin-lang/README.md
new file mode 100644
index 0000000000..eaeae76854
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin-lang/README.md
@@ -0,0 +1,16 @@
+## Core Kotlin Lang
+
+This module contains articles about core features in the Kotlin language.
+
+### Relevant articles:
+- [Guide to the “when{}” Block in Kotlin](https://www.baeldung.com/kotlin-when)
+- [Difference Between “==” and “===” Operators in Kotlin](https://www.baeldung.com/kotlin-equality-operators)
+- [Nested forEach in Kotlin](https://www.baeldung.com/kotlin-nested-foreach)
+- [Destructuring Declarations in Kotlin](https://www.baeldung.com/kotlin-destructuring-declarations)
+- [Try-with-resources in Kotlin](https://www.baeldung.com/kotlin-try-with-resources)
+- [Operator Overloading in Kotlin](https://www.baeldung.com/kotlin-operator-overloading)
+- [Inline Functions in Kotlin](https://www.baeldung.com/kotlin-inline-functions)
+- [Void Type in Kotlin](https://www.baeldung.com/kotlin-void-type)
+- [How to use Kotlin Range Expressions](https://www.baeldung.com/kotlin-ranges)
+- [Creating a Kotlin Range Iterator on a Custom Object](https://www.baeldung.com/kotlin-custom-range-iterator)
+- [[More --> ]](/core-kotlin-modules/core-kotlin-lang-2)
diff --git a/core-kotlin-modules/core-kotlin-lang/pom.xml b/core-kotlin-modules/core-kotlin-lang/pom.xml
new file mode 100644
index 0000000000..d3ac7f690c
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin-lang/pom.xml
@@ -0,0 +1,16 @@
+<?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-kotlin-lang</artifactId>
+    <name>core-kotlin-lang</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-kotlin-modules</groupId>
+        <artifactId>core-kotlin-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+</project>
\ No newline at end of file
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Person.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/destructuringdeclarations/Person.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Person.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/destructuringdeclarations/Person.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Result.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/destructuringdeclarations/Result.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Result.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/destructuringdeclarations/Result.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Sandbox.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/destructuringdeclarations/Sandbox.kt
similarity index 94%
rename from core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Sandbox.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/destructuringdeclarations/Sandbox.kt
index a5018d93c8..f845d01539 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Sandbox.kt
+++ b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/destructuringdeclarations/Sandbox.kt
@@ -1,7 +1,5 @@
 package com.baeldung.destructuringdeclarations
 
-import com.baeldung.destructuringdeclarations.Person
-
 fun main(args: Array<String>) {
 
         //2.1. Objects
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/User.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/equalityoperators/User.kt
similarity index 66%
rename from core-kotlin/src/main/kotlin/com/baeldung/kotlin/User.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/equalityoperators/User.kt
index 759627b56e..030169bb8a 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/User.kt
+++ b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/equalityoperators/User.kt
@@ -1,3 +1,3 @@
-package com.baeldung.kotlin
+package com.baeldung.equalityoperators
 
 data class User(val name: String, val age: Int, val hobbies: List<String>)
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/forEach/forEach.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/forEach/forEach.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/forEach/forEach.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/forEach/forEach.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/functions/Inline.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/inline/Inline.kt
similarity index 88%
rename from core-kotlin/src/main/kotlin/com/baeldung/functions/Inline.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/inline/Inline.kt
index 239c425c03..3b179642ba 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/functions/Inline.kt
+++ b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/inline/Inline.kt
@@ -1,4 +1,4 @@
-package com.baeldung.functions
+package com.baeldung.inline
 
 import kotlin.random.Random
 
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/operators/Money.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/operators/Money.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/operators/Money.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/operators/Money.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/operators/Page.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/operators/Page.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/operators/Page.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/operators/Page.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/operators/Point.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/operators/Point.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/operators/Point.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/operators/Point.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/operators/Utils.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/operators/Utils.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/operators/Utils.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/operators/Utils.kt
diff --git a/core-kotlin-2/src/main/kotlin/com/baeldung/range/CharRange.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/CharRange.kt
similarity index 100%
rename from core-kotlin-2/src/main/kotlin/com/baeldung/range/CharRange.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/CharRange.kt
diff --git a/core-kotlin-2/src/main/kotlin/com/baeldung/range/Color.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/Color.kt
similarity index 100%
rename from core-kotlin-2/src/main/kotlin/com/baeldung/range/Color.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/Color.kt
diff --git a/core-kotlin-2/src/main/kotlin/com/baeldung/range/Filter.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/Filter.kt
similarity index 100%
rename from core-kotlin-2/src/main/kotlin/com/baeldung/range/Filter.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/Filter.kt
diff --git a/core-kotlin-2/src/main/kotlin/com/baeldung/range/FirstLast.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/FirstLast.kt
similarity index 100%
rename from core-kotlin-2/src/main/kotlin/com/baeldung/range/FirstLast.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/FirstLast.kt
diff --git a/core-kotlin-2/src/main/kotlin/com/baeldung/range/OtherRangeFunctions.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/OtherRangeFunctions.kt
similarity index 100%
rename from core-kotlin-2/src/main/kotlin/com/baeldung/range/OtherRangeFunctions.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/OtherRangeFunctions.kt
diff --git a/core-kotlin-2/src/main/kotlin/com/baeldung/range/Range.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/Range.kt
similarity index 100%
rename from core-kotlin-2/src/main/kotlin/com/baeldung/range/Range.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/Range.kt
diff --git a/core-kotlin-2/src/main/kotlin/com/baeldung/range/ReverseRange.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/ReverseRange.kt
similarity index 100%
rename from core-kotlin-2/src/main/kotlin/com/baeldung/range/ReverseRange.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/ReverseRange.kt
diff --git a/core-kotlin-2/src/main/kotlin/com/baeldung/range/Step.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/Step.kt
similarity index 100%
rename from core-kotlin-2/src/main/kotlin/com/baeldung/range/Step.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/Step.kt
diff --git a/core-kotlin-2/src/main/kotlin/com/baeldung/range/UntilRange.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/UntilRange.kt
similarity index 100%
rename from core-kotlin-2/src/main/kotlin/com/baeldung/range/UntilRange.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/range/UntilRange.kt
diff --git a/core-kotlin-2/src/main/kotlin/com/baeldung/range/CustomColor.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/rangeiterator/CustomColor.kt
similarity index 84%
rename from core-kotlin-2/src/main/kotlin/com/baeldung/range/CustomColor.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/rangeiterator/CustomColor.kt
index b4fed13b18..c1ab8e1610 100644
--- a/core-kotlin-2/src/main/kotlin/com/baeldung/range/CustomColor.kt
+++ b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/rangeiterator/CustomColor.kt
@@ -1,4 +1,4 @@
-package com.baeldung.range
+package com.baeldung.rangeiterator
 
 import java.lang.IllegalStateException
 
@@ -8,7 +8,7 @@ class CustomColor(val rgb: Int): Comparable<CustomColor> {
         return this.rgb.compareTo(other.rgb)
     }
 
-    operator fun rangeTo(that: CustomColor) = ColorRange(this,that)
+    operator fun rangeTo(that: CustomColor) = ColorRange(this, that)
 
     operator fun inc(): CustomColor {
         return CustomColor(rgb + 1)
@@ -25,7 +25,7 @@ class CustomColor(val rgb: Int): Comparable<CustomColor> {
     }
 }
 class ColorRange(override val start: CustomColor,
-                override val endInclusive: CustomColor) : ClosedRange<CustomColor>, Iterable<CustomColor>{
+                 override val endInclusive: CustomColor) : ClosedRange<CustomColor>, Iterable<CustomColor>{
 
     override fun iterator(): Iterator<CustomColor> {
         return ColorIterator(start, endInclusive)
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/WhenBlockTypes.kt b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/whenblock/WhenBlockTypes.kt
similarity index 95%
rename from core-kotlin/src/main/kotlin/com/baeldung/kotlin/WhenBlockTypes.kt
rename to core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/whenblock/WhenBlockTypes.kt
index 6180da10d9..a4cd7b98f0 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/WhenBlockTypes.kt
+++ b/core-kotlin-modules/core-kotlin-lang/src/main/kotlin/com/baeldung/whenblock/WhenBlockTypes.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.whenblock
 
 enum class UnixFileType {
     D, HYPHEN_MINUS, L
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/EqualityTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/equalityoperators/EqualityTest.kt
similarity index 97%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/EqualityTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/equalityoperators/EqualityTest.kt
index 6fb6d0a288..0728d55b73 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/EqualityTest.kt
+++ b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/equalityoperators/EqualityTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.equalityoperators
 
 import org.junit.Test
 import kotlin.test.assertFalse
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/operators/PageTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/operators/PageTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/operators/PageTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/operators/PageTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/operators/PointTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/operators/PointTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/operators/PointTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/operators/PointTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/operators/UtilsTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/operators/UtilsTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/operators/UtilsTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/operators/UtilsTest.kt
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/range/CharRangeTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/CharRangeTest.kt
similarity index 100%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/range/CharRangeTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/CharRangeTest.kt
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/range/ColorTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/ColorTest.kt
similarity index 100%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/range/ColorTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/ColorTest.kt
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/range/FilterTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/FilterTest.kt
similarity index 100%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/range/FilterTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/FilterTest.kt
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/range/FirstLastTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/FirstLastTest.kt
similarity index 100%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/range/FirstLastTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/FirstLastTest.kt
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/range/OtherRangeFunctionsTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/OtherRangeFunctionsTest.kt
similarity index 100%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/range/OtherRangeFunctionsTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/OtherRangeFunctionsTest.kt
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/range/RangeTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/RangeTest.kt
similarity index 100%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/range/RangeTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/RangeTest.kt
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/range/ReverseRangeTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/ReverseRangeTest.kt
similarity index 100%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/range/ReverseRangeTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/ReverseRangeTest.kt
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/range/StepTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/StepTest.kt
similarity index 100%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/range/StepTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/StepTest.kt
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/range/UntilRangeTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/UntilRangeTest.kt
similarity index 100%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/range/UntilRangeTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/range/UntilRangeTest.kt
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/range/CustomColorTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/rangeiterator/CustomColorTest.kt
similarity index 95%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/range/CustomColorTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/rangeiterator/CustomColorTest.kt
index 8c8795ac42..676b47ae7a 100644
--- a/core-kotlin-2/src/test/kotlin/com/baeldung/range/CustomColorTest.kt
+++ b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/rangeiterator/CustomColorTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.range
+package com.baeldung.rangeiterator
 
 import org.junit.Test
 import java.lang.IllegalStateException
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/UseTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/trywithresource/UseTest.kt
similarity index 98%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/UseTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/trywithresource/UseTest.kt
index 15bdfcafd8..d17832b380 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/UseTest.kt
+++ b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/trywithresource/UseTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.trywithresource
 
 import org.junit.Test
 import java.beans.ExceptionListener
diff --git a/core-kotlin-2/src/test/kotlin/voidtypes/VoidTypesUnitTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/voidtypes/VoidTypesUnitTest.kt
similarity index 100%
rename from core-kotlin-2/src/test/kotlin/voidtypes/VoidTypesUnitTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/voidtypes/VoidTypesUnitTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/WhenBlockUnitTest.kt b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/whenblock/WhenBlockUnitTest.kt
similarity index 99%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/WhenBlockUnitTest.kt
rename to core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/whenblock/WhenBlockUnitTest.kt
index aa1891fa46..31b6ad69f5 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/WhenBlockUnitTest.kt
+++ b/core-kotlin-modules/core-kotlin-lang/src/test/kotlin/com/baeldung/whenblock/WhenBlockUnitTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.whenblock
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
diff --git a/core-kotlin-modules/pom.xml b/core-kotlin-modules/pom.xml
index 747e8b69de..1abea86289 100644
--- a/core-kotlin-modules/pom.xml
+++ b/core-kotlin-modules/pom.xml
@@ -17,6 +17,8 @@
     <modules>
         <module>core-kotlin-annotations</module>
         <module>core-kotlin-io</module>
+        <module>core-kotlin-lang</module>
+        <module>core-kotlin-lang-2</module>
         <module>core-kotlin-strings</module>
     </modules>
 
diff --git a/core-kotlin/README.md b/core-kotlin/README.md
index f75a4e764c..785eb0b689 100644
--- a/core-kotlin/README.md
+++ b/core-kotlin/README.md
@@ -5,14 +5,9 @@ This module contains articles about core Kotlin.
 ### Relevant articles:
 
 - [Introduction to the Kotlin Language](https://www.baeldung.com/kotlin)
-- [Guide to the “when{}” Block in Kotlin](https://www.baeldung.com/kotlin-when)
-- [Comprehensive Guide to Null Safety in Kotlin](https://www.baeldung.com/kotlin-null-safety)
 - [Kotlin Java Interoperability](https://www.baeldung.com/kotlin-java-interoperability)
-- [Difference Between “==” and “===” operators in Kotlin](https://www.baeldung.com/kotlin-equality-operators)
 - [Generics in Kotlin](https://www.baeldung.com/kotlin-generics)
 - [Introduction to Kotlin Coroutines](https://www.baeldung.com/kotlin-coroutines)
-- [Destructuring Declarations in Kotlin](https://www.baeldung.com/kotlin-destructuring-declarations)
-- [Lazy Initialization in Kotlin](https://www.baeldung.com/kotlin-lazy-initialization)
 - [Overview of Kotlin Collections API](https://www.baeldung.com/kotlin-collections-api)
 - [Converting a List to Map in Kotlin](https://www.baeldung.com/kotlin-list-to-map)
 - [Data Classes in Kotlin](https://www.baeldung.com/kotlin-data-classes)
@@ -20,12 +15,9 @@ This module contains articles about core Kotlin.
 - [Sealed Classes in Kotlin](https://www.baeldung.com/kotlin-sealed-classes)
 - [JUnit 5 for Kotlin Developers](https://www.baeldung.com/junit-5-kotlin)
 - [Extension Methods in Kotlin](https://www.baeldung.com/kotlin-extension-methods)
-- [Infix Functions in Kotlin](https://www.baeldung.com/kotlin-infix-functions)
-- [Try-with-resources in Kotlin](https://www.baeldung.com/kotlin-try-with-resources)
 - [Regular Expressions in Kotlin](https://www.baeldung.com/kotlin-regular-expressions)
 - [Objects in Kotlin](https://www.baeldung.com/kotlin-objects)
 - [Filtering Kotlin Collections](https://www.baeldung.com/kotlin-filter-collection)
-- [Lambda Expressions in Kotlin](https://www.baeldung.com/kotlin-lambda-expressions)
 - [Working with Enums in Kotlin](https://www.baeldung.com/kotlin-enum)
 - [Create a Java and Kotlin Project with Maven](https://www.baeldung.com/kotlin-maven-java-project)
 - [Reflection with Kotlin](https://www.baeldung.com/kotlin-reflection)
@@ -37,21 +29,15 @@ This module contains articles about core Kotlin.
 - [Fuel HTTP Library with Kotlin](https://www.baeldung.com/kotlin-fuel)
 - [Introduction to Kovenant Library for Kotlin](https://www.baeldung.com/kotlin-kovenant)
 - [Converting Kotlin Data Class from JSON using GSON](https://www.baeldung.com/kotlin-json-convert-data-class)
-- [Kotlin return, break, continue Keywords](https://www.baeldung.com/kotlin-return-break-continue)
 - [Mapping of Data Objects in Kotlin](https://www.baeldung.com/kotlin-data-objects)
-- [Initializing Arrays in Kotlin](https://www.baeldung.com/kotlin-initialize-array)
 - [Threads vs Coroutines in Kotlin](https://www.baeldung.com/kotlin-threads-coroutines)
 - [Guide to Kotlin Interfaces](https://www.baeldung.com/kotlin-interfaces)
 - [Guide to Sorting in Kotlin](https://www.baeldung.com/kotlin-sort)
 - [Dependency Injection for Kotlin with Injekt](https://www.baeldung.com/kotlin-dependency-injection-with-injekt)
 - [Implementing a Binary Tree in Kotlin](https://www.baeldung.com/kotlin-binary-tree)
 - [Kotlin Contracts](https://www.baeldung.com/kotlin-contracts)
-- [Operator Overloading in Kotlin](https://www.baeldung.com/kotlin-operator-overloading)
 - [Inline Classes in Kotlin](https://www.baeldung.com/kotlin-inline-classes)
-- [Creating Java static final Equivalents in Kotlin](https://www.baeldung.com/kotlin-java-static-final)
-- [Nested forEach in Kotlin](https://www.baeldung.com/kotlin-nested-foreach)
 - [Building DSLs in Kotlin](https://www.baeldung.com/kotlin-dsl)
 - [Static Methods Behavior in Kotlin](https://www.baeldung.com/kotlin-static-methods)
-- [Inline Functions in Kotlin](https://www.baeldung.com/kotlin-inline-functions)
 - [Delegation Pattern in Kotlin](https://www.baeldung.com/kotlin-delegation-pattern)
 - More articles: [[next -->]](/core-kotlin-2)

From e68dd13723dc38d425714a964d17ad0446e04a4b Mon Sep 17 00:00:00 2001
From: sampada <sampada.wagde@gmail.com>
Date: Mon, 16 Dec 2019 22:50:51 +0530
Subject: [PATCH 021/106] BAEL-3589 : removed unnecessary final modifiers

---
 .../randomstrings/RandomStringsUnitTest.java  | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/core-java-modules/core-java-strings/src/test/java/com/baeldung/randomstrings/RandomStringsUnitTest.java b/core-java-modules/core-java-strings/src/test/java/com/baeldung/randomstrings/RandomStringsUnitTest.java
index 2d0f5183a9..edfabc8777 100644
--- a/core-java-modules/core-java-strings/src/test/java/com/baeldung/randomstrings/RandomStringsUnitTest.java
+++ b/core-java-modules/core-java-strings/src/test/java/com/baeldung/randomstrings/RandomStringsUnitTest.java
@@ -14,38 +14,38 @@ public class RandomStringsUnitTest {
 
     @Test
     public void givenUsingPlainJava_whenGeneratingRandomStringUnbounded_thenCorrect() {
-        final byte[] array = new byte[7]; // length is bounded by 7
+        byte[] array = new byte[7]; // length is bounded by 7
         new Random().nextBytes(array);
-        final String generatedString = new String(array, Charset.forName("UTF-8"));
+        String generatedString = new String(array, Charset.forName("UTF-8"));
 
         LOG.debug(generatedString);
     }
 
     @Test
     public void givenUsingPlainJava_whenGeneratingRandomStringBounded_thenCorrect() {
-        final int leftLimit = 97; // letter 'a'
-        final int rightLimit = 122; // letter 'z'
-        final int targetStringLength = 10;
-        final Random random = new Random();
-        final StringBuilder buffer = new StringBuilder(targetStringLength);
+        int leftLimit = 97; // letter 'a'
+        int rightLimit = 122; // letter 'z'
+        int targetStringLength = 10;
+        Random random = new Random();
+        StringBuilder buffer = new StringBuilder(targetStringLength);
 
         for (int i = 0; i < targetStringLength; i++) {
-            final int randomLimitedInt = leftLimit + (int) (random.nextFloat() * (rightLimit - leftLimit + 1));
+            int randomLimitedInt = leftLimit + (int) (random.nextFloat() * (rightLimit - leftLimit + 1));
             buffer.append((char) randomLimitedInt);
         }
-        final String generatedString = buffer.toString();
+        String generatedString = buffer.toString();
 
         LOG.debug(generatedString);
     }
 
     @Test
     public void givenUsingJava8_whenGeneratingRandomAlphabeticString_thenCorrect() {
-        final int leftLimit = 97; // letter 'a'
-        final int rightLimit = 122; // letter 'z'
-        final int targetStringLength = 10;
-        final Random random = new Random();
+        int leftLimit = 97; // letter 'a'
+        int rightLimit = 122; // letter 'z'
+        int targetStringLength = 10;
+        Random random = new Random();
 
-        final String generatedString = random.ints(leftLimit, rightLimit + 1)
+        String generatedString = random.ints(leftLimit, rightLimit + 1)
             .limit(targetStringLength)
             .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
             .toString();
@@ -55,12 +55,12 @@ public class RandomStringsUnitTest {
 
     @Test
     public void givenUsingJava8_whenGeneratingRandomAlphanumericString_thenCorrect() {
-        final int leftLimit = 48; // numeral '0'
-        final int rightLimit = 122; // letter 'z'
-        final int targetStringLength = 10;
-        final Random random = new Random();
+        int leftLimit = 48; // numeral '0'
+        int rightLimit = 122; // letter 'z'
+        int targetStringLength = 10;
+        Random random = new Random();
 
-        final String generatedString = random.ints(leftLimit, rightLimit + 1)
+        String generatedString = random.ints(leftLimit, rightLimit + 1)
             .filter(i -> (i <= 57 || i >= 65) && (i <= 90 || i >= 97))
             .limit(targetStringLength)
             .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
@@ -71,31 +71,31 @@ public class RandomStringsUnitTest {
 
     @Test
     public void givenUsingApache_whenGeneratingRandomString_thenCorrect() {
-        final String generatedString = RandomStringUtils.random(10);
+        String generatedString = RandomStringUtils.random(10);
 
         LOG.debug(generatedString);
     }
 
     @Test
     public void givenUsingApache_whenGeneratingRandomAlphabeticString_thenCorrect() {
-        final String generatedString = RandomStringUtils.randomAlphabetic(10);
+        String generatedString = RandomStringUtils.randomAlphabetic(10);
 
         LOG.debug(generatedString);
     }
 
     @Test
     public void givenUsingApache_whenGeneratingRandomAlphanumericString_thenCorrect() {
-        final String generatedString = RandomStringUtils.randomAlphanumeric(10);
+        String generatedString = RandomStringUtils.randomAlphanumeric(10);
 
         LOG.debug(generatedString);
     }
 
     @Test
     public void givenUsingApache_whenGeneratingRandomStringBounded_thenCorrect() {
-        final int length = 10;
-        final boolean useLetters = true;
-        final boolean useNumbers = false;
-        final String generatedString = RandomStringUtils.random(length, useLetters, useNumbers);
+        int length = 10;
+        boolean useLetters = true;
+        boolean useNumbers = false;
+        String generatedString = RandomStringUtils.random(length, useLetters, useNumbers);
 
         LOG.debug(generatedString);
     }

From 0aad68fe2ec7ad95406abb14d943dba591185732 Mon Sep 17 00:00:00 2001
From: catalin-burcea <burcea.iulian.catalin@gmail.com>
Date: Mon, 16 Dec 2019 18:35:04 +0200
Subject: [PATCH 022/106] [BAEL-19881] - Rename spring-mvc-simple modules

---
 pom.xml                                       |  16 +-
 spring-mvc-basics-2/README.md                 |  25 +--
 spring-mvc-basics-2/pom.xml                   | 170 ++++++++++++++--
 .../ApplicationConfiguration.java             |   0
 .../FreemarkerConfiguration.java              |   0
 .../configuration/GroovyConfiguration.java    |   0
 .../JadeTemplateConfiguration.java            |   0
 .../configuration/PushConfiguration.java      |   0
 .../configuration/ThymeleafConfiguration.java |   0
 .../TilesApplicationConfiguration.java        |   0
 .../spring/configuration/WebInitializer.java  |   0
 ...AnnotationMethodHandlerAdapterExample.java |  28 +--
 .../spring/controller/CustomerController.java |   0
 .../spring/controller/EmployeeController.java |   0
 .../controller/FileUploadController.java      |   0
 .../spring/controller/MailController.java     |   0
 .../RequestMappingHandlerAdapterExample.java  |  28 +--
 .../controller/RequestMethodController.java   |   0
 ...SimpleControllerHandlerAdapterExample.java |  30 +--
 .../spring/controller/UserController.java     |   0
 .../spring/controller/rss/Article.java        |   0
 .../controller/rss/ArticleFeedView.java       |   0
 .../controller/rss/ArticleRssController.java  |   0
 .../rss/ArticleRssFeedViewResolver.java       |   0
 .../rss/JsonChannelHttpMessageConverter.java  |   0
 .../controller/scribe/GithubController.java   |   0
 .../controller/scribe/TwitterController.java  |   0
 .../controller/tiles/TilesController.java     |   0
 .../com/baeldung/spring/domain/Customer.java  |   0
 .../com/baeldung/spring/domain/Employee.java  |   0
 .../baeldung/spring/domain/MailObject.java    |   0
 .../java/com/baeldung/spring/domain/User.java |   0
 .../exception/InvalidRequestException.java    |   0
 .../FileUploadExceptionAdvice.java            |   0
 .../baeldung/spring/mail/EmailService.java    |   0
 .../spring/mail/EmailServiceImpl.java         |   0
 .../push/controller/PushController.java       |   0
 .../requestparam/RequestParamController.java  |   0
 .../spring/service/EmployeeService.java       |   0
 .../spring/service/EmployeeServiceImpl.java   |   0
 .../spring/servlets/ForwardedServlet.java     |   0
 .../spring/servlets/HelloServlet.java         |   0
 .../spring/servlets/RedirectedServlet.java    |   0
 .../spring/servlets/WelcomeServlet.java       |   0
 .../spring/validator/CustomerValidator.java   |   0
 .../src/main/resources/application.properties |  23 ++-
 .../src/main/webapp/WEB-INF/Greeting.jsp      |   0
 .../main/webapp/WEB-INF/views/Greeting.jsp    |   0
 .../webapp/WEB-INF/views/customerHome.jsp     |   0
 .../webapp/WEB-INF/views/customerView.jsp     |   0
 .../src/main/webapp/WEB-INF/views/demo.jsp    |   0
 .../src/main/webapp/WEB-INF/views/emails.jsp  |   0
 .../webapp/WEB-INF/views/employeeHome.jsp     |   0
 .../webapp/WEB-INF/views/employeeView.jsp     |   0
 .../src/main/webapp/WEB-INF/views/error.jsp   |   0
 .../src/main/webapp/WEB-INF/views/file.jsp    |   0
 .../main/webapp/WEB-INF/views/mail/send.jsp   |   0
 .../WEB-INF/views/pages/apachetiles.jsp       |   0
 .../main/webapp/WEB-INF/views/pages/home.jsp  |   0
 .../webapp/WEB-INF/views/pages/springmvc.jsp  |   0
 .../WEB-INF/views/registration-freemarker.ftl |   0
 .../WEB-INF/views/registration-groovy.tpl     |   0
 .../WEB-INF/views/registration-jade.jade      |   0
 .../WEB-INF/views/registration-thymeleaf.html |   0
 .../webapp/WEB-INF/views/registration.jsp     |   0
 .../views/tiles/layouts/defaultLayout.jsp     |   0
 .../views/tiles/templates/defaultFooter.jsp   |   0
 .../views/tiles/templates/defaultHeader.jsp   |   0
 .../views/tiles/templates/defaultMenu.jsp     |   0
 .../main/webapp/WEB-INF/views/tiles/tiles.xml |   0
 .../src/main/webapp/resources/logo.png        | Bin
 .../src/main/webapp/static/css/app.css        |   0
 .../java/com/baeldung/SpringContextTest.java  |   0
 .../push/PushControllerIntegrationTest.java   |   0
 .../rss/ArticleRssIntegrationTest.java        |   0
 .../servlets/HelloServletIntegrationTest.java |   0
 .../WelcomeServletIntegrationTest.java        |   0
 .../README.md                                 |   5 +-
 .../pom.xml                                   |   4 +-
 .../java/com}/baeldung/boot/Application.java  |   0
 .../com}/baeldung/boot/config/WebConfig.java  |   0
 .../controller/GenericEntityController.java   |   0
 .../converter/GenericBigDecimalConverter.java |   0
 ...tringToAbstractEntityConverterFactory.java |   0
 .../converter/StringToEmployeeConverter.java  |   0
 .../boot/converter/StringToEnumConverter.java |   0
 .../StringToLocalDateTimeConverter.java       |   0
 .../controller/AbstractEntityController.java  |   0
 .../StringToEmployeeConverterController.java  |   0
 .../baeldung/boot/domain/AbstractEntity.java  |   0
 .../java/com}/baeldung/boot/domain/Bar.java   |   0
 .../com}/baeldung/boot/domain/Employee.java   |   0
 .../java/com}/baeldung/boot/domain/Foo.java   |   0
 .../baeldung/boot/domain/GenericEntity.java   |   0
 .../java/com}/baeldung/boot/domain/Modes.java |   0
 .../repository/GenericEntityRepository.java   |   0
 .../HeaderVersionArgumentResolver.java        |   0
 .../baeldung/boot/web/resolver/Version.java   |   0
 .../CachedBodyHttpServletRequest.java         |   0
 .../CachedBodyServletInputStream.java         |   0
 .../cachedrequest/ContentCachingFilter.java   |   0
 .../cachedrequest/HttpRequestDemoConfig.java  |   0
 .../com}/baeldung/cachedrequest/Person.java   |   0
 .../cachedrequest/PersonController.java       |   0
 .../PrintRequestContentFilter.java            |   0
 .../exclude_urls_filter/Application.java      |   0
 .../controller/FAQController.java             |   0
 .../exclude_urls_filter/controller/Ping.java  |   0
 .../filter/FilterRegistrationConfig.java      |   0
 .../filter/HeaderValidatorFilter.java         |   0
 .../exclude_urls_filter/filter/LogFilter.java |   0
 .../service/FAQService.java                   |   0
 .../service/FAQServiceImpl.java               |   0
 .../flash_attributes/Application.java         |   0
 .../controllers/PoemSubmission.java           |   0
 .../baeldung/flash_attributes/model/Poem.java |   0
 .../baeldung/form_submission/Application.java |   0
 .../controllers/FeedbackForm.java             |   0
 .../form_submission/model/Feedback.java       |   0
 .../interpolation/MyMessageInterpolator.java  |   0
 .../interpolation/NotNullRequest.java         |   0
 .../interpolation/ValidationController.java   |   0
 .../interpolation/ValidationExamples.java     |   0
 .../java/com/baeldung/spring/Application.java |   0
 .../com/baeldung/spring/config/MvcConfig.java |   0
 .../converter/StringToEnumConverter.java      |   0
 .../baeldung/spring/enums/EnumController.java |   0
 .../GlobalControllerExceptionHandler.java     |   0
 .../controller/ReadHeaderRestController.java  |   0
 .../java/com/baeldung/spring/model/Modes.java |   0
 .../baeldung/spring/slash/Application.java    |   0
 .../spring/slash/SlashParsingController.java  |   0
 .../SpringListValidationApplication.java      |   0
 .../constraint/MaxSizeConstraint.java         |   0
 .../MaxSizeConstraintValidator.java           |   0
 .../controller/MovieController.java           |   0
 .../ConstraintViolationExceptionHandler.java  |   0
 .../listvalidation/model/Movie.java           |   0
 .../listvalidation/service/MovieService.java  |   0
 .../src/main/resources/application.properties |   0
 .../main/resources/templates/feedback.html    |   0
 .../src/main/resources/templates/submit.html  |   0
 .../src/main/resources/templates/success.html |   0
 .../baeldung/AppContextIntegrationTest.java   |   0
 .../SpringBootApplicationIntegrationTest.java |   0
 .../SpringBootJPAIntegrationTest.java         |   0
 .../SpringBootMailIntegrationTest.java        |   0
 .../CachedBodyHttpServletRequestUnitTest.java |   0
 .../CachedBodyServletInputStreamUnitTest.java |   0
 .../ContentCachingFilterUnitTest.java         |   0
 .../PersonControllerIntegrationTest.java      |   0
 .../PrintRequestContentFilterUnitTest.java    |   0
 ...adHeaderRestControllerIntegrationTest.java |   0
 .../slash/SlashParsingControllerIntTest.java  |   0
 .../MovieControllerIntegrationTest.java       |   0
 .../.gitignore                                |   0
 spring-mvc-basics-4/README.md                 |  11 ++
 spring-mvc-basics-4/pom.xml                   |  37 ++++
 .../java/com/baeldung/contexts/Greeting.java  |   0
 ...BasedApplicationAndServletInitializer.java |   0
 ...nnotationsBasedApplicationInitializer.java |   0
 .../config/ApplicationInitializer.java        |   0
 .../contexts/config/NormalWebAppConfig.java   |   0
 .../config/RootApplicationConfig.java         |   0
 ...BasedApplicationAndServletInitializer.java |   0
 .../contexts/config/SecureWebAppConfig.java   |   0
 .../contexts/normal/HelloWorldController.java |   0
 .../secure/HelloWorldSecureController.java    |   0
 .../ApplicationContextUtilService.java        |   0
 .../contexts/services/GreeterService.java     |   0
 .../config/StudentControllerConfig.java       |   0
 .../baeldung/controller/config/WebConfig.java |   0
 .../controller/PassParametersController.java  |   0
 .../controller/RestAnnotatedController.java   |   0
 .../controller/controller/RestController.java |   0
 .../controller/controller/TestController.java |   0
 .../baeldung/controller/student/Student.java  |   0
 .../baeldung}/optionalpathvars/Article.java   |   0
 .../ArticleViewerController.java              |   0
 .../ArticleViewerWithMapParamController.java  |   0
 ...icleViewerWithOptionalParamController.java |   0
 ...ViewerWithRequiredAttributeController.java |   0
 ...iewerWithTwoSeparateMethodsController.java |   0
 .../src/main/resources/application.properties |   1 +
 .../src/main/resources/logback.xml            |   0
 .../src/main/resources/test-mvc.xml           |   0
 .../src/main/webapp/WEB-INF/greeting.xml      |   0
 .../src/main/webapp/WEB-INF/index.jsp         |   0
 .../webapp/WEB-INF/normal-webapp-servlet.xml  |   0
 .../webapp/WEB-INF/rootApplicationContext.xml |   0
 .../webapp/WEB-INF/secure-webapp-servlet.xml  |   0
 .../webapp/WEB-INF/secure/view/welcome.jsp    |   0
 .../src/main/webapp/WEB-INF/view/sample.jsp   |   0
 .../webapp/WEB-INF/view/scopesExample.jsp     |   0
 .../main/webapp/WEB-INF/view/viewPage.html    |   0
 .../src/main/webapp/WEB-INF/view/welcome.jsp  |   0
 .../src/main/webapp/WEB-INF/web-old.xml       |   0
 .../src/main/webapp/WEB-INF/welcome.jsp       |   0
 .../src/main/webapp/index.jsp                 |   0
 .../ControllerAnnotationIntegrationTest.java  |   0
 .../controller/ControllerIntegrationTest.java |   0
 ...ssParametersControllerIntegrationTest.java |   0
 ...rticleViewerControllerIntegrationTest.java |   0
 ...ollerWithOptionalParamIntegrationTest.java |   0
 ...rWithRequiredAttributeIntegrationTest.java |   0
 ...icleViewerWithMapParamIntegrationTest.java |   0
 ...WithTwoSeparateMethodsIntegrationTest.java |   0
 .../src/test/resources/test-mvc.xml           |   0
 spring-mvc-basics/README.md                   |   2 +-
 spring-mvc-basics/pom.xml                     |   1 +
 spring-mvc-simple/README.md                   |  15 --
 spring-mvc-simple/pom.xml                     | 185 ------------------
 .../src/main/resources/application.properties |  22 ---
 213 files changed, 301 insertions(+), 302 deletions(-)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/configuration/ApplicationConfiguration.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/configuration/FreemarkerConfiguration.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/configuration/GroovyConfiguration.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/configuration/JadeTemplateConfiguration.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/configuration/PushConfiguration.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/configuration/ThymeleafConfiguration.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/configuration/TilesApplicationConfiguration.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/configuration/WebInitializer.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/AnnotationMethodHandlerAdapterExample.java (97%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/CustomerController.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/EmployeeController.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/FileUploadController.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/MailController.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/RequestMappingHandlerAdapterExample.java (97%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/RequestMethodController.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/SimpleControllerHandlerAdapterExample.java (97%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/UserController.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/rss/Article.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/rss/ArticleFeedView.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/rss/ArticleRssController.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/rss/ArticleRssFeedViewResolver.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/rss/JsonChannelHttpMessageConverter.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/scribe/GithubController.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/scribe/TwitterController.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/controller/tiles/TilesController.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/domain/Customer.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/domain/Employee.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/domain/MailObject.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/domain/User.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/exception/InvalidRequestException.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/interceptor/FileUploadExceptionAdvice.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/mail/EmailService.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/mail/EmailServiceImpl.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/push/controller/PushController.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/requestparam/RequestParamController.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/service/EmployeeService.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/service/EmployeeServiceImpl.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/servlets/ForwardedServlet.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/servlets/HelloServlet.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/servlets/RedirectedServlet.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/servlets/WelcomeServlet.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/java/com/baeldung/spring/validator/CustomerValidator.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/Greeting.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/Greeting.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/customerHome.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/customerView.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/demo.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/emails.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/employeeHome.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/employeeView.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/error.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/file.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/mail/send.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/pages/apachetiles.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/pages/home.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/pages/springmvc.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/registration-freemarker.ftl (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/registration-groovy.tpl (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/registration-jade.jade (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/registration-thymeleaf.html (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/registration.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/tiles/layouts/defaultLayout.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/tiles/templates/defaultFooter.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/tiles/templates/defaultHeader.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/tiles/templates/defaultMenu.jsp (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/WEB-INF/views/tiles/tiles.xml (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/resources/logo.png (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/main/webapp/static/css/app.css (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/test/java/com/baeldung/SpringContextTest.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/test/java/com/baeldung/controller/push/PushControllerIntegrationTest.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/test/java/com/baeldung/controller/rss/ArticleRssIntegrationTest.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/test/java/com/baeldung/spring/servlets/HelloServletIntegrationTest.java (100%)
 rename {spring-mvc-simple => spring-mvc-basics-2}/src/test/java/com/baeldung/spring/servlets/WelcomeServletIntegrationTest.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/README.md (87%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/pom.xml (98%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/Application.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/config/WebConfig.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/controller/GenericEntityController.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/converter/GenericBigDecimalConverter.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/converter/StringToAbstractEntityConverterFactory.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/converter/StringToEmployeeConverter.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/converter/StringToEnumConverter.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/converter/StringToLocalDateTimeConverter.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/converter/controller/AbstractEntityController.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/converter/controller/StringToEmployeeConverterController.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/domain/AbstractEntity.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/domain/Bar.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/domain/Employee.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/domain/Foo.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/domain/GenericEntity.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/domain/Modes.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/repository/GenericEntityRepository.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/boot/web/resolver/Version.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/cachedrequest/CachedBodyHttpServletRequest.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/cachedrequest/CachedBodyServletInputStream.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/cachedrequest/ContentCachingFilter.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/cachedrequest/HttpRequestDemoConfig.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/cachedrequest/Person.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/cachedrequest/PersonController.java (100%)
 rename {spring-mvc-simple-2/src/main/java/org => spring-mvc-basics-3/src/main/java/com}/baeldung/cachedrequest/PrintRequestContentFilter.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/exclude_urls_filter/Application.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/exclude_urls_filter/controller/FAQController.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/exclude_urls_filter/controller/Ping.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/exclude_urls_filter/filter/FilterRegistrationConfig.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/exclude_urls_filter/filter/HeaderValidatorFilter.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/exclude_urls_filter/filter/LogFilter.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/exclude_urls_filter/service/FAQService.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/exclude_urls_filter/service/FAQServiceImpl.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/flash_attributes/Application.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/flash_attributes/controllers/PoemSubmission.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/flash_attributes/model/Poem.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/form_submission/Application.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/form_submission/controllers/FeedbackForm.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/form_submission/model/Feedback.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/interpolation/MyMessageInterpolator.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/interpolation/NotNullRequest.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/interpolation/ValidationController.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/interpolation/ValidationExamples.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/spring/Application.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/spring/config/MvcConfig.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/spring/config/converter/StringToEnumConverter.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/spring/enums/EnumController.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/spring/exceptions/GlobalControllerExceptionHandler.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/spring/headers/controller/ReadHeaderRestController.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/spring/model/Modes.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/spring/slash/Application.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/spring/slash/SlashParsingController.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/validation/listvalidation/SpringListValidationApplication.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/validation/listvalidation/constraint/MaxSizeConstraint.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/validation/listvalidation/constraint/MaxSizeConstraintValidator.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/validation/listvalidation/controller/MovieController.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/validation/listvalidation/exception/ConstraintViolationExceptionHandler.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/validation/listvalidation/model/Movie.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/java/com/baeldung/validation/listvalidation/service/MovieService.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/resources/application.properties (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/resources/templates/feedback.html (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/resources/templates/submit.html (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/main/resources/templates/success.html (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/test/java/com/baeldung/AppContextIntegrationTest.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/test/java/com/baeldung/SpringBootApplicationIntegrationTest.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/test/java/com/baeldung/SpringBootMailIntegrationTest.java (100%)
 rename {spring-mvc-simple-2/src/test/java/org => spring-mvc-basics-3/src/test/java/com}/baeldung/cachedrequest/CachedBodyHttpServletRequestUnitTest.java (100%)
 rename {spring-mvc-simple-2/src/test/java/org => spring-mvc-basics-3/src/test/java/com}/baeldung/cachedrequest/CachedBodyServletInputStreamUnitTest.java (100%)
 rename {spring-mvc-simple-2/src/test/java/org => spring-mvc-basics-3/src/test/java/com}/baeldung/cachedrequest/ContentCachingFilterUnitTest.java (100%)
 rename {spring-mvc-simple-2/src/test/java/org => spring-mvc-basics-3/src/test/java/com}/baeldung/cachedrequest/PersonControllerIntegrationTest.java (100%)
 rename {spring-mvc-simple-2/src/test/java/org => spring-mvc-basics-3/src/test/java/com}/baeldung/cachedrequest/PrintRequestContentFilterUnitTest.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/test/java/com/baeldung/headers/controller/ReadHeaderRestControllerIntegrationTest.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/test/java/com/baeldung/spring/slash/SlashParsingControllerIntTest.java (100%)
 rename {spring-mvc-simple-2 => spring-mvc-basics-3}/src/test/java/com/baeldung/validation/listvalidation/MovieControllerIntegrationTest.java (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/.gitignore (100%)
 create mode 100644 spring-mvc-basics-4/README.md
 create mode 100644 spring-mvc-basics-4/pom.xml
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/java/com/baeldung/contexts/Greeting.java (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/java/com/baeldung/contexts/config/NormalWebAppConfig.java (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/java/com/baeldung/contexts/config/RootApplicationConfig.java (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/java/com/baeldung/contexts/config/SecureWebAppConfig.java (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/java/com/baeldung/contexts/normal/HelloWorldController.java (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/java/com/baeldung/contexts/secure/HelloWorldSecureController.java (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/java/com/baeldung/contexts/services/ApplicationContextUtilService.java (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/java/com/baeldung/contexts/services/GreeterService.java (100%)
 rename {spring-mvc-basics-2/src/main/java/org => spring-mvc-basics-4/src/main/java/com}/baeldung/controller/config/StudentControllerConfig.java (100%)
 rename {spring-mvc-basics-2/src/main/java/org => spring-mvc-basics-4/src/main/java/com}/baeldung/controller/config/WebConfig.java (100%)
 rename {spring-mvc-basics-2/src/main/java/org => spring-mvc-basics-4/src/main/java/com}/baeldung/controller/controller/PassParametersController.java (100%)
 rename {spring-mvc-basics-2/src/main/java/org => spring-mvc-basics-4/src/main/java/com}/baeldung/controller/controller/RestAnnotatedController.java (100%)
 rename {spring-mvc-basics-2/src/main/java/org => spring-mvc-basics-4/src/main/java/com}/baeldung/controller/controller/RestController.java (100%)
 rename {spring-mvc-basics-2/src/main/java/org => spring-mvc-basics-4/src/main/java/com}/baeldung/controller/controller/TestController.java (100%)
 rename {spring-mvc-basics-2/src/main/java/org => spring-mvc-basics-4/src/main/java/com}/baeldung/controller/student/Student.java (100%)
 rename {spring-mvc-basics-2/src/main/java/com/baeldung/controller => spring-mvc-basics-4/src/main/java/com/baeldung}/optionalpathvars/Article.java (100%)
 rename {spring-mvc-basics-2/src/main/java/com/baeldung/controller => spring-mvc-basics-4/src/main/java/com/baeldung}/optionalpathvars/ArticleViewerController.java (100%)
 rename {spring-mvc-basics-2/src/main/java/com/baeldung/controller => spring-mvc-basics-4/src/main/java/com/baeldung}/optionalpathvars/ArticleViewerWithMapParamController.java (100%)
 rename {spring-mvc-basics-2/src/main/java/com/baeldung/controller => spring-mvc-basics-4/src/main/java/com/baeldung}/optionalpathvars/ArticleViewerWithOptionalParamController.java (100%)
 rename {spring-mvc-basics-2/src/main/java/com/baeldung/controller => spring-mvc-basics-4/src/main/java/com/baeldung}/optionalpathvars/ArticleViewerWithRequiredAttributeController.java (100%)
 rename {spring-mvc-basics-2/src/main/java/com/baeldung/controller => spring-mvc-basics-4/src/main/java/com/baeldung}/optionalpathvars/ArticleViewerWithTwoSeparateMethodsController.java (100%)
 create mode 100644 spring-mvc-basics-4/src/main/resources/application.properties
 rename {spring-mvc-simple => spring-mvc-basics-4}/src/main/resources/logback.xml (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/resources/test-mvc.xml (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/webapp/WEB-INF/greeting.xml (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/webapp/WEB-INF/index.jsp (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/webapp/WEB-INF/normal-webapp-servlet.xml (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/webapp/WEB-INF/rootApplicationContext.xml (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/webapp/WEB-INF/secure-webapp-servlet.xml (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/webapp/WEB-INF/secure/view/welcome.jsp (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/webapp/WEB-INF/view/sample.jsp (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/webapp/WEB-INF/view/scopesExample.jsp (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/webapp/WEB-INF/view/viewPage.html (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/webapp/WEB-INF/view/welcome.jsp (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/webapp/WEB-INF/web-old.xml (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/webapp/WEB-INF/welcome.jsp (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/main/webapp/index.jsp (100%)
 rename {spring-mvc-basics-2/src/test/java/org => spring-mvc-basics-4/src/test/java/com}/baeldung/controller/ControllerAnnotationIntegrationTest.java (100%)
 rename {spring-mvc-basics-2/src/test/java/org => spring-mvc-basics-4/src/test/java/com}/baeldung/controller/ControllerIntegrationTest.java (100%)
 rename {spring-mvc-basics-2/src/test/java/org => spring-mvc-basics-4/src/test/java/com}/baeldung/controller/PassParametersControllerIntegrationTest.java (100%)
 rename {spring-mvc-basics-2/src/test/java/com/baeldung/controller => spring-mvc-basics-4/src/test/java/com/baeldung}/optionalpathvars/ArticleViewerControllerIntegrationTest.java (100%)
 rename {spring-mvc-basics-2/src/test/java/com/baeldung/controller => spring-mvc-basics-4/src/test/java/com/baeldung}/optionalpathvars/ArticleViewerControllerWithOptionalParamIntegrationTest.java (100%)
 rename {spring-mvc-basics-2/src/test/java/com/baeldung/controller => spring-mvc-basics-4/src/test/java/com/baeldung}/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java (100%)
 rename {spring-mvc-basics-2/src/test/java/com/baeldung/controller => spring-mvc-basics-4/src/test/java/com/baeldung}/optionalpathvars/ArticleViewerWithMapParamIntegrationTest.java (100%)
 rename {spring-mvc-basics-2/src/test/java/com/baeldung/controller => spring-mvc-basics-4/src/test/java/com/baeldung}/optionalpathvars/ArticleViewerWithTwoSeparateMethodsIntegrationTest.java (100%)
 rename {spring-mvc-basics-2 => spring-mvc-basics-4}/src/test/resources/test-mvc.xml (100%)
 delete mode 100644 spring-mvc-simple/README.md
 delete mode 100644 spring-mvc-simple/pom.xml
 delete mode 100644 spring-mvc-simple/src/main/resources/application.properties

diff --git a/pom.xml b/pom.xml
index 63d4e04291..3b4edc871a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -629,7 +629,7 @@
                 <module>spring-boot-mvc-2</module>
                 <module>spring-boot-performance</module>
                 <module>spring-boot-properties</module>
-                <!-- <module>spring-mvc-basics</module> --> <!-- Compilation failure -->
+                <module>spring-mvc-basics</module>
                 <module>spring-security-modules/spring-security-kerberos</module>
                 <module>oauth2-framework-impl</module>
 
@@ -786,13 +786,13 @@
 
                 <module>spring-mobile</module>
                 <module>spring-mockito</module>
-                <module>spring-mvc-basics-2</module>
+                <module>spring-mvc-basics-4</module>
                 <module>spring-mvc-forms-jsp</module>
                 <module>spring-mvc-forms-thymeleaf</module>
                 <module>spring-mvc-java</module>
                 <module>spring-mvc-kotlin</module>
-                <module>spring-mvc-simple</module>
-                <module>spring-mvc-simple-2</module>
+                <module>spring-mvc-basics-2</module>
+                <module>spring-mvc-basics-3</module>
                 <module>spring-mvc-views</module>
                 <module>spring-mvc-velocity</module>
                 <module>spring-mvc-webflow</module>
@@ -1259,7 +1259,7 @@
                 <module>spf4j</module>
                 <module>spring-boot-performance</module>
                 <module>spring-boot-properties</module>
-                <!-- <module>spring-mvc-basics</module> --> <!-- Compilation failure -->
+                <module>spring-mvc-basics</module>
                 <!-- <module>Twitter4J</module> --> <!-- Builds locally, but fails in Jenkins, Failed to parse POMs -->
 
             </modules>
@@ -1391,13 +1391,13 @@
 
                 <module>spring-mobile</module>
                 <module>spring-mockito</module>
-                <module>spring-mvc-basics-2</module>
                 <module>spring-mvc-forms-jsp</module>
                 <module>spring-mvc-forms-thymeleaf</module>
                 <module>spring-mvc-java</module>
                 <module>spring-mvc-kotlin</module>
-                <module>spring-mvc-simple</module>
-                <module>spring-mvc-simple-2</module>
+                <module>spring-mvc-basics-2</module>
+                <module>spring-mvc-basics-3</module>
+                <module>spring-mvc-basics-4</module>
                 <module>spring-mvc-views</module>
                 <module>spring-mvc-velocity</module>
                 <module>spring-mvc-webflow</module>
diff --git a/spring-mvc-basics-2/README.md b/spring-mvc-basics-2/README.md
index 4a5ea24283..db783f4d29 100644
--- a/spring-mvc-basics-2/README.md
+++ b/spring-mvc-basics-2/README.md
@@ -1,14 +1,15 @@
-## Spring MVC Basics
+## Spring MVC Basics 2
 
-This module contains articles about the basics of Spring MVC. Articles about more specific areas of Spring MVC have
-their own module. 
+This module contains articles about Spring MVC
 
-### The Course
-The "REST With Spring" Classes: http://bit.ly/restwithspring
-
-### Relevant Articles: 
-- [Quick Guide to Spring Controllers](http://www.baeldung.com/spring-controllers)
-- [The Spring @Controller and @RestController Annotations](http://www.baeldung.com/spring-controller-vs-restcontroller)
-- [Model, ModelMap, and ModelView in Spring MVC](http://www.baeldung.com/spring-mvc-model-model-map-model-view)
-- [Spring Web Contexts](http://www.baeldung.com/spring-web-contexts)
-- [[<-- Prev]](/spring-mvc-basics)
\ No newline at end of file
+## Relevant articles:
+- [HandlerAdapters in Spring MVC](https://www.baeldung.com/spring-mvc-handler-adapters)
+- [Template Engines for Spring](https://www.baeldung.com/spring-template-engines)
+- [Spring 5 and Servlet 4 – The PushBuilder](https://www.baeldung.com/spring-5-push)
+- [Servlet Redirect vs Forward](https://www.baeldung.com/servlet-redirect-forward)
+- [Apache Tiles Integration with Spring MVC](https://www.baeldung.com/spring-mvc-apache-tiles)
+- [Guide to Spring Email](https://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)
+- More articles: [[more -->]](/spring-mvc-basics-3)
+- More articles: [[<-- prev]](/spring-mvc-basics)
\ No newline at end of file
diff --git a/spring-mvc-basics-2/pom.xml b/spring-mvc-basics-2/pom.xml
index 8e36eb38d8..4c3041a209 100644
--- a/spring-mvc-basics-2/pom.xml
+++ b/spring-mvc-basics-2/pom.xml
@@ -1,37 +1,185 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-mvc-basics-2</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
     <name>spring-mvc-basics-2</name>
     <packaging>war</packaging>
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-spring-5</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../parent-spring-5</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-oxm</artifactId>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <version>${javax.mail.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
+            <version>${javax.servlet-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
+            <version>${javax.servlet.jsp-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>${jstl.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>${commons-fileupload.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <!-- thymeleaf dependencies -->
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf</artifactId>
+            <version>${org.thymeleaf-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf-spring4</artifactId>
+            <version>${org.thymeleaf-version}</version>
+        </dependency>
+
+        <!-- freemarker dependencies -->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>${freemarker.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <!-- groovy template dependency -->
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-templates</artifactId>
+            <version>${groovy.version}</version>
+        </dependency>
+
+        <!-- jade dependency -->
+        <dependency>
+            <groupId>de.neuland-bfi</groupId>
+            <artifactId>spring-jade4j</artifactId>
+            <version>${jade.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-jsp</artifactId>
+            <version>${apache-tiles.version}</version>
+        </dependency>
+
+        <!--Testing -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.rometools</groupId>
+            <artifactId>rome</artifactId>
+            <version>${rome.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>${xstream.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.scribejava</groupId>
+            <artifactId>scribejava-apis</artifactId>
+            <version>${scribejava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>${json.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-logger-api</artifactId>
+            <version>${maven-surefire-plugin.version}</version>
+            <!-- to get around bug https://github.com/junit-team/junit5/issues/1367 -->
+            <scope>test</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+    <build>
+        <finalName>spring-mvc-basics-2</finalName>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>${maven-war-plugin.version}</version>
+                    <configuration>
+                        <warSourceDirectory>src/main/webapp</warSourceDirectory>
+                        <warName>springMvcSimple</warName>
+                        <failOnMissingWebXml>false</failOnMissingWebXml>
+                        <outputDirectory>${deploy-path}</outputDirectory>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.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>
+        <deploy-path>enter-location-of-server</deploy-path>
+        <commons-fileupload.version>1.3.2</commons-fileupload.version>
+        <org.thymeleaf-version>3.0.7.RELEASE</org.thymeleaf-version>
+        <groovy.version>2.4.12</groovy.version>
+        <freemarker.version>2.3.27-incubating</freemarker.version>
+        <jade.version>1.2.5</jade.version>
+        <rome.version>1.9.0</rome.version>
+        <xstream.version>1.4.9</xstream.version>
+        <scribejava.version>5.1.0</scribejava.version>
+        <json.version>20180130</json.version>
+        <apache-tiles.version>3.0.8</apache-tiles.version>
+        <javax.mail.version>1.6.1</javax.mail.version>
+    </properties>
+
+</project>
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/ApplicationConfiguration.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/ApplicationConfiguration.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/ApplicationConfiguration.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/ApplicationConfiguration.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/FreemarkerConfiguration.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/FreemarkerConfiguration.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/FreemarkerConfiguration.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/FreemarkerConfiguration.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/GroovyConfiguration.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/GroovyConfiguration.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/GroovyConfiguration.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/GroovyConfiguration.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/JadeTemplateConfiguration.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/JadeTemplateConfiguration.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/JadeTemplateConfiguration.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/JadeTemplateConfiguration.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/PushConfiguration.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/PushConfiguration.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/PushConfiguration.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/PushConfiguration.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/ThymeleafConfiguration.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/ThymeleafConfiguration.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/ThymeleafConfiguration.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/ThymeleafConfiguration.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/TilesApplicationConfiguration.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/TilesApplicationConfiguration.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/TilesApplicationConfiguration.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/TilesApplicationConfiguration.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/WebInitializer.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/WebInitializer.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/WebInitializer.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/WebInitializer.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/AnnotationMethodHandlerAdapterExample.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/AnnotationMethodHandlerAdapterExample.java
similarity index 97%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/AnnotationMethodHandlerAdapterExample.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/AnnotationMethodHandlerAdapterExample.java
index 89f5b2501b..30bda5c582 100644
--- a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/AnnotationMethodHandlerAdapterExample.java
+++ b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/AnnotationMethodHandlerAdapterExample.java
@@ -1,15 +1,15 @@
-package com.baeldung.spring.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-@Controller
-public class AnnotationMethodHandlerAdapterExample {
-    @RequestMapping("/annotedName")
-    public ModelAndView getEmployeeName() {
-        ModelAndView model = new ModelAndView("Greeting");
-        model.addObject("message", "Dinesh");
-        return model;
-    }
+package com.baeldung.spring.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+public class AnnotationMethodHandlerAdapterExample {
+    @RequestMapping("/annotedName")
+    public ModelAndView getEmployeeName() {
+        ModelAndView model = new ModelAndView("Greeting");
+        model.addObject("message", "Dinesh");
+        return model;
+    }
 }
\ No newline at end of file
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/CustomerController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/CustomerController.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/CustomerController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/CustomerController.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/EmployeeController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/EmployeeController.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/EmployeeController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/EmployeeController.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/FileUploadController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/FileUploadController.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/FileUploadController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/FileUploadController.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/MailController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/MailController.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/MailController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/MailController.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/RequestMappingHandlerAdapterExample.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/RequestMappingHandlerAdapterExample.java
similarity index 97%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/RequestMappingHandlerAdapterExample.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/RequestMappingHandlerAdapterExample.java
index 754bea79f1..628f853208 100644
--- a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/RequestMappingHandlerAdapterExample.java
+++ b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/RequestMappingHandlerAdapterExample.java
@@ -1,15 +1,15 @@
-package com.baeldung.spring.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-@Controller
-public class RequestMappingHandlerAdapterExample {
-    @RequestMapping("/requestName")
-    public ModelAndView getEmployeeName() {
-        ModelAndView model = new ModelAndView("Greeting");
-        model.addObject("message", "Madhwal");
-        return model;
-    }
+package com.baeldung.spring.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+public class RequestMappingHandlerAdapterExample {
+    @RequestMapping("/requestName")
+    public ModelAndView getEmployeeName() {
+        ModelAndView model = new ModelAndView("Greeting");
+        model.addObject("message", "Madhwal");
+        return model;
+    }
 }
\ No newline at end of file
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/RequestMethodController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/RequestMethodController.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/RequestMethodController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/RequestMethodController.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/SimpleControllerHandlerAdapterExample.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/SimpleControllerHandlerAdapterExample.java
similarity index 97%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/SimpleControllerHandlerAdapterExample.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/SimpleControllerHandlerAdapterExample.java
index 17c4ab689e..d3800d4e1c 100644
--- a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/SimpleControllerHandlerAdapterExample.java
+++ b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/SimpleControllerHandlerAdapterExample.java
@@ -1,16 +1,16 @@
-package com.baeldung.spring.controller;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.AbstractController;
-
-public class SimpleControllerHandlerAdapterExample extends AbstractController {
-    @Override
-    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        ModelAndView model = new ModelAndView("Greeting");
-        model.addObject("message", "Dinesh Madhwal");
-        return model;
-    }
+package com.baeldung.spring.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.AbstractController;
+
+public class SimpleControllerHandlerAdapterExample extends AbstractController {
+    @Override
+    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        ModelAndView model = new ModelAndView("Greeting");
+        model.addObject("message", "Dinesh Madhwal");
+        return model;
+    }
 }
\ No newline at end of file
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/UserController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/UserController.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/UserController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/UserController.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/Article.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/rss/Article.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/Article.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/rss/Article.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/ArticleFeedView.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/rss/ArticleFeedView.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/ArticleFeedView.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/rss/ArticleFeedView.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/ArticleRssController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/rss/ArticleRssController.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/ArticleRssController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/rss/ArticleRssController.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/ArticleRssFeedViewResolver.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/rss/ArticleRssFeedViewResolver.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/ArticleRssFeedViewResolver.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/rss/ArticleRssFeedViewResolver.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/JsonChannelHttpMessageConverter.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/rss/JsonChannelHttpMessageConverter.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/JsonChannelHttpMessageConverter.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/rss/JsonChannelHttpMessageConverter.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/scribe/GithubController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/scribe/GithubController.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/scribe/GithubController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/scribe/GithubController.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/scribe/TwitterController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/scribe/TwitterController.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/scribe/TwitterController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/scribe/TwitterController.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/tiles/TilesController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/tiles/TilesController.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/controller/tiles/TilesController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/tiles/TilesController.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/domain/Customer.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/domain/Customer.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/domain/Customer.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/domain/Customer.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/domain/Employee.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/domain/Employee.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/domain/Employee.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/domain/Employee.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/domain/MailObject.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/domain/MailObject.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/domain/MailObject.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/domain/MailObject.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/domain/User.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/domain/User.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/domain/User.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/domain/User.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/exception/InvalidRequestException.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/exception/InvalidRequestException.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/exception/InvalidRequestException.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/exception/InvalidRequestException.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/interceptor/FileUploadExceptionAdvice.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/interceptor/FileUploadExceptionAdvice.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/interceptor/FileUploadExceptionAdvice.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/interceptor/FileUploadExceptionAdvice.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/mail/EmailService.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/mail/EmailService.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/mail/EmailService.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/mail/EmailService.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/mail/EmailServiceImpl.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/mail/EmailServiceImpl.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/mail/EmailServiceImpl.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/mail/EmailServiceImpl.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/push/controller/PushController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/push/controller/PushController.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/push/controller/PushController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/push/controller/PushController.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/requestparam/RequestParamController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/requestparam/RequestParamController.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/requestparam/RequestParamController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/requestparam/RequestParamController.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/service/EmployeeService.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/service/EmployeeService.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/service/EmployeeService.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/service/EmployeeService.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/service/EmployeeServiceImpl.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/service/EmployeeServiceImpl.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/service/EmployeeServiceImpl.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/service/EmployeeServiceImpl.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/ForwardedServlet.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/servlets/ForwardedServlet.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/ForwardedServlet.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/servlets/ForwardedServlet.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/HelloServlet.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/servlets/HelloServlet.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/HelloServlet.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/servlets/HelloServlet.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/RedirectedServlet.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/servlets/RedirectedServlet.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/RedirectedServlet.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/servlets/RedirectedServlet.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/WelcomeServlet.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/servlets/WelcomeServlet.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/WelcomeServlet.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/servlets/WelcomeServlet.java
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/validator/CustomerValidator.java b/spring-mvc-basics-2/src/main/java/com/baeldung/spring/validator/CustomerValidator.java
similarity index 100%
rename from spring-mvc-simple/src/main/java/com/baeldung/spring/validator/CustomerValidator.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/spring/validator/CustomerValidator.java
diff --git a/spring-mvc-basics-2/src/main/resources/application.properties b/spring-mvc-basics-2/src/main/resources/application.properties
index 709574239b..9a804c07d8 100644
--- a/spring-mvc-basics-2/src/main/resources/application.properties
+++ b/spring-mvc-basics-2/src/main/resources/application.properties
@@ -1 +1,22 @@
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+#this property file will have to be loaded explicitly as this is not a Spring Boot project
+
+# Gmail SMTP
+spring.mail.host=smtp.gmail.com
+spring.mail.port=587
+spring.mail.username=username
+spring.mail.password=password
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+
+# Amazon SES SMTP
+#spring.mail.host=email-smtp.us-west-2.amazonaws.com
+#spring.mail.username=username
+#spring.mail.password=password
+#spring.mail.properties.mail.transport.protocol=smtp
+#spring.mail.properties.mail.smtp.port=25
+#spring.mail.properties.mail.smtp.auth=true
+#spring.mail.properties.mail.smtp.starttls.enable=true
+#spring.mail.properties.mail.smtp.starttls.required=true
+
+# path to attachment file
+attachment.invoice=path_to_file
\ No newline at end of file
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/Greeting.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/Greeting.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/Greeting.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/Greeting.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/Greeting.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/Greeting.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/Greeting.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/Greeting.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/customerHome.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/customerHome.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/customerHome.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/customerHome.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/customerView.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/customerView.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/customerView.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/customerView.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/demo.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/demo.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/demo.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/demo.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/emails.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/emails.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/emails.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/emails.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/employeeHome.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/employeeHome.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/employeeHome.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/employeeHome.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/employeeView.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/employeeView.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/employeeView.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/employeeView.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/error.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/error.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/error.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/error.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/file.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/file.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/file.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/file.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/mail/send.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/mail/send.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/mail/send.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/mail/send.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/pages/apachetiles.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/pages/apachetiles.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/pages/apachetiles.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/pages/apachetiles.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/pages/home.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/pages/home.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/pages/home.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/pages/home.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/pages/springmvc.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/pages/springmvc.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/pages/springmvc.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/pages/springmvc.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/registration-freemarker.ftl b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/registration-freemarker.ftl
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/registration-freemarker.ftl
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/registration-freemarker.ftl
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/registration-groovy.tpl b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/registration-groovy.tpl
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/registration-groovy.tpl
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/registration-groovy.tpl
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/registration-jade.jade b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/registration-jade.jade
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/registration-jade.jade
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/registration-jade.jade
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/registration-thymeleaf.html b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/registration-thymeleaf.html
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/registration-thymeleaf.html
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/registration-thymeleaf.html
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/registration.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/registration.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/registration.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/registration.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/tiles/layouts/defaultLayout.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/tiles/layouts/defaultLayout.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/tiles/layouts/defaultLayout.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/tiles/layouts/defaultLayout.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/tiles/templates/defaultFooter.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/tiles/templates/defaultFooter.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/tiles/templates/defaultFooter.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/tiles/templates/defaultFooter.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/tiles/templates/defaultHeader.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/tiles/templates/defaultHeader.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/tiles/templates/defaultHeader.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/tiles/templates/defaultHeader.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/tiles/templates/defaultMenu.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/tiles/templates/defaultMenu.jsp
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/tiles/templates/defaultMenu.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/tiles/templates/defaultMenu.jsp
diff --git a/spring-mvc-simple/src/main/webapp/WEB-INF/views/tiles/tiles.xml b/spring-mvc-basics-2/src/main/webapp/WEB-INF/views/tiles/tiles.xml
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/WEB-INF/views/tiles/tiles.xml
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/views/tiles/tiles.xml
diff --git a/spring-mvc-simple/src/main/webapp/resources/logo.png b/spring-mvc-basics-2/src/main/webapp/resources/logo.png
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/resources/logo.png
rename to spring-mvc-basics-2/src/main/webapp/resources/logo.png
diff --git a/spring-mvc-simple/src/main/webapp/static/css/app.css b/spring-mvc-basics-2/src/main/webapp/static/css/app.css
similarity index 100%
rename from spring-mvc-simple/src/main/webapp/static/css/app.css
rename to spring-mvc-basics-2/src/main/webapp/static/css/app.css
diff --git a/spring-mvc-simple/src/test/java/com/baeldung/SpringContextTest.java b/spring-mvc-basics-2/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-mvc-simple/src/test/java/com/baeldung/SpringContextTest.java
rename to spring-mvc-basics-2/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-mvc-simple/src/test/java/com/baeldung/controller/push/PushControllerIntegrationTest.java b/spring-mvc-basics-2/src/test/java/com/baeldung/controller/push/PushControllerIntegrationTest.java
similarity index 100%
rename from spring-mvc-simple/src/test/java/com/baeldung/controller/push/PushControllerIntegrationTest.java
rename to spring-mvc-basics-2/src/test/java/com/baeldung/controller/push/PushControllerIntegrationTest.java
diff --git a/spring-mvc-simple/src/test/java/com/baeldung/controller/rss/ArticleRssIntegrationTest.java b/spring-mvc-basics-2/src/test/java/com/baeldung/controller/rss/ArticleRssIntegrationTest.java
similarity index 100%
rename from spring-mvc-simple/src/test/java/com/baeldung/controller/rss/ArticleRssIntegrationTest.java
rename to spring-mvc-basics-2/src/test/java/com/baeldung/controller/rss/ArticleRssIntegrationTest.java
diff --git a/spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/HelloServletIntegrationTest.java b/spring-mvc-basics-2/src/test/java/com/baeldung/spring/servlets/HelloServletIntegrationTest.java
similarity index 100%
rename from spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/HelloServletIntegrationTest.java
rename to spring-mvc-basics-2/src/test/java/com/baeldung/spring/servlets/HelloServletIntegrationTest.java
diff --git a/spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/WelcomeServletIntegrationTest.java b/spring-mvc-basics-2/src/test/java/com/baeldung/spring/servlets/WelcomeServletIntegrationTest.java
similarity index 100%
rename from spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/WelcomeServletIntegrationTest.java
rename to spring-mvc-basics-2/src/test/java/com/baeldung/spring/servlets/WelcomeServletIntegrationTest.java
diff --git a/spring-mvc-simple-2/README.md b/spring-mvc-basics-3/README.md
similarity index 87%
rename from spring-mvc-simple-2/README.md
rename to spring-mvc-basics-3/README.md
index 3d240531ae..b21f7b686a 100644
--- a/spring-mvc-simple-2/README.md
+++ b/spring-mvc-basics-3/README.md
@@ -1,4 +1,4 @@
-## Spring MVC Simple 2
+## Spring MVC Basics 3
 
 This module contains articles about Spring MVC
 
@@ -11,4 +11,5 @@ This module contains articles about Spring MVC
 - [Using Enums as Request Parameters in Spring](https://www.baeldung.com/spring-enum-request-param)
 - [Excluding URLs for a Filter in a Spring Web Application](https://www.baeldung.com/spring-exclude-filter)
 - [Guide to Flash Attributes in a Spring Web Application](https://www.baeldung.com/spring-web-flash-attributes)
-- More articles: [[<-- prev]](/spring-mvc-simple)
+- More articles: [[more -->]](/spring-mvc-basics-4)
+- More articles: [[<-- prev]](/spring-mvc-basics-2)
diff --git a/spring-mvc-simple-2/pom.xml b/spring-mvc-basics-3/pom.xml
similarity index 98%
rename from spring-mvc-simple-2/pom.xml
rename to spring-mvc-basics-3/pom.xml
index 307e8bc94b..48b1e51dd3 100644
--- a/spring-mvc-simple-2/pom.xml
+++ b/spring-mvc-basics-3/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-mvc-simple-2</artifactId>
-    <name>spring-mvc-simple-2</name>
+    <artifactId>spring-mvc-basics-3</artifactId>
+    <name>spring-mvc-basics-3</name>
     <packaging>war</packaging>
     <description>Demo project for Spring Boot</description>
 
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/Application.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/Application.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/Application.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/Application.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/config/WebConfig.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/config/WebConfig.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/config/WebConfig.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/config/WebConfig.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/controller/GenericEntityController.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/controller/GenericEntityController.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/controller/GenericEntityController.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/controller/GenericEntityController.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/GenericBigDecimalConverter.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/GenericBigDecimalConverter.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/GenericBigDecimalConverter.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/GenericBigDecimalConverter.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToAbstractEntityConverterFactory.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/StringToAbstractEntityConverterFactory.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToAbstractEntityConverterFactory.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/StringToAbstractEntityConverterFactory.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToEmployeeConverter.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/StringToEmployeeConverter.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToEmployeeConverter.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/StringToEmployeeConverter.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToEnumConverter.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/StringToEnumConverter.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToEnumConverter.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/StringToEnumConverter.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToLocalDateTimeConverter.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/StringToLocalDateTimeConverter.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToLocalDateTimeConverter.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/StringToLocalDateTimeConverter.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/controller/AbstractEntityController.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/controller/AbstractEntityController.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/controller/AbstractEntityController.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/controller/AbstractEntityController.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/controller/StringToEmployeeConverterController.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/controller/StringToEmployeeConverterController.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/controller/StringToEmployeeConverterController.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/controller/StringToEmployeeConverterController.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/AbstractEntity.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/AbstractEntity.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/AbstractEntity.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/AbstractEntity.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Bar.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Bar.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Bar.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Bar.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Employee.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Employee.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Employee.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Employee.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Foo.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Foo.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Foo.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Foo.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/GenericEntity.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/GenericEntity.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/GenericEntity.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/GenericEntity.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Modes.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Modes.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Modes.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Modes.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/repository/GenericEntityRepository.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/repository/GenericEntityRepository.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/boot/web/resolver/Version.java b/spring-mvc-basics-3/src/main/java/com/baeldung/boot/web/resolver/Version.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/boot/web/resolver/Version.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/boot/web/resolver/Version.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/CachedBodyHttpServletRequest.java b/spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/CachedBodyHttpServletRequest.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/CachedBodyHttpServletRequest.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/CachedBodyHttpServletRequest.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/CachedBodyServletInputStream.java b/spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/CachedBodyServletInputStream.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/CachedBodyServletInputStream.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/CachedBodyServletInputStream.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/ContentCachingFilter.java b/spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/ContentCachingFilter.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/ContentCachingFilter.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/ContentCachingFilter.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/HttpRequestDemoConfig.java b/spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/HttpRequestDemoConfig.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/HttpRequestDemoConfig.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/HttpRequestDemoConfig.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/Person.java b/spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/Person.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/Person.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/Person.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/PersonController.java b/spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/PersonController.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/PersonController.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/PersonController.java
diff --git a/spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/PrintRequestContentFilter.java b/spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/PrintRequestContentFilter.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/org/baeldung/cachedrequest/PrintRequestContentFilter.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/PrintRequestContentFilter.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/Application.java b/spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/Application.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/Application.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/Application.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/controller/FAQController.java b/spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/controller/FAQController.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/controller/FAQController.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/controller/FAQController.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/controller/Ping.java b/spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/controller/Ping.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/controller/Ping.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/controller/Ping.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/filter/FilterRegistrationConfig.java b/spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/filter/FilterRegistrationConfig.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/filter/FilterRegistrationConfig.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/filter/FilterRegistrationConfig.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/filter/HeaderValidatorFilter.java b/spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/filter/HeaderValidatorFilter.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/filter/HeaderValidatorFilter.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/filter/HeaderValidatorFilter.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/filter/LogFilter.java b/spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/filter/LogFilter.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/filter/LogFilter.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/filter/LogFilter.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/service/FAQService.java b/spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/service/FAQService.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/service/FAQService.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/service/FAQService.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/service/FAQServiceImpl.java b/spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/service/FAQServiceImpl.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/exclude_urls_filter/service/FAQServiceImpl.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/exclude_urls_filter/service/FAQServiceImpl.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/flash_attributes/Application.java b/spring-mvc-basics-3/src/main/java/com/baeldung/flash_attributes/Application.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/flash_attributes/Application.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/flash_attributes/Application.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/flash_attributes/controllers/PoemSubmission.java b/spring-mvc-basics-3/src/main/java/com/baeldung/flash_attributes/controllers/PoemSubmission.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/flash_attributes/controllers/PoemSubmission.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/flash_attributes/controllers/PoemSubmission.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/flash_attributes/model/Poem.java b/spring-mvc-basics-3/src/main/java/com/baeldung/flash_attributes/model/Poem.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/flash_attributes/model/Poem.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/flash_attributes/model/Poem.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/form_submission/Application.java b/spring-mvc-basics-3/src/main/java/com/baeldung/form_submission/Application.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/form_submission/Application.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/form_submission/Application.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/form_submission/controllers/FeedbackForm.java b/spring-mvc-basics-3/src/main/java/com/baeldung/form_submission/controllers/FeedbackForm.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/form_submission/controllers/FeedbackForm.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/form_submission/controllers/FeedbackForm.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/form_submission/model/Feedback.java b/spring-mvc-basics-3/src/main/java/com/baeldung/form_submission/model/Feedback.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/form_submission/model/Feedback.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/form_submission/model/Feedback.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/interpolation/MyMessageInterpolator.java b/spring-mvc-basics-3/src/main/java/com/baeldung/interpolation/MyMessageInterpolator.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/interpolation/MyMessageInterpolator.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/interpolation/MyMessageInterpolator.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/interpolation/NotNullRequest.java b/spring-mvc-basics-3/src/main/java/com/baeldung/interpolation/NotNullRequest.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/interpolation/NotNullRequest.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/interpolation/NotNullRequest.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/interpolation/ValidationController.java b/spring-mvc-basics-3/src/main/java/com/baeldung/interpolation/ValidationController.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/interpolation/ValidationController.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/interpolation/ValidationController.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/interpolation/ValidationExamples.java b/spring-mvc-basics-3/src/main/java/com/baeldung/interpolation/ValidationExamples.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/interpolation/ValidationExamples.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/interpolation/ValidationExamples.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/spring/Application.java b/spring-mvc-basics-3/src/main/java/com/baeldung/spring/Application.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/spring/Application.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/spring/Application.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/spring/config/MvcConfig.java b/spring-mvc-basics-3/src/main/java/com/baeldung/spring/config/MvcConfig.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/spring/config/MvcConfig.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/spring/config/MvcConfig.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/spring/config/converter/StringToEnumConverter.java b/spring-mvc-basics-3/src/main/java/com/baeldung/spring/config/converter/StringToEnumConverter.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/spring/config/converter/StringToEnumConverter.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/spring/config/converter/StringToEnumConverter.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/spring/enums/EnumController.java b/spring-mvc-basics-3/src/main/java/com/baeldung/spring/enums/EnumController.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/spring/enums/EnumController.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/spring/enums/EnumController.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/spring/exceptions/GlobalControllerExceptionHandler.java b/spring-mvc-basics-3/src/main/java/com/baeldung/spring/exceptions/GlobalControllerExceptionHandler.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/spring/exceptions/GlobalControllerExceptionHandler.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/spring/exceptions/GlobalControllerExceptionHandler.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/spring/headers/controller/ReadHeaderRestController.java b/spring-mvc-basics-3/src/main/java/com/baeldung/spring/headers/controller/ReadHeaderRestController.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/spring/headers/controller/ReadHeaderRestController.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/spring/headers/controller/ReadHeaderRestController.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/spring/model/Modes.java b/spring-mvc-basics-3/src/main/java/com/baeldung/spring/model/Modes.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/spring/model/Modes.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/spring/model/Modes.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/spring/slash/Application.java b/spring-mvc-basics-3/src/main/java/com/baeldung/spring/slash/Application.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/spring/slash/Application.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/spring/slash/Application.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/spring/slash/SlashParsingController.java b/spring-mvc-basics-3/src/main/java/com/baeldung/spring/slash/SlashParsingController.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/spring/slash/SlashParsingController.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/spring/slash/SlashParsingController.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/SpringListValidationApplication.java b/spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/SpringListValidationApplication.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/SpringListValidationApplication.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/SpringListValidationApplication.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/constraint/MaxSizeConstraint.java b/spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/constraint/MaxSizeConstraint.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/constraint/MaxSizeConstraint.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/constraint/MaxSizeConstraint.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/constraint/MaxSizeConstraintValidator.java b/spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/constraint/MaxSizeConstraintValidator.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/constraint/MaxSizeConstraintValidator.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/constraint/MaxSizeConstraintValidator.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/controller/MovieController.java b/spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/controller/MovieController.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/controller/MovieController.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/controller/MovieController.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/exception/ConstraintViolationExceptionHandler.java b/spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/exception/ConstraintViolationExceptionHandler.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/exception/ConstraintViolationExceptionHandler.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/exception/ConstraintViolationExceptionHandler.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/model/Movie.java b/spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/model/Movie.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/model/Movie.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/model/Movie.java
diff --git a/spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/service/MovieService.java b/spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/service/MovieService.java
similarity index 100%
rename from spring-mvc-simple-2/src/main/java/com/baeldung/validation/listvalidation/service/MovieService.java
rename to spring-mvc-basics-3/src/main/java/com/baeldung/validation/listvalidation/service/MovieService.java
diff --git a/spring-mvc-simple-2/src/main/resources/application.properties b/spring-mvc-basics-3/src/main/resources/application.properties
similarity index 100%
rename from spring-mvc-simple-2/src/main/resources/application.properties
rename to spring-mvc-basics-3/src/main/resources/application.properties
diff --git a/spring-mvc-simple-2/src/main/resources/templates/feedback.html b/spring-mvc-basics-3/src/main/resources/templates/feedback.html
similarity index 100%
rename from spring-mvc-simple-2/src/main/resources/templates/feedback.html
rename to spring-mvc-basics-3/src/main/resources/templates/feedback.html
diff --git a/spring-mvc-simple-2/src/main/resources/templates/submit.html b/spring-mvc-basics-3/src/main/resources/templates/submit.html
similarity index 100%
rename from spring-mvc-simple-2/src/main/resources/templates/submit.html
rename to spring-mvc-basics-3/src/main/resources/templates/submit.html
diff --git a/spring-mvc-simple-2/src/main/resources/templates/success.html b/spring-mvc-basics-3/src/main/resources/templates/success.html
similarity index 100%
rename from spring-mvc-simple-2/src/main/resources/templates/success.html
rename to spring-mvc-basics-3/src/main/resources/templates/success.html
diff --git a/spring-mvc-simple-2/src/test/java/com/baeldung/AppContextIntegrationTest.java b/spring-mvc-basics-3/src/test/java/com/baeldung/AppContextIntegrationTest.java
similarity index 100%
rename from spring-mvc-simple-2/src/test/java/com/baeldung/AppContextIntegrationTest.java
rename to spring-mvc-basics-3/src/test/java/com/baeldung/AppContextIntegrationTest.java
diff --git a/spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootApplicationIntegrationTest.java b/spring-mvc-basics-3/src/test/java/com/baeldung/SpringBootApplicationIntegrationTest.java
similarity index 100%
rename from spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootApplicationIntegrationTest.java
rename to spring-mvc-basics-3/src/test/java/com/baeldung/SpringBootApplicationIntegrationTest.java
diff --git a/spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java b/spring-mvc-basics-3/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java
similarity index 100%
rename from spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java
rename to spring-mvc-basics-3/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java
diff --git a/spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootMailIntegrationTest.java b/spring-mvc-basics-3/src/test/java/com/baeldung/SpringBootMailIntegrationTest.java
similarity index 100%
rename from spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootMailIntegrationTest.java
rename to spring-mvc-basics-3/src/test/java/com/baeldung/SpringBootMailIntegrationTest.java
diff --git a/spring-mvc-simple-2/src/test/java/org/baeldung/cachedrequest/CachedBodyHttpServletRequestUnitTest.java b/spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/CachedBodyHttpServletRequestUnitTest.java
similarity index 100%
rename from spring-mvc-simple-2/src/test/java/org/baeldung/cachedrequest/CachedBodyHttpServletRequestUnitTest.java
rename to spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/CachedBodyHttpServletRequestUnitTest.java
diff --git a/spring-mvc-simple-2/src/test/java/org/baeldung/cachedrequest/CachedBodyServletInputStreamUnitTest.java b/spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/CachedBodyServletInputStreamUnitTest.java
similarity index 100%
rename from spring-mvc-simple-2/src/test/java/org/baeldung/cachedrequest/CachedBodyServletInputStreamUnitTest.java
rename to spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/CachedBodyServletInputStreamUnitTest.java
diff --git a/spring-mvc-simple-2/src/test/java/org/baeldung/cachedrequest/ContentCachingFilterUnitTest.java b/spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/ContentCachingFilterUnitTest.java
similarity index 100%
rename from spring-mvc-simple-2/src/test/java/org/baeldung/cachedrequest/ContentCachingFilterUnitTest.java
rename to spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/ContentCachingFilterUnitTest.java
diff --git a/spring-mvc-simple-2/src/test/java/org/baeldung/cachedrequest/PersonControllerIntegrationTest.java b/spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/PersonControllerIntegrationTest.java
similarity index 100%
rename from spring-mvc-simple-2/src/test/java/org/baeldung/cachedrequest/PersonControllerIntegrationTest.java
rename to spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/PersonControllerIntegrationTest.java
diff --git a/spring-mvc-simple-2/src/test/java/org/baeldung/cachedrequest/PrintRequestContentFilterUnitTest.java b/spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/PrintRequestContentFilterUnitTest.java
similarity index 100%
rename from spring-mvc-simple-2/src/test/java/org/baeldung/cachedrequest/PrintRequestContentFilterUnitTest.java
rename to spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/PrintRequestContentFilterUnitTest.java
diff --git a/spring-mvc-simple-2/src/test/java/com/baeldung/headers/controller/ReadHeaderRestControllerIntegrationTest.java b/spring-mvc-basics-3/src/test/java/com/baeldung/headers/controller/ReadHeaderRestControllerIntegrationTest.java
similarity index 100%
rename from spring-mvc-simple-2/src/test/java/com/baeldung/headers/controller/ReadHeaderRestControllerIntegrationTest.java
rename to spring-mvc-basics-3/src/test/java/com/baeldung/headers/controller/ReadHeaderRestControllerIntegrationTest.java
diff --git a/spring-mvc-simple-2/src/test/java/com/baeldung/spring/slash/SlashParsingControllerIntTest.java b/spring-mvc-basics-3/src/test/java/com/baeldung/spring/slash/SlashParsingControllerIntTest.java
similarity index 100%
rename from spring-mvc-simple-2/src/test/java/com/baeldung/spring/slash/SlashParsingControllerIntTest.java
rename to spring-mvc-basics-3/src/test/java/com/baeldung/spring/slash/SlashParsingControllerIntTest.java
diff --git a/spring-mvc-simple-2/src/test/java/com/baeldung/validation/listvalidation/MovieControllerIntegrationTest.java b/spring-mvc-basics-3/src/test/java/com/baeldung/validation/listvalidation/MovieControllerIntegrationTest.java
similarity index 100%
rename from spring-mvc-simple-2/src/test/java/com/baeldung/validation/listvalidation/MovieControllerIntegrationTest.java
rename to spring-mvc-basics-3/src/test/java/com/baeldung/validation/listvalidation/MovieControllerIntegrationTest.java
diff --git a/spring-mvc-basics-2/.gitignore b/spring-mvc-basics-4/.gitignore
similarity index 100%
rename from spring-mvc-basics-2/.gitignore
rename to spring-mvc-basics-4/.gitignore
diff --git a/spring-mvc-basics-4/README.md b/spring-mvc-basics-4/README.md
new file mode 100644
index 0000000000..19cb9059ed
--- /dev/null
+++ b/spring-mvc-basics-4/README.md
@@ -0,0 +1,11 @@
+## Spring MVC Basics with Java Configuration Example Project
+
+### The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
+### Relevant Articles: 
+- [Quick Guide to Spring Controllers](https://www.baeldung.com/spring-controllers)
+- [Model, ModelMap, and ModelView in Spring MVC](https://www.baeldung.com/spring-mvc-model-model-map-model-view)
+- [Spring Web Contexts](https://www.baeldung.com/spring-web-contexts)
+- [Spring Optional Path variables](https://www.baeldung.com/spring-optional-path-variables)
+- More articles: [[<-- prev]](/spring-mvc-basics-3)
\ No newline at end of file
diff --git a/spring-mvc-basics-4/pom.xml b/spring-mvc-basics-4/pom.xml
new file mode 100644
index 0000000000..8382cd03b8
--- /dev/null
+++ b/spring-mvc-basics-4/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>
+    <artifactId>spring-mvc-basics-4</artifactId>
+    <name>spring-mvc-basics-4</name>
+    <packaging>war</packaging>
+
+    <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>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/Greeting.java b/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/Greeting.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/contexts/Greeting.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/contexts/Greeting.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java b/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java b/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java b/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/NormalWebAppConfig.java b/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/NormalWebAppConfig.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/NormalWebAppConfig.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/NormalWebAppConfig.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/RootApplicationConfig.java b/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/RootApplicationConfig.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/RootApplicationConfig.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/RootApplicationConfig.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java b/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/SecureWebAppConfig.java b/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/SecureWebAppConfig.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/SecureWebAppConfig.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/SecureWebAppConfig.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/normal/HelloWorldController.java b/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/normal/HelloWorldController.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/contexts/normal/HelloWorldController.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/contexts/normal/HelloWorldController.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/secure/HelloWorldSecureController.java b/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/secure/HelloWorldSecureController.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/contexts/secure/HelloWorldSecureController.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/contexts/secure/HelloWorldSecureController.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/services/ApplicationContextUtilService.java b/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/services/ApplicationContextUtilService.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/contexts/services/ApplicationContextUtilService.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/contexts/services/ApplicationContextUtilService.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/services/GreeterService.java b/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/services/GreeterService.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/contexts/services/GreeterService.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/contexts/services/GreeterService.java
diff --git a/spring-mvc-basics-2/src/main/java/org/baeldung/controller/config/StudentControllerConfig.java b/spring-mvc-basics-4/src/main/java/com/baeldung/controller/config/StudentControllerConfig.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/org/baeldung/controller/config/StudentControllerConfig.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/controller/config/StudentControllerConfig.java
diff --git a/spring-mvc-basics-2/src/main/java/org/baeldung/controller/config/WebConfig.java b/spring-mvc-basics-4/src/main/java/com/baeldung/controller/config/WebConfig.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/org/baeldung/controller/config/WebConfig.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/controller/config/WebConfig.java
diff --git a/spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/PassParametersController.java b/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/PassParametersController.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/PassParametersController.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/PassParametersController.java
diff --git a/spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/RestAnnotatedController.java b/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/RestAnnotatedController.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/RestAnnotatedController.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/RestAnnotatedController.java
diff --git a/spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/RestController.java b/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/RestController.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/RestController.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/RestController.java
diff --git a/spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/TestController.java b/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/TestController.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/TestController.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/TestController.java
diff --git a/spring-mvc-basics-2/src/main/java/org/baeldung/controller/student/Student.java b/spring-mvc-basics-4/src/main/java/com/baeldung/controller/student/Student.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/org/baeldung/controller/student/Student.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/controller/student/Student.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/controller/optionalpathvars/Article.java b/spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/Article.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/controller/optionalpathvars/Article.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/Article.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/controller/optionalpathvars/ArticleViewerController.java b/spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerController.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/controller/optionalpathvars/ArticleViewerController.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerController.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/controller/optionalpathvars/ArticleViewerWithMapParamController.java b/spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerWithMapParamController.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/controller/optionalpathvars/ArticleViewerWithMapParamController.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerWithMapParamController.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/controller/optionalpathvars/ArticleViewerWithOptionalParamController.java b/spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerWithOptionalParamController.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/controller/optionalpathvars/ArticleViewerWithOptionalParamController.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerWithOptionalParamController.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/controller/optionalpathvars/ArticleViewerWithRequiredAttributeController.java b/spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerWithRequiredAttributeController.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/controller/optionalpathvars/ArticleViewerWithRequiredAttributeController.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerWithRequiredAttributeController.java
diff --git a/spring-mvc-basics-2/src/main/java/com/baeldung/controller/optionalpathvars/ArticleViewerWithTwoSeparateMethodsController.java b/spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerWithTwoSeparateMethodsController.java
similarity index 100%
rename from spring-mvc-basics-2/src/main/java/com/baeldung/controller/optionalpathvars/ArticleViewerWithTwoSeparateMethodsController.java
rename to spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerWithTwoSeparateMethodsController.java
diff --git a/spring-mvc-basics-4/src/main/resources/application.properties b/spring-mvc-basics-4/src/main/resources/application.properties
new file mode 100644
index 0000000000..709574239b
--- /dev/null
+++ b/spring-mvc-basics-4/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
diff --git a/spring-mvc-simple/src/main/resources/logback.xml b/spring-mvc-basics-4/src/main/resources/logback.xml
similarity index 100%
rename from spring-mvc-simple/src/main/resources/logback.xml
rename to spring-mvc-basics-4/src/main/resources/logback.xml
diff --git a/spring-mvc-basics-2/src/main/resources/test-mvc.xml b/spring-mvc-basics-4/src/main/resources/test-mvc.xml
similarity index 100%
rename from spring-mvc-basics-2/src/main/resources/test-mvc.xml
rename to spring-mvc-basics-4/src/main/resources/test-mvc.xml
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/greeting.xml b/spring-mvc-basics-4/src/main/webapp/WEB-INF/greeting.xml
similarity index 100%
rename from spring-mvc-basics-2/src/main/webapp/WEB-INF/greeting.xml
rename to spring-mvc-basics-4/src/main/webapp/WEB-INF/greeting.xml
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/index.jsp b/spring-mvc-basics-4/src/main/webapp/WEB-INF/index.jsp
similarity index 100%
rename from spring-mvc-basics-2/src/main/webapp/WEB-INF/index.jsp
rename to spring-mvc-basics-4/src/main/webapp/WEB-INF/index.jsp
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/normal-webapp-servlet.xml b/spring-mvc-basics-4/src/main/webapp/WEB-INF/normal-webapp-servlet.xml
similarity index 100%
rename from spring-mvc-basics-2/src/main/webapp/WEB-INF/normal-webapp-servlet.xml
rename to spring-mvc-basics-4/src/main/webapp/WEB-INF/normal-webapp-servlet.xml
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/rootApplicationContext.xml b/spring-mvc-basics-4/src/main/webapp/WEB-INF/rootApplicationContext.xml
similarity index 100%
rename from spring-mvc-basics-2/src/main/webapp/WEB-INF/rootApplicationContext.xml
rename to spring-mvc-basics-4/src/main/webapp/WEB-INF/rootApplicationContext.xml
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/secure-webapp-servlet.xml b/spring-mvc-basics-4/src/main/webapp/WEB-INF/secure-webapp-servlet.xml
similarity index 100%
rename from spring-mvc-basics-2/src/main/webapp/WEB-INF/secure-webapp-servlet.xml
rename to spring-mvc-basics-4/src/main/webapp/WEB-INF/secure-webapp-servlet.xml
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/secure/view/welcome.jsp b/spring-mvc-basics-4/src/main/webapp/WEB-INF/secure/view/welcome.jsp
similarity index 100%
rename from spring-mvc-basics-2/src/main/webapp/WEB-INF/secure/view/welcome.jsp
rename to spring-mvc-basics-4/src/main/webapp/WEB-INF/secure/view/welcome.jsp
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/sample.jsp b/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/sample.jsp
similarity index 100%
rename from spring-mvc-basics-2/src/main/webapp/WEB-INF/view/sample.jsp
rename to spring-mvc-basics-4/src/main/webapp/WEB-INF/view/sample.jsp
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/scopesExample.jsp b/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/scopesExample.jsp
similarity index 100%
rename from spring-mvc-basics-2/src/main/webapp/WEB-INF/view/scopesExample.jsp
rename to spring-mvc-basics-4/src/main/webapp/WEB-INF/view/scopesExample.jsp
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/viewPage.html b/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/viewPage.html
similarity index 100%
rename from spring-mvc-basics-2/src/main/webapp/WEB-INF/view/viewPage.html
rename to spring-mvc-basics-4/src/main/webapp/WEB-INF/view/viewPage.html
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/welcome.jsp b/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/welcome.jsp
similarity index 100%
rename from spring-mvc-basics-2/src/main/webapp/WEB-INF/view/welcome.jsp
rename to spring-mvc-basics-4/src/main/webapp/WEB-INF/view/welcome.jsp
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/web-old.xml b/spring-mvc-basics-4/src/main/webapp/WEB-INF/web-old.xml
similarity index 100%
rename from spring-mvc-basics-2/src/main/webapp/WEB-INF/web-old.xml
rename to spring-mvc-basics-4/src/main/webapp/WEB-INF/web-old.xml
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/welcome.jsp b/spring-mvc-basics-4/src/main/webapp/WEB-INF/welcome.jsp
similarity index 100%
rename from spring-mvc-basics-2/src/main/webapp/WEB-INF/welcome.jsp
rename to spring-mvc-basics-4/src/main/webapp/WEB-INF/welcome.jsp
diff --git a/spring-mvc-basics-2/src/main/webapp/index.jsp b/spring-mvc-basics-4/src/main/webapp/index.jsp
similarity index 100%
rename from spring-mvc-basics-2/src/main/webapp/index.jsp
rename to spring-mvc-basics-4/src/main/webapp/index.jsp
diff --git a/spring-mvc-basics-2/src/test/java/org/baeldung/controller/ControllerAnnotationIntegrationTest.java b/spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerAnnotationIntegrationTest.java
similarity index 100%
rename from spring-mvc-basics-2/src/test/java/org/baeldung/controller/ControllerAnnotationIntegrationTest.java
rename to spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerAnnotationIntegrationTest.java
diff --git a/spring-mvc-basics-2/src/test/java/org/baeldung/controller/ControllerIntegrationTest.java b/spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerIntegrationTest.java
similarity index 100%
rename from spring-mvc-basics-2/src/test/java/org/baeldung/controller/ControllerIntegrationTest.java
rename to spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerIntegrationTest.java
diff --git a/spring-mvc-basics-2/src/test/java/org/baeldung/controller/PassParametersControllerIntegrationTest.java b/spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java
similarity index 100%
rename from spring-mvc-basics-2/src/test/java/org/baeldung/controller/PassParametersControllerIntegrationTest.java
rename to spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java
diff --git a/spring-mvc-basics-2/src/test/java/com/baeldung/controller/optionalpathvars/ArticleViewerControllerIntegrationTest.java b/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerIntegrationTest.java
similarity index 100%
rename from spring-mvc-basics-2/src/test/java/com/baeldung/controller/optionalpathvars/ArticleViewerControllerIntegrationTest.java
rename to spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerIntegrationTest.java
diff --git a/spring-mvc-basics-2/src/test/java/com/baeldung/controller/optionalpathvars/ArticleViewerControllerWithOptionalParamIntegrationTest.java b/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithOptionalParamIntegrationTest.java
similarity index 100%
rename from spring-mvc-basics-2/src/test/java/com/baeldung/controller/optionalpathvars/ArticleViewerControllerWithOptionalParamIntegrationTest.java
rename to spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithOptionalParamIntegrationTest.java
diff --git a/spring-mvc-basics-2/src/test/java/com/baeldung/controller/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java b/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java
similarity index 100%
rename from spring-mvc-basics-2/src/test/java/com/baeldung/controller/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java
rename to spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java
diff --git a/spring-mvc-basics-2/src/test/java/com/baeldung/controller/optionalpathvars/ArticleViewerWithMapParamIntegrationTest.java b/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithMapParamIntegrationTest.java
similarity index 100%
rename from spring-mvc-basics-2/src/test/java/com/baeldung/controller/optionalpathvars/ArticleViewerWithMapParamIntegrationTest.java
rename to spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithMapParamIntegrationTest.java
diff --git a/spring-mvc-basics-2/src/test/java/com/baeldung/controller/optionalpathvars/ArticleViewerWithTwoSeparateMethodsIntegrationTest.java b/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithTwoSeparateMethodsIntegrationTest.java
similarity index 100%
rename from spring-mvc-basics-2/src/test/java/com/baeldung/controller/optionalpathvars/ArticleViewerWithTwoSeparateMethodsIntegrationTest.java
rename to spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithTwoSeparateMethodsIntegrationTest.java
diff --git a/spring-mvc-basics-2/src/test/resources/test-mvc.xml b/spring-mvc-basics-4/src/test/resources/test-mvc.xml
similarity index 100%
rename from spring-mvc-basics-2/src/test/resources/test-mvc.xml
rename to spring-mvc-basics-4/src/test/resources/test-mvc.xml
diff --git a/spring-mvc-basics/README.md b/spring-mvc-basics/README.md
index a995c89a07..cd36ffd94a 100644
--- a/spring-mvc-basics/README.md
+++ b/spring-mvc-basics/README.md
@@ -17,4 +17,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Using Spring @ResponseStatus to Set HTTP Status Code](https://www.baeldung.com/spring-response-status)
 - [Spring MVC and the @ModelAttribute Annotation](https://www.baeldung.com/spring-mvc-and-the-modelattribute-annotation)
 - [The HttpMediaTypeNotAcceptableException in Spring MVC](https://www.baeldung.com/spring-httpmediatypenotacceptable)
-- [[Next -->]](/spring-mvc-basics-2)
\ No newline at end of file
+- More articles: [[more -->]](/spring-mvc-basics-2)
\ No newline at end of file
diff --git a/spring-mvc-basics/pom.xml b/spring-mvc-basics/pom.xml
index ab6d200e67..159dda955f 100644
--- a/spring-mvc-basics/pom.xml
+++ b/spring-mvc-basics/pom.xml
@@ -38,6 +38,7 @@
     </dependencies>
 
     <build>
+        <finalName>spring-mvc-basics</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/spring-mvc-simple/README.md b/spring-mvc-simple/README.md
deleted file mode 100644
index ae03fedf3c..0000000000
--- a/spring-mvc-simple/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## Spring MVC Simple
-
-This module contains articles about Spring MVC
-
-## Relevant articles:
-
-- [HandlerAdapters in Spring MVC](https://www.baeldung.com/spring-mvc-handler-adapters)
-- [Template Engines for Spring](https://www.baeldung.com/spring-template-engines)
-- [Spring 5 and Servlet 4 – The PushBuilder](https://www.baeldung.com/spring-5-push)
-- [Servlet Redirect vs Forward](https://www.baeldung.com/servlet-redirect-forward)
-- [Apache Tiles Integration with Spring MVC](https://www.baeldung.com/spring-mvc-apache-tiles)
-- [Guide to Spring Email](https://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)
-- More articles: [[more -->]](/spring-mvc-simple-2)
\ No newline at end of file
diff --git a/spring-mvc-simple/pom.xml b/spring-mvc-simple/pom.xml
deleted file mode 100644
index 539e81307a..0000000000
--- a/spring-mvc-simple/pom.xml
+++ /dev/null
@@ -1,185 +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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-mvc-simple</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-mvc-simple</name>
-    <packaging>war</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-5</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-spring-5</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-oxm</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>${javax.mail.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>javax.servlet.jsp-api</artifactId>
-            <version>${javax.servlet.jsp-api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>${jstl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>${hibernate-validator.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>${commons-fileupload.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-
-        <!-- thymeleaf dependencies -->
-        <dependency>
-            <groupId>org.thymeleaf</groupId>
-            <artifactId>thymeleaf</artifactId>
-            <version>${org.thymeleaf-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.thymeleaf</groupId>
-            <artifactId>thymeleaf-spring4</artifactId>
-            <version>${org.thymeleaf-version}</version>
-        </dependency>
-
-        <!-- freemarker dependencies -->
-        <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>${freemarker.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-
-        <!-- groovy template dependency -->
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-templates</artifactId>
-            <version>${groovy.version}</version>
-        </dependency>
-
-        <!-- jade dependency -->
-        <dependency>
-            <groupId>de.neuland-bfi</groupId>
-            <artifactId>spring-jade4j</artifactId>
-            <version>${jade.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-jsp</artifactId>
-            <version>${apache-tiles.version}</version>
-        </dependency>
-
-        <!--Testing -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.rometools</groupId>
-            <artifactId>rome</artifactId>
-            <version>${rome.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>${xstream.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.scribejava</groupId>
-            <artifactId>scribejava-apis</artifactId>
-            <version>${scribejava.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>${json.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-logger-api</artifactId>
-            <version>${maven-surefire-plugin.version}</version>
-            <!-- to get around bug https://github.com/junit-team/junit5/issues/1367 -->
-            <scope>test</scope>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>${maven-war-plugin.version}</version>
-                    <configuration>
-                        <warSourceDirectory>src/main/webapp</warSourceDirectory>
-                        <warName>springMvcSimple</warName>
-                        <failOnMissingWebXml>false</failOnMissingWebXml>
-                        <outputDirectory>${deploy-path}</outputDirectory>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <finalName>spring-mvc-simple</finalName>
-    </build>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.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>
-        <deploy-path>enter-location-of-server</deploy-path>
-        <commons-fileupload.version>1.3.2</commons-fileupload.version>
-        <org.thymeleaf-version>3.0.7.RELEASE</org.thymeleaf-version>
-        <groovy.version>2.4.12</groovy.version>
-        <freemarker.version>2.3.27-incubating</freemarker.version>
-        <jade.version>1.2.5</jade.version>
-        <rome.version>1.9.0</rome.version>
-        <xstream.version>1.4.9</xstream.version>
-        <scribejava.version>5.1.0</scribejava.version>
-        <json.version>20180130</json.version>
-        <apache-tiles.version>3.0.8</apache-tiles.version>
-        <javax.mail.version>1.6.1</javax.mail.version>
-    </properties>
-
-</project>
diff --git a/spring-mvc-simple/src/main/resources/application.properties b/spring-mvc-simple/src/main/resources/application.properties
deleted file mode 100644
index 9a804c07d8..0000000000
--- a/spring-mvc-simple/src/main/resources/application.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#this property file will have to be loaded explicitly as this is not a Spring Boot project
-
-# Gmail SMTP
-spring.mail.host=smtp.gmail.com
-spring.mail.port=587
-spring.mail.username=username
-spring.mail.password=password
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.starttls.enable=true
-
-# Amazon SES SMTP
-#spring.mail.host=email-smtp.us-west-2.amazonaws.com
-#spring.mail.username=username
-#spring.mail.password=password
-#spring.mail.properties.mail.transport.protocol=smtp
-#spring.mail.properties.mail.smtp.port=25
-#spring.mail.properties.mail.smtp.auth=true
-#spring.mail.properties.mail.smtp.starttls.enable=true
-#spring.mail.properties.mail.smtp.starttls.required=true
-
-# path to attachment file
-attachment.invoice=path_to_file
\ No newline at end of file

From 0df902da92720c0da367a3fa0ae444f99b2def2d Mon Sep 17 00:00:00 2001
From: Gang <Wu>
Date: Mon, 16 Dec 2019 23:46:22 -0700
Subject: [PATCH 023/106] =?UTF-8?q?BAEL-3406=20Kruskal=E2=80=99s=20Algorit?=
 =?UTF-8?q?hm=20for=20Spanning=20Trees?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 algorithms-miscellaneous-5/pom.xml            |  5 ++
 .../baeldung/algorithms/kruskal/Kruskal.java  | 88 +++++++++++++++++++
 .../algorithms/kruskal/KruskalUnitTest.java   | 66 ++++++++++++++
 3 files changed, 159 insertions(+)
 create mode 100644 algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java
 create mode 100644 algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java

diff --git a/algorithms-miscellaneous-5/pom.xml b/algorithms-miscellaneous-5/pom.xml
index 2f530958e3..83a30f420c 100644
--- a/algorithms-miscellaneous-5/pom.xml
+++ b/algorithms-miscellaneous-5/pom.xml
@@ -34,6 +34,11 @@
             <artifactId>tradukisto</artifactId>
             <version>${tradukisto.version}</version>
         </dependency>
+        <dependency>
+           <groupId>com.google.guava</groupId>
+           <artifactId>guava</artifactId>
+           <version>28.1-jre</version>
+        </dependency>
 
         <dependency>
             <groupId>org.assertj</groupId>
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java
new file mode 100644
index 0000000000..62b260c71e
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java
@@ -0,0 +1,88 @@
+package com.baeldung.algorithms.kruskal;
+
+import com.google.common.graph.EndpointPair;
+import com.google.common.graph.MutableValueGraph;
+import com.google.common.graph.ValueGraph;
+import com.google.common.graph.ValueGraphBuilder;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+
+public class Kruskal {
+
+    public ValueGraph<Integer, Double> minSpanningTree(ValueGraph<Integer, Double> graph) {
+        
+        return spanningTree(graph, true);
+    }
+
+    public ValueGraph<Integer, Double> maxSpanningTree(ValueGraph<Integer, Double> graph) {
+        return spanningTree(graph, false);
+    }
+
+    private ValueGraph<Integer, Double> spanningTree(ValueGraph<Integer, Double> graph, boolean minSpanningTree) {
+        Set<EndpointPair<Integer>> edges = graph.edges();
+        List<EndpointPair<Integer>> edgeList = new ArrayList<>(edges);
+
+        if (minSpanningTree) {
+            edgeList.sort(Comparator.comparing(e -> graph.edgeValue(e).get()));
+        } else {
+            edgeList.sort(Collections.reverseOrder(Comparator.comparing(e -> graph.edgeValue(e).get())));
+        }
+
+        int totalEdges = edgeList.size();
+        int totalNodes = graph.nodes().size();
+        int edgeCount = 0;
+        List<Integer> roots = new ArrayList<>(totalNodes);
+        List<Integer> sizes = new ArrayList<>(totalNodes);
+        for (int i = 0; i < totalNodes; i++) {
+            roots.add(i);
+            sizes.add(1);
+        }
+
+        MutableValueGraph<Integer, Double> spanningTree = ValueGraphBuilder.undirected().build();
+        for (int i = 0; i < totalEdges; i++) {
+            EndpointPair<Integer> edge = edgeList.get(i);
+            if (detectCycle(edge.nodeU(), edge.nodeV(), roots, sizes)) {
+                continue;
+            }
+            spanningTree.putEdgeValue(edge.nodeU(), edge.nodeV(), graph.edgeValue(edge).get());
+            edgeCount++;
+            if (edgeCount == totalNodes - 1) {
+                break;
+            }
+        }
+        return spanningTree;
+    }
+
+    private Integer find(Integer x, List<Integer> roots) {
+        Integer root = roots.get(x);
+        if (!root.equals(x)) {
+            roots.set(x, find(root, roots));
+        }
+        return roots.get(x);
+    }
+
+    private void unionBySize(Integer rootU, Integer rootV, List<Integer> roots, List<Integer> sizes) {
+        Integer total = sizes.get(rootU) + sizes.get(rootV);
+        if (sizes.get(rootU) < sizes.get(rootV)) {
+            roots.set(rootU, rootV);
+            sizes.set(rootV, total);
+        } else {
+            roots.set(rootV, rootU);
+            sizes.set(rootU, total);
+        }
+    }
+
+    private boolean detectCycle(Integer u, Integer v, List<Integer> roots, List<Integer> sizes) {
+        Integer rootU = find(u, roots);
+        Integer rootV = find(v, roots);
+        if (rootU.equals(rootV)) {
+            return true;
+        }
+        unionBySize(rootU, rootV, roots, sizes);
+        return false;
+    }
+}
diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java
new file mode 100644
index 0000000000..e944d2894c
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java
@@ -0,0 +1,66 @@
+package com.baeldung.algorithms.kruskal;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+import com.google.common.graph.MutableValueGraph;
+import com.google.common.graph.ValueGraph;
+import com.google.common.graph.ValueGraphBuilder;
+
+public class KruskalUnitTest {
+
+    private MutableValueGraph<Integer, Double> graph;
+
+    @Before
+    public void setup() {
+        graph = ValueGraphBuilder.undirected().build();
+        graph.putEdgeValue(0, 1, 8.0);
+        graph.putEdgeValue(0, 2, 5.0);
+        graph.putEdgeValue(1, 2, 9.0);
+        graph.putEdgeValue(1, 3, 11.0);
+        graph.putEdgeValue(2, 3, 15.0);
+        graph.putEdgeValue(2, 4, 10.0);
+        graph.putEdgeValue(3, 4, 7.0);
+    }
+
+    @Test
+    public void givenGraph_whenMinimumSpanningTree_thenOutputCorrectResult() {
+        final Kruskal kruskal = new Kruskal();
+        ValueGraph<Integer, Double> spanningTree = kruskal.minSpanningTree(graph);
+
+        assertTrue(spanningTree.hasEdgeConnecting(0, 1));
+        assertTrue(spanningTree.hasEdgeConnecting(0, 2));
+        assertTrue(spanningTree.hasEdgeConnecting(2, 4));
+        assertTrue(spanningTree.hasEdgeConnecting(3, 4));
+        assertEquals(graph.edgeValue(0, 1), spanningTree.edgeValue(0, 1));
+        assertEquals(graph.edgeValue(0, 2), spanningTree.edgeValue(0, 2));
+        assertEquals(graph.edgeValue(2, 4), spanningTree.edgeValue(2, 4));
+        assertEquals(graph.edgeValue(3, 4), spanningTree.edgeValue(3, 4));
+
+        assertFalse(spanningTree.hasEdgeConnecting(1, 2));
+        assertFalse(spanningTree.hasEdgeConnecting(1, 3));
+        assertFalse(spanningTree.hasEdgeConnecting(2, 3));
+    }
+
+    @Test
+    public void givenGraph_whenMaximumSpanningTree_thenOutputCorrectResult() {
+        final Kruskal kruskal = new Kruskal();
+        ValueGraph<Integer, Double> spanningTree = kruskal.maxSpanningTree(graph);
+
+        assertTrue(spanningTree.hasEdgeConnecting(0, 1));
+        assertTrue(spanningTree.hasEdgeConnecting(1, 3));
+        assertTrue(spanningTree.hasEdgeConnecting(2, 3));
+        assertTrue(spanningTree.hasEdgeConnecting(2, 4));
+        assertEquals(graph.edgeValue(0, 1), spanningTree.edgeValue(0, 1));
+        assertEquals(graph.edgeValue(1, 3), spanningTree.edgeValue(1, 3));
+        assertEquals(graph.edgeValue(2, 3), spanningTree.edgeValue(2, 3));
+        assertEquals(graph.edgeValue(2, 4), spanningTree.edgeValue(2, 4));
+
+        assertFalse(spanningTree.hasEdgeConnecting(0, 2));
+        assertFalse(spanningTree.hasEdgeConnecting(1, 2));
+        assertFalse(spanningTree.hasEdgeConnecting(3, 4));
+    }
+}

From 70ce72124bbc22c0396aaabe6c32f0d4e2e65a38 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Tue, 17 Dec 2019 20:24:33 +0100
Subject: [PATCH 024/106] BAEL-3242: Use random port for test execution in
 spring-vertx module

---
 .../vertxspring/config/PortConfiguration.java | 32 +++++++++++++++++++
 .../vertxspring/verticles/ServerVerticle.java |  6 +++-
 ...VertxSpringApplicationIntegrationTest.java | 14 +++++---
 3 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 spring-vertx/src/main/java/com/baeldung/vertxspring/config/PortConfiguration.java

diff --git a/spring-vertx/src/main/java/com/baeldung/vertxspring/config/PortConfiguration.java b/spring-vertx/src/main/java/com/baeldung/vertxspring/config/PortConfiguration.java
new file mode 100644
index 0000000000..50beb6c549
--- /dev/null
+++ b/spring-vertx/src/main/java/com/baeldung/vertxspring/config/PortConfiguration.java
@@ -0,0 +1,32 @@
+package com.baeldung.vertxspring.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+
+@Configuration
+public class PortConfiguration {
+
+    private static final int DEFAULT_PORT = 8069;
+
+
+    @Profile("default")
+    @Bean
+    public Integer defaultPort() {
+        return DEFAULT_PORT;
+    }
+
+    @Profile("test")
+    @Bean
+    public Integer randomPort() {
+        try (ServerSocket socket = new ServerSocket(0)) {
+            return socket.getLocalPort();
+
+        } catch (IOException e) {
+            return DEFAULT_PORT;
+        }
+    }
+}
diff --git a/spring-vertx/src/main/java/com/baeldung/vertxspring/verticles/ServerVerticle.java b/spring-vertx/src/main/java/com/baeldung/vertxspring/verticles/ServerVerticle.java
index 3c23cb15bc..a84845f030 100644
--- a/spring-vertx/src/main/java/com/baeldung/vertxspring/verticles/ServerVerticle.java
+++ b/spring-vertx/src/main/java/com/baeldung/vertxspring/verticles/ServerVerticle.java
@@ -1,5 +1,6 @@
 package com.baeldung.vertxspring.verticles;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import io.vertx.core.AbstractVerticle;
@@ -9,6 +10,9 @@ import io.vertx.ext.web.RoutingContext;
 @Component
 public class ServerVerticle extends AbstractVerticle {
 
+    @Autowired
+    private Integer defaultPort;
+
     private void getAllArticlesHandler(RoutingContext routingContext) {
         vertx.eventBus()
             .<String>send(ArticleRecipientVerticle.GET_ALL_ARTICLES, "", result -> {
@@ -36,7 +40,7 @@ public class ServerVerticle extends AbstractVerticle {
 
         vertx.createHttpServer()
             .requestHandler(router::accept)
-            .listen(config().getInteger("http.port", 8080));
+            .listen(config().getInteger("http.port", defaultPort));
     }
 
 }
diff --git a/spring-vertx/src/test/java/com/baeldung/vertxspring/VertxSpringApplicationIntegrationTest.java b/spring-vertx/src/test/java/com/baeldung/vertxspring/VertxSpringApplicationIntegrationTest.java
index bfb902e5d4..1eda45eb3b 100644
--- a/spring-vertx/src/test/java/com/baeldung/vertxspring/VertxSpringApplicationIntegrationTest.java
+++ b/spring-vertx/src/test/java/com/baeldung/vertxspring/VertxSpringApplicationIntegrationTest.java
@@ -1,27 +1,33 @@
 package com.baeldung.vertxspring;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import static org.junit.Assert.assertEquals;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
+@ActiveProfiles("test")
 public class VertxSpringApplicationIntegrationTest {
 
+    @Autowired
+    private Integer port;
+
     private TestRestTemplate restTemplate = new TestRestTemplate();
 
     @Test
     public void givenUrl_whenReceivedArticles_thenSuccess() throws InterruptedException {
-        ResponseEntity<String> responseEntity = restTemplate.getForEntity("http://localhost:8080/api/baeldung/articles", String.class);
+        ResponseEntity<String> responseEntity = restTemplate
+                .getForEntity("http://localhost:" + port + "/api/baeldung/articles", String.class);
 
         assertEquals(200, responseEntity.getStatusCodeValue());
     }
-
 }
 
 

From c56b1558cb468796c6d8c2fcbf107d1f78a1cca4 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Tue, 17 Dec 2019 21:23:11 +0100
Subject: [PATCH 025/106] BAEL-19967: Migrate spring-aop module to the
 com.baeldung package

---
 .../{org => com}/baeldung/Application.java    |  2 +-
 .../{org => com}/baeldung/ExampleAspect.java  |  4 +-
 .../baeldung/LogExecutionTime.java            |  2 +-
 .../java/{org => com}/baeldung/Service.java   |  2 +-
 .../baeldung/aspectj/Account.java             |  2 +-
 .../baeldung/aspectj/AccountAspect.aj         |  4 +-
 .../baeldung/aspectj/Secured.java             |  2 +-
 .../baeldung/aspectj/SecuredMethod.java       |  2 +-
 .../baeldung/aspectj/SecuredMethodAspect.java |  2 +-
 .../baeldung/logger/AdderAfterAspect.java     | 26 ++++-----
 .../logger/AdderAfterReturnAspect.java        | 26 ++++-----
 .../logger/AdderAfterThrowAspect.java         | 26 ++++-----
 .../baeldung/logger/AdderAroundAspect.java    | 36 ++++++------
 .../baeldung/logger/AdderBeforeAspect.java    | 26 ++++-----
 .../baeldung/logger/SampleAdder.java          | 24 ++++----
 .../performancemonitor/AopConfiguration.java  | 10 ++--
 .../MyPerformanceMonitorInterceptor.java      |  2 +-
 .../performancemonitor/PerfomanceApp.java     |  2 +-
 .../baeldung/performancemonitor/Person.java   |  2 +-
 .../performancemonitor/PersonService.java     |  2 +-
 .../src/main/resources/META-INF/aop.xml       |  2 +-
 spring-aop/src/main/resources/logback.xml     |  2 +-
 .../springAop-applicationContext.xml          | 22 +++----
 .../CustomAnnotationIntegrationTest.java      |  2 +-
 .../baeldung/SpringContextTest.java           |  2 +-
 .../baeldung/aspectj/AccountUnitTest.java     |  2 +-
 .../aspectj/SecuredMethodUnitTest.java        |  2 +-
 .../logger/CalculatorIntegrationTest.java     | 58 +++++++++----------
 .../springAop-applicationContext.xml          | 22 +++----
 29 files changed, 159 insertions(+), 159 deletions(-)
 rename spring-aop/src/main/java/{org => com}/baeldung/Application.java (92%)
 rename spring-aop/src/main/java/{org => com}/baeldung/ExampleAspect.java (88%)
 rename spring-aop/src/main/java/{org => com}/baeldung/LogExecutionTime.java (92%)
 rename spring-aop/src/main/java/{org => com}/baeldung/Service.java (90%)
 rename spring-aop/src/main/java/{org => com}/baeldung/aspectj/Account.java (88%)
 rename spring-aop/src/main/java/{org => com}/baeldung/aspectj/AccountAspect.aj (86%)
 rename spring-aop/src/main/java/{org => com}/baeldung/aspectj/Secured.java (90%)
 rename spring-aop/src/main/java/{org => com}/baeldung/aspectj/SecuredMethod.java (94%)
 rename spring-aop/src/main/java/{org => com}/baeldung/aspectj/SecuredMethodAspect.java (96%)
 rename spring-aop/src/main/java/{org => com}/baeldung/logger/AdderAfterAspect.java (86%)
 rename spring-aop/src/main/java/{org => com}/baeldung/logger/AdderAfterReturnAspect.java (88%)
 rename spring-aop/src/main/java/{org => com}/baeldung/logger/AdderAfterThrowAspect.java (88%)
 rename spring-aop/src/main/java/{org => com}/baeldung/logger/AdderAroundAspect.java (92%)
 rename spring-aop/src/main/java/{org => com}/baeldung/logger/AdderBeforeAspect.java (87%)
 rename spring-aop/src/main/java/{org => com}/baeldung/logger/SampleAdder.java (85%)
 rename spring-aop/src/main/java/{org => com}/baeldung/performancemonitor/AopConfiguration.java (85%)
 rename spring-aop/src/main/java/{org => com}/baeldung/performancemonitor/MyPerformanceMonitorInterceptor.java (96%)
 rename spring-aop/src/main/java/{org => com}/baeldung/performancemonitor/PerfomanceApp.java (93%)
 rename spring-aop/src/main/java/{org => com}/baeldung/performancemonitor/Person.java (95%)
 rename spring-aop/src/main/java/{org => com}/baeldung/performancemonitor/PersonService.java (89%)
 rename spring-aop/src/test/java/{org => com}/baeldung/CustomAnnotationIntegrationTest.java (95%)
 rename spring-aop/src/test/java/{org => com}/baeldung/SpringContextTest.java (94%)
 rename spring-aop/src/test/java/{org => com}/baeldung/aspectj/AccountUnitTest.java (94%)
 rename spring-aop/src/test/java/{org => com}/baeldung/aspectj/SecuredMethodUnitTest.java (88%)
 rename spring-aop/src/test/java/{org => com}/baeldung/logger/CalculatorIntegrationTest.java (93%)

diff --git a/spring-aop/src/main/java/org/baeldung/Application.java b/spring-aop/src/main/java/com/baeldung/Application.java
similarity index 92%
rename from spring-aop/src/main/java/org/baeldung/Application.java
rename to spring-aop/src/main/java/com/baeldung/Application.java
index e5c764ef7e..52ef79ac23 100644
--- a/spring-aop/src/main/java/org/baeldung/Application.java
+++ b/spring-aop/src/main/java/com/baeldung/Application.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-aop/src/main/java/org/baeldung/ExampleAspect.java b/spring-aop/src/main/java/com/baeldung/ExampleAspect.java
similarity index 88%
rename from spring-aop/src/main/java/org/baeldung/ExampleAspect.java
rename to spring-aop/src/main/java/com/baeldung/ExampleAspect.java
index 7c3b5fb599..482f4b8c08 100644
--- a/spring-aop/src/main/java/org/baeldung/ExampleAspect.java
+++ b/spring-aop/src/main/java/com/baeldung/ExampleAspect.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class ExampleAspect {
 
-    @Around("@annotation(LogExecutionTime)")
+    @Around("@annotation(com.baeldung.LogExecutionTime)")
     public Object logExecutionTime(ProceedingJoinPoint joinPoint) throws Throwable {
         final long start = System.currentTimeMillis();
 
diff --git a/spring-aop/src/main/java/org/baeldung/LogExecutionTime.java b/spring-aop/src/main/java/com/baeldung/LogExecutionTime.java
similarity index 92%
rename from spring-aop/src/main/java/org/baeldung/LogExecutionTime.java
rename to spring-aop/src/main/java/com/baeldung/LogExecutionTime.java
index c10f97e78f..c58a3cb7ee 100644
--- a/spring-aop/src/main/java/org/baeldung/LogExecutionTime.java
+++ b/spring-aop/src/main/java/com/baeldung/LogExecutionTime.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-aop/src/main/java/org/baeldung/Service.java b/spring-aop/src/main/java/com/baeldung/Service.java
similarity index 90%
rename from spring-aop/src/main/java/org/baeldung/Service.java
rename to spring-aop/src/main/java/com/baeldung/Service.java
index e4bee38438..01315c9723 100644
--- a/spring-aop/src/main/java/org/baeldung/Service.java
+++ b/spring-aop/src/main/java/com/baeldung/Service.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-aop/src/main/java/org/baeldung/aspectj/Account.java b/spring-aop/src/main/java/com/baeldung/aspectj/Account.java
similarity index 88%
rename from spring-aop/src/main/java/org/baeldung/aspectj/Account.java
rename to spring-aop/src/main/java/com/baeldung/aspectj/Account.java
index 2c551116f4..bc9ca375aa 100644
--- a/spring-aop/src/main/java/org/baeldung/aspectj/Account.java
+++ b/spring-aop/src/main/java/com/baeldung/aspectj/Account.java
@@ -1,4 +1,4 @@
-package org.baeldung.aspectj;
+package com.baeldung.aspectj;
 
 public class Account {
     int balance = 20;
diff --git a/spring-aop/src/main/java/org/baeldung/aspectj/AccountAspect.aj b/spring-aop/src/main/java/com/baeldung/aspectj/AccountAspect.aj
similarity index 86%
rename from spring-aop/src/main/java/org/baeldung/aspectj/AccountAspect.aj
rename to spring-aop/src/main/java/com/baeldung/aspectj/AccountAspect.aj
index f08d7dc281..0c79e5546a 100644
--- a/spring-aop/src/main/java/org/baeldung/aspectj/AccountAspect.aj
+++ b/spring-aop/src/main/java/com/baeldung/aspectj/AccountAspect.aj
@@ -1,4 +1,4 @@
-package org.baeldung.aspectj;
+package com.baeldung.aspectj;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,7 +8,7 @@ public aspect AccountAspect {
     final int MIN_BALANCE = 10;
 
     pointcut callWithDraw(int amount, Account account):
-             call(boolean Account.withdraw(int)) && args(amount) && target(account);
+             call(boolean com.baeldung.aspectj.Account.withdraw(int)) && args(amount) && target(account);
 
     before(int amount, Account account) : callWithDraw(amount, account) {
         logger.info(" Balance before withdrawal: {}", account.balance);
diff --git a/spring-aop/src/main/java/org/baeldung/aspectj/Secured.java b/spring-aop/src/main/java/com/baeldung/aspectj/Secured.java
similarity index 90%
rename from spring-aop/src/main/java/org/baeldung/aspectj/Secured.java
rename to spring-aop/src/main/java/com/baeldung/aspectj/Secured.java
index 08711d5db1..923f208c2f 100644
--- a/spring-aop/src/main/java/org/baeldung/aspectj/Secured.java
+++ b/spring-aop/src/main/java/com/baeldung/aspectj/Secured.java
@@ -1,4 +1,4 @@
-package org.baeldung.aspectj;
+package com.baeldung.aspectj;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-aop/src/main/java/org/baeldung/aspectj/SecuredMethod.java b/spring-aop/src/main/java/com/baeldung/aspectj/SecuredMethod.java
similarity index 94%
rename from spring-aop/src/main/java/org/baeldung/aspectj/SecuredMethod.java
rename to spring-aop/src/main/java/com/baeldung/aspectj/SecuredMethod.java
index d1f7d43738..aa4b733a00 100644
--- a/spring-aop/src/main/java/org/baeldung/aspectj/SecuredMethod.java
+++ b/spring-aop/src/main/java/com/baeldung/aspectj/SecuredMethod.java
@@ -1,4 +1,4 @@
-package org.baeldung.aspectj;
+package com.baeldung.aspectj;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-aop/src/main/java/org/baeldung/aspectj/SecuredMethodAspect.java b/spring-aop/src/main/java/com/baeldung/aspectj/SecuredMethodAspect.java
similarity index 96%
rename from spring-aop/src/main/java/org/baeldung/aspectj/SecuredMethodAspect.java
rename to spring-aop/src/main/java/com/baeldung/aspectj/SecuredMethodAspect.java
index b474f266ab..9ea45ec43b 100644
--- a/spring-aop/src/main/java/org/baeldung/aspectj/SecuredMethodAspect.java
+++ b/spring-aop/src/main/java/com/baeldung/aspectj/SecuredMethodAspect.java
@@ -1,4 +1,4 @@
-package org.baeldung.aspectj;
+package com.baeldung.aspectj;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
diff --git a/spring-aop/src/main/java/org/baeldung/logger/AdderAfterAspect.java b/spring-aop/src/main/java/com/baeldung/logger/AdderAfterAspect.java
similarity index 86%
rename from spring-aop/src/main/java/org/baeldung/logger/AdderAfterAspect.java
rename to spring-aop/src/main/java/com/baeldung/logger/AdderAfterAspect.java
index 59afa38f06..658eb8a726 100644
--- a/spring-aop/src/main/java/org/baeldung/logger/AdderAfterAspect.java
+++ b/spring-aop/src/main/java/com/baeldung/logger/AdderAfterAspect.java
@@ -1,13 +1,13 @@
-package org.baeldung.logger;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AdderAfterAspect {
-
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    public void afterAdvice() throws Throwable {
-        logger.info("I'm done calling the method");
-    }
-}
+package com.baeldung.logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AdderAfterAspect {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public void afterAdvice() throws Throwable {
+        logger.info("I'm done calling the method");
+    }
+}
diff --git a/spring-aop/src/main/java/org/baeldung/logger/AdderAfterReturnAspect.java b/spring-aop/src/main/java/com/baeldung/logger/AdderAfterReturnAspect.java
similarity index 88%
rename from spring-aop/src/main/java/org/baeldung/logger/AdderAfterReturnAspect.java
rename to spring-aop/src/main/java/com/baeldung/logger/AdderAfterReturnAspect.java
index a2b1959374..faec9547aa 100644
--- a/spring-aop/src/main/java/org/baeldung/logger/AdderAfterReturnAspect.java
+++ b/spring-aop/src/main/java/com/baeldung/logger/AdderAfterReturnAspect.java
@@ -1,13 +1,13 @@
-package org.baeldung.logger;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AdderAfterReturnAspect {
-
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    public void afterReturn(final Object returnValue) throws Throwable {
-        logger.info("value return was {}",  returnValue);
-    }
-}
+package com.baeldung.logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AdderAfterReturnAspect {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public void afterReturn(final Object returnValue) throws Throwable {
+        logger.info("value return was {}",  returnValue);
+    }
+}
diff --git a/spring-aop/src/main/java/org/baeldung/logger/AdderAfterThrowAspect.java b/spring-aop/src/main/java/com/baeldung/logger/AdderAfterThrowAspect.java
similarity index 88%
rename from spring-aop/src/main/java/org/baeldung/logger/AdderAfterThrowAspect.java
rename to spring-aop/src/main/java/com/baeldung/logger/AdderAfterThrowAspect.java
index 1f19af05e4..8637730b8a 100644
--- a/spring-aop/src/main/java/org/baeldung/logger/AdderAfterThrowAspect.java
+++ b/spring-aop/src/main/java/com/baeldung/logger/AdderAfterThrowAspect.java
@@ -1,13 +1,13 @@
-package org.baeldung.logger;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AdderAfterThrowAspect {
-
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    public void afterThrow(final Exception exception) throws Throwable {
-        logger.info("Exception thrown was {}",  exception.getMessage());
-    }
-}
+package com.baeldung.logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AdderAfterThrowAspect {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public void afterThrow(final Exception exception) throws Throwable {
+        logger.info("Exception thrown was {}",  exception.getMessage());
+    }
+}
diff --git a/spring-aop/src/main/java/org/baeldung/logger/AdderAroundAspect.java b/spring-aop/src/main/java/com/baeldung/logger/AdderAroundAspect.java
similarity index 92%
rename from spring-aop/src/main/java/org/baeldung/logger/AdderAroundAspect.java
rename to spring-aop/src/main/java/com/baeldung/logger/AdderAroundAspect.java
index fceba87d15..1524576085 100644
--- a/spring-aop/src/main/java/org/baeldung/logger/AdderAroundAspect.java
+++ b/spring-aop/src/main/java/com/baeldung/logger/AdderAroundAspect.java
@@ -1,18 +1,18 @@
-package org.baeldung.logger;
-
-import java.util.Arrays;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AdderAroundAspect {
-
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    public Object aroundAdvice(final ProceedingJoinPoint joinPoint) throws Throwable {
-        logger.info("Arguments passed to method are: " + Arrays.toString(joinPoint.getArgs()));
-        final Object result = joinPoint.proceed();
-        logger.info("Result from method is: " + result);
-        return result;
-    }
-}
+package com.baeldung.logger;
+
+import java.util.Arrays;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AdderAroundAspect {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public Object aroundAdvice(final ProceedingJoinPoint joinPoint) throws Throwable {
+        logger.info("Arguments passed to method are: " + Arrays.toString(joinPoint.getArgs()));
+        final Object result = joinPoint.proceed();
+        logger.info("Result from method is: " + result);
+        return result;
+    }
+}
diff --git a/spring-aop/src/main/java/org/baeldung/logger/AdderBeforeAspect.java b/spring-aop/src/main/java/com/baeldung/logger/AdderBeforeAspect.java
similarity index 87%
rename from spring-aop/src/main/java/org/baeldung/logger/AdderBeforeAspect.java
rename to spring-aop/src/main/java/com/baeldung/logger/AdderBeforeAspect.java
index 750e7ba122..0d30622088 100644
--- a/spring-aop/src/main/java/org/baeldung/logger/AdderBeforeAspect.java
+++ b/spring-aop/src/main/java/com/baeldung/logger/AdderBeforeAspect.java
@@ -1,13 +1,13 @@
-package org.baeldung.logger;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AdderBeforeAspect {
-
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    public void beforeAdvice() throws Throwable {
-        logger.info("I would be executed just before method starts");
-    }
-}
+package com.baeldung.logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AdderBeforeAspect {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public void beforeAdvice() throws Throwable {
+        logger.info("I would be executed just before method starts");
+    }
+}
diff --git a/spring-aop/src/main/java/org/baeldung/logger/SampleAdder.java b/spring-aop/src/main/java/com/baeldung/logger/SampleAdder.java
similarity index 85%
rename from spring-aop/src/main/java/org/baeldung/logger/SampleAdder.java
rename to spring-aop/src/main/java/com/baeldung/logger/SampleAdder.java
index 96fda1b0b9..0ef13ca7f0 100644
--- a/spring-aop/src/main/java/org/baeldung/logger/SampleAdder.java
+++ b/spring-aop/src/main/java/com/baeldung/logger/SampleAdder.java
@@ -1,12 +1,12 @@
-package org.baeldung.logger;
-
-public class SampleAdder {
-
-    public int add(int a, int b) {
-        if (a < 0 || b < 0) {
-            throw new IllegalArgumentException("Make sure all the arguments are greater than zero.");
-        }
-        return a + b;
-    }
-
-}
+package com.baeldung.logger;
+
+public class SampleAdder {
+
+    public int add(int a, int b) {
+        if (a < 0 || b < 0) {
+            throw new IllegalArgumentException("Make sure all the arguments are greater than zero.");
+        }
+        return a + b;
+    }
+
+}
diff --git a/spring-aop/src/main/java/org/baeldung/performancemonitor/AopConfiguration.java b/spring-aop/src/main/java/com/baeldung/performancemonitor/AopConfiguration.java
similarity index 85%
rename from spring-aop/src/main/java/org/baeldung/performancemonitor/AopConfiguration.java
rename to spring-aop/src/main/java/com/baeldung/performancemonitor/AopConfiguration.java
index 00026baf07..3df14e2f45 100644
--- a/spring-aop/src/main/java/org/baeldung/performancemonitor/AopConfiguration.java
+++ b/spring-aop/src/main/java/com/baeldung/performancemonitor/AopConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.performancemonitor;
+package com.baeldung.performancemonitor;
 
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.aop.Advisor;
@@ -16,10 +16,10 @@ import java.time.Month;
 @EnableAspectJAutoProxy
 public class AopConfiguration {
     
-    @Pointcut("execution(public String org.baeldung.performancemonitor.PersonService.getFullName(..))")
+    @Pointcut("execution(public String com.baeldung.performancemonitor.PersonService.getFullName(..))")
     public void monitor() { }
     
-    @Pointcut("execution(public int org.baeldung.performancemonitor.PersonService.getAge(..))")
+    @Pointcut("execution(public int com.baeldung.performancemonitor.PersonService.getAge(..))")
     public void myMonitor() { }
     
     @Bean
@@ -30,7 +30,7 @@ public class AopConfiguration {
     @Bean
     public Advisor performanceMonitorAdvisor() {
         AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
-        pointcut.setExpression("org.baeldung.performancemonitor.AopConfiguration.monitor()");
+        pointcut.setExpression("com.baeldung.performancemonitor.AopConfiguration.monitor()");
         return new DefaultPointcutAdvisor(pointcut, performanceMonitorInterceptor());
     }
     
@@ -52,7 +52,7 @@ public class AopConfiguration {
     @Bean
     public Advisor myPerformanceMonitorAdvisor() {
         AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
-        pointcut.setExpression("org.baeldung.performancemonitor.AopConfiguration.myMonitor()");
+        pointcut.setExpression("com.baeldung.performancemonitor.AopConfiguration.myMonitor()");
         return new DefaultPointcutAdvisor(pointcut, myPerformanceMonitorInterceptor());
     }
     
diff --git a/spring-aop/src/main/java/org/baeldung/performancemonitor/MyPerformanceMonitorInterceptor.java b/spring-aop/src/main/java/com/baeldung/performancemonitor/MyPerformanceMonitorInterceptor.java
similarity index 96%
rename from spring-aop/src/main/java/org/baeldung/performancemonitor/MyPerformanceMonitorInterceptor.java
rename to spring-aop/src/main/java/com/baeldung/performancemonitor/MyPerformanceMonitorInterceptor.java
index d098d9466c..dfc6606c6a 100644
--- a/spring-aop/src/main/java/org/baeldung/performancemonitor/MyPerformanceMonitorInterceptor.java
+++ b/spring-aop/src/main/java/com/baeldung/performancemonitor/MyPerformanceMonitorInterceptor.java
@@ -1,4 +1,4 @@
-package org.baeldung.performancemonitor;
+package com.baeldung.performancemonitor;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.logging.Log;
diff --git a/spring-aop/src/main/java/org/baeldung/performancemonitor/PerfomanceApp.java b/spring-aop/src/main/java/com/baeldung/performancemonitor/PerfomanceApp.java
similarity index 93%
rename from spring-aop/src/main/java/org/baeldung/performancemonitor/PerfomanceApp.java
rename to spring-aop/src/main/java/com/baeldung/performancemonitor/PerfomanceApp.java
index d0fb3a5393..00268c978e 100644
--- a/spring-aop/src/main/java/org/baeldung/performancemonitor/PerfomanceApp.java
+++ b/spring-aop/src/main/java/com/baeldung/performancemonitor/PerfomanceApp.java
@@ -1,4 +1,4 @@
-package org.baeldung.performancemonitor;
+package com.baeldung.performancemonitor;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
diff --git a/spring-aop/src/main/java/org/baeldung/performancemonitor/Person.java b/spring-aop/src/main/java/com/baeldung/performancemonitor/Person.java
similarity index 95%
rename from spring-aop/src/main/java/org/baeldung/performancemonitor/Person.java
rename to spring-aop/src/main/java/com/baeldung/performancemonitor/Person.java
index abd2465764..f16f28fdef 100644
--- a/spring-aop/src/main/java/org/baeldung/performancemonitor/Person.java
+++ b/spring-aop/src/main/java/com/baeldung/performancemonitor/Person.java
@@ -1,4 +1,4 @@
-package org.baeldung.performancemonitor;
+package com.baeldung.performancemonitor;
 
 import java.time.LocalDate;
 
diff --git a/spring-aop/src/main/java/org/baeldung/performancemonitor/PersonService.java b/spring-aop/src/main/java/com/baeldung/performancemonitor/PersonService.java
similarity index 89%
rename from spring-aop/src/main/java/org/baeldung/performancemonitor/PersonService.java
rename to spring-aop/src/main/java/com/baeldung/performancemonitor/PersonService.java
index 5b98aaf436..f5bfdddc12 100644
--- a/spring-aop/src/main/java/org/baeldung/performancemonitor/PersonService.java
+++ b/spring-aop/src/main/java/com/baeldung/performancemonitor/PersonService.java
@@ -1,4 +1,4 @@
-package org.baeldung.performancemonitor;
+package com.baeldung.performancemonitor;
 
 import java.time.LocalDate;
 import java.time.Period;
diff --git a/spring-aop/src/main/resources/META-INF/aop.xml b/spring-aop/src/main/resources/META-INF/aop.xml
index e5bddcc30c..f930cde942 100644
--- a/spring-aop/src/main/resources/META-INF/aop.xml
+++ b/spring-aop/src/main/resources/META-INF/aop.xml
@@ -1,6 +1,6 @@
 <aspectj>
     <aspects>
-        <aspect name="org.baeldung.aspectj.SecuredMethodAspect"/>
+        <aspect name="com.baeldung.aspectj.SecuredMethodAspect"/>
         <weaver options="-verbose -showWeaveInfo">
             <include within="com.baeldung.aspectj.*"/>
         </weaver>
diff --git a/spring-aop/src/main/resources/logback.xml b/spring-aop/src/main/resources/logback.xml
index 7c15f603a0..4eaa556705 100644
--- a/spring-aop/src/main/resources/logback.xml
+++ b/spring-aop/src/main/resources/logback.xml
@@ -13,7 +13,7 @@
     <!-- in order to debug some marshalling issues, this needs to be TRACE -->
     <logger name="org.springframework.web.servlet.mvc" level="WARN" />
 
-    <logger name="org.baeldung.performancemonitor.MyPerformanceMonitorInterceptor" level="INFO" />
+    <logger name="com.baeldung.performancemonitor.MyPerformanceMonitorInterceptor" level="INFO" />
     
     <logger name="org.springframework.aop.interceptor.PerformanceMonitorInterceptor" level="TRACE" />
 
diff --git a/spring-aop/src/main/resources/org.baeldung.logger/springAop-applicationContext.xml b/spring-aop/src/main/resources/org.baeldung.logger/springAop-applicationContext.xml
index 058beaa7a1..32e50e3502 100644
--- a/spring-aop/src/main/resources/org.baeldung.logger/springAop-applicationContext.xml
+++ b/spring-aop/src/main/resources/org.baeldung.logger/springAop-applicationContext.xml
@@ -6,45 +6,45 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.2.xsd">
 
 	<bean id="sampleAdder"
-		class="org.baeldung.logger.SampleAdder" />
+		class="com.baeldung.logger.SampleAdder" />
 
-	<bean id="doBeforeAspect" class="org.baeldung.logger.AdderBeforeAspect" />
-	<bean id="doAfterAspect" class="org.baeldung.logger.AdderAfterAspect" />
-	<bean id="doAfterThrowingAspect" class="org.baeldung.logger.AdderAfterThrowAspect" />
-	<bean id="doAfterReturningAspect" class="org.baeldung.logger.AdderAfterReturnAspect" />
-	<bean id="doAroundAspect" class="org.baeldung.logger.AdderAroundAspect" />
+	<bean id="doBeforeAspect" class="com.baeldung.logger.AdderBeforeAspect" />
+	<bean id="doAfterAspect" class="com.baeldung.logger.AdderAfterAspect" />
+	<bean id="doAfterThrowingAspect" class="com.baeldung.logger.AdderAfterThrowAspect" />
+	<bean id="doAfterReturningAspect" class="com.baeldung.logger.AdderAfterReturnAspect" />
+	<bean id="doAroundAspect" class="com.baeldung.logger.AdderAroundAspect" />
 
 	<aop:config>
 
 		<aop:aspect id="aspects" ref="doBeforeAspect">
 			<aop:pointcut id="pointCutBefore"
-				expression="execution(* org.baeldung.logger.SampleAdder+.*(..))" />
+				expression="execution(* com.baeldung.logger.SampleAdder+.*(..))" />
 			<aop:before method="beforeAdvice" pointcut-ref="pointCutBefore" />
 		</aop:aspect>
 
 		<aop:aspect id="aspects" ref="doAfterAspect">
 			<aop:pointcut id="pointCutAfter"
-				expression="execution(* org.baeldung.logger.SampleAdder+.*(..))" />
+				expression="execution(* com.baeldung.logger.SampleAdder+.*(..))" />
 			<aop:after method="afterAdvice" pointcut-ref="pointCutAfter" />
 		</aop:aspect>
 
 		<aop:aspect id="aspects" ref="doAfterReturningAspect">
 			<aop:pointcut id="pointCutAfterReturning"
-				expression="execution(* org.baeldung.logger.SampleAdder+.*(..))" />
+				expression="execution(* com.baeldung.logger.SampleAdder+.*(..))" />
 			<aop:after-returning method="afterReturn"
 				returning="returnValue" pointcut-ref="pointCutAfterReturning" />
 		</aop:aspect>
 
 		<aop:aspect id="aspects" ref="doAfterThrowingAspect">
 			<aop:pointcut id="pointCutAfterThrowing"
-				expression="execution(* org.baeldung.logger.SampleAdder+.*(..))" />
+				expression="execution(* com.baeldung.logger.SampleAdder+.*(..))" />
 			<aop:after-throwing method="afterThrow"
 				throwing="error" pointcut-ref="pointCutAfterThrowing" />
 		</aop:aspect>
 
 		<aop:aspect id="aspects" ref="doAroundAspect">
 			<aop:pointcut id="pointCutAround"
-				expression="execution(* org.baeldung.logger.SampleAdder+.*(..))" />
+				expression="execution(* com.baeldung.logger.SampleAdder+.*(..))" />
 			<aop:around method="aroundAdvice" pointcut-ref="pointCutAround" />
 		</aop:aspect>
 
diff --git a/spring-aop/src/test/java/org/baeldung/CustomAnnotationIntegrationTest.java b/spring-aop/src/test/java/com/baeldung/CustomAnnotationIntegrationTest.java
similarity index 95%
rename from spring-aop/src/test/java/org/baeldung/CustomAnnotationIntegrationTest.java
rename to spring-aop/src/test/java/com/baeldung/CustomAnnotationIntegrationTest.java
index b109e3a39e..155f8e1c96 100644
--- a/spring-aop/src/test/java/org/baeldung/CustomAnnotationIntegrationTest.java
+++ b/spring-aop/src/test/java/com/baeldung/CustomAnnotationIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-aop/src/test/java/org/baeldung/SpringContextTest.java b/spring-aop/src/test/java/com/baeldung/SpringContextTest.java
similarity index 94%
rename from spring-aop/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-aop/src/test/java/com/baeldung/SpringContextTest.java
index 4d3ed953c4..13c1c162f1 100644
--- a/spring-aop/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-aop/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-aop/src/test/java/org/baeldung/aspectj/AccountUnitTest.java b/spring-aop/src/test/java/com/baeldung/aspectj/AccountUnitTest.java
similarity index 94%
rename from spring-aop/src/test/java/org/baeldung/aspectj/AccountUnitTest.java
rename to spring-aop/src/test/java/com/baeldung/aspectj/AccountUnitTest.java
index 3d5384a7f7..3af1f963da 100644
--- a/spring-aop/src/test/java/org/baeldung/aspectj/AccountUnitTest.java
+++ b/spring-aop/src/test/java/com/baeldung/aspectj/AccountUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.aspectj;
+package com.baeldung.aspectj;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/spring-aop/src/test/java/org/baeldung/aspectj/SecuredMethodUnitTest.java b/spring-aop/src/test/java/com/baeldung/aspectj/SecuredMethodUnitTest.java
similarity index 88%
rename from spring-aop/src/test/java/org/baeldung/aspectj/SecuredMethodUnitTest.java
rename to spring-aop/src/test/java/com/baeldung/aspectj/SecuredMethodUnitTest.java
index cbdb2db057..e1a2553610 100644
--- a/spring-aop/src/test/java/org/baeldung/aspectj/SecuredMethodUnitTest.java
+++ b/spring-aop/src/test/java/com/baeldung/aspectj/SecuredMethodUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.aspectj;
+package com.baeldung.aspectj;
 
 import org.junit.Test;
 
diff --git a/spring-aop/src/test/java/org/baeldung/logger/CalculatorIntegrationTest.java b/spring-aop/src/test/java/com/baeldung/logger/CalculatorIntegrationTest.java
similarity index 93%
rename from spring-aop/src/test/java/org/baeldung/logger/CalculatorIntegrationTest.java
rename to spring-aop/src/test/java/com/baeldung/logger/CalculatorIntegrationTest.java
index 8c31b7f892..66e06f7928 100644
--- a/spring-aop/src/test/java/org/baeldung/logger/CalculatorIntegrationTest.java
+++ b/spring-aop/src/test/java/com/baeldung/logger/CalculatorIntegrationTest.java
@@ -1,29 +1,29 @@
-package org.baeldung.logger;
-
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(value = {"classpath:springAop-applicationContext.xml"})
-public class CalculatorIntegrationTest {
-
-    @Autowired
-    private SampleAdder sampleAdder;
-
-    @Test
-    public void whenAddValidValues_returnsSucessfully() {
-        final int addedValue = sampleAdder.add(12, 12);
-
-        assertEquals(24, addedValue);
-    }
-    
-    @Test (expected = IllegalArgumentException.class)
-    public void whenAddInValidValues_throwsException() {
-        sampleAdder.add(12, -12);
-    }
-
-}
+package com.baeldung.logger;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(value = {"classpath:springAop-applicationContext.xml"})
+public class CalculatorIntegrationTest {
+
+    @Autowired
+    private SampleAdder sampleAdder;
+
+    @Test
+    public void whenAddValidValues_returnsSucessfully() {
+        final int addedValue = sampleAdder.add(12, 12);
+
+        assertEquals(24, addedValue);
+    }
+    
+    @Test (expected = IllegalArgumentException.class)
+    public void whenAddInValidValues_throwsException() {
+        sampleAdder.add(12, -12);
+    }
+
+}
diff --git a/spring-aop/src/test/resources/springAop-applicationContext.xml b/spring-aop/src/test/resources/springAop-applicationContext.xml
index 4d88bd3711..fb71052567 100644
--- a/spring-aop/src/test/resources/springAop-applicationContext.xml
+++ b/spring-aop/src/test/resources/springAop-applicationContext.xml
@@ -6,45 +6,45 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.2.xsd">
 
 	<bean id="sampleAdder"
-		class="org.baeldung.logger.SampleAdder" />
+		class="com.baeldung.logger.SampleAdder" />
 
-	<bean id="doBeforeAspect" class="org.baeldung.logger.AdderBeforeAspect" />
-	<bean id="doAfterAspect" class="org.baeldung.logger.AdderAfterAspect" />
-	<bean id="doAfterThrowingAspect" class="org.baeldung.logger.AdderAfterThrowAspect" />
-	<bean id="doAfterReturningAspect" class="org.baeldung.logger.AdderAfterReturnAspect" />
-	<bean id="doAroundAspect" class="org.baeldung.logger.AdderAroundAspect" />
+	<bean id="doBeforeAspect" class="com.baeldung.logger.AdderBeforeAspect" />
+	<bean id="doAfterAspect" class="com.baeldung.logger.AdderAfterAspect" />
+	<bean id="doAfterThrowingAspect" class="com.baeldung.logger.AdderAfterThrowAspect" />
+	<bean id="doAfterReturningAspect" class="com.baeldung.logger.AdderAfterReturnAspect" />
+	<bean id="doAroundAspect" class="com.baeldung.logger.AdderAroundAspect" />
 
 	<aop:config>
 
 		<aop:aspect id="aspects" ref="doBeforeAspect">
 			<aop:pointcut id="pointCutBefore"
-				expression="execution(* org.baeldung.logger.SampleAdder+.*(..))" />
+				expression="execution(* com.baeldung.logger.SampleAdder+.*(..))" />
 			<aop:before method="beforeAdvice" pointcut-ref="pointCutBefore" />
 		</aop:aspect>
 
 		<aop:aspect id="aspects" ref="doAfterAspect">
 			<aop:pointcut id="pointCutAfter"
-				expression="execution(* org.baeldung.logger.SampleAdder+.*(..))" />
+				expression="execution(* com.baeldung.logger.SampleAdder+.*(..))" />
 			<aop:after method="afterAdvice" pointcut-ref="pointCutAfter" />
 		</aop:aspect>
 
 		<aop:aspect id="aspects" ref="doAfterReturningAspect">
 			<aop:pointcut id="pointCutAfterReturning"
-				expression="execution(* org.baeldung.logger.SampleAdder+.*(..))" />
+				expression="execution(* com.baeldung.logger.SampleAdder+.*(..))" />
 			<aop:after-returning method="afterReturn"
 				returning="returnValue" pointcut-ref="pointCutAfterReturning" />
 		</aop:aspect>
 
 		<aop:aspect id="aspects" ref="doAfterThrowingAspect">
 			<aop:pointcut id="pointCutAfterThrowing"
-				expression="execution(* org.baeldung.logger.SampleAdder+.*(..))" />
+				expression="execution(* com.baeldung.logger.SampleAdder+.*(..))" />
 			<aop:after-throwing method="afterThrow"
 				throwing="exception" pointcut-ref="pointCutAfterThrowing" />
 		</aop:aspect>
 
 		<aop:aspect id="aspects" ref="doAroundAspect">
 			<aop:pointcut id="pointCutAround"
-				expression="execution(* org.baeldung.logger.SampleAdder+.*(..))" />
+				expression="execution(* com.baeldung.logger.SampleAdder+.*(..))" />
 			<aop:around method="aroundAdvice" pointcut-ref="pointCutAround" />
 		</aop:aspect>
 

From faf8421d758656fe276f53199a78ab3a39448775 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Tue, 17 Dec 2019 21:26:22 +0100
Subject: [PATCH 026/106] BAEL-19967: Migrate spring-akka module to the
 com.baeldung package

---
 .../java/{org => com}/baeldung/akka/AppConfiguration.java   | 6 ++----
 .../main/java/{org => com}/baeldung/akka/GreetingActor.java | 2 +-
 .../java/{org => com}/baeldung/akka/GreetingService.java    | 2 +-
 .../{org => com}/baeldung/akka/SpringActorProducer.java     | 2 +-
 .../java/{org => com}/baeldung/akka/SpringExtension.java    | 2 +-
 .../baeldung/akka/SpringAkkaIntegrationTest.java            | 6 +++---
 6 files changed, 9 insertions(+), 11 deletions(-)
 rename spring-akka/src/main/java/{org => com}/baeldung/akka/AppConfiguration.java (76%)
 rename spring-akka/src/main/java/{org => com}/baeldung/akka/GreetingActor.java (97%)
 rename spring-akka/src/main/java/{org => com}/baeldung/akka/GreetingService.java (86%)
 rename spring-akka/src/main/java/{org => com}/baeldung/akka/SpringActorProducer.java (96%)
 rename spring-akka/src/main/java/{org => com}/baeldung/akka/SpringExtension.java (97%)
 rename spring-akka/src/test/java/{org => com}/baeldung/akka/SpringAkkaIntegrationTest.java (90%)

diff --git a/spring-akka/src/main/java/org/baeldung/akka/AppConfiguration.java b/spring-akka/src/main/java/com/baeldung/akka/AppConfiguration.java
similarity index 76%
rename from spring-akka/src/main/java/org/baeldung/akka/AppConfiguration.java
rename to spring-akka/src/main/java/com/baeldung/akka/AppConfiguration.java
index 9211ae0fdb..3568026d6d 100644
--- a/spring-akka/src/main/java/org/baeldung/akka/AppConfiguration.java
+++ b/spring-akka/src/main/java/com/baeldung/akka/AppConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.akka;
+package com.baeldung.akka;
 
 import akka.actor.ActorSystem;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,8 +7,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
-import static org.baeldung.akka.SpringExtension.SPRING_EXTENSION_PROVIDER;
-
 @Configuration
 @ComponentScan
 public class AppConfiguration {
@@ -19,7 +17,7 @@ public class AppConfiguration {
     @Bean
     public ActorSystem actorSystem() {
         ActorSystem system = ActorSystem.create("akka-spring-demo");
-        SPRING_EXTENSION_PROVIDER.get(system).initialize(applicationContext);
+        SpringExtension.SPRING_EXTENSION_PROVIDER.get(system).initialize(applicationContext);
         return system;
     }
 
diff --git a/spring-akka/src/main/java/org/baeldung/akka/GreetingActor.java b/spring-akka/src/main/java/com/baeldung/akka/GreetingActor.java
similarity index 97%
rename from spring-akka/src/main/java/org/baeldung/akka/GreetingActor.java
rename to spring-akka/src/main/java/com/baeldung/akka/GreetingActor.java
index 6366c277a4..35dcd254d6 100644
--- a/spring-akka/src/main/java/org/baeldung/akka/GreetingActor.java
+++ b/spring-akka/src/main/java/com/baeldung/akka/GreetingActor.java
@@ -1,4 +1,4 @@
-package org.baeldung.akka;
+package com.baeldung.akka;
 
 import akka.actor.UntypedActor;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
diff --git a/spring-akka/src/main/java/org/baeldung/akka/GreetingService.java b/spring-akka/src/main/java/com/baeldung/akka/GreetingService.java
similarity index 86%
rename from spring-akka/src/main/java/org/baeldung/akka/GreetingService.java
rename to spring-akka/src/main/java/com/baeldung/akka/GreetingService.java
index 801921887d..aa6883648b 100644
--- a/spring-akka/src/main/java/org/baeldung/akka/GreetingService.java
+++ b/spring-akka/src/main/java/com/baeldung/akka/GreetingService.java
@@ -1,4 +1,4 @@
-package org.baeldung.akka;
+package com.baeldung.akka;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-akka/src/main/java/org/baeldung/akka/SpringActorProducer.java b/spring-akka/src/main/java/com/baeldung/akka/SpringActorProducer.java
similarity index 96%
rename from spring-akka/src/main/java/org/baeldung/akka/SpringActorProducer.java
rename to spring-akka/src/main/java/com/baeldung/akka/SpringActorProducer.java
index 20813ab60a..289acb4447 100644
--- a/spring-akka/src/main/java/org/baeldung/akka/SpringActorProducer.java
+++ b/spring-akka/src/main/java/com/baeldung/akka/SpringActorProducer.java
@@ -1,4 +1,4 @@
-package org.baeldung.akka;
+package com.baeldung.akka;
 
 import akka.actor.Actor;
 import akka.actor.IndirectActorProducer;
diff --git a/spring-akka/src/main/java/org/baeldung/akka/SpringExtension.java b/spring-akka/src/main/java/com/baeldung/akka/SpringExtension.java
similarity index 97%
rename from spring-akka/src/main/java/org/baeldung/akka/SpringExtension.java
rename to spring-akka/src/main/java/com/baeldung/akka/SpringExtension.java
index aa5941c763..96f62da179 100644
--- a/spring-akka/src/main/java/org/baeldung/akka/SpringExtension.java
+++ b/spring-akka/src/main/java/com/baeldung/akka/SpringExtension.java
@@ -1,4 +1,4 @@
-package org.baeldung.akka;
+package com.baeldung.akka;
 
 import akka.actor.AbstractExtensionId;
 import akka.actor.ExtendedActorSystem;
diff --git a/spring-akka/src/test/java/org/baeldung/akka/SpringAkkaIntegrationTest.java b/spring-akka/src/test/java/com/baeldung/akka/SpringAkkaIntegrationTest.java
similarity index 90%
rename from spring-akka/src/test/java/org/baeldung/akka/SpringAkkaIntegrationTest.java
rename to spring-akka/src/test/java/com/baeldung/akka/SpringAkkaIntegrationTest.java
index c5da0f747e..3915a46507 100644
--- a/spring-akka/src/test/java/org/baeldung/akka/SpringAkkaIntegrationTest.java
+++ b/spring-akka/src/test/java/com/baeldung/akka/SpringAkkaIntegrationTest.java
@@ -1,11 +1,11 @@
-package org.baeldung.akka;
+package com.baeldung.akka;
 
 import java.util.concurrent.TimeUnit;
 
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
 import akka.util.Timeout;
-import org.baeldung.akka.GreetingActor.Greet;
+import com.baeldung.akka.GreetingActor.Greet;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
@@ -17,7 +17,7 @@ import scala.concurrent.Future;
 import scala.concurrent.duration.FiniteDuration;
 
 import static akka.pattern.Patterns.ask;
-import static org.baeldung.akka.SpringExtension.SPRING_EXTENSION_PROVIDER;
+import static com.baeldung.akka.SpringExtension.SPRING_EXTENSION_PROVIDER;
 
 @ContextConfiguration(classes = AppConfiguration.class)
 public class SpringAkkaIntegrationTest extends AbstractJUnit4SpringContextTests {

From babe8e87de8c8a1ba01c0552748c16245545d553 Mon Sep 17 00:00:00 2001
From: Al Niyas <al1niyas@yahoo.com>
Date: Wed, 18 Dec 2019 22:12:16 +0300
Subject: [PATCH 027/106] BAEL-3632 Using Instant to check if Two Java Dates
 are On Same Day

---
 .../baeldung/date/comparison/DateComparisonUtils.java  | 10 ++++++++++
 .../date/comparison/DateComparisonUtilsUnitTest.java   | 10 +++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/date/comparison/DateComparisonUtils.java b/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/date/comparison/DateComparisonUtils.java
index ae8d21c29c..fea268964a 100644
--- a/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/date/comparison/DateComparisonUtils.java
+++ b/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/date/comparison/DateComparisonUtils.java
@@ -1,8 +1,10 @@
 package com.baeldung.date.comparison;
 
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
@@ -23,6 +25,14 @@ public class DateComparisonUtils {
         return localDate1.isEqual(localDate2);
     }
 
+    public static boolean isSameDayUsingInstant(Date date1, Date date2) {
+        Instant instant1 = date1.toInstant()
+            .truncatedTo(ChronoUnit.DAYS);
+        Instant instant2 = date2.toInstant()
+            .truncatedTo(ChronoUnit.DAYS);
+        return instant1.equals(instant2);
+    }
+
     public static boolean isSameDayUsingSimpleDateFormat(Date date1, Date date2) {
         SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd");
         return fmt.format(date1)
diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/date/comparison/DateComparisonUtilsUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/date/comparison/DateComparisonUtilsUnitTest.java
index db55aadcca..faa2b18c91 100644
--- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/date/comparison/DateComparisonUtilsUnitTest.java
+++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/date/comparison/DateComparisonUtilsUnitTest.java
@@ -1,13 +1,13 @@
 package com.baeldung.date.comparison;
 
-import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
 
 public class DateComparisonUtilsUnitTest {
 
@@ -23,6 +23,7 @@ public class DateComparisonUtilsUnitTest {
     @Test
     public void givenDatesWithDifferentTime_whenIsSameDay_thenReturnsTrue() {
         assertTrue(DateComparisonUtils.isSameDayUsingLocalDate(day1Morning, day1Evening));
+        assertTrue(DateComparisonUtils.isSameDayUsingInstant(day1Morning, day1Evening));
         assertTrue(DateComparisonUtils.isSameDayUsingSimpleDateFormat(day1Morning, day1Evening));
         assertTrue(DateComparisonUtils.isSameDayUsingCalendar(day1Morning, day1Evening));
         assertTrue(DateComparisonUtils.isSameDayUsingApacheCommons(day1Morning, day1Evening));
@@ -35,6 +36,9 @@ public class DateComparisonUtilsUnitTest {
         assertFalse(DateComparisonUtils.isSameDayUsingLocalDate(day1Morning, day2Morning));
         assertFalse(DateComparisonUtils.isSameDayUsingLocalDate(day1Evening, day2Morning));
 
+        assertFalse(DateComparisonUtils.isSameDayUsingInstant(day1Morning, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingInstant(day1Evening, day2Morning));
+
         assertFalse(DateComparisonUtils.isSameDayUsingSimpleDateFormat(day1Morning, day2Morning));
         assertFalse(DateComparisonUtils.isSameDayUsingSimpleDateFormat(day1Evening, day2Morning));
 

From 4465bb6fa94d084504e3feb8ee38f5114fa41973 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Wed, 18 Dec 2019 21:31:15 +0100
Subject: [PATCH 028/106] BAEL-19967: Migrate spring-caching module to the
 com.baeldung package

---
 .../caching/config/ApplicationCacheConfig.java         |  2 +-
 .../baeldung/caching/config/CachingConfig.java         |  4 ++--
 .../baeldung/caching/config/CustomKeyGenerator.java    |  2 +-
 .../eviction/controllers/CachingController.java        |  4 ++--
 .../caching/eviction/service/CachingService.java       |  2 +-
 .../baeldung/caching/example/AbstractService.java      |  2 +-
 .../baeldung/caching/example/BookService.java          |  4 ++--
 .../baeldung/caching/example/Customer.java             |  2 +-
 .../baeldung/caching/example/CustomerDataService.java  |  2 +-
 .../caching/example/CustomerServiceWithParent.java     |  2 +-
 .../java/{org => com}/baeldung/caching/model/Book.java |  2 +-
 .../baeldung/ehcache/calculator/SquaredCalculator.java |  4 ++--
 .../baeldung/ehcache/config/CacheHelper.java           |  2 +-
 spring-caching/src/main/resources/config.xml           |  4 ++--
 .../test/CacheEvictAnnotationIntegrationTest.java      |  4 ++--
 .../caching/test/CacheManagerEvictIntegrationTest.java |  4 ++--
 .../caching/test/SpringCachingIntegrationTest.java     | 10 +++++-----
 .../baeldung/ehcache/SquareCalculatorUnitTest.java     |  6 +++---
 18 files changed, 31 insertions(+), 31 deletions(-)
 rename spring-caching/src/main/java/{org => com}/baeldung/caching/config/ApplicationCacheConfig.java (96%)
 rename spring-caching/src/main/java/{org => com}/baeldung/caching/config/CachingConfig.java (90%)
 rename spring-caching/src/main/java/{org => com}/baeldung/caching/config/CustomKeyGenerator.java (92%)
 rename spring-caching/src/main/java/{org => com}/baeldung/caching/eviction/controllers/CachingController.java (78%)
 rename spring-caching/src/main/java/{org => com}/baeldung/caching/eviction/service/CachingService.java (97%)
 rename spring-caching/src/main/java/{org => com}/baeldung/caching/example/AbstractService.java (98%)
 rename spring-caching/src/main/java/{org => com}/baeldung/caching/example/BookService.java (87%)
 rename spring-caching/src/main/java/{org => com}/baeldung/caching/example/Customer.java (95%)
 rename spring-caching/src/main/java/{org => com}/baeldung/caching/example/CustomerDataService.java (98%)
 rename spring-caching/src/main/java/{org => com}/baeldung/caching/example/CustomerServiceWithParent.java (86%)
 rename spring-caching/src/main/java/{org => com}/baeldung/caching/model/Book.java (94%)
 rename spring-caching/src/main/java/{org => com}/baeldung/ehcache/calculator/SquaredCalculator.java (86%)
 rename spring-caching/src/main/java/{org => com}/baeldung/ehcache/config/CacheHelper.java (96%)
 rename spring-caching/src/test/java/{org => com}/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java (96%)
 rename spring-caching/src/test/java/{org => com}/baeldung/caching/test/CacheManagerEvictIntegrationTest.java (97%)
 rename spring-caching/src/test/java/{org => com}/baeldung/caching/test/SpringCachingIntegrationTest.java (88%)
 rename spring-caching/src/test/java/{org => com}/baeldung/ehcache/SquareCalculatorUnitTest.java (90%)

diff --git a/spring-caching/src/main/java/org/baeldung/caching/config/ApplicationCacheConfig.java b/spring-caching/src/main/java/com/baeldung/caching/config/ApplicationCacheConfig.java
similarity index 96%
rename from spring-caching/src/main/java/org/baeldung/caching/config/ApplicationCacheConfig.java
rename to spring-caching/src/main/java/com/baeldung/caching/config/ApplicationCacheConfig.java
index 8bf23de2cc..9a8759cbff 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/config/ApplicationCacheConfig.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/config/ApplicationCacheConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.config;
+package com.baeldung.caching.config;
 
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/config/CachingConfig.java b/spring-caching/src/main/java/com/baeldung/caching/config/CachingConfig.java
similarity index 90%
rename from spring-caching/src/main/java/org/baeldung/caching/config/CachingConfig.java
rename to spring-caching/src/main/java/com/baeldung/caching/config/CachingConfig.java
index c995bca68d..d245b05502 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/config/CachingConfig.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/config/CachingConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.config;
+package com.baeldung.caching.config;
 
 import java.util.Arrays;
 
@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @EnableCaching
-@ComponentScan("org.baeldung.caching.example")
+@ComponentScan("com.baeldung.caching.example")
 public class CachingConfig {
 
     @Bean
diff --git a/spring-caching/src/main/java/org/baeldung/caching/config/CustomKeyGenerator.java b/spring-caching/src/main/java/com/baeldung/caching/config/CustomKeyGenerator.java
similarity index 92%
rename from spring-caching/src/main/java/org/baeldung/caching/config/CustomKeyGenerator.java
rename to spring-caching/src/main/java/com/baeldung/caching/config/CustomKeyGenerator.java
index c1da9493e0..173f44bfbc 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/config/CustomKeyGenerator.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/config/CustomKeyGenerator.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.config;
+package com.baeldung.caching.config;
 
 import org.springframework.cache.interceptor.KeyGenerator;
 import org.springframework.util.StringUtils;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/eviction/controllers/CachingController.java b/spring-caching/src/main/java/com/baeldung/caching/eviction/controllers/CachingController.java
similarity index 78%
rename from spring-caching/src/main/java/org/baeldung/caching/eviction/controllers/CachingController.java
rename to spring-caching/src/main/java/com/baeldung/caching/eviction/controllers/CachingController.java
index aaaf8a5918..2980e32763 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/eviction/controllers/CachingController.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/eviction/controllers/CachingController.java
@@ -1,6 +1,6 @@
-package org.baeldung.caching.eviction.controllers;
+package com.baeldung.caching.eviction.controllers;
 
-import org.baeldung.caching.eviction.service.CachingService;
+import com.baeldung.caching.eviction.service.CachingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/eviction/service/CachingService.java b/spring-caching/src/main/java/com/baeldung/caching/eviction/service/CachingService.java
similarity index 97%
rename from spring-caching/src/main/java/org/baeldung/caching/eviction/service/CachingService.java
rename to spring-caching/src/main/java/com/baeldung/caching/eviction/service/CachingService.java
index a0dd30c329..d44da332d4 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/eviction/service/CachingService.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/eviction/service/CachingService.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.eviction.service;
+package com.baeldung.caching.eviction.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.CacheManager;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/example/AbstractService.java b/spring-caching/src/main/java/com/baeldung/caching/example/AbstractService.java
similarity index 98%
rename from spring-caching/src/main/java/org/baeldung/caching/example/AbstractService.java
rename to spring-caching/src/main/java/com/baeldung/caching/example/AbstractService.java
index 02b8c3c159..5893ffdfcf 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/example/AbstractService.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/example/AbstractService.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.example;
+package com.baeldung.caching.example;
 
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/example/BookService.java b/spring-caching/src/main/java/com/baeldung/caching/example/BookService.java
similarity index 87%
rename from spring-caching/src/main/java/org/baeldung/caching/example/BookService.java
rename to spring-caching/src/main/java/com/baeldung/caching/example/BookService.java
index 9f3aaf89cf..2b335ac10d 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/example/BookService.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/example/BookService.java
@@ -1,6 +1,6 @@
-package org.baeldung.caching.example;
+package com.baeldung.caching.example;
 
-import org.baeldung.caching.model.Book;
+import com.baeldung.caching.model.Book;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 
diff --git a/spring-caching/src/main/java/org/baeldung/caching/example/Customer.java b/spring-caching/src/main/java/com/baeldung/caching/example/Customer.java
similarity index 95%
rename from spring-caching/src/main/java/org/baeldung/caching/example/Customer.java
rename to spring-caching/src/main/java/com/baeldung/caching/example/Customer.java
index a57f08e35b..52de4bc1cc 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/example/Customer.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/example/Customer.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.example;
+package com.baeldung.caching.example;
 
 public class Customer {
 
diff --git a/spring-caching/src/main/java/org/baeldung/caching/example/CustomerDataService.java b/spring-caching/src/main/java/com/baeldung/caching/example/CustomerDataService.java
similarity index 98%
rename from spring-caching/src/main/java/org/baeldung/caching/example/CustomerDataService.java
rename to spring-caching/src/main/java/com/baeldung/caching/example/CustomerDataService.java
index 1c595057a8..005a85fcb4 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/example/CustomerDataService.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/example/CustomerDataService.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.example;
+package com.baeldung.caching.example;
 
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/example/CustomerServiceWithParent.java b/spring-caching/src/main/java/com/baeldung/caching/example/CustomerServiceWithParent.java
similarity index 86%
rename from spring-caching/src/main/java/org/baeldung/caching/example/CustomerServiceWithParent.java
rename to spring-caching/src/main/java/com/baeldung/caching/example/CustomerServiceWithParent.java
index a5ded7daf9..be201413b4 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/example/CustomerServiceWithParent.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/example/CustomerServiceWithParent.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.example;
+package com.baeldung.caching.example;
 
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.stereotype.Component;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/model/Book.java b/spring-caching/src/main/java/com/baeldung/caching/model/Book.java
similarity index 94%
rename from spring-caching/src/main/java/org/baeldung/caching/model/Book.java
rename to spring-caching/src/main/java/com/baeldung/caching/model/Book.java
index c110c79db0..fd8abf1816 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/model/Book.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/model/Book.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.model;
+package com.baeldung.caching.model;
 
 public class Book {
 
diff --git a/spring-caching/src/main/java/org/baeldung/ehcache/calculator/SquaredCalculator.java b/spring-caching/src/main/java/com/baeldung/ehcache/calculator/SquaredCalculator.java
similarity index 86%
rename from spring-caching/src/main/java/org/baeldung/ehcache/calculator/SquaredCalculator.java
rename to spring-caching/src/main/java/com/baeldung/ehcache/calculator/SquaredCalculator.java
index 25957539df..caf1df2a1b 100644
--- a/spring-caching/src/main/java/org/baeldung/ehcache/calculator/SquaredCalculator.java
+++ b/spring-caching/src/main/java/com/baeldung/ehcache/calculator/SquaredCalculator.java
@@ -1,6 +1,6 @@
-package org.baeldung.ehcache.calculator;
+package com.baeldung.ehcache.calculator;
 
-import org.baeldung.ehcache.config.CacheHelper;
+import com.baeldung.ehcache.config.CacheHelper;
 
 public class SquaredCalculator {
     private CacheHelper cache;
diff --git a/spring-caching/src/main/java/org/baeldung/ehcache/config/CacheHelper.java b/spring-caching/src/main/java/com/baeldung/ehcache/config/CacheHelper.java
similarity index 96%
rename from spring-caching/src/main/java/org/baeldung/ehcache/config/CacheHelper.java
rename to spring-caching/src/main/java/com/baeldung/ehcache/config/CacheHelper.java
index 7f59ad8cfb..d138f6e84c 100644
--- a/spring-caching/src/main/java/org/baeldung/ehcache/config/CacheHelper.java
+++ b/spring-caching/src/main/java/com/baeldung/ehcache/config/CacheHelper.java
@@ -1,4 +1,4 @@
-package org.baeldung.ehcache.config;
+package com.baeldung.ehcache.config;
 
 import org.ehcache.Cache;
 import org.ehcache.CacheManager;
diff --git a/spring-caching/src/main/resources/config.xml b/spring-caching/src/main/resources/config.xml
index 23458539b0..666e91e173 100644
--- a/spring-caching/src/main/resources/config.xml
+++ b/spring-caching/src/main/resources/config.xml
@@ -13,7 +13,7 @@
     <!-- <context:annotation-config/> -->
 
     <!-- the service that you wish to make cacheable. -->
-    <bean id="customerDataService" class="org.baeldung.caching.example.CustomerDataService"/>
+    <bean id="customerDataService" class="com.baeldung.caching.example.CustomerDataService"/>
 
     <bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
         <property name="caches">
@@ -34,7 +34,7 @@
 
     <!-- apply the behavior to all the implementations of CustomerDataService  -->
     <aop:config>
-        <aop:advisor advice-ref="cachingBehavior" pointcut="execution(* org.baeldung.caching.example.CustomerDataService.*(..))"/>
+        <aop:advisor advice-ref="cachingBehavior" pointcut="execution(* com.baeldung.caching.example.CustomerDataService.*(..))"/>
     </aop:config>
 
 </beans>
diff --git a/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java b/spring-caching/src/test/java/com/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
similarity index 96%
rename from spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
rename to spring-caching/src/test/java/com/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
index 28b0d26bed..7363022268 100644
--- a/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
+++ b/spring-caching/src/test/java/com/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.test;
+package com.baeldung.caching.test;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -7,7 +7,7 @@ import static org.junit.Assert.assertThat;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.baeldung.caching.eviction.service.CachingService;
+import com.baeldung.caching.eviction.service.CachingService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java b/spring-caching/src/test/java/com/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
similarity index 97%
rename from spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
rename to spring-caching/src/test/java/com/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
index ffcc88febc..fa3168fc62 100644
--- a/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
+++ b/spring-caching/src/test/java/com/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.test;
+package com.baeldung.caching.test;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -7,7 +7,7 @@ import static org.junit.Assert.assertThat;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.baeldung.caching.eviction.service.CachingService;
+import com.baeldung.caching.eviction.service.CachingService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-caching/src/test/java/org/baeldung/caching/test/SpringCachingIntegrationTest.java b/spring-caching/src/test/java/com/baeldung/caching/test/SpringCachingIntegrationTest.java
similarity index 88%
rename from spring-caching/src/test/java/org/baeldung/caching/test/SpringCachingIntegrationTest.java
rename to spring-caching/src/test/java/com/baeldung/caching/test/SpringCachingIntegrationTest.java
index 8c4ebaa7ec..080044f359 100644
--- a/spring-caching/src/test/java/org/baeldung/caching/test/SpringCachingIntegrationTest.java
+++ b/spring-caching/src/test/java/com/baeldung/caching/test/SpringCachingIntegrationTest.java
@@ -1,9 +1,9 @@
-package org.baeldung.caching.test;
+package com.baeldung.caching.test;
 
-import org.baeldung.caching.config.CachingConfig;
-import org.baeldung.caching.example.Customer;
-import org.baeldung.caching.example.CustomerDataService;
-import org.baeldung.caching.example.CustomerServiceWithParent;
+import com.baeldung.caching.config.CachingConfig;
+import com.baeldung.caching.example.Customer;
+import com.baeldung.caching.example.CustomerDataService;
+import com.baeldung.caching.example.CustomerServiceWithParent;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-caching/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java b/spring-caching/src/test/java/com/baeldung/ehcache/SquareCalculatorUnitTest.java
similarity index 90%
rename from spring-caching/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java
rename to spring-caching/src/test/java/com/baeldung/ehcache/SquareCalculatorUnitTest.java
index 0e6ac6fd8e..37df749bab 100644
--- a/spring-caching/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java
+++ b/spring-caching/src/test/java/com/baeldung/ehcache/SquareCalculatorUnitTest.java
@@ -1,7 +1,7 @@
-package org.baeldung.ehcache;
+package com.baeldung.ehcache;
 
-import org.baeldung.ehcache.calculator.SquaredCalculator;
-import org.baeldung.ehcache.config.CacheHelper;
+import com.baeldung.ehcache.calculator.SquaredCalculator;
+import com.baeldung.ehcache.config.CacheHelper;
 import org.junit.Before;
 import org.junit.Test;
 

From 8b17262844bd20a3db1283eb6aa7f9645bc5c47a Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Wed, 18 Dec 2019 21:35:26 +0100
Subject: [PATCH 029/106] BAEL-19967: Migrate spring-shell module to the
 com.baeldung package

---
 .../src/main/java/{org => com}/baeldung/shell/Main.java         | 2 +-
 .../baeldung/shell/simple/SimpleBannerProvider.java             | 2 +-
 .../main/java/{org => com}/baeldung/shell/simple/SimpleCLI.java | 2 +-
 .../baeldung/shell/simple/SimpleHistoryFileNameProvider.java    | 2 +-
 .../baeldung/shell/simple/SimplePromptProvider.java             | 2 +-
 .../{org => com}/baeldung/shell/simple/SimpleURLConverter.java  | 2 +-
 .../src/main/resources/META-INF/spring/spring-shell-plugin.xml  | 2 +-
 .../baeldung/shell/simple/SimpleCLIIntegrationTest.java         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename spring-shell/src/main/java/{org => com}/baeldung/shell/Main.java (87%)
 rename spring-shell/src/main/java/{org => com}/baeldung/shell/simple/SimpleBannerProvider.java (96%)
 rename spring-shell/src/main/java/{org => com}/baeldung/shell/simple/SimpleCLI.java (98%)
 rename spring-shell/src/main/java/{org => com}/baeldung/shell/simple/SimpleHistoryFileNameProvider.java (93%)
 rename spring-shell/src/main/java/{org => com}/baeldung/shell/simple/SimplePromptProvider.java (93%)
 rename spring-shell/src/main/java/{org => com}/baeldung/shell/simple/SimpleURLConverter.java (96%)
 rename spring-shell/src/test/java/{org => com}/baeldung/shell/simple/SimpleCLIIntegrationTest.java (98%)

diff --git a/spring-shell/src/main/java/org/baeldung/shell/Main.java b/spring-shell/src/main/java/com/baeldung/shell/Main.java
similarity index 87%
rename from spring-shell/src/main/java/org/baeldung/shell/Main.java
rename to spring-shell/src/main/java/com/baeldung/shell/Main.java
index 3d9f7a5860..97871394f7 100644
--- a/spring-shell/src/main/java/org/baeldung/shell/Main.java
+++ b/spring-shell/src/main/java/com/baeldung/shell/Main.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell;
+package com.baeldung.shell;
 
 import java.io.IOException;
 import org.springframework.shell.Bootstrap;
diff --git a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleBannerProvider.java
similarity index 96%
rename from spring-shell/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java
rename to spring-shell/src/main/java/com/baeldung/shell/simple/SimpleBannerProvider.java
index df7a48cd32..dbfde76f8e 100644
--- a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java
+++ b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleBannerProvider.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell.simple;
+package com.baeldung.shell.simple;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
diff --git a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleCLI.java b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleCLI.java
similarity index 98%
rename from spring-shell/src/main/java/org/baeldung/shell/simple/SimpleCLI.java
rename to spring-shell/src/main/java/com/baeldung/shell/simple/SimpleCLI.java
index f73d9bda00..d8a0aef838 100644
--- a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleCLI.java
+++ b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleCLI.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell.simple;
+package com.baeldung.shell.simple;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
diff --git a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
similarity index 93%
rename from spring-shell/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
rename to spring-shell/src/main/java/com/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
index cef53adc69..5936006f11 100644
--- a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
+++ b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell.simple;
+package com.baeldung.shell.simple;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
diff --git a/spring-shell/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java b/spring-shell/src/main/java/com/baeldung/shell/simple/SimplePromptProvider.java
similarity index 93%
rename from spring-shell/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java
rename to spring-shell/src/main/java/com/baeldung/shell/simple/SimplePromptProvider.java
index 9a84954e05..a795d19eed 100644
--- a/spring-shell/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java
+++ b/spring-shell/src/main/java/com/baeldung/shell/simple/SimplePromptProvider.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell.simple;
+package com.baeldung.shell.simple;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
diff --git a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleURLConverter.java
similarity index 96%
rename from spring-shell/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java
rename to spring-shell/src/main/java/com/baeldung/shell/simple/SimpleURLConverter.java
index 4824cfbf05..7615f31ace 100644
--- a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java
+++ b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleURLConverter.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell.simple;
+package com.baeldung.shell.simple;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/spring-shell/src/main/resources/META-INF/spring/spring-shell-plugin.xml b/spring-shell/src/main/resources/META-INF/spring/spring-shell-plugin.xml
index 1b97ab3b59..3ff60f3c08 100644
--- a/spring-shell/src/main/resources/META-INF/spring/spring-shell-plugin.xml
+++ b/spring-shell/src/main/resources/META-INF/spring/spring-shell-plugin.xml
@@ -8,6 +8,6 @@
       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd
       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd">
 
-    <context:component-scan base-package="org.baeldung.shell.simple"/>
+    <context:component-scan base-package="com.baeldung.shell.simple"/>
 
 </beans>
\ No newline at end of file
diff --git a/spring-shell/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java b/spring-shell/src/test/java/com/baeldung/shell/simple/SimpleCLIIntegrationTest.java
similarity index 98%
rename from spring-shell/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java
rename to spring-shell/src/test/java/com/baeldung/shell/simple/SimpleCLIIntegrationTest.java
index 3ec756e238..53627700c5 100644
--- a/spring-shell/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java
+++ b/spring-shell/src/test/java/com/baeldung/shell/simple/SimpleCLIIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell.simple;
+package com.baeldung.shell.simple;
 
 import org.junit.AfterClass;
 import org.junit.Assert;

From 37454052a16441c88286635fe24ddfc883f84b96 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Wed, 18 Dec 2019 21:41:35 +0100
Subject: [PATCH 030/106] BAEL-19967: Migrate spring-rest-testing module to the
 com.baeldung package

---
 .../{org => com}/baeldung/persistence/IOperations.java |  2 +-
 .../{org => com}/baeldung/persistence/dao/IFooDao.java |  4 ++--
 .../{org => com}/baeldung/persistence/model/Foo.java   |  2 +-
 .../{org => com}/baeldung/persistence/model/User.java  |  2 +-
 .../com/baeldung/persistence/service/IFooService.java  | 10 ++++++++++
 .../persistence/service/common/AbstractService.java    |  4 ++--
 .../baeldung/persistence/service/impl/FooService.java  | 10 +++++-----
 .../java/{org => com}/baeldung/spring/Application.java |  4 ++--
 .../baeldung/spring/PersistenceConfig.java             |  8 ++++----
 .../java/{org => com}/baeldung/spring/WebConfig.java   |  4 ++--
 .../baeldung/web/controller/FooController.java         |  8 ++++----
 .../baeldung/web/controller/HomeController.java        |  2 +-
 .../baeldung/web/controller/RootController.java        |  6 +++---
 .../web/exception/MyResourceNotFoundException.java     |  2 +-
 .../baeldung/web/metric/ActuatorMetricService.java     |  2 +-
 .../web/metric/CustomActuatorMetricService.java        |  2 +-
 .../baeldung/web/metric/IActuatorMetricService.java    |  2 +-
 .../web/metric/ICustomActuatorMetricService.java       |  2 +-
 .../baeldung/web/metric/IMetricService.java            |  2 +-
 .../{org => com}/baeldung/web/metric/MetricFilter.java |  2 +-
 .../baeldung/web/metric/MetricService.java             |  2 +-
 .../baeldung/web/util/RestPreconditions.java           |  5 ++---
 .../org/baeldung/persistence/service/IFooService.java  | 10 ----------
 .../src/main/resources/springDataPersistenceConfig.xml |  2 +-
 spring-rest-testing/src/main/webapp/WEB-INF/web.xml    |  4 ++--
 .../src/test/java/{org => com}/baeldung/Consts.java    |  2 +-
 .../baeldung/SpringContextIntegrationTest.java         |  4 ++--
 .../java/{org => com}/baeldung/SpringContextTest.java  |  4 ++--
 .../baeldung/persistence/PersistenceTestSuite.java     |  4 ++--
 .../AbstractServicePersistenceIntegrationTest.java     |  8 ++++----
 .../service/FooServicePersistenceIntegrationTest.java  |  8 ++++----
 .../test/java/{org => com}/baeldung/util/IDUtil.java   |  2 +-
 32 files changed, 67 insertions(+), 68 deletions(-)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/persistence/IOperations.java (89%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/persistence/dao/IFooDao.java (81%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/persistence/model/Foo.java (97%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/persistence/model/User.java (97%)
 create mode 100644 spring-rest-testing/src/main/java/com/baeldung/persistence/service/IFooService.java
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/persistence/service/common/AbstractService.java (90%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/persistence/service/impl/FooService.java (73%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/spring/Application.java (95%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/spring/PersistenceConfig.java (94%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/spring/WebConfig.java (94%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/web/controller/FooController.java (92%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/web/controller/HomeController.java (87%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/web/controller/RootController.java (90%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/web/exception/MyResourceNotFoundException.java (92%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/web/metric/ActuatorMetricService.java (99%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/web/metric/CustomActuatorMetricService.java (98%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/web/metric/IActuatorMetricService.java (69%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/web/metric/ICustomActuatorMetricService.java (79%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/web/metric/IMetricService.java (86%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/web/metric/MetricFilter.java (98%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/web/metric/MetricService.java (99%)
 rename spring-rest-testing/src/main/java/{org => com}/baeldung/web/util/RestPreconditions.java (93%)
 delete mode 100644 spring-rest-testing/src/main/java/org/baeldung/persistence/service/IFooService.java
 rename spring-rest-testing/src/test/java/{org => com}/baeldung/Consts.java (73%)
 rename spring-rest-testing/src/test/java/{org => com}/baeldung/SpringContextIntegrationTest.java (86%)
 rename spring-rest-testing/src/test/java/{org => com}/baeldung/SpringContextTest.java (85%)
 rename spring-rest-testing/src/test/java/{org => com}/baeldung/persistence/PersistenceTestSuite.java (71%)
 rename spring-rest-testing/src/test/java/{org => com}/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java (97%)
 rename spring-rest-testing/src/test/java/{org => com}/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java (93%)
 rename spring-rest-testing/src/test/java/{org => com}/baeldung/util/IDUtil.java (96%)

diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/IOperations.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/IOperations.java
similarity index 89%
rename from spring-rest-testing/src/main/java/org/baeldung/persistence/IOperations.java
rename to spring-rest-testing/src/main/java/com/baeldung/persistence/IOperations.java
index 0b617bf7ab..73100ec64f 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/IOperations.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/IOperations.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence;
+package com.baeldung.persistence;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/dao/IFooDao.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/dao/IFooDao.java
similarity index 81%
rename from spring-rest-testing/src/main/java/org/baeldung/persistence/dao/IFooDao.java
rename to spring-rest-testing/src/main/java/com/baeldung/persistence/dao/IFooDao.java
index 230abd0d5f..8d47d2eb42 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/dao/IFooDao.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/dao/IFooDao.java
@@ -1,6 +1,6 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.model.Foo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/model/Foo.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/model/Foo.java
similarity index 97%
rename from spring-rest-testing/src/main/java/org/baeldung/persistence/model/Foo.java
rename to spring-rest-testing/src/main/java/com/baeldung/persistence/model/Foo.java
index 8e1dee33e8..9af3d07bed 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/model/Foo.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/model/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import java.io.Serializable;
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/model/User.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/model/User.java
similarity index 97%
rename from spring-rest-testing/src/main/java/org/baeldung/persistence/model/User.java
rename to spring-rest-testing/src/main/java/com/baeldung/persistence/model/User.java
index 670d4a2e74..dbc2b9360f 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/model/User.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/model/User.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/spring-rest-testing/src/main/java/com/baeldung/persistence/service/IFooService.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/service/IFooService.java
new file mode 100644
index 0000000000..15330550a1
--- /dev/null
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/service/IFooService.java
@@ -0,0 +1,10 @@
+package com.baeldung.persistence.service;
+
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.IOperations;
+
+public interface IFooService extends IOperations<Foo> {
+
+    Foo retrieveByName(String name);
+
+}
diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/service/common/AbstractService.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/service/common/AbstractService.java
similarity index 90%
rename from spring-rest-testing/src/main/java/org/baeldung/persistence/service/common/AbstractService.java
rename to spring-rest-testing/src/main/java/com/baeldung/persistence/service/common/AbstractService.java
index ceefbbe0e3..5a5d9d6241 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/service/common/AbstractService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/service/common/AbstractService.java
@@ -1,9 +1,9 @@
-package org.baeldung.persistence.service.common;
+package com.baeldung.persistence.service.common;
 
 import java.io.Serializable;
 import java.util.List;
 
-import org.baeldung.persistence.IOperations;
+import com.baeldung.persistence.IOperations;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/service/impl/FooService.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/service/impl/FooService.java
similarity index 73%
rename from spring-rest-testing/src/main/java/org/baeldung/persistence/service/impl/FooService.java
rename to spring-rest-testing/src/main/java/com/baeldung/persistence/service/impl/FooService.java
index 32fe1bd7e0..92fb6c28a0 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/service/impl/FooService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/service/impl/FooService.java
@@ -1,9 +1,9 @@
-package org.baeldung.persistence.service.impl;
+package com.baeldung.persistence.service.impl;
 
-import org.baeldung.persistence.dao.IFooDao;
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.persistence.service.IFooService;
-import org.baeldung.persistence.service.common.AbstractService;
+import com.baeldung.persistence.dao.IFooDao;
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.service.IFooService;
+import com.baeldung.persistence.service.common.AbstractService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Service;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/spring/Application.java b/spring-rest-testing/src/main/java/com/baeldung/spring/Application.java
similarity index 95%
rename from spring-rest-testing/src/main/java/org/baeldung/spring/Application.java
rename to spring-rest-testing/src/main/java/com/baeldung/spring/Application.java
index ca72a4ef56..c35c4d7e5e 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/spring/Application.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/spring/Application.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
@@ -19,7 +19,7 @@ import org.springframework.web.context.request.RequestContextListener;
  */
 @EnableScheduling
 @EnableAutoConfiguration
-@ComponentScan("org.baeldung")
+@ComponentScan("com.baeldung")
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/spring/PersistenceConfig.java b/spring-rest-testing/src/main/java/com/baeldung/spring/PersistenceConfig.java
similarity index 94%
rename from spring-rest-testing/src/main/java/org/baeldung/spring/PersistenceConfig.java
rename to spring-rest-testing/src/main/java/com/baeldung/spring/PersistenceConfig.java
index f3a87b189e..4a4b9eee3f 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/spring/PersistenceConfig.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/spring/PersistenceConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import java.util.Properties;
 
@@ -24,9 +24,9 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-${envTarget:h2}.properties" })
-@ComponentScan({ "org.baeldung.persistence" })
+@ComponentScan({ "com.baeldung.persistence" })
 // @ImportResource("classpath*:springDataPersistenceConfig.xml")
-@EnableJpaRepositories(basePackages = "org.baeldung.persistence.dao")
+@EnableJpaRepositories(basePackages = "com.baeldung.persistence.dao")
 public class PersistenceConfig {
 
     @Autowired
@@ -40,7 +40,7 @@ public class PersistenceConfig {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
+        em.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
 
         final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         // vendorAdapter.set
diff --git a/spring-rest-testing/src/main/java/org/baeldung/spring/WebConfig.java b/spring-rest-testing/src/main/java/com/baeldung/spring/WebConfig.java
similarity index 94%
rename from spring-rest-testing/src/main/java/org/baeldung/spring/WebConfig.java
rename to spring-rest-testing/src/main/java/com/baeldung/spring/WebConfig.java
index a0db08d93d..e35acb0bf0 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/spring/WebConfig.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/spring/WebConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -10,7 +10,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
 @Configuration
-@ComponentScan("org.baeldung.web")
+@ComponentScan("com.baeldung.web")
 @EnableWebMvc
 public class WebConfig implements WebMvcConfigurer {
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/controller/FooController.java b/spring-rest-testing/src/main/java/com/baeldung/web/controller/FooController.java
similarity index 92%
rename from spring-rest-testing/src/main/java/org/baeldung/web/controller/FooController.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/controller/FooController.java
index caaf422410..b5350c33c1 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/controller/FooController.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/controller/FooController.java
@@ -1,12 +1,12 @@
-package org.baeldung.web.controller;
+package com.baeldung.web.controller;
 
 import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.persistence.service.IFooService;
-import org.baeldung.web.util.RestPreconditions;
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.service.IFooService;
+import com.baeldung.web.util.RestPreconditions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/controller/HomeController.java b/spring-rest-testing/src/main/java/com/baeldung/web/controller/HomeController.java
similarity index 87%
rename from spring-rest-testing/src/main/java/org/baeldung/web/controller/HomeController.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/controller/HomeController.java
index 9c4d14cae3..c82911211a 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/controller/HomeController.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/controller/HomeController.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.controller;
+package com.baeldung.web.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/controller/RootController.java b/spring-rest-testing/src/main/java/com/baeldung/web/controller/RootController.java
similarity index 90%
rename from spring-rest-testing/src/main/java/org/baeldung/web/controller/RootController.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/controller/RootController.java
index a66f3d1893..005f6f023b 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/controller/RootController.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/controller/RootController.java
@@ -1,9 +1,9 @@
-package org.baeldung.web.controller;
+package com.baeldung.web.controller;
 
 import java.util.Map;
 
-import org.baeldung.web.metric.IActuatorMetricService;
-import org.baeldung.web.metric.IMetricService;
+import com.baeldung.web.metric.IActuatorMetricService;
+import com.baeldung.web.metric.IMetricService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java b/spring-rest-testing/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java
similarity index 92%
rename from spring-rest-testing/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java
index 14b61f9832..fd002efc28 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.exception;
+package com.baeldung.web.exception;
 
 public final class MyResourceNotFoundException extends RuntimeException {
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/ActuatorMetricService.java
similarity index 99%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/ActuatorMetricService.java
index 4dcec17b9e..8c26fa04a0 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/ActuatorMetricService.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/CustomActuatorMetricService.java
similarity index 98%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/CustomActuatorMetricService.java
index cf30686e52..ee17825b7c 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/CustomActuatorMetricService.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/IActuatorMetricService.java
similarity index 69%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/IActuatorMetricService.java
index 191d347070..60bb43ee00 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/IActuatorMetricService.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 public interface IActuatorMetricService {
     Object[][] getGraphData();
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/ICustomActuatorMetricService.java
similarity index 79%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/ICustomActuatorMetricService.java
index 19ab7164ac..5126252e27 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/ICustomActuatorMetricService.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 public interface ICustomActuatorMetricService {
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/IMetricService.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/IMetricService.java
similarity index 86%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/IMetricService.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/IMetricService.java
index 902d6ac811..b8dfa60215 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/IMetricService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/IMetricService.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 import java.util.Map;
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricFilter.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/MetricFilter.java
similarity index 98%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricFilter.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/MetricFilter.java
index 6c2fb0cb39..dee63b226f 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricFilter.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/MetricFilter.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricService.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/MetricService.java
similarity index 99%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricService.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/MetricService.java
index 086068ad8f..fd3cccab3e 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/MetricService.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/util/RestPreconditions.java b/spring-rest-testing/src/main/java/com/baeldung/web/util/RestPreconditions.java
similarity index 93%
rename from spring-rest-testing/src/main/java/org/baeldung/web/util/RestPreconditions.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/util/RestPreconditions.java
index 4f2dedcfa0..93a4ef6a33 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/util/RestPreconditions.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/util/RestPreconditions.java
@@ -1,9 +1,8 @@
-package org.baeldung.web.util;
+package com.baeldung.web.util;
 
+import com.baeldung.web.exception.MyResourceNotFoundException;
 import org.springframework.http.HttpStatus;
 
-import org.baeldung.web.exception.MyResourceNotFoundException;
-
 /**
  * Simple static methods to be called at the start of your own methods to verify correct arguments and state. If the Precondition fails, an {@link HttpStatus} code is thrown
  */
diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/service/IFooService.java b/spring-rest-testing/src/main/java/org/baeldung/persistence/service/IFooService.java
deleted file mode 100644
index 60d607b9ef..0000000000
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/service/IFooService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.baeldung.persistence.service;
-
-import org.baeldung.persistence.IOperations;
-import org.baeldung.persistence.model.Foo;
-
-public interface IFooService extends IOperations<Foo> {
-
-    Foo retrieveByName(String name);
-
-}
diff --git a/spring-rest-testing/src/main/resources/springDataPersistenceConfig.xml b/spring-rest-testing/src/main/resources/springDataPersistenceConfig.xml
index d6d0ec6e47..5ea2d9c05b 100644
--- a/spring-rest-testing/src/main/resources/springDataPersistenceConfig.xml
+++ b/spring-rest-testing/src/main/resources/springDataPersistenceConfig.xml
@@ -7,6 +7,6 @@
     http://www.springframework.org/schema/data/jpa/spring-jpa.xsd"
 >
 
-    <jpa:repositories base-package="org.baeldung.persistence.dao"/>
+    <jpa:repositories base-package="com.baeldung.persistence.dao"/>
 
 </beans>
\ No newline at end of file
diff --git a/spring-rest-testing/src/main/webapp/WEB-INF/web.xml b/spring-rest-testing/src/main/webapp/WEB-INF/web.xml
index 5f90c3519f..7129b6b4af 100644
--- a/spring-rest-testing/src/main/webapp/WEB-INF/web.xml
+++ b/spring-rest-testing/src/main/webapp/WEB-INF/web.xml
@@ -16,7 +16,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>
@@ -37,7 +37,7 @@
     <!-- Metric filter -->
     <filter>
         <filter-name>metricFilter</filter-name>
-        <filter-class>org.baeldung.web.metric.MetricFilter</filter-class>
+        <filter-class>com.baeldung.web.metric.MetricFilter</filter-class>
     </filter>
 
     <filter-mapping>
diff --git a/spring-rest-testing/src/test/java/org/baeldung/Consts.java b/spring-rest-testing/src/test/java/com/baeldung/Consts.java
similarity index 73%
rename from spring-rest-testing/src/test/java/org/baeldung/Consts.java
rename to spring-rest-testing/src/test/java/com/baeldung/Consts.java
index e5f0be160f..e33efd589e 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/Consts.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/Consts.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 public interface Consts {
     int APPLICATION_PORT = 8082;
diff --git a/spring-rest-testing/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-rest-testing/src/test/java/com/baeldung/SpringContextIntegrationTest.java
similarity index 86%
rename from spring-rest-testing/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-rest-testing/src/test/java/com/baeldung/SpringContextIntegrationTest.java
index 35939c992f..155e05b106 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/SpringContextIntegrationTest.java
@@ -1,6 +1,6 @@
-package org.baeldung;
+package com.baeldung;
 
-import org.baeldung.spring.Application;
+import com.baeldung.spring.Application;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-rest-testing/src/test/java/org/baeldung/SpringContextTest.java b/spring-rest-testing/src/test/java/com/baeldung/SpringContextTest.java
similarity index 85%
rename from spring-rest-testing/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-rest-testing/src/test/java/com/baeldung/SpringContextTest.java
index 8debddc40a..e023254719 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,6 +1,6 @@
-package org.baeldung;
+package com.baeldung;
 
-import org.baeldung.spring.Application;
+import com.baeldung.spring.Application;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-rest-testing/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java b/spring-rest-testing/src/test/java/com/baeldung/persistence/PersistenceTestSuite.java
similarity index 71%
rename from spring-rest-testing/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java
rename to spring-rest-testing/src/test/java/com/baeldung/persistence/PersistenceTestSuite.java
index fb0fd00bb5..77c74b15e4 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/persistence/PersistenceTestSuite.java
@@ -1,6 +1,6 @@
-package org.baeldung.persistence;
+package com.baeldung.persistence;
 
-import org.baeldung.persistence.service.FooServicePersistenceIntegrationTest;
+import com.baeldung.persistence.service.FooServicePersistenceIntegrationTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/spring-rest-testing/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java b/spring-rest-testing/src/test/java/com/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
similarity index 97%
rename from spring-rest-testing/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
rename to spring-rest-testing/src/test/java/com/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
index 79889e0f9e..e66e9d49e2 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.hamcrest.Matchers.hasItem;
@@ -11,9 +11,9 @@ import static org.junit.Assert.assertThat;
 import java.io.Serializable;
 import java.util.List;
 
-import org.baeldung.persistence.IOperations;
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.util.IDUtil;
+import com.baeldung.util.IDUtil;
+import com.baeldung.persistence.IOperations;
+import com.baeldung.persistence.model.Foo;
 import org.hamcrest.Matchers;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/spring-rest-testing/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java b/spring-rest-testing/src/test/java/com/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
similarity index 93%
rename from spring-rest-testing/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
rename to spring-rest-testing/src/test/java/com/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
index 089d2d13a2..24f46b9c8f 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
@@ -1,11 +1,11 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.junit.Assert.assertNotNull;
 
-import org.baeldung.persistence.IOperations;
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.spring.PersistenceConfig;
+import com.baeldung.persistence.IOperations;
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.spring.PersistenceConfig;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-rest-testing/src/test/java/org/baeldung/util/IDUtil.java b/spring-rest-testing/src/test/java/com/baeldung/util/IDUtil.java
similarity index 96%
rename from spring-rest-testing/src/test/java/org/baeldung/util/IDUtil.java
rename to spring-rest-testing/src/test/java/com/baeldung/util/IDUtil.java
index 85ab623e5f..45e72e046d 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/util/IDUtil.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/util/IDUtil.java
@@ -1,4 +1,4 @@
-package org.baeldung.util;
+package com.baeldung.util;
 
 import java.util.Random;
 

From 93b79e272da1c5ec1c6f8689cb25df1673954ff2 Mon Sep 17 00:00:00 2001
From: rahulgul8 <rahulgul8@gmail.com>
Date: Thu, 19 Dec 2019 04:34:44 +0530
Subject: [PATCH 031/106] Changes for WebRTC (BAEL-3198) (#8213)

* Adding webrtc changes

* formatting

* formatting pom

* formatting

* Adding space instead of tabs for indentation

* formatting changes

* Updating tabs to spaces
---
 pom.xml                                       |   2 +-
 webrtc/pom.xml                                |  37 ++++++
 .../com/baeldung/webrtc/SocketHandler.java    |  31 +++++
 .../webrtc/WebRTCDemoApplication.java         |  12 ++
 .../webrtc/WebSocketConfiguration.java        |  17 +++
 .../src/main/resources/application.properties |   0
 webrtc/src/main/resources/static/client.js    | 116 ++++++++++++++++++
 webrtc/src/main/resources/static/index.html   |  67 ++++++++++
 8 files changed, 281 insertions(+), 1 deletion(-)
 create mode 100644 webrtc/pom.xml
 create mode 100644 webrtc/src/main/java/com/baeldung/webrtc/SocketHandler.java
 create mode 100644 webrtc/src/main/java/com/baeldung/webrtc/WebRTCDemoApplication.java
 create mode 100644 webrtc/src/main/java/com/baeldung/webrtc/WebSocketConfiguration.java
 create mode 100644 webrtc/src/main/resources/application.properties
 create mode 100644 webrtc/src/main/resources/static/client.js
 create mode 100644 webrtc/src/main/resources/static/index.html

diff --git a/pom.xml b/pom.xml
index 80ceaf5ca0..cfb3fe1889 100644
--- a/pom.xml
+++ b/pom.xml
@@ -635,6 +635,7 @@
                 <module>spring-boot-nashorn</module>
                 <module>java-blockchain</module>
                 <module>machine-learning</module>
+                <module>webrtc</module>
                 <module>wildfly</module>
                 <module>quarkus-extension</module>
             </modules>
@@ -883,7 +884,6 @@
 
                 <module>spring-boot-nashorn</module>
                 <module>java-blockchain</module>
-
             </modules>
 
         </profile>
diff --git a/webrtc/pom.xml b/webrtc/pom.xml
new file mode 100644
index 0000000000..2a3b48b2ed
--- /dev/null
+++ b/webrtc/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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>webrtc</artifactId>
+    <version>0.0.1</version>
+
+    <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-websocket</artifactId>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/webrtc/src/main/java/com/baeldung/webrtc/SocketHandler.java b/webrtc/src/main/java/com/baeldung/webrtc/SocketHandler.java
new file mode 100644
index 0000000000..bffd57f6cf
--- /dev/null
+++ b/webrtc/src/main/java/com/baeldung/webrtc/SocketHandler.java
@@ -0,0 +1,31 @@
+package com.baeldung.webrtc;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+@Component
+public class SocketHandler extends TextWebSocketHandler {
+
+    List<WebSocketSession> sessions = new CopyOnWriteArrayList<>();
+
+    @Override
+    public void handleTextMessage(WebSocketSession session, TextMessage message) throws InterruptedException, IOException {
+
+        for (WebSocketSession webSocketSession : sessions) {
+            if (webSocketSession.isOpen() && !session.getId().equals(webSocketSession.getId())) {
+                webSocketSession.sendMessage(message);
+            }
+        }
+    }
+
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) throws Exception {
+        sessions.add(session);
+    }
+}
\ No newline at end of file
diff --git a/webrtc/src/main/java/com/baeldung/webrtc/WebRTCDemoApplication.java b/webrtc/src/main/java/com/baeldung/webrtc/WebRTCDemoApplication.java
new file mode 100644
index 0000000000..f54946547d
--- /dev/null
+++ b/webrtc/src/main/java/com/baeldung/webrtc/WebRTCDemoApplication.java
@@ -0,0 +1,12 @@
+package com.baeldung.webrtc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class WebRTCDemoApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(WebRTCDemoApplication.class, args);
+    }
+}
diff --git a/webrtc/src/main/java/com/baeldung/webrtc/WebSocketConfiguration.java b/webrtc/src/main/java/com/baeldung/webrtc/WebSocketConfiguration.java
new file mode 100644
index 0000000000..9deb395dad
--- /dev/null
+++ b/webrtc/src/main/java/com/baeldung/webrtc/WebSocketConfiguration.java
@@ -0,0 +1,17 @@
+package com.baeldung.webrtc;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
+
+@Configuration
+@EnableWebSocket
+public class WebSocketConfiguration implements WebSocketConfigurer {
+
+    @Override
+    public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
+        registry.addHandler(new SocketHandler(), "/socket")
+            .setAllowedOrigins("*");
+    }
+}
diff --git a/webrtc/src/main/resources/application.properties b/webrtc/src/main/resources/application.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/webrtc/src/main/resources/static/client.js b/webrtc/src/main/resources/static/client.js
new file mode 100644
index 0000000000..059dc84bcb
--- /dev/null
+++ b/webrtc/src/main/resources/static/client.js
@@ -0,0 +1,116 @@
+//connecting to our signaling server 
+var conn = new WebSocket('ws://localhost:8080/socket');
+
+conn.onopen = function() {
+    console.log("Connected to the signaling server");
+    initialize();
+};
+
+conn.onmessage = function(msg) {
+    console.log("Got message", msg.data);
+    var content = JSON.parse(msg.data);
+    var data = content.data;
+    switch (content.event) {
+    // when somebody wants to call us
+    case "offer":
+        handleOffer(data);
+        break;
+    case "answer":
+        handleAnswer(data);
+        break;
+    // when a remote peer sends an ice candidate to us
+    case "candidate":
+        handleCandidate(data);
+        break;
+    default:
+        break;
+    }
+};
+
+function send(message) {
+    conn.send(JSON.stringify(message));
+}
+
+var peerConnection;
+var dataChannel;
+var input = document.getElementById("messageInput");
+
+function initialize() {
+    var configuration = null;
+
+    peerConnection = new RTCPeerConnection(configuration, {
+        optional : [ {
+            RtpDataChannels : true
+        } ]
+    });
+
+    // Setup ice handling
+    peerConnection.onicecandidate = function(event) {
+        if (event.candidate) {
+            send({
+                event : "candidate",
+                data : event.candidate
+            });
+        }
+    };
+
+    // creating data channel
+    dataChannel = peerConnection.createDataChannel("dataChannel", {
+        reliable : true
+    });
+
+    dataChannel.onerror = function(error) {
+        console.log("Error occured on datachannel:", error);
+    };
+
+    // when we receive a message from the other peer, printing it on the console
+    dataChannel.onmessage = function(event) {
+        console.log("message:", event.data);
+    };
+
+    dataChannel.onclose = function() {
+        console.log("data channel is closed");
+    };
+}
+
+function createOffer() {
+    peerConnection.createOffer(function(offer) {
+        send({
+            event : "offer",
+            data : offer
+        });
+        peerConnection.setLocalDescription(offer);
+    }, function(error) {
+        alert("Error creating an offer");
+    });
+}
+
+function handleOffer(offer) {
+    peerConnection.setRemoteDescription(new RTCSessionDescription(offer));
+
+    // create and send an answer to an offer
+    peerConnection.createAnswer(function(answer) {
+        peerConnection.setLocalDescription(answer);
+        send({
+            event : "answer",
+            data : answer
+        });
+    }, function(error) {
+        alert("Error creating an answer");
+    });
+
+};
+
+function handleCandidate(candidate) {
+    peerConnection.addIceCandidate(new RTCIceCandidate(candidate));
+};
+
+function handleAnswer(answer) {
+    peerConnection.setRemoteDescription(new RTCSessionDescription(answer));
+    console.log("connection established successfully!!");
+};
+
+function sendMessage() {
+    dataChannel.send(input.value);
+    input.value = "";
+}
diff --git a/webrtc/src/main/resources/static/index.html b/webrtc/src/main/resources/static/index.html
new file mode 100644
index 0000000000..39a86ec61e
--- /dev/null
+++ b/webrtc/src/main/resources/static/index.html
@@ -0,0 +1,67 @@
+<html>
+
+<head>
+<title>WebRTC demo</title>
+<!--Bootstrap only for styling-->
+<link rel="stylesheet"
+ href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+<script
+ src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+<script
+ src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+<!--Bootstrap only for styling-->
+</head>
+<style>
+.container {
+    background: rgb(148, 144, 144);
+    margin: 50px auto;
+    max-width: 80%;
+    text-align: center;
+    padding: 2%;
+}
+
+button {
+    margin: 1em;
+}
+
+input {
+    margin-top: 1em;
+}
+
+.footer {
+    background: rgb(148, 144, 144);
+    text-align: center;
+    padding: 2%;
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+}
+</style>
+
+<body>
+
+ <div class="container">
+  <h1>A Demo for messaging in WebRTC</h1>
+
+  <h3>
+   Run two instances of this webpage along with the server to test this
+   application.<br> Create an offer, and then send the message. <br>Check
+   the browser console to see the output.
+  </h3>
+
+  <!--WebRTC related code-->
+  <button type="button" class="btn btn-primary" onclick='createOffer()'>Create
+   Offer</button>
+  <input id="messageInput" type="text" class="form-control"
+   placeholder="message">
+  <button type="button" class="btn btn-primary" onclick='sendMessage()'>SEND</button>
+  <script src="client.js"></script>
+  <!--WebRTC related code-->
+
+ </div>
+ <div class="footer">This application is intentionally made simple
+  to avoid cluttering with non WebRTC related code.</div>
+
+</body>
+
+</html>

From 5e800a7e719558465c439a7c7238e0c78c7af43e Mon Sep 17 00:00:00 2001
From: Anshul Bansal <smartdiscover17@gmail.com>
Date: Thu, 19 Dec 2019 10:51:22 +0200
Subject: [PATCH 032/106] code indentation fixed

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

diff --git a/pom.xml b/pom.xml
index 0d4b11fc45..64ecfb6925 100644
--- a/pom.xml
+++ b/pom.xml
@@ -589,7 +589,7 @@
                 <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
                 <module>mustache</module>
                 <module>mybatis</module>
-				<module>ninja</module>
+                <module>ninja</module>
                 <module>netflix</module>
 
                 <module>optaplanner</module>
@@ -1224,7 +1224,7 @@
                 <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
                 <module>mustache</module>
                 <module>mybatis</module>
-				<module>ninja</module>
+                <module>ninja</module>
                 <module>netflix</module>
 
                 <module>optaplanner</module>

From bc8cbd305e96c62661ea9c07a96e4afa47e5abd5 Mon Sep 17 00:00:00 2001
From: Anshul Bansal <smartdiscover17@gmail.com>
Date: Thu, 19 Dec 2019 10:52:45 +0200
Subject: [PATCH 033/106] typo corrected

---
 ninja/src/main/java/controllers/ApplicationController.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ninja/src/main/java/controllers/ApplicationController.java b/ninja/src/main/java/controllers/ApplicationController.java
index cd8ad9d160..38dd598694 100644
--- a/ninja/src/main/java/controllers/ApplicationController.java
+++ b/ninja/src/main/java/controllers/ApplicationController.java
@@ -40,7 +40,7 @@ public class ApplicationController {
     private static Log logger = LogFactory.getLog(ApplicationController.class);
     
     @Inject 
-    Provider<EntityManager> entitiyManagerProvider;
+    Provider<EntityManager> entityManagerProvider;
 
     @Inject
     UserService userService;
@@ -77,7 +77,7 @@ public class ApplicationController {
     
     @UnitOfWork
     public Result fetchUsers() {
-        EntityManager entityManager = entitiyManagerProvider.get();
+        EntityManager entityManager = entityManagerProvider.get();
         Query q = entityManager.createQuery("SELECT x FROM User x");
         List<User> users = (List<User>) q.getResultList();
         return Results.json().render(users);
@@ -90,7 +90,7 @@ public class ApplicationController {
         if (validation.getViolations().size() > 0) {
             flashScope.error("Validation Error: User can't be created");
         } else {
-            EntityManager entityManager = entitiyManagerProvider.get();
+            EntityManager entityManager = entityManagerProvider.get();
             entityManager.persist(user);
             entityManager.flush();
             flashScope.success("User '" + user + "' is created successfully");

From 2883b5148c401cd2066ea19d2189b420694f1e53 Mon Sep 17 00:00:00 2001
From: Anshul Bansal <smartdiscover17@gmail.com>
Date: Thu, 19 Dec 2019 11:13:18 +0200
Subject: [PATCH 034/106] code indentation

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

diff --git a/pom.xml b/pom.xml
index 64ecfb6925..b3405e2f53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -670,7 +670,6 @@
             </build>
 
             <modules>
-
                 <module>netflix</module>
 
                 <module>parent-boot-1</module>

From c845cf256b1a12678017ac2dccb6f82eb10308dd Mon Sep 17 00:00:00 2001
From: Anshul Bansal <smartdiscover17@gmail.com>
Date: Thu, 19 Dec 2019 11:14:02 +0200
Subject: [PATCH 035/106] Updated ApiControllerDocTesterUnitTest

---
 ninja/src/test/java/controllers/ApiControllerDocTesterTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java b/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
index d5f4f1811c..969073d5d8 100644
--- a/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
+++ b/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
@@ -7,7 +7,7 @@ import org.doctester.testbrowser.Response;
 import org.junit.Test;
 import ninja.NinjaDocTester;
 
-public class ApiControllerDocTesterTest extends NinjaDocTester {
+public class ApiControllerDocTesterUnitTest extends NinjaDocTester {
     
     String URL_INDEX = "/";
     String URL_HELLO = "/hello";

From af427218c93994197806f8e158459f8b2a200b42 Mon Sep 17 00:00:00 2001
From: Anshul Bansal <smartdiscover17@gmail.com>
Date: Thu, 19 Dec 2019 11:14:30 +0200
Subject: [PATCH 036/106] Updated ApiControllerMockUnitTest

---
 ninja/src/test/java/controllers/ApiControllerMockTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ninja/src/test/java/controllers/ApiControllerMockTest.java b/ninja/src/test/java/controllers/ApiControllerMockTest.java
index 2466e54b2a..cb53965678 100644
--- a/ninja/src/test/java/controllers/ApiControllerMockTest.java
+++ b/ninja/src/test/java/controllers/ApiControllerMockTest.java
@@ -10,7 +10,7 @@ import ninja.Result;
 import services.UserService;
 
 @RunWith(NinjaRunner.class)
-public class ApiControllerMockTest {
+public class ApiControllerMockUnitTest {
 
     @Inject private UserService userService;
 

From 78b94fc86ef0f3a3225622748e4c9c49458717ab Mon Sep 17 00:00:00 2001
From: Anshul BANSAL <smartdiscover17@gmail.com>
Date: Thu, 19 Dec 2019 11:46:23 +0200
Subject: [PATCH 037/106] Test name fixes

---
 ninja/src/test/java/controllers/ApiControllerDocTesterTest.java | 2 +-
 ...piControllerMockTest.java => ApiControllerMockUnitTest.java} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename ninja/src/test/java/controllers/{ApiControllerMockTest.java => ApiControllerMockUnitTest.java} (100%)

diff --git a/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java b/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
index 969073d5d8..d5f4f1811c 100644
--- a/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
+++ b/ninja/src/test/java/controllers/ApiControllerDocTesterTest.java
@@ -7,7 +7,7 @@ import org.doctester.testbrowser.Response;
 import org.junit.Test;
 import ninja.NinjaDocTester;
 
-public class ApiControllerDocTesterUnitTest extends NinjaDocTester {
+public class ApiControllerDocTesterTest extends NinjaDocTester {
     
     String URL_INDEX = "/";
     String URL_HELLO = "/hello";
diff --git a/ninja/src/test/java/controllers/ApiControllerMockTest.java b/ninja/src/test/java/controllers/ApiControllerMockUnitTest.java
similarity index 100%
rename from ninja/src/test/java/controllers/ApiControllerMockTest.java
rename to ninja/src/test/java/controllers/ApiControllerMockUnitTest.java

From f84ff448c56bd97322049842c0656865e6d9549c Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Thu, 19 Dec 2019 11:02:46 +0100
Subject: [PATCH 038/106] BAEL-19988: Migrate spring-testing module to the
 com.baeldung package

---
 testing-modules/spring-testing/pom.xml                    | 2 +-
 .../{org => com}/baeldung/mockito/repository/User.java    | 2 +-
 .../baeldung/mockito/repository/UserRepository.java       | 2 +-
 .../baeldung/reflectiontestutils/repository/Employee.java | 2 +-
 .../reflectiontestutils/repository/EmployeeService.java   | 2 +-
 .../reflectiontestutils/repository/HRService.java         | 2 +-
 .../baeldung/mockito/MockAnnotationUnitTest.java          | 4 ++--
 .../mockito/MockBeanAnnotationIntegrationTest.java        | 4 ++--
 .../reflectiontestutils/ReflectionTestUtilsUnitTest.java  | 8 ++++----
 9 files changed, 14 insertions(+), 14 deletions(-)
 rename testing-modules/spring-testing/src/main/java/{org => com}/baeldung/mockito/repository/User.java (95%)
 rename testing-modules/spring-testing/src/main/java/{org => com}/baeldung/mockito/repository/UserRepository.java (84%)
 rename testing-modules/spring-testing/src/main/java/{org => com}/baeldung/reflectiontestutils/repository/Employee.java (87%)
 rename testing-modules/spring-testing/src/main/java/{org => com}/baeldung/reflectiontestutils/repository/EmployeeService.java (87%)
 rename testing-modules/spring-testing/src/main/java/{org => com}/baeldung/reflectiontestutils/repository/HRService.java (77%)
 rename testing-modules/spring-testing/src/test/java/{org => com}/baeldung/mockito/MockAnnotationUnitTest.java (92%)
 rename testing-modules/spring-testing/src/test/java/{org => com}/baeldung/mockito/MockBeanAnnotationIntegrationTest.java (91%)
 rename testing-modules/spring-testing/src/test/java/{org => com}/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java (87%)

diff --git a/testing-modules/spring-testing/pom.xml b/testing-modules/spring-testing/pom.xml
index 22f5f68240..38e7a0dd46 100644
--- a/testing-modules/spring-testing/pom.xml
+++ b/testing-modules/spring-testing/pom.xml
@@ -3,7 +3,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>
-    <groupId>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-testing</artifactId>
     <version>0.1-SNAPSHOT</version>
     <name>spring-testing</name>
diff --git a/testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/User.java b/testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/User.java
similarity index 95%
rename from testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/User.java
rename to testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/User.java
index 28cd4f9fb0..1854a085ac 100644
--- a/testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/User.java
+++ b/testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/User.java
@@ -1,4 +1,4 @@
-package org.baeldung.mockito.repository;
+package com.baeldung.mockito.repository;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/UserRepository.java b/testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/UserRepository.java
similarity index 84%
rename from testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/UserRepository.java
rename to testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/UserRepository.java
index 3f1952a5e7..fd5bd55c84 100644
--- a/testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/UserRepository.java
+++ b/testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/UserRepository.java
@@ -1,4 +1,4 @@
-package org.baeldung.mockito.repository;
+package com.baeldung.mockito.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git a/testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/Employee.java b/testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/Employee.java
similarity index 87%
rename from testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/Employee.java
rename to testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/Employee.java
index 8d4eeb57c4..d542f9c234 100644
--- a/testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/Employee.java
+++ b/testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/Employee.java
@@ -1,4 +1,4 @@
-package org.baeldung.reflectiontestutils.repository;
+package com.baeldung.reflectiontestutils.repository;
 
 public class Employee {
     private Integer id;
diff --git a/testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/EmployeeService.java b/testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/EmployeeService.java
similarity index 87%
rename from testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/EmployeeService.java
rename to testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/EmployeeService.java
index d28745e2ab..9feae7ae30 100644
--- a/testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/EmployeeService.java
+++ b/testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/EmployeeService.java
@@ -1,4 +1,4 @@
-package org.baeldung.reflectiontestutils.repository;
+package com.baeldung.reflectiontestutils.repository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/HRService.java b/testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/HRService.java
similarity index 77%
rename from testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/HRService.java
rename to testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/HRService.java
index 13a5973ee8..bb2c34d82f 100644
--- a/testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/HRService.java
+++ b/testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/HRService.java
@@ -1,4 +1,4 @@
-package org.baeldung.reflectiontestutils.repository;
+package com.baeldung.reflectiontestutils.repository;
 
 import org.springframework.stereotype.Component;
 
diff --git a/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockAnnotationUnitTest.java
similarity index 92%
rename from testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
rename to testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockAnnotationUnitTest.java
index 1fa7f241e7..424a622b65 100644
--- a/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockAnnotationUnitTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.mockito;
+package com.baeldung.mockito;
 
-import org.baeldung.mockito.repository.UserRepository;
+import com.baeldung.mockito.repository.UserRepository;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
similarity index 91%
rename from testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
rename to testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
index 3a7e58fb48..b7617ef652 100644
--- a/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.mockito;
+package com.baeldung.mockito;
 
-import org.baeldung.mockito.repository.UserRepository;
+import com.baeldung.mockito.repository.UserRepository;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/testing-modules/spring-testing/src/test/java/org/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java
similarity index 87%
rename from testing-modules/spring-testing/src/test/java/org/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java
rename to testing-modules/spring-testing/src/test/java/com/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java
index 36e5428b58..33d4db22f3 100644
--- a/testing-modules/spring-testing/src/test/java/org/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java
@@ -1,11 +1,11 @@
-package org.baeldung.reflectiontestutils;
+package com.baeldung.reflectiontestutils;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 
-import org.baeldung.reflectiontestutils.repository.Employee;
-import org.baeldung.reflectiontestutils.repository.EmployeeService;
-import org.baeldung.reflectiontestutils.repository.HRService;
+import com.baeldung.reflectiontestutils.repository.EmployeeService;
+import com.baeldung.reflectiontestutils.repository.HRService;
+import com.baeldung.reflectiontestutils.repository.Employee;
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 

From aca11c38f9052cd66a1da1a114f2b0677df64ca3 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Thu, 19 Dec 2019 11:17:45 +0100
Subject: [PATCH 039/106] BAEL-19988: Migrate mocks module to the com.baeldung
 package

---
 .../baeldung}/jmockit/AdvancedCollaborator.java        |  2 +-
 .../com/baeldung/{mocks => }/jmockit/AppManager.java   |  2 +-
 .../mocks => com/baeldung}/jmockit/Collaborator.java   |  2 +-
 .../baeldung}/jmockit/ExpectationsCollaborator.java    |  2 +-
 .../baeldung/mocks => com/baeldung}/jmockit/Model.java |  2 +-
 .../mocks => com/baeldung}/jmockit/Performer.java      |  2 +-
 .../baeldung}/testCase/LoginController.java            |  2 +-
 .../mocks => com/baeldung}/testCase/LoginDao.java      |  2 +-
 .../mocks => com/baeldung}/testCase/LoginService.java  |  2 +-
 .../mocks => com/baeldung}/testCase/UserForm.java      |  2 +-
 .../easymock/LoginControllerIntegrationTest.java       | 10 +++++-----
 .../jmockit/AdvancedCollaboratorIntegrationTest.java   |  3 ++-
 .../{mocks => }/jmockit/AppManagerUnitTest.java        |  3 +--
 .../baeldung}/jmockit/ExpectationsIntegrationTest.java |  4 +++-
 .../jmockit/LoginControllerIntegrationTest.java        | 10 +++++-----
 .../baeldung}/jmockit/PerformerIntegrationTest.java    |  5 ++++-
 .../baeldung}/jmockit/ReusingIntegrationTest.java      |  5 ++++-
 .../mockito/LoginControllerIntegrationTest.java        | 10 +++++-----
 18 files changed, 39 insertions(+), 31 deletions(-)
 rename testing-modules/mocks/src/main/java/{org/baeldung/mocks => com/baeldung}/jmockit/AdvancedCollaborator.java (93%)
 rename testing-modules/mocks/src/main/java/com/baeldung/{mocks => }/jmockit/AppManager.java (94%)
 rename testing-modules/mocks/src/main/java/{org/baeldung/mocks => com/baeldung}/jmockit/Collaborator.java (80%)
 rename testing-modules/mocks/src/main/java/{org/baeldung/mocks => com/baeldung}/jmockit/ExpectationsCollaborator.java (94%)
 rename testing-modules/mocks/src/main/java/{org/baeldung/mocks => com/baeldung}/jmockit/Model.java (69%)
 rename testing-modules/mocks/src/main/java/{org/baeldung/mocks => com/baeldung}/jmockit/Performer.java (84%)
 rename testing-modules/mocks/src/main/java/{org/baeldung/mocks => com/baeldung}/testCase/LoginController.java (94%)
 rename testing-modules/mocks/src/main/java/{org/baeldung/mocks => com/baeldung}/testCase/LoginDao.java (79%)
 rename testing-modules/mocks/src/main/java/{org/baeldung/mocks => com/baeldung}/testCase/LoginService.java (94%)
 rename testing-modules/mocks/src/main/java/{org/baeldung/mocks => com/baeldung}/testCase/UserForm.java (84%)
 rename testing-modules/mocks/src/test/java/{org/baeldung/mocks => com/baeldung}/easymock/LoginControllerIntegrationTest.java (94%)
 rename testing-modules/mocks/src/test/java/{org/baeldung/mocks => com/baeldung}/jmockit/AdvancedCollaboratorIntegrationTest.java (96%)
 rename testing-modules/mocks/src/test/java/com/baeldung/{mocks => }/jmockit/AppManagerUnitTest.java (91%)
 rename testing-modules/mocks/src/test/java/{org/baeldung/mocks => com/baeldung}/jmockit/ExpectationsIntegrationTest.java (97%)
 rename testing-modules/mocks/src/test/java/{org/baeldung/mocks => com/baeldung}/jmockit/LoginControllerIntegrationTest.java (95%)
 rename testing-modules/mocks/src/test/java/{org/baeldung/mocks => com/baeldung}/jmockit/PerformerIntegrationTest.java (80%)
 rename testing-modules/mocks/src/test/java/{org/baeldung/mocks => com/baeldung}/jmockit/ReusingIntegrationTest.java (89%)
 rename testing-modules/mocks/src/test/java/{org/baeldung/mocks => com/baeldung}/mockito/LoginControllerIntegrationTest.java (94%)

diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/AdvancedCollaborator.java
similarity index 93%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java
rename to testing-modules/mocks/src/main/java/com/baeldung/jmockit/AdvancedCollaborator.java
index 4d25f466a6..ef7484cfdd 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/AdvancedCollaborator.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 public class AdvancedCollaborator {
     int i;
diff --git a/testing-modules/mocks/src/main/java/com/baeldung/mocks/jmockit/AppManager.java b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/AppManager.java
similarity index 94%
rename from testing-modules/mocks/src/main/java/com/baeldung/mocks/jmockit/AppManager.java
rename to testing-modules/mocks/src/main/java/com/baeldung/jmockit/AppManager.java
index 615650ea6d..6306a94d29 100644
--- a/testing-modules/mocks/src/main/java/com/baeldung/mocks/jmockit/AppManager.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/AppManager.java
@@ -1,4 +1,4 @@
-package com.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 import java.util.Random;
 
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/Collaborator.java
similarity index 80%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java
rename to testing-modules/mocks/src/main/java/com/baeldung/jmockit/Collaborator.java
index 60da12fa7c..8c4f6b15b6 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/Collaborator.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 public class Collaborator {
 
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/ExpectationsCollaborator.java
similarity index 94%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java
rename to testing-modules/mocks/src/main/java/com/baeldung/jmockit/ExpectationsCollaborator.java
index 8209464936..799e7721e0 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/ExpectationsCollaborator.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 import java.util.List;
 
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Model.java b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/Model.java
similarity index 69%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Model.java
rename to testing-modules/mocks/src/main/java/com/baeldung/jmockit/Model.java
index 79ae24c2f5..ac81e5059a 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Model.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/Model.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 public class Model {
     public String getInfo() {
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Performer.java b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/Performer.java
similarity index 84%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Performer.java
rename to testing-modules/mocks/src/main/java/com/baeldung/jmockit/Performer.java
index 4f8e8adb24..82fd03fef1 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Performer.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/Performer.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 public class Performer {
 	private Collaborator collaborator;
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginController.java b/testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginController.java
similarity index 94%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginController.java
rename to testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginController.java
index 914b0034d2..e7e972a3ce 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginController.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginController.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.testCase;
+package com.baeldung.testCase;
 
 public class LoginController {
 
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginDao.java b/testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginDao.java
similarity index 79%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginDao.java
rename to testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginDao.java
index 2cbff6c9d4..f2efe38019 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginDao.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginDao.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.testCase;
+package com.baeldung.testCase;
 
 public class LoginDao {
 
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginService.java b/testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginService.java
similarity index 94%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginService.java
rename to testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginService.java
index d6a31a8047..3e34024971 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginService.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginService.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.testCase;
+package com.baeldung.testCase;
 
 public class LoginService {
 
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/UserForm.java b/testing-modules/mocks/src/main/java/com/baeldung/testCase/UserForm.java
similarity index 84%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/UserForm.java
rename to testing-modules/mocks/src/main/java/com/baeldung/testCase/UserForm.java
index 14136d0f31..bfb1411ce5 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/UserForm.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/testCase/UserForm.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.testCase;
+package com.baeldung.testCase;
 
 public class UserForm {
 
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/easymock/LoginControllerIntegrationTest.java
similarity index 94%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/easymock/LoginControllerIntegrationTest.java
index 4cf2a23ee8..5636382efd 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/easymock/LoginControllerIntegrationTest.java
@@ -1,9 +1,9 @@
-package org.baeldung.mocks.easymock;
+package com.baeldung.easymock;
 
-import org.baeldung.mocks.testCase.LoginController;
-import org.baeldung.mocks.testCase.LoginDao;
-import org.baeldung.mocks.testCase.LoginService;
-import org.baeldung.mocks.testCase.UserForm;
+import com.baeldung.testCase.LoginController;
+import com.baeldung.testCase.LoginDao;
+import com.baeldung.testCase.LoginService;
+import com.baeldung.testCase.UserForm;
 import org.easymock.*;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/AdvancedCollaboratorIntegrationTest.java
similarity index 96%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/jmockit/AdvancedCollaboratorIntegrationTest.java
index 3a30342eb9..e55a69895f 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/AdvancedCollaboratorIntegrationTest.java
@@ -1,10 +1,11 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import com.baeldung.jmockit.AdvancedCollaborator;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/testing-modules/mocks/src/test/java/com/baeldung/mocks/jmockit/AppManagerUnitTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/AppManagerUnitTest.java
similarity index 91%
rename from testing-modules/mocks/src/test/java/com/baeldung/mocks/jmockit/AppManagerUnitTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/jmockit/AppManagerUnitTest.java
index ecdc6e441e..bc88f62024 100644
--- a/testing-modules/mocks/src/test/java/com/baeldung/mocks/jmockit/AppManagerUnitTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/AppManagerUnitTest.java
@@ -1,10 +1,9 @@
-package com.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import mockit.Deencapsulation;
 import mockit.Mock;
 import mockit.MockUp;
 
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/ExpectationsIntegrationTest.java
similarity index 97%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/jmockit/ExpectationsIntegrationTest.java
index 8b85af6243..8b0c3ab4ec 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/ExpectationsIntegrationTest.java
@@ -1,5 +1,7 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
+import com.baeldung.jmockit.ExpectationsCollaborator;
+import com.baeldung.jmockit.Model;
 import mockit.Delegate;
 import mockit.Expectations;
 import mockit.Mocked;
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/LoginControllerIntegrationTest.java
similarity index 95%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/jmockit/LoginControllerIntegrationTest.java
index ecad7df5b5..4dbe94991f 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/LoginControllerIntegrationTest.java
@@ -1,11 +1,11 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 import mockit.*;
 import mockit.integration.junit4.JMockit;
-import org.baeldung.mocks.testCase.LoginController;
-import org.baeldung.mocks.testCase.LoginDao;
-import org.baeldung.mocks.testCase.LoginService;
-import org.baeldung.mocks.testCase.UserForm;
+import com.baeldung.testCase.LoginController;
+import com.baeldung.testCase.LoginDao;
+import com.baeldung.testCase.LoginService;
+import com.baeldung.testCase.UserForm;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.junit.Assert;
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/PerformerIntegrationTest.java
similarity index 80%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/jmockit/PerformerIntegrationTest.java
index 7c79a5979e..fb94ae908b 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/PerformerIntegrationTest.java
@@ -1,5 +1,8 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
+import com.baeldung.jmockit.Collaborator;
+import com.baeldung.jmockit.Model;
+import com.baeldung.jmockit.Performer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/ReusingIntegrationTest.java
similarity index 89%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/jmockit/ReusingIntegrationTest.java
index 73bc712143..30b17ee2e4 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/ReusingIntegrationTest.java
@@ -1,5 +1,8 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
+import com.baeldung.jmockit.Collaborator;
+import com.baeldung.jmockit.Model;
+import com.baeldung.jmockit.Performer;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/mockito/LoginControllerIntegrationTest.java
similarity index 94%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/mockito/LoginControllerIntegrationTest.java
index 9d47b2f5d4..98df2cf850 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/mockito/LoginControllerIntegrationTest.java
@@ -1,9 +1,9 @@
-package org.baeldung.mocks.mockito;
+package com.baeldung.mockito;
 
-import org.baeldung.mocks.testCase.LoginController;
-import org.baeldung.mocks.testCase.LoginDao;
-import org.baeldung.mocks.testCase.LoginService;
-import org.baeldung.mocks.testCase.UserForm;
+import com.baeldung.testCase.LoginController;
+import com.baeldung.testCase.LoginDao;
+import com.baeldung.testCase.LoginService;
+import com.baeldung.testCase.UserForm;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

From d820c79b5091cc54e86a535d92dbaf919b06bab4 Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:20:46 +0800
Subject: [PATCH 040/106] Update README.md

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

diff --git a/core-java-modules/core-java-11/README.md b/core-java-modules/core-java-11/README.md
index 93a2c6faf5..79ff14afe3 100644
--- a/core-java-modules/core-java-11/README.md
+++ b/core-java-modules/core-java-11/README.md
@@ -4,6 +4,7 @@ This module contains articles about Java 11 core features
 
 ### Relevant articles
 
+- [Benchmark JDK Collections vs Eclipse Collections](https://www.baeldung.com/jdk-collections-vs-eclipse-collections)
 - [Java 11 Single File Source Code](https://www.baeldung.com/java-single-file-source-code)
 - [Java 11 Local Variable Syntax for Lambda Parameters](https://www.baeldung.com/java-var-lambda-params)
 - [Java 11 String API Additions](https://www.baeldung.com/java-11-string-api)

From 21d8e18ce9bd05edaa106bdf09be5854776567da Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:21:25 +0800
Subject: [PATCH 041/106] Update README.md

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

diff --git a/core-java-modules/core-java-11/README.md b/core-java-modules/core-java-11/README.md
index 79ff14afe3..7ca81e901a 100644
--- a/core-java-modules/core-java-11/README.md
+++ b/core-java-modules/core-java-11/README.md
@@ -4,7 +4,6 @@ This module contains articles about Java 11 core features
 
 ### Relevant articles
 
-- [Benchmark JDK Collections vs Eclipse Collections](https://www.baeldung.com/jdk-collections-vs-eclipse-collections)
 - [Java 11 Single File Source Code](https://www.baeldung.com/java-single-file-source-code)
 - [Java 11 Local Variable Syntax for Lambda Parameters](https://www.baeldung.com/java-var-lambda-params)
 - [Java 11 String API Additions](https://www.baeldung.com/java-11-string-api)
@@ -13,3 +12,4 @@ This module contains articles about Java 11 core features
 - [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)
 - [Negate a Predicate Method Reference with Java 11](https://www.baeldung.com/java-negate-predicate-method-reference)
+- [Benchmark JDK Collections vs Eclipse Collections](https://www.baeldung.com/jdk-collections-vs-eclipse-collections)

From fc2fb5e6e703dc859bc748de637f4b27b84564ce Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:23:39 +0800
Subject: [PATCH 042/106] Update README.md

---
 spring-mvc-basics-2/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-mvc-basics-2/README.md b/spring-mvc-basics-2/README.md
index 4a5ea24283..0f518095da 100644
--- a/spring-mvc-basics-2/README.md
+++ b/spring-mvc-basics-2/README.md
@@ -11,4 +11,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [The Spring @Controller and @RestController Annotations](http://www.baeldung.com/spring-controller-vs-restcontroller)
 - [Model, ModelMap, and ModelView in Spring MVC](http://www.baeldung.com/spring-mvc-model-model-map-model-view)
 - [Spring Web Contexts](http://www.baeldung.com/spring-web-contexts)
-- [[<-- Prev]](/spring-mvc-basics)
\ No newline at end of file
+- [Spring Optional Path Variables](https://www.baeldung.com/spring-optional-path-variables)
+- [[<-- Prev]](/spring-mvc-basics)

From 8f9091d7b672cafb467f7548dba416fb11f3c352 Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:25:41 +0800
Subject: [PATCH 043/106] Update README.adoc

---
 intelliJ/remote-debugging/README.adoc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/intelliJ/remote-debugging/README.adoc b/intelliJ/remote-debugging/README.adoc
index 6a4b80959f..808d269dd0 100644
--- a/intelliJ/remote-debugging/README.adoc
+++ b/intelliJ/remote-debugging/README.adoc
@@ -82,3 +82,7 @@ The following guides may also be helpful:
 * https://spring.io/guides/gs/batch-processing/[Creating a Batch Service]
 
 include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/master/footer.adoc[]
+
+### Relevant Articles:
+
+- [Remote Debugging with IntelliJ IDEA](https://www.baeldung.com/intellij-remote-debugging)

From 9c512c4a82a7920cda404e7be08328036b31a08d Mon Sep 17 00:00:00 2001
From: Fabio Silva <silva_fabio@hotmail.com>
Date: Thu, 19 Dec 2019 07:28:51 -0300
Subject: [PATCH 044/106] Josh Cummings suggestions: JMH documentation states
 that benchmark methods should return a value in order to defend against Dead
 Code Elimination

---
 .../PatternPerformanceComparison.java         | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/core-java-modules/core-java-text/src/main/java/com/baeldung/patternreuse/PatternPerformanceComparison.java b/core-java-modules/core-java-text/src/main/java/com/baeldung/patternreuse/PatternPerformanceComparison.java
index 01a6121ad0..01f8df9ec6 100644
--- a/core-java-modules/core-java-text/src/main/java/com/baeldung/patternreuse/PatternPerformanceComparison.java
+++ b/core-java-modules/core-java-text/src/main/java/com/baeldung/patternreuse/PatternPerformanceComparison.java
@@ -1,6 +1,7 @@
 package com.baeldung.patternreuse;
 
 import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
 import org.openjdk.jmh.runner.RunnerException;
 
 import java.io.IOException;
@@ -29,52 +30,52 @@ public class PatternPerformanceComparison {
     }
 
     @Benchmark
-    public void matcherFromPreCompiledPatternResetMatches() {
+    public void matcherFromPreCompiledPatternResetMatches(Blackhole bh) {
         //With pre-compiled pattern and reusing the matcher
         // 1 Pattern object created
         // 1 Matcher objects created
         for (String value : values) {
-            matcherFromPreCompiledPattern.reset(value).matches();
+            bh.consume(matcherFromPreCompiledPattern.reset(value).matches());
         }
     }
 
     @Benchmark
-    public void preCompiledPatternMatcherMatches() {
+    public void preCompiledPatternMatcherMatches(Blackhole bh) {
         // With pre-compiled pattern
         // 1         Pattern object created
         // 5_000_000 Matcher objects created
         for (String value : values) {
-            preCompiledPattern.matcher(value).matches();
+            bh.consume(preCompiledPattern.matcher(value).matches());
         }
     }
 
     @Benchmark
-    public void patternCompileMatcherMatches() {
+    public void patternCompileMatcherMatches(Blackhole bh) {
         // Above approach "Pattern.matches(PATTERN, value)" makes this internally
         // 5_000_000 Pattern objects created
         // 5_000_000 Matcher objects created
         for (String value : values) {
-            Pattern.compile(PATTERN).matcher(value).matches();
+            bh.consume(Pattern.compile(PATTERN).matcher(value).matches());
         }
     }
 
     @Benchmark
-    public void patternMatches() {
+    public void patternMatches(Blackhole bh) {
         // Above approach "value.matches(PATTERN)" makes this internally
         // 5_000_000 Pattern objects created
         // 5_000_000 Matcher objects created
         for (String value : values) {
-            Pattern.matches(PATTERN, value);
+            bh.consume(Pattern.matches(PATTERN, value));
         }
     }
 
     @Benchmark
-    public void stringMatchs() {
+    public void stringMatchs(Blackhole bh) {
         // 5_000_000 Pattern objects created
         // 5_000_000 Matcher objects created
         Instant start = Instant.now();
         for (String value : values) {
-            value.matches(PATTERN);
+            bh.consume(value.matches(PATTERN));
         }
     }
 

From 47873258206ef0edf8cd4932b0e4e1d1957bb91e Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:32:06 +0800
Subject: [PATCH 045/106] Update README.adoc

---
 intelliJ/remote-debugging/README.adoc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/intelliJ/remote-debugging/README.adoc b/intelliJ/remote-debugging/README.adoc
index 808d269dd0..7110a5d7b9 100644
--- a/intelliJ/remote-debugging/README.adoc
+++ b/intelliJ/remote-debugging/README.adoc
@@ -83,6 +83,3 @@ The following guides may also be helpful:
 
 include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/master/footer.adoc[]
 
-### Relevant Articles:
-
-- [Remote Debugging with IntelliJ IDEA](https://www.baeldung.com/intellij-remote-debugging)

From 78a368dbcb122d814672ce5d35a1197e4cb63ed2 Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:34:18 +0800
Subject: [PATCH 046/106] Update README.md

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

diff --git a/testing-modules/mockito-2/README.md b/testing-modules/mockito-2/README.md
index 1d1bd6af7c..d7069949e4 100644
--- a/testing-modules/mockito-2/README.md
+++ b/testing-modules/mockito-2/README.md
@@ -5,3 +5,4 @@
 - [Mockito Strict Stubbing and The UnnecessaryStubbingException](https://www.baeldung.com/mockito-unnecessary-stubbing-exception)
 - [Quick Guide to BDDMockito](https://www.baeldung.com/bdd-mockito)
 - [Mockito – Using Spies](https://www.baeldung.com/mockito-spy)
+- [Mockito and Fluent APIs](https://www.baeldung.com/mockito-fluent-apis)

From 8e6b03af76755ad84f666f9c6409740d9ca57ee7 Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:35:47 +0800
Subject: [PATCH 047/106] Update README.md

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

diff --git a/algorithms-miscellaneous-5/README.md b/algorithms-miscellaneous-5/README.md
index 27ab303210..271765e91d 100644
--- a/algorithms-miscellaneous-5/README.md
+++ b/algorithms-miscellaneous-5/README.md
@@ -10,4 +10,5 @@ This module contains articles about algorithms. Some classes of algorithms, e.g.
 - [Find If Two Numbers Are Relatively Prime in Java](https://www.baeldung.com/java-two-relatively-prime-numbers)
 - [Knapsack Problem Implementation in Java](https://www.baeldung.com/java-knapsack)
 - [How to Determine if a Binary Tree is Balanced](https://www.baeldung.com/java-balanced-binary-tree)
+- [The Caesar Cipher in Java](https://www.baeldung.com/java-caesar-cipher)
 - More articles: [[<-- prev]](/../algorithms-miscellaneous-4)

From 6aedec9f8667f255575f6fccc254c68dc8aec9f8 Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:37:28 +0800
Subject: [PATCH 048/106] Create README.md

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

diff --git a/play-framework/websockets/README.md b/play-framework/websockets/README.md
new file mode 100644
index 0000000000..d056b8f059
--- /dev/null
+++ b/play-framework/websockets/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles:
+
+- [WebSockets with the Play Framework and Akka](https://www.baeldung.com/akka-play-websockets)

From bf1359bda7b01bfc3d57130ca44e0e12f9becfb6 Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:39:19 +0800
Subject: [PATCH 049/106] Update README.md

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

diff --git a/testing-modules/testing-libraries/README.md b/testing-modules/testing-libraries/README.md
index d76b7b1308..e5145d6af8 100644
--- a/testing-modules/testing-libraries/README.md
+++ b/testing-modules/testing-libraries/README.md
@@ -8,5 +8,5 @@
 - [Introduction to Lambda Behave](http://www.baeldung.com/lambda-behave)
 - [Introduction to CheckStyle](https://www.baeldung.com/checkstyle-java)
 - [Introduction to FindBugs](https://www.baeldung.com/intro-to-findbugs)
-
+- [Cucumber Data Tables](https://www.baeldung.com/cucumber-data-tables)
 

From 82013334a54b2c7a1593b5342cc63bb74cc2a372 Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:40:58 +0800
Subject: [PATCH 050/106] Update README.md

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

diff --git a/testing-modules/gatling/README.md b/testing-modules/gatling/README.md
index 941ab75f06..7352479d1b 100644
--- a/testing-modules/gatling/README.md
+++ b/testing-modules/gatling/README.md
@@ -1,5 +1,6 @@
 ### Relevant Articles:
 - [Intro to Gatling](http://www.baeldung.com/introduction-to-gatling)
+- [Run Gatling Tests From Jenkins](https://www.baeldung.com/jenkins-run-gatling-tests)
 
 ### Running a simualtion
 - To run a simulation use "simulation" profile, command - `mvn install -Psimulation -Dgib.enabled=false`

From d1e18e76bb56347a21c3d64713b2ffeb47560ace Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:44:35 +0800
Subject: [PATCH 051/106] Update README.md

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

diff --git a/core-java-modules/core-java-lang-math/README.md b/core-java-modules/core-java-lang-math/README.md
index aec339574b..294df0342e 100644
--- a/core-java-modules/core-java-lang-math/README.md
+++ b/core-java-modules/core-java-lang-math/README.md
@@ -7,3 +7,4 @@
 - [Java 8 Unsigned Arithmetic Support](https://www.baeldung.com/java-unsigned-arithmetic)
 - [How to Separate Double into Integer and Decimal Parts](https://www.baeldung.com/java-separate-double-into-integer-decimal-parts)
 - [The strictfp Keyword in Java](https://www.baeldung.com/java-strictfp)
+- [Basic Calculator in Java](https://www.baeldung.com/java-basic-calculator)

From 488729307200f83e65345d1370a7e3f9b3545dc9 Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:46:41 +0800
Subject: [PATCH 052/106] Update README.md

---
 persistence-modules/hibernate5-2/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/persistence-modules/hibernate5-2/README.md b/persistence-modules/hibernate5-2/README.md
index 0b6be27410..c41b5307d0 100644
--- a/persistence-modules/hibernate5-2/README.md
+++ b/persistence-modules/hibernate5-2/README.md
@@ -5,4 +5,5 @@ This module contains articles about Hibernate 5.
 ### Relevant Articles:
 - [Hibernate Error “Not all named parameters have been set”](https://www.baeldung.com/hibernate-error-named-parameters-not-set)
 - [FetchMode in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-fetchmode)
-- [[<-- Prev]](/hibernate5)
\ No newline at end of file
+- [JPA/Hibernate Persistence Context](https://www.baeldung.com/jpa-hibernate-persistence-context)
+- [[<-- Prev]](/hibernate5)

From 80f1985745c227abc7a72f33c809a21e02be1bd2 Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:48:32 +0800
Subject: [PATCH 053/106] Update README.md

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

diff --git a/spring-cloud/spring-cloud-gateway/README.md b/spring-cloud/spring-cloud-gateway/README.md
index e87bc547e1..d3323947e8 100644
--- a/spring-cloud/spring-cloud-gateway/README.md
+++ b/spring-cloud/spring-cloud-gateway/README.md
@@ -4,3 +4,4 @@ This module contains articles about Spring Cloud Gateway
 
 ### Relevant Articles:
 - [Exploring the new Spring Cloud Gateway](http://www.baeldung.com/spring-cloud-gateway)
+- [Writing Custom Spring Cloud Gateway Filters](https://www.baeldung.com/spring-cloud-custom-gateway-filters)

From 2fe0006c74360a3c3aa40b0d426a378c7fc61a2b Mon Sep 17 00:00:00 2001
From: johnA1331 <53036378+johnA1331@users.noreply.github.com>
Date: Thu, 19 Dec 2019 18:50:32 +0800
Subject: [PATCH 054/106] Update README.md

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

diff --git a/core-java-modules/core-java-lang-math/README.md b/core-java-modules/core-java-lang-math/README.md
index 294df0342e..c72b69fcad 100644
--- a/core-java-modules/core-java-lang-math/README.md
+++ b/core-java-modules/core-java-lang-math/README.md
@@ -8,3 +8,4 @@
 - [How to Separate Double into Integer and Decimal Parts](https://www.baeldung.com/java-separate-double-into-integer-decimal-parts)
 - [The strictfp Keyword in Java](https://www.baeldung.com/java-strictfp)
 - [Basic Calculator in Java](https://www.baeldung.com/java-basic-calculator)
+- [Overflow and Underflow in Java](https://www.baeldung.com/java-overflow-underflow)

From 40d51fea7837e8be21cb8f4a7f5a34411d6916ee Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Thu, 19 Dec 2019 11:55:26 +0100
Subject: [PATCH 055/106] BAEL-19988: Rename org.baeldung package to
 com.baeldung package

---
 .../baeldung/junit5vstestng/SelectPackagesSuiteUnitTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vstestng/SelectPackagesSuiteUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vstestng/SelectPackagesSuiteUnitTest.java
index 8f2eb2b5c5..7378eafaa7 100644
--- a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vstestng/SelectPackagesSuiteUnitTest.java
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vstestng/SelectPackagesSuiteUnitTest.java
@@ -5,7 +5,7 @@ import org.junit.platform.suite.api.SelectPackages;
 import org.junit.runner.RunWith;
 
 @RunWith(JUnitPlatform.class)
-@SelectPackages({ "org.baeldung.java.suite.childpackage1", "org.baeldung.java.suite.childpackage2" })
+@SelectPackages({ "com.baeldung.java.suite.childpackage1", "com.baeldung.java.suite.childpackage2" })
 public class SelectPackagesSuiteUnitTest {
 
 }

From 5c0f7d09f00d1a4ff054fad1dbca537bfd4d1407 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Thu, 19 Dec 2019 11:59:44 +0100
Subject: [PATCH 056/106] BAEL-19988: Migrate easy-random module to the
 com.baeldung package

---
 .../baeldung/easy/random/model/Department.java         |  2 +-
 .../baeldung/easy/random/model/Employee.java           |  2 +-
 .../{org => com}/baeldung/easy/random/model/Grade.java |  2 +-
 .../baeldung/easy/random/model/Person.java             |  2 +-
 .../baeldung/easy/random/model/YearQuarter.java        |  2 +-
 .../easy/random/randomizer/YearQuarterRandomizer.java  |  4 ++--
 .../baeldung/easy/random/EasyRandomUnitTest.java       | 10 +++++-----
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename testing-modules/easy-random/src/main/java/{org => com}/baeldung/easy/random/model/Department.java (90%)
 rename testing-modules/easy-random/src/main/java/{org => com}/baeldung/easy/random/model/Employee.java (97%)
 rename testing-modules/easy-random/src/main/java/{org => com}/baeldung/easy/random/model/Grade.java (90%)
 rename testing-modules/easy-random/src/main/java/{org => com}/baeldung/easy/random/model/Person.java (93%)
 rename testing-modules/easy-random/src/main/java/{org => com}/baeldung/easy/random/model/YearQuarter.java (96%)
 rename testing-modules/easy-random/src/main/java/{org => com}/baeldung/easy/random/randomizer/YearQuarterRandomizer.java (79%)
 rename testing-modules/easy-random/src/test/java/{org => com}/baeldung/easy/random/EasyRandomUnitTest.java (89%)

diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Department.java b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Department.java
similarity index 90%
rename from testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Department.java
rename to testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Department.java
index ee4dc82771..87bff514a0 100644
--- a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Department.java
+++ b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Department.java
@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
 
 import java.util.StringJoiner;
 
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Employee.java b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Employee.java
similarity index 97%
rename from testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Employee.java
rename to testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Employee.java
index ef63642ca2..af44822215 100644
--- a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Employee.java
+++ b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Employee.java
@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
 
 import java.util.*;
 
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Grade.java b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Grade.java
similarity index 90%
rename from testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Grade.java
rename to testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Grade.java
index cb979be3b8..1d18a3f183 100644
--- a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Grade.java
+++ b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Grade.java
@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
 
 import java.util.StringJoiner;
 
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Person.java b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Person.java
similarity index 93%
rename from testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Person.java
rename to testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Person.java
index c941499993..3269af7b0f 100644
--- a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Person.java
+++ b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Person.java
@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
 
 import java.util.StringJoiner;
 
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/YearQuarter.java b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/YearQuarter.java
similarity index 96%
rename from testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/YearQuarter.java
rename to testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/YearQuarter.java
index c2868f09b8..576fe67dd0 100644
--- a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/YearQuarter.java
+++ b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/YearQuarter.java
@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
 
 import java.time.LocalDate;
 import java.util.Objects;
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/randomizer/YearQuarterRandomizer.java b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/randomizer/YearQuarterRandomizer.java
similarity index 79%
rename from testing-modules/easy-random/src/main/java/org/baeldung/easy/random/randomizer/YearQuarterRandomizer.java
rename to testing-modules/easy-random/src/main/java/com/baeldung/easy/random/randomizer/YearQuarterRandomizer.java
index 05232ffcbc..28db724684 100644
--- a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/randomizer/YearQuarterRandomizer.java
+++ b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/randomizer/YearQuarterRandomizer.java
@@ -1,6 +1,6 @@
-package org.baeldung.easy.random.randomizer;
+package com.baeldung.easy.random.randomizer;
 
-import org.baeldung.easy.random.model.YearQuarter;
+import com.baeldung.easy.random.model.YearQuarter;
 import org.jeasy.random.api.Randomizer;
 
 import java.time.LocalDate;
diff --git a/testing-modules/easy-random/src/test/java/org/baeldung/easy/random/EasyRandomUnitTest.java b/testing-modules/easy-random/src/test/java/com/baeldung/easy/random/EasyRandomUnitTest.java
similarity index 89%
rename from testing-modules/easy-random/src/test/java/org/baeldung/easy/random/EasyRandomUnitTest.java
rename to testing-modules/easy-random/src/test/java/com/baeldung/easy/random/EasyRandomUnitTest.java
index 9f7a23db66..4e0df74923 100644
--- a/testing-modules/easy-random/src/test/java/org/baeldung/easy/random/EasyRandomUnitTest.java
+++ b/testing-modules/easy-random/src/test/java/com/baeldung/easy/random/EasyRandomUnitTest.java
@@ -1,9 +1,9 @@
-package org.baeldung.easy.random;
+package com.baeldung.easy.random;
 
-import org.baeldung.easy.random.model.Employee;
-import org.baeldung.easy.random.model.Person;
-import org.baeldung.easy.random.model.YearQuarter;
-import org.baeldung.easy.random.randomizer.YearQuarterRandomizer;
+import com.baeldung.easy.random.model.Employee;
+import com.baeldung.easy.random.model.Person;
+import com.baeldung.easy.random.model.YearQuarter;
+import com.baeldung.easy.random.randomizer.YearQuarterRandomizer;
 import org.jeasy.random.EasyRandom;
 import org.jeasy.random.EasyRandomParameters;
 import org.jeasy.random.FieldPredicates;

From c8f16ee11632f1dd45b1a4378417bb674d274930 Mon Sep 17 00:00:00 2001
From: catalin-burcea <burcea.iulian.catalin@gmail.com>
Date: Thu, 19 Dec 2019 13:34:50 +0200
Subject: [PATCH 057/106] [BAEL-13511] - Create jackson-modules parent for all
 related modules

---
 .../jackson-annotations}/README.md            |  0
 .../jackson-annotations}/pom.xml              | 13 +-----
 .../bidirection/CustomListDeserializer.java   |  0
 .../bidirection/CustomListSerializer.java     |  0
 .../baeldung/jackson/bidirection/Item.java    |  0
 .../jackson/bidirection/ItemWithIdentity.java |  0
 .../jackson/bidirection/ItemWithIgnore.java   |  0
 .../jackson/bidirection/ItemWithRef.java      |  0
 .../bidirection/ItemWithSerializer.java       |  0
 .../jackson/bidirection/ItemWithView.java     |  0
 .../baeldung/jackson/bidirection/User.java    |  0
 .../jackson/bidirection/UserWithIdentity.java |  0
 .../jackson/bidirection/UserWithIgnore.java   |  0
 .../jackson/bidirection/UserWithRef.java      |  0
 .../bidirection/UserWithSerializer.java       |  0
 .../jackson/bidirection/UserWithView.java     |  0
 .../jackson/bidirection/jsonview/Views.java   |  0
 .../com/baeldung/jackson/domain/Person.java   |  0
 .../com/baeldung/jackson/format/User.java     |  0
 .../com/baeldung/jackson/jsonview/Item.java   |  0
 .../jsonview/MyBeanSerializerModifier.java    |  0
 .../jackson/jsonview/UpperCasingWriter.java   |  0
 .../com/baeldung/jackson/jsonview/User.java   |  0
 .../com/baeldung/jackson/jsonview/Views.java  |  0
 .../AdvancedAnnotationsUnitTest.java          |  0
 .../advancedannotations/AppendBeans.java      |  0
 .../IdentityReferenceBeans.java               |  0
 .../advancedannotations/NamingBean.java       |  0
 .../advancedannotations/POJOBuilderBean.java  |  0
 .../PropertyDescriptionBean.java              |  0
 .../advancedannotations/TypeIdBean.java       |  0
 .../TypeIdResolverStructure.java              |  0
 .../JacksonBidirectionRelationUnitTest.java   |  0
 .../jackson/format/JsonFormatUnitTest.java    |  0
 .../jsonview/JacksonJsonViewUnitTest.java     |  0
 .../jackson-conversions-2}/README.md          |  0
 .../jackson-conversions-2}/pom.xml            | 14 +------
 .../jackson/csv/JsonCsvConverter.java         |  0
 .../com/baeldung/jackson/csv/OrderLine.java   |  0
 .../baeldung/jackson/csv/OrderLineForCsv.java |  0
 .../jackson/dynamicobject/Product.java        |  0
 .../dynamicobject/ProductJsonNode.java        |  0
 .../jackson/dynamicobject/ProductMap.java     |  0
 .../jackson/multiplefields/Weather.java       |  0
 .../com/baeldung/jackson/xmlToJson/Color.java |  0
 .../baeldung/jackson/xmlToJson/Flower.java    |  0
 .../java/com/baeldung/jackson/yaml/Order.java |  0
 .../com/baeldung/jackson/yaml/OrderLine.java  |  0
 .../src/main/resources/csv/orderLines.csv     |  0
 .../src/main/resources/csv/orderLines.json    |  0
 .../com/baeldung/jackson/csv/CsvUnitTest.java |  0
 .../DynamicObjectDeserializationUnitTest.java |  0
 ...apMultipleFieldsToSingleFieldUnitTest.java |  0
 .../streaming/StreamingAPIUnitTest.java       |  0
 .../jackson/xmlToJson/XmlToJsonUnitTest.java  |  0
 .../baeldung/jackson/yaml/YamlUnitTest.java   |  0
 .../resources/csv/expectedCsvFromJson.csv     |  0
 .../csv/expectedFormattedCsvFromJson.csv      |  0
 .../resources/csv/expectedJsonFromCsv.json    |  0
 .../deserialize-dynamic-object/embedded.json  |  0
 .../deserialize-dynamic-object/flat.json      |  0
 .../src/test/resources/yaml/orderInput.yaml   |  0
 .../jackson-conversions}/README.md            |  0
 .../jackson-conversions}/pom.xml              | 14 +------
 .../jackson/date/CustomDateDeserializer.java  |  0
 .../jackson/date/CustomDateSerializer.java    |  0
 .../date/CustomDateTimeSerializer.java        |  0
 .../date/CustomLocalDateTimeSerializer.java   |  0
 .../java/com/baeldung/jackson/date/Event.java |  0
 .../jackson/date/EventWithFormat.java         |  0
 .../jackson/date/EventWithJodaTime.java       |  0
 .../jackson/date/EventWithLocalDateTime.java  |  0
 .../jackson/date/EventWithSerializer.java     |  0
 .../jackson/enums/deserialization/City.java   |  0
 .../enums/deserialization/Distance.java       |  0
 .../customdeserializer/City.java              |  0
 .../CustomEnumDeserializer.java               |  0
 .../customdeserializer/Distance.java          |  0
 .../deserialization/jsoncreator/City.java     |  0
 .../deserialization/jsoncreator/Distance.java |  0
 .../deserialization/jsonproperty/City.java    |  0
 .../jsonproperty/Distance.java                |  0
 .../enums/deserialization/jsonvalue/City.java |  0
 .../deserialization/jsonvalue/Distance.java   |  0
 .../jackson/enums/serialization/Distance.java |  0
 .../serialization/DistanceSerializer.java     |  0
 .../enums/withEnum/DistanceEnumSimple.java    |  0
 .../withEnum/DistanceEnumWithJsonFormat.java  |  0
 .../enums/withEnum/DistanceEnumWithValue.java |  0
 .../enums/withEnum/MyDtoWithEnumCustom.java   |  0
 .../withEnum/MyDtoWithEnumJsonFormat.java     |  0
 .../com/baeldung/jackson/field/MyDto.java     |  0
 .../jackson/field/MyDtoAccessLevel.java       |  0
 .../jackson/field/MyDtoWithGetter.java        |  0
 .../jackson/field/MyDtoWithSetter.java        |  0
 .../baeldung/jackson/immutable/Employee.java  |  0
 .../baeldung/jackson/immutable/Person.java    |  0
 .../baeldung/jackson/map/ClassWithAMap.java   |  0
 .../java/com/baeldung/jackson/map/MyPair.java |  0
 .../jackson/map/MyPairDeserializer.java       |  0
 .../jackson/map/MyPairSerializer.java         |  0
 .../com/baeldung/jackson/mapnull/MyDto.java   |  0
 .../mapnull/MyDtoNullKeySerializer.java       |  0
 .../baeldung/jackson/tocollection/MyDto.java  |  0
 .../com/baeldung/jackson/xml/Address.java     |  0
 .../java/com/baeldung/jackson/xml/Person.java |  0
 .../jackson/date/JacksonDateUnitTest.java     |  0
 .../DefaultEnumDeserializationUnitTest.java   |  0
 .../EnumCustomDeserializationUnitTest.java    |  0
 ...serializationUsingJsonCreatorUnitTest.java |  0
 ...erializationUsingJsonPropertyUnitTest.java |  0
 ...DeserializationUsingJsonValueUnitTest.java |  0
 .../JacksonEnumSerializationUnitTest.java     |  0
 .../JacksonSerializationEnumsUnitTest.java    |  0
 .../jackson/field/JacksonFieldUnitTest.java   |  0
 ...mmutableObjectDeserializationUnitTest.java |  0
 .../map/JacksonMapDeserializeUnitTest.java    |  0
 .../map/JacksonMapSerializeUnitTest.java      |  0
 .../mapnull/JacksonMapNullUnitTest.java       |  0
 ...serializeWithNestedPropertiesUnitTest.java |  0
 .../com/baeldung/jackson/nested/Product.java  |  0
 .../jackson/nested/ProductDeserializer.java   |  0
 ...ksonCollectionDeserializationUnitTest.java |  0
 .../tojsonnode/StringToJsonNodeUnitTest.java  |  0
 .../xml/XMLSerializeDeserializeUnitTest.java  |  0
 .../src/test/resources/simple_bean.xml        |  0
 .../jackson-custom-conversions}/README.md     |  0
 .../jackson-custom-conversions}/pom.xml       |  8 +---
 .../File.java                                 |  0
 .../Folder.java                               |  0
 .../FolderBeanSerializerModifier.java         |  0
 .../FolderSerializer.java                     |  0
 ...derSerializerWithCallingOwnSerializer.java |  0
 ...SerializerWithDefaultSerializerStored.java |  0
 ...derSerializerWithInternalObjectMapper.java |  0
 ...olderSerializerWithSerializerProvider.java |  0
 .../deserialization/ActorJackson.java         |  0
 .../com/baeldung/deserialization/Item.java    |  0
 .../deserialization/ItemDeserializer.java     |  0
 .../ItemDeserializerOnClass.java              |  0
 .../deserialization/ItemWithDeserializer.java |  0
 .../com/baeldung/deserialization/Movie.java   |  0
 .../com/baeldung/deserialization/User.java    |  0
 .../java/com/baeldung/serialization/Item.java |  0
 .../serialization/ItemSerializer.java         |  0
 .../serialization/ItemSerializerOnClass.java  |  0
 .../serialization/ItemWithSerializer.java     |  0
 .../java/com/baeldung/serialization/User.java |  0
 .../java/com/baeldung/skipfields/Address.java |  0
 .../java/com/baeldung/skipfields/Hidable.java |  0
 .../skipfields/HidableSerializer.java         |  0
 .../baeldung/skipfields/MyDtoWithFilter.java  |  0
 .../java/com/baeldung/skipfields/Person.java  |  0
 .../CallingDefaultSerializerUnitTest.java     |  0
 .../CustomDeserializationUnitTest.java        |  0
 .../CustomSerializationUnitTest.java          |  0
 .../IgnoreFieldsWithFilterUnitTest.java       |  0
 .../JacksonDynamicIgnoreUnitTest.java         |  0
 .../jackson-exceptions}/README.md             |  0
 .../jackson-exceptions}/pom.xml               | 11 +----
 .../java/com/baeldung/exceptions/User.java    |  0
 .../baeldung/exceptions/UserWithConflict.java |  0
 .../UserWithNoDefaultConstructor.java         |  0
 .../exceptions/UserWithPrivateFields.java     |  0
 .../com/baeldung/exceptions/UserWithRoot.java |  0
 .../java/com/baeldung/exceptions/Zoo.java     |  0
 .../baeldung/exceptions/ZooConfigured.java    |  0
 .../mappingexception/MyDtoNoAccessors.java    |  0
 .../MyDtoNoAccessorsAndFieldVisibility.java   |  0
 .../exceptions/JacksonExceptionsUnitTest.java |  0
 .../JacksonMappingExceptionUnitTest.java      |  0
 .../jackson-simple}/README.md                 |  0
 .../jackson-simple}/pom.xml                   | 12 +-----
 .../jackson/annotation/AliasBean.java         |  0
 .../jackson/annotation/BeanWithCreator.java   |  0
 .../annotation/BeanWithCustomAnnotation.java  |  0
 .../jackson/annotation/BeanWithFilter.java    |  0
 .../jackson/annotation/BeanWithGetter.java    |  0
 .../jackson/annotation/BeanWithIgnore.java    |  0
 .../jackson/annotation/BeanWithInject.java    |  0
 .../jackson/annotation/ExtendableBean.java    |  0
 .../baeldung/jackson/annotation/MyBean.java   |  0
 .../jackson/annotation/PrivateBean.java       |  0
 .../baeldung/jackson/annotation/RawBean.java  |  0
 .../jackson/annotation/UnwrappedUser.java     |  0
 .../annotation/UserWithIgnoreType.java        |  0
 .../com/baeldung/jackson/annotation/Zoo.java  |  0
 .../bidirection/ItemWithIdentity.java         |  0
 .../bidirection/ItemWithIgnore.java           |  0
 .../annotation/bidirection/ItemWithRef.java   |  0
 .../bidirection/UserWithIdentity.java         |  0
 .../bidirection/UserWithIgnore.java           |  0
 .../annotation/bidirection/UserWithRef.java   |  0
 .../date/CustomDateDeserializer.java          |  0
 .../annotation/date/CustomDateSerializer.java |  0
 .../annotation/date/EventWithFormat.java      |  0
 .../annotation/date/EventWithSerializer.java  |  0
 .../ItemDeserializerOnClass.java              |  0
 .../jackson/annotation/dtos/Item.java         |  0
 .../annotation/dtos/ItemWithSerializer.java   |  0
 .../jackson/annotation/dtos/User.java         |  0
 .../dtos/withEnum/DistanceEnumWithValue.java  |  0
 .../annotation/exception/UserWithRoot.java    |  0
 .../exception/UserWithRootNamespace.java      |  0
 .../ignore/MyMixInForIgnoreType.java          |  0
 .../jackson/annotation/jsonview/Item.java     |  0
 .../jackson/annotation/jsonview/Views.java    |  0
 .../serialization/ItemSerializer.java         |  0
 .../serialization/ItemSerializerOnClass.java  |  0
 .../com/baeldung/jackson/ignore/MyDto.java    |  0
 .../jackson/ignore/MyDtoIgnoreField.java      |  0
 .../ignore/MyDtoIgnoreFieldByName.java        |  0
 .../jackson/ignore/MyDtoIgnoreNull.java       |  0
 .../ignore/MyDtoIncludeNonDefault.java        |  0
 .../jackson/ignore/MyDtoWithFilter.java       |  0
 .../jackson/ignore/MyDtoWithSpecialField.java |  0
 .../jackson/ignore/MyMixInForIgnoreType.java  |  0
 .../jackson/ignorenullfields/MyDto.java       |  0
 .../ignorenullfields/MyDtoIgnoreNull.java     |  0
 .../baeldung/jackson/jsonproperty/MyDto.java  |  0
 .../jsonproperty/MyDtoFieldNameChanged.java   |  0
 .../objectmapper/CustomCarDeserializer.java   |  0
 .../objectmapper/CustomCarSerializer.java     |  0
 .../jackson/objectmapper/dto/Car.java         |  0
 .../jackson/objectmapper/dto/Request.java     |  0
 .../jackson/unknownproperties/MyDto.java      |  0
 .../unknownproperties/MyDtoIgnoreType.java    |  0
 .../unknownproperties/MyDtoIgnoreUnknown.java |  0
 .../src/main/resources/logback.xml            |  0
 .../annotation/JacksonAnnotationUnitTest.java |  0
 .../IgnoreFieldsWithFilterUnitTest.java       |  0
 .../JacksonSerializationIgnoreUnitTest.java   |  0
 .../IgnoreNullFieldsUnitTest.java             |  0
 .../jsonproperty/JsonPropertyUnitTest.java    |  0
 .../JavaReadWriteJsonExampleUnitTest.java     |  0
 ...izationDeserializationFeatureUnitTest.java |  0
 .../UnknownPropertiesUnitTest.java            |  0
 .../src/test/resources/json_car.json          |  0
 .../jackson}/README.md                        |  0
 {jackson => jackson-modules/jackson}/pom.xml  | 13 +-----
 .../deserialization/jacksoninject/Person.java |  0
 .../jsonanysetter/Inventory.java              |  0
 .../deserialization/jsondeserialize/Book.java |  0
 .../CustomDateDeserializer.java               |  0
 .../com/baeldung/jackson/domain/Person.java   |  0
 .../baeldung/jackson/inheritance/Event.java   |  0
 .../IgnoranceAnnotationStructure.java         |  0
 .../IgnoranceMixinOrIntrospection.java        |  0
 .../inheritance/ItemIdAddedToUser.java        |  0
 .../inheritance/ItemIdRemovedFromUser.java    |  0
 .../SubTypeConstructorStructure.java          |  0
 .../SubTypeConversionStructure.java           |  0
 .../TypeInfoAnnotatedStructure.java           |  0
 .../inheritance/TypeInfoStructure.java        |  0
 .../jackson/jacksonvsgson/ActorJackson.java   |  0
 .../jacksonvsgson/ActorJacksonSerializer.java |  0
 .../baeldung/jackson/jacksonvsgson/Movie.java |  0
 .../jacksonvsgson/MovieWithNullValue.java     |  0
 .../jackson/node/JsonNodeIterator.java        |  0
 .../jackson/optionalwithjackson/Book.java     |  0
 .../jackson}/src/main/resources/example1.json |  0
 .../jackson}/src/main/resources/example2.json |  0
 .../jackson}/src/main/resources/logback.xml   |  0
 .../com/baeldung/jackson/dtos/Address.java    |  0
 .../java/com/baeldung/jackson/dtos/MyDto.java |  0
 .../com/baeldung/jackson/dtos/Person.java     |  0
 .../java/com/baeldung/jackson/dtos/User.java  |  0
 .../inheritance/IgnoranceUnitTest.java        |  0
 .../ItemIdRemovedFromUserUnitTest.java        |  0
 .../inheritance/SubTypeHandlingUnitTest.java  |  0
 .../TypeInfoInclusionUnitTest.java            |  0
 .../JacksonDeserializeUnitTest.java           |  0
 .../JacksonSerializeUnitTest.java             |  0
 .../jsoncompare/JsonCompareUnitTest.java      |  0
 .../jackson/node/ExampleStructure.java        |  0
 .../node/JsonNodeIteratorUnitTest.java        |  0
 .../com/baeldung/jackson/node/NodeBean.java   |  0
 .../jackson/node/NodeOperationUnitTest.java   |  0
 .../OptionalTypeUnitTest.java                 |  0
 .../sandbox/JacksonPrettyPrintUnitTest.java   |  0
 .../jackson/sandbox/SandboxUnitTest.java      |  0
 .../baeldung/jackson/sandbox/TestElement.java |  0
 .../baeldung/jackson/test/UnitTestSuite.java  |  0
 .../com/baeldung/jackson/try1/IEntity.java    |  0
 .../jackson/try1/RestLoaderRequest.java       |  0
 .../try1/RestLoaderRequestDeserializer.java   |  0
 .../author-jsonpropertyorder-schema.json      |  0
 .../src/test/resources/node_example.json      |  0
 jackson-modules/pom.xml                       | 41 +++++++++++++++++++
 jackson-simple/.gitignore                     | 13 ------
 pom.xml                                       | 16 +-------
 291 files changed, 52 insertions(+), 103 deletions(-)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/README.md (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/pom.xml (76%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/CustomListDeserializer.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/CustomListSerializer.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/Item.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/ItemWithIdentity.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/ItemWithIgnore.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/ItemWithRef.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/ItemWithSerializer.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/ItemWithView.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/User.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/UserWithIdentity.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/UserWithIgnore.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/UserWithRef.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/UserWithSerializer.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/UserWithView.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/bidirection/jsonview/Views.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/domain/Person.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/format/User.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/jsonview/Item.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/jsonview/MyBeanSerializerModifier.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/jsonview/UpperCasingWriter.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/jsonview/User.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/main/java/com/baeldung/jackson/jsonview/Views.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/test/java/com/baeldung/jackson/advancedannotations/AdvancedAnnotationsUnitTest.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/test/java/com/baeldung/jackson/advancedannotations/AppendBeans.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/test/java/com/baeldung/jackson/advancedannotations/IdentityReferenceBeans.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/test/java/com/baeldung/jackson/advancedannotations/NamingBean.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/test/java/com/baeldung/jackson/advancedannotations/POJOBuilderBean.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/test/java/com/baeldung/jackson/advancedannotations/PropertyDescriptionBean.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/test/java/com/baeldung/jackson/advancedannotations/TypeIdBean.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/test/java/com/baeldung/jackson/advancedannotations/TypeIdResolverStructure.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/test/java/com/baeldung/jackson/bidirection/JacksonBidirectionRelationUnitTest.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/test/java/com/baeldung/jackson/format/JsonFormatUnitTest.java (100%)
 rename {jackson-annotations => jackson-modules/jackson-annotations}/src/test/java/com/baeldung/jackson/jsonview/JacksonJsonViewUnitTest.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/README.md (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/pom.xml (77%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/main/java/com/baeldung/jackson/csv/JsonCsvConverter.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/main/java/com/baeldung/jackson/csv/OrderLine.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/main/java/com/baeldung/jackson/csv/OrderLineForCsv.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/main/java/com/baeldung/jackson/dynamicobject/Product.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/main/java/com/baeldung/jackson/dynamicobject/ProductJsonNode.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/main/java/com/baeldung/jackson/dynamicobject/ProductMap.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/main/java/com/baeldung/jackson/multiplefields/Weather.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/main/java/com/baeldung/jackson/xmlToJson/Color.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/main/java/com/baeldung/jackson/xmlToJson/Flower.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/main/java/com/baeldung/jackson/yaml/Order.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/main/java/com/baeldung/jackson/yaml/OrderLine.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/main/resources/csv/orderLines.csv (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/main/resources/csv/orderLines.json (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/test/java/com/baeldung/jackson/csv/CsvUnitTest.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/test/java/com/baeldung/jackson/dynamicobject/DynamicObjectDeserializationUnitTest.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/test/java/com/baeldung/jackson/multiplefields/MapMultipleFieldsToSingleFieldUnitTest.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/test/java/com/baeldung/jackson/streaming/StreamingAPIUnitTest.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/test/java/com/baeldung/jackson/xmlToJson/XmlToJsonUnitTest.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/test/java/com/baeldung/jackson/yaml/YamlUnitTest.java (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/test/resources/csv/expectedCsvFromJson.csv (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/test/resources/csv/expectedFormattedCsvFromJson.csv (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/test/resources/csv/expectedJsonFromCsv.json (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/test/resources/deserialize-dynamic-object/embedded.json (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/test/resources/deserialize-dynamic-object/flat.json (100%)
 rename {jackson-conversions-2 => jackson-modules/jackson-conversions-2}/src/test/resources/yaml/orderInput.yaml (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/README.md (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/pom.xml (69%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/date/CustomDateDeserializer.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/date/CustomDateSerializer.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/date/CustomDateTimeSerializer.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/date/CustomLocalDateTimeSerializer.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/date/Event.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/date/EventWithFormat.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/date/EventWithJodaTime.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/date/EventWithLocalDateTime.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/date/EventWithSerializer.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/deserialization/City.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/deserialization/Distance.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/City.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/CustomEnumDeserializer.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/Distance.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/City.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/Distance.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/City.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/Distance.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/City.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/Distance.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/serialization/Distance.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/serialization/DistanceSerializer.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumSimple.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithJsonFormat.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithValue.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumCustom.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumJsonFormat.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/field/MyDto.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/field/MyDtoAccessLevel.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/field/MyDtoWithGetter.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/field/MyDtoWithSetter.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/immutable/Employee.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/immutable/Person.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/map/ClassWithAMap.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/map/MyPair.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/map/MyPairDeserializer.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/map/MyPairSerializer.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/mapnull/MyDto.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/mapnull/MyDtoNullKeySerializer.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/tocollection/MyDto.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/xml/Address.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/main/java/com/baeldung/jackson/xml/Person.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/date/JacksonDateUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/enums/deserialization/DefaultEnumDeserializationUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/enums/deserialization/customdeserializer/EnumCustomDeserializationUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/enums/deserialization/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/enums/deserialization/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/enums/deserialization/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/enums/serialization/JacksonEnumSerializationUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/enums/serialization/JacksonSerializationEnumsUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/field/JacksonFieldUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/immutable/ImmutableObjectDeserializationUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/map/JacksonMapDeserializeUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/map/JacksonMapSerializeUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/mapnull/JacksonMapNullUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/nested/DeserializeWithNestedPropertiesUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/nested/Product.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/nested/ProductDeserializer.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/tocollection/JacksonCollectionDeserializationUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/tojsonnode/StringToJsonNodeUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java (100%)
 rename {jackson-conversions => jackson-modules/jackson-conversions}/src/test/resources/simple_bean.xml (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/README.md (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/pom.xml (81%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/defaultserializercustomserializer/File.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/defaultserializercustomserializer/Folder.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/defaultserializercustomserializer/FolderBeanSerializerModifier.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializer.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithCallingOwnSerializer.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithDefaultSerializerStored.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithInternalObjectMapper.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithSerializerProvider.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/deserialization/ActorJackson.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/deserialization/Item.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/deserialization/ItemDeserializer.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/deserialization/ItemDeserializerOnClass.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/deserialization/ItemWithDeserializer.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/deserialization/Movie.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/deserialization/User.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/serialization/Item.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/serialization/ItemSerializer.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/serialization/ItemSerializerOnClass.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/serialization/ItemWithSerializer.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/serialization/User.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/skipfields/Address.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/skipfields/Hidable.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/skipfields/HidableSerializer.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/skipfields/MyDtoWithFilter.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/main/java/com/baeldung/skipfields/Person.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/test/java/com/baeldung/defaultserializercustomserializer/CallingDefaultSerializerUnitTest.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/test/java/com/baeldung/deserialization/CustomDeserializationUnitTest.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/test/java/com/baeldung/serialization/CustomSerializationUnitTest.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/test/java/com/baeldung/skipfields/IgnoreFieldsWithFilterUnitTest.java (100%)
 rename {jackson-custom-conversions => jackson-modules/jackson-custom-conversions}/src/test/java/com/baeldung/skipfields/JacksonDynamicIgnoreUnitTest.java (100%)
 rename {jackson-exceptions => jackson-modules/jackson-exceptions}/README.md (100%)
 rename {jackson-exceptions => jackson-modules/jackson-exceptions}/pom.xml (70%)
 rename {jackson-exceptions => jackson-modules/jackson-exceptions}/src/main/java/com/baeldung/exceptions/User.java (100%)
 rename {jackson-exceptions => jackson-modules/jackson-exceptions}/src/main/java/com/baeldung/exceptions/UserWithConflict.java (100%)
 rename {jackson-exceptions => jackson-modules/jackson-exceptions}/src/main/java/com/baeldung/exceptions/UserWithNoDefaultConstructor.java (100%)
 rename {jackson-exceptions => jackson-modules/jackson-exceptions}/src/main/java/com/baeldung/exceptions/UserWithPrivateFields.java (100%)
 rename {jackson-exceptions => jackson-modules/jackson-exceptions}/src/main/java/com/baeldung/exceptions/UserWithRoot.java (100%)
 rename {jackson-exceptions => jackson-modules/jackson-exceptions}/src/main/java/com/baeldung/exceptions/Zoo.java (100%)
 rename {jackson-exceptions => jackson-modules/jackson-exceptions}/src/main/java/com/baeldung/exceptions/ZooConfigured.java (100%)
 rename {jackson-exceptions => jackson-modules/jackson-exceptions}/src/main/java/com/baeldung/mappingexception/MyDtoNoAccessors.java (100%)
 rename {jackson-exceptions => jackson-modules/jackson-exceptions}/src/main/java/com/baeldung/mappingexception/MyDtoNoAccessorsAndFieldVisibility.java (100%)
 rename {jackson-exceptions => jackson-modules/jackson-exceptions}/src/test/java/com/baeldung/exceptions/JacksonExceptionsUnitTest.java (100%)
 rename {jackson-exceptions => jackson-modules/jackson-exceptions}/src/test/java/com/baeldung/mappingexception/JacksonMappingExceptionUnitTest.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/README.md (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/pom.xml (75%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/AliasBean.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/BeanWithCreator.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/BeanWithCustomAnnotation.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/BeanWithFilter.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/BeanWithGetter.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/BeanWithIgnore.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/BeanWithInject.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/ExtendableBean.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/MyBean.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/PrivateBean.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/RawBean.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/UnwrappedUser.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/UserWithIgnoreType.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/Zoo.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIdentity.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIgnore.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithRef.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIdentity.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIgnore.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithRef.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/date/CustomDateDeserializer.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/date/CustomDateSerializer.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/date/EventWithFormat.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/date/EventWithSerializer.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/deserialization/ItemDeserializerOnClass.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/dtos/Item.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/dtos/ItemWithSerializer.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/dtos/User.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/dtos/withEnum/DistanceEnumWithValue.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRoot.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRootNamespace.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/ignore/MyMixInForIgnoreType.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/jsonview/Item.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/jsonview/Views.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializer.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializerOnClass.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDto.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreField.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreFieldByName.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreNull.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDtoIncludeNonDefault.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDtoWithFilter.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDtoWithSpecialField.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyMixInForIgnoreType.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/ignorenullfields/MyDto.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/ignorenullfields/MyDtoIgnoreNull.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/jsonproperty/MyDto.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/jsonproperty/MyDtoFieldNameChanged.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/objectmapper/dto/Car.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/objectmapper/dto/Request.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/unknownproperties/MyDto.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreType.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreUnknown.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/main/resources/logback.xml (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/test/java/com/baeldung/jackson/ignore/IgnoreFieldsWithFilterUnitTest.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/test/java/com/baeldung/jackson/ignorenullfields/IgnoreNullFieldsUnitTest.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/test/java/com/baeldung/jackson/jsonproperty/JsonPropertyUnitTest.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/test/java/com/baeldung/jackson/unknownproperties/UnknownPropertiesUnitTest.java (100%)
 rename {jackson-simple => jackson-modules/jackson-simple}/src/test/resources/json_car.json (100%)
 rename {jackson => jackson-modules/jackson}/README.md (100%)
 rename {jackson => jackson-modules/jackson}/pom.xml (86%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/deserialization/jacksoninject/Person.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/deserialization/jsonanysetter/Inventory.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/deserialization/jsondeserialize/Book.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/deserialization/jsondeserialize/CustomDateDeserializer.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/domain/Person.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/inheritance/Event.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/inheritance/IgnoranceAnnotationStructure.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/inheritance/IgnoranceMixinOrIntrospection.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/inheritance/ItemIdAddedToUser.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUser.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/inheritance/SubTypeConstructorStructure.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/inheritance/SubTypeConversionStructure.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/inheritance/TypeInfoAnnotatedStructure.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/inheritance/TypeInfoStructure.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/jacksonvsgson/ActorJackson.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/jacksonvsgson/ActorJacksonSerializer.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/jacksonvsgson/Movie.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/jacksonvsgson/MovieWithNullValue.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/node/JsonNodeIterator.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/java/com/baeldung/jackson/optionalwithjackson/Book.java (100%)
 rename {jackson => jackson-modules/jackson}/src/main/resources/example1.json (100%)
 rename {jackson => jackson-modules/jackson}/src/main/resources/example2.json (100%)
 rename {jackson => jackson-modules/jackson}/src/main/resources/logback.xml (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/dtos/Address.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/dtos/MyDto.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/dtos/Person.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/dtos/User.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/inheritance/IgnoranceUnitTest.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUserUnitTest.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/inheritance/SubTypeHandlingUnitTest.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/inheritance/TypeInfoInclusionUnitTest.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/jacksonvsgson/JacksonDeserializeUnitTest.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/jacksonvsgson/JacksonSerializeUnitTest.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/jsoncompare/JsonCompareUnitTest.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/node/ExampleStructure.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/node/JsonNodeIteratorUnitTest.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/node/NodeBean.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/node/NodeOperationUnitTest.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/optionalwithjackson/OptionalTypeUnitTest.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/sandbox/JacksonPrettyPrintUnitTest.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/sandbox/SandboxUnitTest.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/sandbox/TestElement.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/test/UnitTestSuite.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/try1/IEntity.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/try1/RestLoaderRequest.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/java/com/baeldung/jackson/try1/RestLoaderRequestDeserializer.java (100%)
 rename {jackson => jackson-modules/jackson}/src/test/resources/author-jsonpropertyorder-schema.json (100%)
 rename {jackson => jackson-modules/jackson}/src/test/resources/node_example.json (100%)
 create mode 100644 jackson-modules/pom.xml
 delete mode 100644 jackson-simple/.gitignore

diff --git a/jackson-annotations/README.md b/jackson-modules/jackson-annotations/README.md
similarity index 100%
rename from jackson-annotations/README.md
rename to jackson-modules/jackson-annotations/README.md
diff --git a/jackson-annotations/pom.xml b/jackson-modules/jackson-annotations/pom.xml
similarity index 76%
rename from jackson-annotations/pom.xml
rename to jackson-modules/jackson-annotations/pom.xml
index a259d895da..e4a41a5825 100644
--- a/jackson-annotations/pom.xml
+++ b/jackson-modules/jackson-annotations/pom.xml
@@ -8,22 +8,11 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
+        <artifactId>jackson-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-jsonSchema</artifactId>
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/CustomListDeserializer.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/CustomListDeserializer.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/CustomListDeserializer.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/CustomListDeserializer.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/CustomListSerializer.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/CustomListSerializer.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/CustomListSerializer.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/CustomListSerializer.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/Item.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/Item.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/Item.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/Item.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithIdentity.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithIdentity.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithIdentity.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithIdentity.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithIgnore.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithIgnore.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithIgnore.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithIgnore.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithRef.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithRef.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithRef.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithRef.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithSerializer.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithSerializer.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithSerializer.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithSerializer.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithView.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithView.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithView.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/ItemWithView.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/User.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/User.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/User.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/User.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithIdentity.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithIdentity.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithIdentity.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithIdentity.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithIgnore.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithIgnore.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithIgnore.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithIgnore.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithRef.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithRef.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithRef.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithRef.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithSerializer.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithSerializer.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithSerializer.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithSerializer.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithView.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithView.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithView.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/UserWithView.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/jsonview/Views.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/jsonview/Views.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/jsonview/Views.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/bidirection/jsonview/Views.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/domain/Person.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/domain/Person.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/domain/Person.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/domain/Person.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/format/User.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/format/User.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/format/User.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/format/User.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/Item.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/Item.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/Item.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/Item.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/MyBeanSerializerModifier.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/MyBeanSerializerModifier.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/MyBeanSerializerModifier.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/MyBeanSerializerModifier.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/UpperCasingWriter.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/UpperCasingWriter.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/UpperCasingWriter.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/UpperCasingWriter.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/User.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/User.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/User.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/User.java
diff --git a/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/Views.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/Views.java
similarity index 100%
rename from jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/Views.java
rename to jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/jsonview/Views.java
diff --git a/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/AdvancedAnnotationsUnitTest.java b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/AdvancedAnnotationsUnitTest.java
similarity index 100%
rename from jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/AdvancedAnnotationsUnitTest.java
rename to jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/AdvancedAnnotationsUnitTest.java
diff --git a/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/AppendBeans.java b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/AppendBeans.java
similarity index 100%
rename from jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/AppendBeans.java
rename to jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/AppendBeans.java
diff --git a/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/IdentityReferenceBeans.java b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/IdentityReferenceBeans.java
similarity index 100%
rename from jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/IdentityReferenceBeans.java
rename to jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/IdentityReferenceBeans.java
diff --git a/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/NamingBean.java b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/NamingBean.java
similarity index 100%
rename from jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/NamingBean.java
rename to jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/NamingBean.java
diff --git a/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/POJOBuilderBean.java b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/POJOBuilderBean.java
similarity index 100%
rename from jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/POJOBuilderBean.java
rename to jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/POJOBuilderBean.java
diff --git a/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/PropertyDescriptionBean.java b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/PropertyDescriptionBean.java
similarity index 100%
rename from jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/PropertyDescriptionBean.java
rename to jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/PropertyDescriptionBean.java
diff --git a/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/TypeIdBean.java b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/TypeIdBean.java
similarity index 100%
rename from jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/TypeIdBean.java
rename to jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/TypeIdBean.java
diff --git a/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/TypeIdResolverStructure.java b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/TypeIdResolverStructure.java
similarity index 100%
rename from jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/TypeIdResolverStructure.java
rename to jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/TypeIdResolverStructure.java
diff --git a/jackson-annotations/src/test/java/com/baeldung/jackson/bidirection/JacksonBidirectionRelationUnitTest.java b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/bidirection/JacksonBidirectionRelationUnitTest.java
similarity index 100%
rename from jackson-annotations/src/test/java/com/baeldung/jackson/bidirection/JacksonBidirectionRelationUnitTest.java
rename to jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/bidirection/JacksonBidirectionRelationUnitTest.java
diff --git a/jackson-annotations/src/test/java/com/baeldung/jackson/format/JsonFormatUnitTest.java b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/format/JsonFormatUnitTest.java
similarity index 100%
rename from jackson-annotations/src/test/java/com/baeldung/jackson/format/JsonFormatUnitTest.java
rename to jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/format/JsonFormatUnitTest.java
diff --git a/jackson-annotations/src/test/java/com/baeldung/jackson/jsonview/JacksonJsonViewUnitTest.java b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/jsonview/JacksonJsonViewUnitTest.java
similarity index 100%
rename from jackson-annotations/src/test/java/com/baeldung/jackson/jsonview/JacksonJsonViewUnitTest.java
rename to jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/jsonview/JacksonJsonViewUnitTest.java
diff --git a/jackson-conversions-2/README.md b/jackson-modules/jackson-conversions-2/README.md
similarity index 100%
rename from jackson-conversions-2/README.md
rename to jackson-modules/jackson-conversions-2/README.md
diff --git a/jackson-conversions-2/pom.xml b/jackson-modules/jackson-conversions-2/pom.xml
similarity index 77%
rename from jackson-conversions-2/pom.xml
rename to jackson-modules/jackson-conversions-2/pom.xml
index 732c89c1e5..43c9d1478b 100644
--- a/jackson-conversions-2/pom.xml
+++ b/jackson-modules/jackson-conversions-2/pom.xml
@@ -8,23 +8,11 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
+        <artifactId>jackson-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <!--jackson for xml -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
         <!-- YAML -->
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
diff --git a/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/JsonCsvConverter.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/JsonCsvConverter.java
similarity index 100%
rename from jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/JsonCsvConverter.java
rename to jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/JsonCsvConverter.java
diff --git a/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLine.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLine.java
similarity index 100%
rename from jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLine.java
rename to jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLine.java
diff --git a/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLineForCsv.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLineForCsv.java
similarity index 100%
rename from jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLineForCsv.java
rename to jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLineForCsv.java
diff --git a/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/Product.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/Product.java
similarity index 100%
rename from jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/Product.java
rename to jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/Product.java
diff --git a/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductJsonNode.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductJsonNode.java
similarity index 100%
rename from jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductJsonNode.java
rename to jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductJsonNode.java
diff --git a/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductMap.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductMap.java
similarity index 100%
rename from jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductMap.java
rename to jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductMap.java
diff --git a/jackson-conversions-2/src/main/java/com/baeldung/jackson/multiplefields/Weather.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/multiplefields/Weather.java
similarity index 100%
rename from jackson-conversions-2/src/main/java/com/baeldung/jackson/multiplefields/Weather.java
rename to jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/multiplefields/Weather.java
diff --git a/jackson-conversions-2/src/main/java/com/baeldung/jackson/xmlToJson/Color.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/xmlToJson/Color.java
similarity index 100%
rename from jackson-conversions-2/src/main/java/com/baeldung/jackson/xmlToJson/Color.java
rename to jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/xmlToJson/Color.java
diff --git a/jackson-conversions-2/src/main/java/com/baeldung/jackson/xmlToJson/Flower.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/xmlToJson/Flower.java
similarity index 100%
rename from jackson-conversions-2/src/main/java/com/baeldung/jackson/xmlToJson/Flower.java
rename to jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/xmlToJson/Flower.java
diff --git a/jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/Order.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/Order.java
similarity index 100%
rename from jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/Order.java
rename to jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/Order.java
diff --git a/jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/OrderLine.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/OrderLine.java
similarity index 100%
rename from jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/OrderLine.java
rename to jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/OrderLine.java
diff --git a/jackson-conversions-2/src/main/resources/csv/orderLines.csv b/jackson-modules/jackson-conversions-2/src/main/resources/csv/orderLines.csv
similarity index 100%
rename from jackson-conversions-2/src/main/resources/csv/orderLines.csv
rename to jackson-modules/jackson-conversions-2/src/main/resources/csv/orderLines.csv
diff --git a/jackson-conversions-2/src/main/resources/csv/orderLines.json b/jackson-modules/jackson-conversions-2/src/main/resources/csv/orderLines.json
similarity index 100%
rename from jackson-conversions-2/src/main/resources/csv/orderLines.json
rename to jackson-modules/jackson-conversions-2/src/main/resources/csv/orderLines.json
diff --git a/jackson-conversions-2/src/test/java/com/baeldung/jackson/csv/CsvUnitTest.java b/jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/csv/CsvUnitTest.java
similarity index 100%
rename from jackson-conversions-2/src/test/java/com/baeldung/jackson/csv/CsvUnitTest.java
rename to jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/csv/CsvUnitTest.java
diff --git a/jackson-conversions-2/src/test/java/com/baeldung/jackson/dynamicobject/DynamicObjectDeserializationUnitTest.java b/jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/dynamicobject/DynamicObjectDeserializationUnitTest.java
similarity index 100%
rename from jackson-conversions-2/src/test/java/com/baeldung/jackson/dynamicobject/DynamicObjectDeserializationUnitTest.java
rename to jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/dynamicobject/DynamicObjectDeserializationUnitTest.java
diff --git a/jackson-conversions-2/src/test/java/com/baeldung/jackson/multiplefields/MapMultipleFieldsToSingleFieldUnitTest.java b/jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/multiplefields/MapMultipleFieldsToSingleFieldUnitTest.java
similarity index 100%
rename from jackson-conversions-2/src/test/java/com/baeldung/jackson/multiplefields/MapMultipleFieldsToSingleFieldUnitTest.java
rename to jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/multiplefields/MapMultipleFieldsToSingleFieldUnitTest.java
diff --git a/jackson-conversions-2/src/test/java/com/baeldung/jackson/streaming/StreamingAPIUnitTest.java b/jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/streaming/StreamingAPIUnitTest.java
similarity index 100%
rename from jackson-conversions-2/src/test/java/com/baeldung/jackson/streaming/StreamingAPIUnitTest.java
rename to jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/streaming/StreamingAPIUnitTest.java
diff --git a/jackson-conversions-2/src/test/java/com/baeldung/jackson/xmlToJson/XmlToJsonUnitTest.java b/jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/xmlToJson/XmlToJsonUnitTest.java
similarity index 100%
rename from jackson-conversions-2/src/test/java/com/baeldung/jackson/xmlToJson/XmlToJsonUnitTest.java
rename to jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/xmlToJson/XmlToJsonUnitTest.java
diff --git a/jackson-conversions-2/src/test/java/com/baeldung/jackson/yaml/YamlUnitTest.java b/jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/yaml/YamlUnitTest.java
similarity index 100%
rename from jackson-conversions-2/src/test/java/com/baeldung/jackson/yaml/YamlUnitTest.java
rename to jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/yaml/YamlUnitTest.java
diff --git a/jackson-conversions-2/src/test/resources/csv/expectedCsvFromJson.csv b/jackson-modules/jackson-conversions-2/src/test/resources/csv/expectedCsvFromJson.csv
similarity index 100%
rename from jackson-conversions-2/src/test/resources/csv/expectedCsvFromJson.csv
rename to jackson-modules/jackson-conversions-2/src/test/resources/csv/expectedCsvFromJson.csv
diff --git a/jackson-conversions-2/src/test/resources/csv/expectedFormattedCsvFromJson.csv b/jackson-modules/jackson-conversions-2/src/test/resources/csv/expectedFormattedCsvFromJson.csv
similarity index 100%
rename from jackson-conversions-2/src/test/resources/csv/expectedFormattedCsvFromJson.csv
rename to jackson-modules/jackson-conversions-2/src/test/resources/csv/expectedFormattedCsvFromJson.csv
diff --git a/jackson-conversions-2/src/test/resources/csv/expectedJsonFromCsv.json b/jackson-modules/jackson-conversions-2/src/test/resources/csv/expectedJsonFromCsv.json
similarity index 100%
rename from jackson-conversions-2/src/test/resources/csv/expectedJsonFromCsv.json
rename to jackson-modules/jackson-conversions-2/src/test/resources/csv/expectedJsonFromCsv.json
diff --git a/jackson-conversions-2/src/test/resources/deserialize-dynamic-object/embedded.json b/jackson-modules/jackson-conversions-2/src/test/resources/deserialize-dynamic-object/embedded.json
similarity index 100%
rename from jackson-conversions-2/src/test/resources/deserialize-dynamic-object/embedded.json
rename to jackson-modules/jackson-conversions-2/src/test/resources/deserialize-dynamic-object/embedded.json
diff --git a/jackson-conversions-2/src/test/resources/deserialize-dynamic-object/flat.json b/jackson-modules/jackson-conversions-2/src/test/resources/deserialize-dynamic-object/flat.json
similarity index 100%
rename from jackson-conversions-2/src/test/resources/deserialize-dynamic-object/flat.json
rename to jackson-modules/jackson-conversions-2/src/test/resources/deserialize-dynamic-object/flat.json
diff --git a/jackson-conversions-2/src/test/resources/yaml/orderInput.yaml b/jackson-modules/jackson-conversions-2/src/test/resources/yaml/orderInput.yaml
similarity index 100%
rename from jackson-conversions-2/src/test/resources/yaml/orderInput.yaml
rename to jackson-modules/jackson-conversions-2/src/test/resources/yaml/orderInput.yaml
diff --git a/jackson-conversions/README.md b/jackson-modules/jackson-conversions/README.md
similarity index 100%
rename from jackson-conversions/README.md
rename to jackson-modules/jackson-conversions/README.md
diff --git a/jackson-conversions/pom.xml b/jackson-modules/jackson-conversions/pom.xml
similarity index 69%
rename from jackson-conversions/pom.xml
rename to jackson-modules/jackson-conversions/pom.xml
index c45d88bedd..fafb731cc9 100644
--- a/jackson-conversions/pom.xml
+++ b/jackson-modules/jackson-conversions/pom.xml
@@ -8,17 +8,11 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
+        <artifactId>jackson-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>
@@ -29,12 +23,6 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
             <version>${jackson.version}</version>
         </dependency>
-        <!--jackson for xml -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateDeserializer.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateDeserializer.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateDeserializer.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateDeserializer.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateSerializer.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateSerializer.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateSerializer.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateSerializer.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateTimeSerializer.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateTimeSerializer.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateTimeSerializer.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateTimeSerializer.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomLocalDateTimeSerializer.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomLocalDateTimeSerializer.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomLocalDateTimeSerializer.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomLocalDateTimeSerializer.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/date/Event.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/Event.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/date/Event.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/Event.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithFormat.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithFormat.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithFormat.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithFormat.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithJodaTime.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithJodaTime.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithJodaTime.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithJodaTime.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithLocalDateTime.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithLocalDateTime.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithLocalDateTime.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithLocalDateTime.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithSerializer.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithSerializer.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithSerializer.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithSerializer.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/City.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/City.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/City.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/City.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/Distance.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/Distance.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/Distance.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/Distance.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/City.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/City.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/City.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/City.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/CustomEnumDeserializer.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/CustomEnumDeserializer.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/CustomEnumDeserializer.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/CustomEnumDeserializer.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/Distance.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/Distance.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/Distance.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/Distance.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/City.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/City.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/City.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/City.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/Distance.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/Distance.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/Distance.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/Distance.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/City.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/City.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/City.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/City.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/Distance.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/Distance.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/Distance.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/Distance.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/City.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/City.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/City.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/City.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/Distance.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/Distance.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/Distance.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/Distance.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/Distance.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/Distance.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/Distance.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/Distance.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/DistanceSerializer.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/DistanceSerializer.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/DistanceSerializer.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/DistanceSerializer.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumSimple.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumSimple.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumSimple.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumSimple.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithJsonFormat.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithJsonFormat.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithJsonFormat.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithJsonFormat.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithValue.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithValue.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithValue.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithValue.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumCustom.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumCustom.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumCustom.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumCustom.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumJsonFormat.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumJsonFormat.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumJsonFormat.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumJsonFormat.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDto.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDto.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDto.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDto.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoAccessLevel.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoAccessLevel.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoAccessLevel.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoAccessLevel.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoWithGetter.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoWithGetter.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoWithGetter.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoWithGetter.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoWithSetter.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoWithSetter.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoWithSetter.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoWithSetter.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Employee.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Employee.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Employee.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Employee.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Person.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Person.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Person.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Person.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/map/ClassWithAMap.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/map/ClassWithAMap.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/map/ClassWithAMap.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/map/ClassWithAMap.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPair.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPair.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPair.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPair.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairDeserializer.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairDeserializer.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairDeserializer.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairDeserializer.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairSerializer.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairSerializer.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairSerializer.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairSerializer.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDto.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDto.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDto.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDto.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDtoNullKeySerializer.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDtoNullKeySerializer.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDtoNullKeySerializer.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDtoNullKeySerializer.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/tocollection/MyDto.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/tocollection/MyDto.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/tocollection/MyDto.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/tocollection/MyDto.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/xml/Address.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/xml/Address.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/xml/Address.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/xml/Address.java
diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/xml/Person.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/xml/Person.java
similarity index 100%
rename from jackson-conversions/src/main/java/com/baeldung/jackson/xml/Person.java
rename to jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/xml/Person.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/date/JacksonDateUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/date/JacksonDateUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/date/JacksonDateUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/date/JacksonDateUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/DefaultEnumDeserializationUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/DefaultEnumDeserializationUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/DefaultEnumDeserializationUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/DefaultEnumDeserializationUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/customdeserializer/EnumCustomDeserializationUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/customdeserializer/EnumCustomDeserializationUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/customdeserializer/EnumCustomDeserializationUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/customdeserializer/EnumCustomDeserializationUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonEnumSerializationUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonEnumSerializationUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonEnumSerializationUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonEnumSerializationUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonSerializationEnumsUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonSerializationEnumsUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonSerializationEnumsUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonSerializationEnumsUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/field/JacksonFieldUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/field/JacksonFieldUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/field/JacksonFieldUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/field/JacksonFieldUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/immutable/ImmutableObjectDeserializationUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/immutable/ImmutableObjectDeserializationUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/immutable/ImmutableObjectDeserializationUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/immutable/ImmutableObjectDeserializationUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapDeserializeUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapDeserializeUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapDeserializeUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapDeserializeUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapSerializeUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapSerializeUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapSerializeUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapSerializeUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/mapnull/JacksonMapNullUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/mapnull/JacksonMapNullUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/mapnull/JacksonMapNullUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/mapnull/JacksonMapNullUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/nested/DeserializeWithNestedPropertiesUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/nested/DeserializeWithNestedPropertiesUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/nested/DeserializeWithNestedPropertiesUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/nested/DeserializeWithNestedPropertiesUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/nested/Product.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/nested/Product.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/nested/Product.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/nested/Product.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/nested/ProductDeserializer.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/nested/ProductDeserializer.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/nested/ProductDeserializer.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/nested/ProductDeserializer.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/tocollection/JacksonCollectionDeserializationUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/tocollection/JacksonCollectionDeserializationUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/tocollection/JacksonCollectionDeserializationUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/tocollection/JacksonCollectionDeserializationUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/tojsonnode/StringToJsonNodeUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/tojsonnode/StringToJsonNodeUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/tojsonnode/StringToJsonNodeUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/tojsonnode/StringToJsonNodeUnitTest.java
diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java
similarity index 100%
rename from jackson-conversions/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java
rename to jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java
diff --git a/jackson-conversions/src/test/resources/simple_bean.xml b/jackson-modules/jackson-conversions/src/test/resources/simple_bean.xml
similarity index 100%
rename from jackson-conversions/src/test/resources/simple_bean.xml
rename to jackson-modules/jackson-conversions/src/test/resources/simple_bean.xml
diff --git a/jackson-custom-conversions/README.md b/jackson-modules/jackson-custom-conversions/README.md
similarity index 100%
rename from jackson-custom-conversions/README.md
rename to jackson-modules/jackson-custom-conversions/README.md
diff --git a/jackson-custom-conversions/pom.xml b/jackson-modules/jackson-custom-conversions/pom.xml
similarity index 81%
rename from jackson-custom-conversions/pom.xml
rename to jackson-modules/jackson-custom-conversions/pom.xml
index 68c785e972..c319891da9 100644
--- a/jackson-custom-conversions/pom.xml
+++ b/jackson-modules/jackson-custom-conversions/pom.xml
@@ -8,17 +8,11 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
+        <artifactId>jackson-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/File.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/File.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/File.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/File.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/Folder.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/Folder.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/Folder.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/Folder.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderBeanSerializerModifier.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderBeanSerializerModifier.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderBeanSerializerModifier.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderBeanSerializerModifier.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializer.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializer.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializer.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializer.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithCallingOwnSerializer.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithCallingOwnSerializer.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithCallingOwnSerializer.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithCallingOwnSerializer.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithDefaultSerializerStored.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithDefaultSerializerStored.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithDefaultSerializerStored.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithDefaultSerializerStored.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithInternalObjectMapper.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithInternalObjectMapper.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithInternalObjectMapper.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithInternalObjectMapper.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithSerializerProvider.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithSerializerProvider.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithSerializerProvider.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/defaultserializercustomserializer/FolderSerializerWithSerializerProvider.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ActorJackson.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ActorJackson.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ActorJackson.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ActorJackson.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/Item.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/Item.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/deserialization/Item.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/Item.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ItemDeserializer.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ItemDeserializer.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ItemDeserializer.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ItemDeserializer.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ItemDeserializerOnClass.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ItemDeserializerOnClass.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ItemDeserializerOnClass.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ItemDeserializerOnClass.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ItemWithDeserializer.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ItemWithDeserializer.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ItemWithDeserializer.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/ItemWithDeserializer.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/Movie.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/Movie.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/deserialization/Movie.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/Movie.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/User.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/User.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/deserialization/User.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/deserialization/User.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/serialization/Item.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/serialization/Item.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/serialization/Item.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/serialization/Item.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/serialization/ItemSerializer.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/serialization/ItemSerializer.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/serialization/ItemSerializer.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/serialization/ItemSerializer.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/serialization/ItemSerializerOnClass.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/serialization/ItemSerializerOnClass.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/serialization/ItemSerializerOnClass.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/serialization/ItemSerializerOnClass.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/serialization/ItemWithSerializer.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/serialization/ItemWithSerializer.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/serialization/ItemWithSerializer.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/serialization/ItemWithSerializer.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/serialization/User.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/serialization/User.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/serialization/User.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/serialization/User.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/Address.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/Address.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/skipfields/Address.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/Address.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/Hidable.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/Hidable.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/skipfields/Hidable.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/Hidable.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/HidableSerializer.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/HidableSerializer.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/skipfields/HidableSerializer.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/HidableSerializer.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/MyDtoWithFilter.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/MyDtoWithFilter.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/skipfields/MyDtoWithFilter.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/MyDtoWithFilter.java
diff --git a/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/Person.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/Person.java
similarity index 100%
rename from jackson-custom-conversions/src/main/java/com/baeldung/skipfields/Person.java
rename to jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/skipfields/Person.java
diff --git a/jackson-custom-conversions/src/test/java/com/baeldung/defaultserializercustomserializer/CallingDefaultSerializerUnitTest.java b/jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/defaultserializercustomserializer/CallingDefaultSerializerUnitTest.java
similarity index 100%
rename from jackson-custom-conversions/src/test/java/com/baeldung/defaultserializercustomserializer/CallingDefaultSerializerUnitTest.java
rename to jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/defaultserializercustomserializer/CallingDefaultSerializerUnitTest.java
diff --git a/jackson-custom-conversions/src/test/java/com/baeldung/deserialization/CustomDeserializationUnitTest.java b/jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/deserialization/CustomDeserializationUnitTest.java
similarity index 100%
rename from jackson-custom-conversions/src/test/java/com/baeldung/deserialization/CustomDeserializationUnitTest.java
rename to jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/deserialization/CustomDeserializationUnitTest.java
diff --git a/jackson-custom-conversions/src/test/java/com/baeldung/serialization/CustomSerializationUnitTest.java b/jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/serialization/CustomSerializationUnitTest.java
similarity index 100%
rename from jackson-custom-conversions/src/test/java/com/baeldung/serialization/CustomSerializationUnitTest.java
rename to jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/serialization/CustomSerializationUnitTest.java
diff --git a/jackson-custom-conversions/src/test/java/com/baeldung/skipfields/IgnoreFieldsWithFilterUnitTest.java b/jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/skipfields/IgnoreFieldsWithFilterUnitTest.java
similarity index 100%
rename from jackson-custom-conversions/src/test/java/com/baeldung/skipfields/IgnoreFieldsWithFilterUnitTest.java
rename to jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/skipfields/IgnoreFieldsWithFilterUnitTest.java
diff --git a/jackson-custom-conversions/src/test/java/com/baeldung/skipfields/JacksonDynamicIgnoreUnitTest.java b/jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/skipfields/JacksonDynamicIgnoreUnitTest.java
similarity index 100%
rename from jackson-custom-conversions/src/test/java/com/baeldung/skipfields/JacksonDynamicIgnoreUnitTest.java
rename to jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/skipfields/JacksonDynamicIgnoreUnitTest.java
diff --git a/jackson-exceptions/README.md b/jackson-modules/jackson-exceptions/README.md
similarity index 100%
rename from jackson-exceptions/README.md
rename to jackson-modules/jackson-exceptions/README.md
diff --git a/jackson-exceptions/pom.xml b/jackson-modules/jackson-exceptions/pom.xml
similarity index 70%
rename from jackson-exceptions/pom.xml
rename to jackson-modules/jackson-exceptions/pom.xml
index 3cf4796fa7..1a52892523 100644
--- a/jackson-exceptions/pom.xml
+++ b/jackson-modules/jackson-exceptions/pom.xml
@@ -8,19 +8,10 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
+        <artifactId>jackson-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
     </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <finalName>jackson-exceptions</finalName>
         <resources>
diff --git a/jackson-exceptions/src/main/java/com/baeldung/exceptions/User.java b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/User.java
similarity index 100%
rename from jackson-exceptions/src/main/java/com/baeldung/exceptions/User.java
rename to jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/User.java
diff --git a/jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithConflict.java b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithConflict.java
similarity index 100%
rename from jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithConflict.java
rename to jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithConflict.java
diff --git a/jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithNoDefaultConstructor.java b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithNoDefaultConstructor.java
similarity index 100%
rename from jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithNoDefaultConstructor.java
rename to jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithNoDefaultConstructor.java
diff --git a/jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithPrivateFields.java b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithPrivateFields.java
similarity index 100%
rename from jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithPrivateFields.java
rename to jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithPrivateFields.java
diff --git a/jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithRoot.java b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithRoot.java
similarity index 100%
rename from jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithRoot.java
rename to jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/UserWithRoot.java
diff --git a/jackson-exceptions/src/main/java/com/baeldung/exceptions/Zoo.java b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/Zoo.java
similarity index 100%
rename from jackson-exceptions/src/main/java/com/baeldung/exceptions/Zoo.java
rename to jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/Zoo.java
diff --git a/jackson-exceptions/src/main/java/com/baeldung/exceptions/ZooConfigured.java b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/ZooConfigured.java
similarity index 100%
rename from jackson-exceptions/src/main/java/com/baeldung/exceptions/ZooConfigured.java
rename to jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/ZooConfigured.java
diff --git a/jackson-exceptions/src/main/java/com/baeldung/mappingexception/MyDtoNoAccessors.java b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/mappingexception/MyDtoNoAccessors.java
similarity index 100%
rename from jackson-exceptions/src/main/java/com/baeldung/mappingexception/MyDtoNoAccessors.java
rename to jackson-modules/jackson-exceptions/src/main/java/com/baeldung/mappingexception/MyDtoNoAccessors.java
diff --git a/jackson-exceptions/src/main/java/com/baeldung/mappingexception/MyDtoNoAccessorsAndFieldVisibility.java b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/mappingexception/MyDtoNoAccessorsAndFieldVisibility.java
similarity index 100%
rename from jackson-exceptions/src/main/java/com/baeldung/mappingexception/MyDtoNoAccessorsAndFieldVisibility.java
rename to jackson-modules/jackson-exceptions/src/main/java/com/baeldung/mappingexception/MyDtoNoAccessorsAndFieldVisibility.java
diff --git a/jackson-exceptions/src/test/java/com/baeldung/exceptions/JacksonExceptionsUnitTest.java b/jackson-modules/jackson-exceptions/src/test/java/com/baeldung/exceptions/JacksonExceptionsUnitTest.java
similarity index 100%
rename from jackson-exceptions/src/test/java/com/baeldung/exceptions/JacksonExceptionsUnitTest.java
rename to jackson-modules/jackson-exceptions/src/test/java/com/baeldung/exceptions/JacksonExceptionsUnitTest.java
diff --git a/jackson-exceptions/src/test/java/com/baeldung/mappingexception/JacksonMappingExceptionUnitTest.java b/jackson-modules/jackson-exceptions/src/test/java/com/baeldung/mappingexception/JacksonMappingExceptionUnitTest.java
similarity index 100%
rename from jackson-exceptions/src/test/java/com/baeldung/mappingexception/JacksonMappingExceptionUnitTest.java
rename to jackson-modules/jackson-exceptions/src/test/java/com/baeldung/mappingexception/JacksonMappingExceptionUnitTest.java
diff --git a/jackson-simple/README.md b/jackson-modules/jackson-simple/README.md
similarity index 100%
rename from jackson-simple/README.md
rename to jackson-modules/jackson-simple/README.md
diff --git a/jackson-simple/pom.xml b/jackson-modules/jackson-simple/pom.xml
similarity index 75%
rename from jackson-simple/pom.xml
rename to jackson-modules/jackson-simple/pom.xml
index cdda031e0f..fef28e4359 100644
--- a/jackson-simple/pom.xml
+++ b/jackson-modules/jackson-simple/pom.xml
@@ -3,24 +3,16 @@
          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>jackson-simple</artifactId>
-    <version>0.1-SNAPSHOT</version>
+    <version>0.0.1-SNAPSHOT</version>
     <name>jackson-simple</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
+        <artifactId>jackson-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
     </parent>
 
     <dependencies>
-        <!--jackson for xml -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/AliasBean.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/AliasBean.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/AliasBean.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/AliasBean.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCreator.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCreator.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCreator.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCreator.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCustomAnnotation.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCustomAnnotation.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCustomAnnotation.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCustomAnnotation.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithFilter.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithFilter.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithFilter.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithFilter.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithGetter.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithGetter.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithGetter.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithGetter.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithIgnore.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithIgnore.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithIgnore.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithIgnore.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithInject.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithInject.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithInject.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithInject.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/ExtendableBean.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/ExtendableBean.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/ExtendableBean.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/ExtendableBean.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/MyBean.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/MyBean.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/MyBean.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/MyBean.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/PrivateBean.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/PrivateBean.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/PrivateBean.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/PrivateBean.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/RawBean.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/RawBean.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/RawBean.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/RawBean.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/UnwrappedUser.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/UnwrappedUser.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/UnwrappedUser.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/UnwrappedUser.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/UserWithIgnoreType.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/UserWithIgnoreType.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/UserWithIgnoreType.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/UserWithIgnoreType.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/Zoo.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/Zoo.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/Zoo.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/Zoo.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIdentity.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIdentity.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIdentity.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIdentity.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIgnore.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIgnore.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIgnore.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIgnore.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithRef.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithRef.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithRef.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithRef.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIdentity.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIdentity.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIdentity.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIdentity.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIgnore.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIgnore.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIgnore.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIgnore.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithRef.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithRef.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithRef.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithRef.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateDeserializer.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateDeserializer.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateDeserializer.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateDeserializer.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateSerializer.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateSerializer.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateSerializer.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateSerializer.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithFormat.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithFormat.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithFormat.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithFormat.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithSerializer.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithSerializer.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithSerializer.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithSerializer.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/deserialization/ItemDeserializerOnClass.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/deserialization/ItemDeserializerOnClass.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/deserialization/ItemDeserializerOnClass.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/deserialization/ItemDeserializerOnClass.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/Item.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/Item.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/Item.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/Item.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/ItemWithSerializer.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/ItemWithSerializer.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/ItemWithSerializer.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/ItemWithSerializer.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/User.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/User.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/User.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/User.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/withEnum/DistanceEnumWithValue.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/withEnum/DistanceEnumWithValue.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/withEnum/DistanceEnumWithValue.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/withEnum/DistanceEnumWithValue.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRoot.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRoot.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRoot.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRoot.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRootNamespace.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRootNamespace.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRootNamespace.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRootNamespace.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/ignore/MyMixInForIgnoreType.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/ignore/MyMixInForIgnoreType.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/ignore/MyMixInForIgnoreType.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/ignore/MyMixInForIgnoreType.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Item.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Item.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Item.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Item.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Views.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Views.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Views.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Views.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializer.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializer.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializer.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializer.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializerOnClass.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializerOnClass.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializerOnClass.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializerOnClass.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDto.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDto.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDto.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDto.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreField.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreField.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreField.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreField.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreFieldByName.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreFieldByName.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreFieldByName.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreFieldByName.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreNull.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreNull.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreNull.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreNull.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIncludeNonDefault.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIncludeNonDefault.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIncludeNonDefault.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIncludeNonDefault.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithFilter.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithFilter.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithFilter.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithFilter.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithSpecialField.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithSpecialField.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithSpecialField.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithSpecialField.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyMixInForIgnoreType.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyMixInForIgnoreType.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyMixInForIgnoreType.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyMixInForIgnoreType.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDto.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDto.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDto.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDto.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDtoIgnoreNull.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDtoIgnoreNull.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDtoIgnoreNull.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDtoIgnoreNull.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDto.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDto.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDto.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDto.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDtoFieldNameChanged.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDtoFieldNameChanged.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDtoFieldNameChanged.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDtoFieldNameChanged.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Car.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Car.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Car.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Car.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Request.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Request.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Request.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Request.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDto.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDto.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDto.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDto.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreType.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreType.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreType.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreType.java
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreUnknown.java b/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreUnknown.java
similarity index 100%
rename from jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreUnknown.java
rename to jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreUnknown.java
diff --git a/jackson-simple/src/main/resources/logback.xml b/jackson-modules/jackson-simple/src/main/resources/logback.xml
similarity index 100%
rename from jackson-simple/src/main/resources/logback.xml
rename to jackson-modules/jackson-simple/src/main/resources/logback.xml
diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java b/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java
similarity index 100%
rename from jackson-simple/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java
rename to jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java
diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/ignore/IgnoreFieldsWithFilterUnitTest.java b/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/ignore/IgnoreFieldsWithFilterUnitTest.java
similarity index 100%
rename from jackson-simple/src/test/java/com/baeldung/jackson/ignore/IgnoreFieldsWithFilterUnitTest.java
rename to jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/ignore/IgnoreFieldsWithFilterUnitTest.java
diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java b/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java
similarity index 100%
rename from jackson-simple/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java
rename to jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java
diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/ignorenullfields/IgnoreNullFieldsUnitTest.java b/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/ignorenullfields/IgnoreNullFieldsUnitTest.java
similarity index 100%
rename from jackson-simple/src/test/java/com/baeldung/jackson/ignorenullfields/IgnoreNullFieldsUnitTest.java
rename to jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/ignorenullfields/IgnoreNullFieldsUnitTest.java
diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/jsonproperty/JsonPropertyUnitTest.java b/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/jsonproperty/JsonPropertyUnitTest.java
similarity index 100%
rename from jackson-simple/src/test/java/com/baeldung/jackson/jsonproperty/JsonPropertyUnitTest.java
rename to jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/jsonproperty/JsonPropertyUnitTest.java
diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java b/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java
similarity index 100%
rename from jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java
rename to jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java
diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java b/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java
similarity index 100%
rename from jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java
rename to jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java
diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/unknownproperties/UnknownPropertiesUnitTest.java b/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/unknownproperties/UnknownPropertiesUnitTest.java
similarity index 100%
rename from jackson-simple/src/test/java/com/baeldung/jackson/unknownproperties/UnknownPropertiesUnitTest.java
rename to jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/unknownproperties/UnknownPropertiesUnitTest.java
diff --git a/jackson-simple/src/test/resources/json_car.json b/jackson-modules/jackson-simple/src/test/resources/json_car.json
similarity index 100%
rename from jackson-simple/src/test/resources/json_car.json
rename to jackson-modules/jackson-simple/src/test/resources/json_car.json
diff --git a/jackson/README.md b/jackson-modules/jackson/README.md
similarity index 100%
rename from jackson/README.md
rename to jackson-modules/jackson/README.md
diff --git a/jackson/pom.xml b/jackson-modules/jackson/pom.xml
similarity index 86%
rename from jackson/pom.xml
rename to jackson-modules/jackson/pom.xml
index d7fc3aac9a..615076fc93 100644
--- a/jackson/pom.xml
+++ b/jackson-modules/jackson/pom.xml
@@ -3,26 +3,17 @@
          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>jackson</artifactId>
-    <version>0.1-SNAPSHOT</version>
+    <version>0.0.1-SNAPSHOT</version>
     <name>jackson</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
+        <artifactId>jackson-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
     </parent>
 
     <dependencies>
-        <!--jackson for xml -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
         <!-- marshalling -->
-
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/jacksoninject/Person.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/deserialization/jacksoninject/Person.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/deserialization/jacksoninject/Person.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/deserialization/jacksoninject/Person.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/jsonanysetter/Inventory.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/deserialization/jsonanysetter/Inventory.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/deserialization/jsonanysetter/Inventory.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/deserialization/jsonanysetter/Inventory.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/jsondeserialize/Book.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/deserialization/jsondeserialize/Book.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/deserialization/jsondeserialize/Book.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/deserialization/jsondeserialize/Book.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/jsondeserialize/CustomDateDeserializer.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/deserialization/jsondeserialize/CustomDateDeserializer.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/deserialization/jsondeserialize/CustomDateDeserializer.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/deserialization/jsondeserialize/CustomDateDeserializer.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/domain/Person.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/domain/Person.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/domain/Person.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/domain/Person.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/inheritance/Event.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/Event.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/inheritance/Event.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/Event.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/inheritance/IgnoranceAnnotationStructure.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/IgnoranceAnnotationStructure.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/inheritance/IgnoranceAnnotationStructure.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/IgnoranceAnnotationStructure.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/inheritance/IgnoranceMixinOrIntrospection.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/IgnoranceMixinOrIntrospection.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/inheritance/IgnoranceMixinOrIntrospection.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/IgnoranceMixinOrIntrospection.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/inheritance/ItemIdAddedToUser.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/ItemIdAddedToUser.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/inheritance/ItemIdAddedToUser.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/ItemIdAddedToUser.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUser.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUser.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUser.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUser.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/inheritance/SubTypeConstructorStructure.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/SubTypeConstructorStructure.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/inheritance/SubTypeConstructorStructure.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/SubTypeConstructorStructure.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/inheritance/SubTypeConversionStructure.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/SubTypeConversionStructure.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/inheritance/SubTypeConversionStructure.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/SubTypeConversionStructure.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/inheritance/TypeInfoAnnotatedStructure.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/TypeInfoAnnotatedStructure.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/inheritance/TypeInfoAnnotatedStructure.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/TypeInfoAnnotatedStructure.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/inheritance/TypeInfoStructure.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/TypeInfoStructure.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/inheritance/TypeInfoStructure.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/inheritance/TypeInfoStructure.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/ActorJackson.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/ActorJackson.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/ActorJackson.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/ActorJackson.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/ActorJacksonSerializer.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/ActorJacksonSerializer.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/ActorJacksonSerializer.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/ActorJacksonSerializer.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/Movie.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/Movie.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/Movie.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/Movie.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/MovieWithNullValue.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/MovieWithNullValue.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/MovieWithNullValue.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/jacksonvsgson/MovieWithNullValue.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/node/JsonNodeIterator.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/node/JsonNodeIterator.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/node/JsonNodeIterator.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/node/JsonNodeIterator.java
diff --git a/jackson/src/main/java/com/baeldung/jackson/optionalwithjackson/Book.java b/jackson-modules/jackson/src/main/java/com/baeldung/jackson/optionalwithjackson/Book.java
similarity index 100%
rename from jackson/src/main/java/com/baeldung/jackson/optionalwithjackson/Book.java
rename to jackson-modules/jackson/src/main/java/com/baeldung/jackson/optionalwithjackson/Book.java
diff --git a/jackson/src/main/resources/example1.json b/jackson-modules/jackson/src/main/resources/example1.json
similarity index 100%
rename from jackson/src/main/resources/example1.json
rename to jackson-modules/jackson/src/main/resources/example1.json
diff --git a/jackson/src/main/resources/example2.json b/jackson-modules/jackson/src/main/resources/example2.json
similarity index 100%
rename from jackson/src/main/resources/example2.json
rename to jackson-modules/jackson/src/main/resources/example2.json
diff --git a/jackson/src/main/resources/logback.xml b/jackson-modules/jackson/src/main/resources/logback.xml
similarity index 100%
rename from jackson/src/main/resources/logback.xml
rename to jackson-modules/jackson/src/main/resources/logback.xml
diff --git a/jackson/src/test/java/com/baeldung/jackson/dtos/Address.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/dtos/Address.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/dtos/Address.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/dtos/Address.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/dtos/MyDto.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/dtos/MyDto.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/dtos/MyDto.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/dtos/MyDto.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/dtos/Person.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/dtos/Person.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/dtos/Person.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/dtos/Person.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/dtos/User.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/dtos/User.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/dtos/User.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/dtos/User.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceUnitTest.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceUnitTest.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceUnitTest.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceUnitTest.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUserUnitTest.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUserUnitTest.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUserUnitTest.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUserUnitTest.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeHandlingUnitTest.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeHandlingUnitTest.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeHandlingUnitTest.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeHandlingUnitTest.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoInclusionUnitTest.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoInclusionUnitTest.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoInclusionUnitTest.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoInclusionUnitTest.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/jacksonvsgson/JacksonDeserializeUnitTest.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/jacksonvsgson/JacksonDeserializeUnitTest.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/jacksonvsgson/JacksonDeserializeUnitTest.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/jacksonvsgson/JacksonDeserializeUnitTest.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/jacksonvsgson/JacksonSerializeUnitTest.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/jacksonvsgson/JacksonSerializeUnitTest.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/jacksonvsgson/JacksonSerializeUnitTest.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/jacksonvsgson/JacksonSerializeUnitTest.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/jsoncompare/JsonCompareUnitTest.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/jsoncompare/JsonCompareUnitTest.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/jsoncompare/JsonCompareUnitTest.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/jsoncompare/JsonCompareUnitTest.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/node/ExampleStructure.java b/jackson-modules/jackson/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-modules/jackson/src/test/java/com/baeldung/jackson/node/ExampleStructure.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/node/JsonNodeIteratorUnitTest.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/node/JsonNodeIteratorUnitTest.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/node/JsonNodeIteratorUnitTest.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/node/JsonNodeIteratorUnitTest.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/node/NodeBean.java b/jackson-modules/jackson/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-modules/jackson/src/test/java/com/baeldung/jackson/node/NodeBean.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/node/NodeOperationUnitTest.java b/jackson-modules/jackson/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-modules/jackson/src/test/java/com/baeldung/jackson/node/NodeOperationUnitTest.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/optionalwithjackson/OptionalTypeUnitTest.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/optionalwithjackson/OptionalTypeUnitTest.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/optionalwithjackson/OptionalTypeUnitTest.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/optionalwithjackson/OptionalTypeUnitTest.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/sandbox/JacksonPrettyPrintUnitTest.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/sandbox/JacksonPrettyPrintUnitTest.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/sandbox/JacksonPrettyPrintUnitTest.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/sandbox/JacksonPrettyPrintUnitTest.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/sandbox/SandboxUnitTest.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/sandbox/SandboxUnitTest.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/sandbox/SandboxUnitTest.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/sandbox/SandboxUnitTest.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/sandbox/TestElement.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/sandbox/TestElement.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/sandbox/TestElement.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/sandbox/TestElement.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/test/UnitTestSuite.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/test/UnitTestSuite.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/test/UnitTestSuite.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/test/UnitTestSuite.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/try1/IEntity.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/try1/IEntity.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/try1/IEntity.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/try1/IEntity.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/try1/RestLoaderRequest.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/try1/RestLoaderRequest.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/try1/RestLoaderRequest.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/try1/RestLoaderRequest.java
diff --git a/jackson/src/test/java/com/baeldung/jackson/try1/RestLoaderRequestDeserializer.java b/jackson-modules/jackson/src/test/java/com/baeldung/jackson/try1/RestLoaderRequestDeserializer.java
similarity index 100%
rename from jackson/src/test/java/com/baeldung/jackson/try1/RestLoaderRequestDeserializer.java
rename to jackson-modules/jackson/src/test/java/com/baeldung/jackson/try1/RestLoaderRequestDeserializer.java
diff --git a/jackson/src/test/resources/author-jsonpropertyorder-schema.json b/jackson-modules/jackson/src/test/resources/author-jsonpropertyorder-schema.json
similarity index 100%
rename from jackson/src/test/resources/author-jsonpropertyorder-schema.json
rename to jackson-modules/jackson/src/test/resources/author-jsonpropertyorder-schema.json
diff --git a/jackson/src/test/resources/node_example.json b/jackson-modules/jackson/src/test/resources/node_example.json
similarity index 100%
rename from jackson/src/test/resources/node_example.json
rename to jackson-modules/jackson/src/test/resources/node_example.json
diff --git a/jackson-modules/pom.xml b/jackson-modules/pom.xml
new file mode 100644
index 0000000000..a8568c1950
--- /dev/null
+++ b/jackson-modules/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jackson-modules</artifactId>
+    <name>jackson-modules</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <modules>
+        <module>jackson</module>
+        <module>jackson-annotations</module>
+        <module>jackson-conversions</module>
+        <module>jackson-conversions-2</module>
+        <module>jackson-custom-conversions</module>
+        <module>jackson-exceptions</module>
+        <module>jackson-simple</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <!--jackson for xml -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/jackson-simple/.gitignore b/jackson-simple/.gitignore
deleted file mode 100644
index 83c05e60c8..0000000000
--- a/jackson-simple/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.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/pom.xml b/pom.xml
index cfb3fe1889..54ac6a724c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -499,13 +499,7 @@
                 <module>image-processing</module>
                 <module>immutables</module>
 
-                <module>jackson</module>
-                <module>jackson-simple</module>
-                <module>jackson-annotations</module>
-                <module>jackson-exceptions</module>
-                <module>jackson-conversions</module>
-                <module>jackson-conversions-2</module>
-                <module>jackson-custom-conversions</module>
+                <module>jackson-modules</module>
                 <module>java-collections-conversions</module>
                 <module>java-collections-conversions-2</module>
                 <module>java-collections-maps</module>
@@ -1137,13 +1131,7 @@
                 <module>image-processing</module>
                 <module>immutables</module>
 
-                <module>jackson</module>
-                <module>jackson-simple</module>
-                <module>jackson-annotations</module>
-                <module>jackson-exceptions</module>
-                <module>jackson-conversions</module>
-                <module>jackson-conversions-2</module>
-                <module>jackson-custom-conversions</module>
+                <module>jackson-modules</module>
                 <module>java-collections-conversions</module>
                 <module>java-collections-conversions-2</module>
                 <module>java-collections-maps</module>

From a8ae650304a298180eb9a86447ae4fe202227653 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Thu, 19 Dec 2019 14:13:18 +0100
Subject: [PATCH 058/106] BAEL-19988: Migrate rest-testing module to the
 com.baeldung package

---
 .../rest => com/baeldung/rest/jbehave}/GitHubUser.java       | 2 +-
 .../rest/jbehave/GithubUserResponsePayloadSteps.java         | 5 -----
 .../rest => com/baeldung/rest/jbehave}/RetrieveUtil.java     | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)
 rename testing-modules/rest-testing/src/test/java/{org/baeldung/rest => com/baeldung/rest/jbehave}/GitHubUser.java (88%)
 rename testing-modules/rest-testing/src/test/java/{org/baeldung/rest => com/baeldung/rest/jbehave}/RetrieveUtil.java (95%)

diff --git a/testing-modules/rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GitHubUser.java
similarity index 88%
rename from testing-modules/rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GitHubUser.java
index 73c9677377..6992789f0e 100644
--- a/testing-modules/rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java
+++ b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GitHubUser.java
@@ -1,4 +1,4 @@
-package org.baeldung.rest;
+package com.baeldung.rest.jbehave;
 
 public class GitHubUser {
 
diff --git a/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java
index d9401a5d00..51beb609c2 100644
--- a/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java
+++ b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java
@@ -1,11 +1,6 @@
 package com.baeldung.rest.jbehave;
 
 import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.baeldung.rest.GitHubUser;
-import org.baeldung.rest.RetrieveUtil;
 import org.hamcrest.Matchers;
 import org.jbehave.core.annotations.Given;
 import org.jbehave.core.annotations.Then;
diff --git a/testing-modules/rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/RetrieveUtil.java
similarity index 95%
rename from testing-modules/rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/RetrieveUtil.java
index 75ec3c842c..03f96bed73 100644
--- a/testing-modules/rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java
+++ b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/RetrieveUtil.java
@@ -1,4 +1,4 @@
-package org.baeldung.rest;
+package com.baeldung.rest.jbehave;
 
 import java.io.IOException;
 

From 3e9ff755e076ed26693faf7df4ef48048edf3bd9 Mon Sep 17 00:00:00 2001
From: rohitchaudhary2023
 <57285851+rohitchaudhary2023@users.noreply.github.com>
Date: Thu, 19 Dec 2019 22:06:50 +0530
Subject: [PATCH 059/106] BAEL-3380 (#8335)

* initial commit

* changes for articlesBAEL-3380

* Removed evaluation article files

* BAEL-3380

* adding test case BAEL-3380

* BAEL-3380

* BAEL-3380 - updated tests and removed main class

* BAEL-3380 - Updated Test class name

* BAEL-3380 - Updated Test class name

* BAEL-3380 - Updated testcase names as per BDD naming convention
---
 .../arraysort/SortComparisonUnitTest.java     | 185 ++++++++++++++++++
 1 file changed, 185 insertions(+)
 create mode 100644 core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/arraysort/SortComparisonUnitTest.java

diff --git a/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/arraysort/SortComparisonUnitTest.java b/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/arraysort/SortComparisonUnitTest.java
new file mode 100644
index 0000000000..d1aba5a886
--- /dev/null
+++ b/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/arraysort/SortComparisonUnitTest.java
@@ -0,0 +1,185 @@
+package com.baeldung.arraysort;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+
+import java.util.Arrays;
+import java.util.Random;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+/**
+ * Time taken by JUnit test cases can be seen in JUnit Runner
+ * @author rchaudhary23
+ *
+ */
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class SortComparisonUnitTest {
+
+    private int[] sizeOfArrays = { 1000, 10000, 100000, 1000000 };
+
+    private int[] _1000_elements_array;
+    private int[] _10000_elements_array;
+    private int[] _100000_elements_array;
+    private int[] _1000000_elements_array;
+
+    @Before
+    public void setUp() throws Exception {
+
+        _1000_elements_array = new int[sizeOfArrays[0]];
+        _10000_elements_array = new int[sizeOfArrays[1]];
+        _100000_elements_array = new int[sizeOfArrays[2]];
+        _1000000_elements_array = new int[sizeOfArrays[3]];
+
+        Random random = new Random();
+        for (int i = 0; i < sizeOfArrays[0]; i++) {
+            _1000_elements_array[i] = random.nextInt(sizeOfArrays[0]) + random.nextInt(sizeOfArrays[0]);
+        }
+
+        for (int i = 0; i < sizeOfArrays[1]; i++) {
+            _10000_elements_array[i] = random.nextInt(sizeOfArrays[1]) + random.nextInt(sizeOfArrays[1]);
+        }
+
+        for (int i = 0; i < sizeOfArrays[2]; i++) {
+            _100000_elements_array[i] = random.nextInt(sizeOfArrays[2]) + random.nextInt(sizeOfArrays[2]);
+        }
+
+        for (int i = 0; i < sizeOfArrays[3]; i++) {
+            _1000000_elements_array[i] = random.nextInt(sizeOfArrays[3]) + random.nextInt(sizeOfArrays[3]);
+        }
+
+    }
+
+    @Test
+    public void givenArrayOfIntegers_whenUsingArraysSortMethod_thenSortFullArrayInAscendingOrder() {
+
+        int[] array = { 10, 4, 6, 2, 1, 9, 7, 8, 3, 5 };
+        int[] expected = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+
+        Arrays.sort(array);
+
+        assertArrayEquals(expected, array);
+
+    }
+
+    @Test
+    public void givenArrayOfIntegers_whenUsingArraysSortMethodWithRange_thenSortRangeOfArrayInAscendingOrder() {
+        int[] array = { 10, 4, 6, 2, 1, 9, 7, 8, 3, 5 };
+        int[] expected = { 10, 4, 1, 2, 6, 7, 8, 9, 3, 5 };
+
+        Arrays.sort(array, 2, 8);
+
+        assertArrayEquals(expected, array);
+    }
+
+    @Test
+    public void givenArrayOfIntegers_whenUsingArraysParallelSortMethod_thenSortFullArrayInAscendingOrder() {
+        int[] array = { 10, 4, 6, 2, 1, 9, 7, 8, 3, 5 };
+        int[] expected = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+
+        Arrays.parallelSort(array);
+
+        assertArrayEquals(expected, array);
+    }
+
+    @Test
+    public void givenArrayOfIntegers_whenUsingArraysParallelSortMethodWithRange_thenSortRangeOfArrayInAscendingOrder() {
+        int[] array = { 10, 4, 6, 2, 1, 9, 7, 8, 3, 5 };
+        int[] expected = { 10, 4, 1, 2, 6, 7, 8, 9, 3, 5 };
+
+        Arrays.parallelSort(array, 2, 8);
+
+        assertArrayEquals(expected, array);
+    }
+
+    @Test
+    public void givenIntegerArrayOf1000Elements_whenUsingArraysSortMethod_thenSortFullArrayInAscendingOrder() {
+        int[] sequentialDataSet = Arrays.copyOf(_1000_elements_array, _1000_elements_array.length);
+        Arrays.sort(sequentialDataSet);
+
+        assertNotNull(sequentialDataSet);
+        assertNotSame(Arrays.copyOf(_1000_elements_array, _1000_elements_array.length), sequentialDataSet);
+
+    }
+
+    @Test
+    public void givenIntegerArrayOf1000Elements_whenUsingArraysParallelSortMethod_thenSortFullArrayInAscendingOrder() {
+        int[] parallelDataSet = Arrays.copyOf(_1000_elements_array, _1000_elements_array.length);
+        Arrays.parallelSort(parallelDataSet);
+
+        assertNotNull(parallelDataSet);
+        assertNotSame(Arrays.copyOf(_1000_elements_array, _1000_elements_array.length), parallelDataSet);
+
+    }
+
+    @Test
+    public void givenIntegerArrayOf10000Elements_whenUsingArraysSortMethod_thenSortFullArrayInAscendingOrder() {
+        int[] sequentialDataSet = Arrays.copyOf(_10000_elements_array, _10000_elements_array.length);
+        Arrays.sort(sequentialDataSet);
+
+        assertNotNull(sequentialDataSet);
+        assertNotSame(Arrays.copyOf(_10000_elements_array, _10000_elements_array.length), sequentialDataSet);
+    }
+
+    @Test
+    public void givenIntegerArrayOf10000Elements_whenUsingArraysParallelSortMethod_thenSortFullArrayInAscendingOrder() {
+        int[] parallelDataSet = Arrays.copyOf(_10000_elements_array, _10000_elements_array.length);
+        Arrays.parallelSort(parallelDataSet);
+
+        assertNotNull(parallelDataSet);
+        assertNotSame(Arrays.copyOf(_10000_elements_array, _10000_elements_array.length), parallelDataSet);
+    }
+
+    @Test
+    public void givenIntegerArrayOf100000Elements_whenUsingArraysSortMethod_thenSortFullArrayInAscendingOrder() {
+        int[] sequentialDataSet = Arrays.copyOf(_100000_elements_array, _100000_elements_array.length);
+        Arrays.sort(sequentialDataSet);
+
+        assertNotNull(sequentialDataSet);
+        assertNotSame(Arrays.copyOf(_100000_elements_array, _100000_elements_array.length), sequentialDataSet);
+    }
+
+    @Test
+    public void givenIntegerArrayOf100000Elements_whenUsingArraysParallelSortMethod_thenSortFullArrayInAscendingOrder() {
+        int[] parallelDataSet = Arrays.copyOf(_100000_elements_array, _100000_elements_array.length);
+        Arrays.parallelSort(parallelDataSet);
+
+        assertNotNull(parallelDataSet);
+        assertNotSame(Arrays.copyOf(_100000_elements_array, _100000_elements_array.length), parallelDataSet);
+    }
+
+    @Test
+    public void givenIntegerArrayOf1000000Elements_whenUsingArraysSortMethod_thenSortFullArrayInAscendingOrder() {
+        int[] sequentialDataSet = Arrays.copyOf(_1000000_elements_array, _1000000_elements_array.length);
+        Arrays.sort(sequentialDataSet);
+
+        assertNotNull(sequentialDataSet);
+        assertNotSame(Arrays.copyOf(_1000000_elements_array, _1000000_elements_array.length), sequentialDataSet);
+    }
+
+    @Test
+    public void givenIntegerArrayOf1000000Elements_whenUsingArraysParallelSortMethod_thenSortFullArrayInAscendingOrder() {
+        int[] parallelDataSet = Arrays.copyOf(_1000000_elements_array, _1000000_elements_array.length);
+        Arrays.parallelSort(parallelDataSet);
+
+        assertNotNull(parallelDataSet);
+        assertNotSame(Arrays.copyOf(_1000000_elements_array, _1000000_elements_array.length), parallelDataSet);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        sizeOfArrays = null;
+        _1000_elements_array = null;
+        _10000_elements_array = null;
+        _100000_elements_array = null;
+        _1000000_elements_array = null;
+    }
+}
+
+

From 03a34d5cf6f22221b87886ddca99a64a3a7c4629 Mon Sep 17 00:00:00 2001
From: Martin van Wingerden <martin@martinvw.nl>
Date: Thu, 19 Dec 2019 18:58:07 +0100
Subject: [PATCH 060/106] BAEL-3495 Code for Deny of Missing Pre/PostAuthorize
 annotation

- Moved classes around so that the scans do not collide
- Make sure the LiveTest actually stops when done
- Removed some useless gitignore / README parts.
---
 .../spring-security-core/.gitignore           | 14 +----
 .../spring-security-core/README.md            |  4 +-
 .../src/main/java/com/baeldung/app/App.java   |  6 ---
 ...temptedPathAuthorizationAuditListener.java |  2 +-
 .../auditing/LoginAttemptsLogger.java         |  2 +-
 .../{ => app}/config/DatabaseLoader.java      |  6 +--
 .../{ => app}/config/WebSecurityConfig.java   |  2 +-
 .../{ => app}/controller/TaskController.java  |  6 +--
 .../com/baeldung/{ => app}/entity/Task.java   |  2 +-
 .../{ => app}/filter/CustomFilter.java        |  2 +-
 .../{ => app}/repository/TaskRepository.java  |  4 +-
 .../{ => app}/service/TaskService.java        |  6 +--
 ...onAllowedMethodSecurityMetadataSource.java | 49 +++++++++++++++++
 .../denyonmissing/DenyApplication.java        | 11 ++++
 .../DenyMethodSecurityConfig.java             | 29 ++++++++++
 .../DenyOnMissingController.java              | 19 +++++++
 .../baeldung/{ => app}/SpringContextTest.java |  2 +-
 .../com/baeldung/{ => app}/test/LiveTest.java |  4 +-
 ...enyOnMissingControllerIntegrationTest.java | 53 +++++++++++++++++++
 .../src/test/resources/.gitignore             | 13 -----
 20 files changed, 182 insertions(+), 54 deletions(-)
 rename spring-security-modules/spring-security-core/src/main/java/com/baeldung/{ => app}/auditing/ExposeAttemptedPathAuthorizationAuditListener.java (97%)
 rename spring-security-modules/spring-security-core/src/main/java/com/baeldung/{ => app}/auditing/LoginAttemptsLogger.java (96%)
 rename spring-security-modules/spring-security-core/src/main/java/com/baeldung/{ => app}/config/DatabaseLoader.java (85%)
 rename spring-security-modules/spring-security-core/src/main/java/com/baeldung/{ => app}/config/WebSecurityConfig.java (98%)
 rename spring-security-modules/spring-security-core/src/main/java/com/baeldung/{ => app}/controller/TaskController.java (89%)
 rename spring-security-modules/spring-security-core/src/main/java/com/baeldung/{ => app}/entity/Task.java (96%)
 rename spring-security-modules/spring-security-core/src/main/java/com/baeldung/{ => app}/filter/CustomFilter.java (96%)
 rename spring-security-modules/spring-security-core/src/main/java/com/baeldung/{ => app}/repository/TaskRepository.java (64%)
 rename spring-security-modules/spring-security-core/src/main/java/com/baeldung/{ => app}/service/TaskService.java (85%)
 create mode 100644 spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/CustomPermissionAllowedMethodSecurityMetadataSource.java
 create mode 100644 spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/DenyApplication.java
 create mode 100644 spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/DenyMethodSecurityConfig.java
 create mode 100644 spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/DenyOnMissingController.java
 rename spring-security-modules/spring-security-core/src/test/java/com/baeldung/{ => app}/SpringContextTest.java (93%)
 rename spring-security-modules/spring-security-core/src/test/java/com/baeldung/{ => app}/test/LiveTest.java (96%)
 create mode 100644 spring-security-modules/spring-security-core/src/test/java/com/baeldung/denyonmissing/DenyOnMissingControllerIntegrationTest.java
 delete mode 100644 spring-security-modules/spring-security-core/src/test/resources/.gitignore

diff --git a/spring-security-modules/spring-security-core/.gitignore b/spring-security-modules/spring-security-core/.gitignore
index 83c05e60c8..9f970225ad 100644
--- a/spring-security-modules/spring-security-core/.gitignore
+++ b/spring-security-modules/spring-security-core/.gitignore
@@ -1,13 +1 @@
-*.class
-
-#folders#
-/target
-/neoDb*
-/data
-/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-
-# Packaged files #
-*.jar
-*.war
-*.ear
\ No newline at end of file
+target/
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-core/README.md b/spring-security-modules/spring-security-core/README.md
index 3579e5e759..6b1f236b7c 100644
--- a/spring-security-modules/spring-security-core/README.md
+++ b/spring-security-modules/spring-security-core/README.md
@@ -8,8 +8,6 @@ This module contains articles about core Spring Security
 - [Introduction to Spring Method Security](https://www.baeldung.com/spring-security-method-security)
 - [Overview and Need for DelegatingFilterProxy in Spring](https://www.baeldung.com/spring-delegating-filter-proxy)
 
-### @PreFilter and @PostFilter annotations
-
-#### Build the Project
+### Build the Project
 
 `mvn clean install`
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/App.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/App.java
index d23df9adef..6e41a53967 100644
--- a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/App.java
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/App.java
@@ -12,9 +12,6 @@ import org.springframework.web.filter.DelegatingFilterProxy;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
 @SpringBootApplication
-@EnableJpaRepositories("com.baeldung.repository")
-@ComponentScan("com.baeldung")
-@EntityScan("com.baeldung.entity")
 public class App extends SpringBootServletInitializer {
     public static void main(String[] args) {
         SpringApplication.run(App.class, args);
@@ -31,19 +28,16 @@ public class App extends SpringBootServletInitializer {
 
         @Override
         protected Class<?>[] getRootConfigClasses() {
-            // TODO Auto-generated method stub
             return null;
         }
 
         @Override
         protected Class<?>[] getServletConfigClasses() {
-            // TODO Auto-generated method stub
             return null;
         }
 
         @Override
         protected String[] getServletMappings() {
-            // TODO Auto-generated method stub
             return null;
         }
     }
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/auditing/ExposeAttemptedPathAuthorizationAuditListener.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/auditing/ExposeAttemptedPathAuthorizationAuditListener.java
similarity index 97%
rename from spring-security-modules/spring-security-core/src/main/java/com/baeldung/auditing/ExposeAttemptedPathAuthorizationAuditListener.java
rename to spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/auditing/ExposeAttemptedPathAuthorizationAuditListener.java
index 615d14584f..d238c157df 100644
--- a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/auditing/ExposeAttemptedPathAuthorizationAuditListener.java
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/auditing/ExposeAttemptedPathAuthorizationAuditListener.java
@@ -1,4 +1,4 @@
-package com.baeldung.auditing;
+package com.baeldung.app.auditing;
 
 import org.springframework.boot.actuate.audit.AuditEvent;
 import org.springframework.boot.actuate.security.AbstractAuthorizationAuditListener;
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/auditing/LoginAttemptsLogger.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/auditing/LoginAttemptsLogger.java
similarity index 96%
rename from spring-security-modules/spring-security-core/src/main/java/com/baeldung/auditing/LoginAttemptsLogger.java
rename to spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/auditing/LoginAttemptsLogger.java
index d06c3e24e1..e775006953 100644
--- a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/auditing/LoginAttemptsLogger.java
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/auditing/LoginAttemptsLogger.java
@@ -1,4 +1,4 @@
-package com.baeldung.auditing;
+package com.baeldung.app.auditing;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/config/DatabaseLoader.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/DatabaseLoader.java
similarity index 85%
rename from spring-security-modules/spring-security-core/src/main/java/com/baeldung/config/DatabaseLoader.java
rename to spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/DatabaseLoader.java
index 7f22c3ec99..9d06d5f7ac 100644
--- a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/config/DatabaseLoader.java
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/DatabaseLoader.java
@@ -1,11 +1,11 @@
-package com.baeldung.config;
+package com.baeldung.app.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
-import com.baeldung.entity.Task;
-import com.baeldung.repository.TaskRepository;
+import com.baeldung.app.entity.Task;
+import com.baeldung.app.repository.TaskRepository;
 
 @Component
 public class DatabaseLoader implements CommandLineRunner {
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/config/WebSecurityConfig.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/WebSecurityConfig.java
similarity index 98%
rename from spring-security-modules/spring-security-core/src/main/java/com/baeldung/config/WebSecurityConfig.java
rename to spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/WebSecurityConfig.java
index be11a0fde5..15af160135 100644
--- a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/config/WebSecurityConfig.java
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/WebSecurityConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.config;
+package com.baeldung.app.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/controller/TaskController.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/controller/TaskController.java
similarity index 89%
rename from spring-security-modules/spring-security-core/src/main/java/com/baeldung/controller/TaskController.java
rename to spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/controller/TaskController.java
index 91156354b1..a084f14eca 100644
--- a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/controller/TaskController.java
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/controller/TaskController.java
@@ -1,4 +1,4 @@
-package com.baeldung.controller;
+package com.baeldung.app.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.baeldung.entity.Task;
-import com.baeldung.service.TaskService;
+import com.baeldung.app.entity.Task;
+import com.baeldung.app.service.TaskService;
 
 @Controller
 @RequestMapping("api/tasks")
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/entity/Task.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/entity/Task.java
similarity index 96%
rename from spring-security-modules/spring-security-core/src/main/java/com/baeldung/entity/Task.java
rename to spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/entity/Task.java
index 9103c342cc..d2a8a1383d 100644
--- a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/entity/Task.java
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/entity/Task.java
@@ -1,4 +1,4 @@
-package com.baeldung.entity;
+package com.baeldung.app.entity;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/filter/CustomFilter.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/filter/CustomFilter.java
similarity index 96%
rename from spring-security-modules/spring-security-core/src/main/java/com/baeldung/filter/CustomFilter.java
rename to spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/filter/CustomFilter.java
index e748b373b7..7229e4606f 100644
--- a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/filter/CustomFilter.java
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/filter/CustomFilter.java
@@ -1,4 +1,4 @@
-package com.baeldung.filter;
+package com.baeldung.app.filter;
 
 import java.io.IOException;
 
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/repository/TaskRepository.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/repository/TaskRepository.java
similarity index 64%
rename from spring-security-modules/spring-security-core/src/main/java/com/baeldung/repository/TaskRepository.java
rename to spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/repository/TaskRepository.java
index afb999719c..ac0f850891 100644
--- a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/repository/TaskRepository.java
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/repository/TaskRepository.java
@@ -1,8 +1,8 @@
-package com.baeldung.repository;
+package com.baeldung.app.repository;
 
 import org.springframework.data.repository.CrudRepository;
 
-import com.baeldung.entity.Task;
+import com.baeldung.app.entity.Task;
 
 public interface TaskRepository extends CrudRepository<Task, Long> {
 
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/service/TaskService.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/service/TaskService.java
similarity index 85%
rename from spring-security-modules/spring-security-core/src/main/java/com/baeldung/service/TaskService.java
rename to spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/service/TaskService.java
index 1269eb4fd0..20d53ac77a 100644
--- a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/service/TaskService.java
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/service/TaskService.java
@@ -1,12 +1,12 @@
-package com.baeldung.service;
+package com.baeldung.app.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PostFilter;
 import org.springframework.security.access.prepost.PreFilter;
 import org.springframework.stereotype.Service;
 
-import com.baeldung.entity.Task;
-import com.baeldung.repository.TaskRepository;
+import com.baeldung.app.entity.Task;
+import com.baeldung.app.repository.TaskRepository;
 
 @Service
 public class TaskService {
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/CustomPermissionAllowedMethodSecurityMetadataSource.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/CustomPermissionAllowedMethodSecurityMetadataSource.java
new file mode 100644
index 0000000000..4bde3f5aa3
--- /dev/null
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/CustomPermissionAllowedMethodSecurityMetadataSource.java
@@ -0,0 +1,49 @@
+package com.baeldung.denyonmissing;
+
+import static org.springframework.security.access.annotation.Jsr250SecurityConfig.DENY_ALL_ATTRIBUTE;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.method.AbstractFallbackMethodSecurityMetadataSource;
+import org.springframework.security.access.prepost.PostAuthorize;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+
+public class CustomPermissionAllowedMethodSecurityMetadataSource extends AbstractFallbackMethodSecurityMetadataSource {
+    @Override
+    protected Collection<ConfigAttribute> findAttributes(Class<?> clazz) {
+        return null;
+    }
+
+    @Override
+    protected Collection<ConfigAttribute> findAttributes(Method method, Class<?> targetClass) {
+        Annotation[] annotations = AnnotationUtils.getAnnotations(method);
+        List<ConfigAttribute> attributes = new ArrayList<>();
+
+        // if the class is annotated as @Controller we should by default deny access to every method
+        if (AnnotationUtils.findAnnotation(targetClass, Controller.class) != null) {
+            attributes.add(DENY_ALL_ATTRIBUTE);
+        }
+
+        if (annotations != null) {
+            for (Annotation a : annotations) {
+                // but not if the method has at least a PreAuthorize or PostAuthorize annotation
+                if (a instanceof PreAuthorize || a instanceof PostAuthorize) {
+                    return null;
+                }
+            }
+        }
+        return attributes;
+    }
+
+    @Override
+    public Collection<ConfigAttribute> getAllConfigAttributes() {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/DenyApplication.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/DenyApplication.java
new file mode 100644
index 0000000000..d5d28ae210
--- /dev/null
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/DenyApplication.java
@@ -0,0 +1,11 @@
+package com.baeldung.denyonmissing;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class DenyApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(DenyApplication.class, args);
+    }
+}
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/DenyMethodSecurityConfig.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/DenyMethodSecurityConfig.java
new file mode 100644
index 0000000000..695f81eb54
--- /dev/null
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/DenyMethodSecurityConfig.java
@@ -0,0 +1,29 @@
+package com.baeldung.denyonmissing;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.access.method.MethodSecurityMetadataSource;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+
+@Configuration
+@EnableWebSecurity
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+public class DenyMethodSecurityConfig extends GlobalMethodSecurityConfiguration {
+    @Override
+    protected MethodSecurityMetadataSource customMethodSecurityMetadataSource() {
+        return new CustomPermissionAllowedMethodSecurityMetadataSource();
+    }
+
+    @Bean
+    public UserDetailsService userDetailsService() {
+        return new InMemoryUserDetailsManager(
+                User.withUsername("user").password("{noop}password").roles("USER").build(),
+                User.withUsername("guest").password("{noop}password").roles().build()
+        );
+    }
+}
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/DenyOnMissingController.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/DenyOnMissingController.java
new file mode 100644
index 0000000000..ef8881d3b7
--- /dev/null
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/denyonmissing/DenyOnMissingController.java
@@ -0,0 +1,19 @@
+package com.baeldung.denyonmissing;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class DenyOnMissingController {
+    @GetMapping(path = "hello")
+    @PreAuthorize("hasRole('USER')")
+    public String hello() {
+        return "Hello world!";
+    }
+
+    @GetMapping(path = "bye")
+    public String bye() {
+        return "Bye bye world!";
+    }
+}
diff --git a/spring-security-modules/spring-security-core/src/test/java/com/baeldung/SpringContextTest.java b/spring-security-modules/spring-security-core/src/test/java/com/baeldung/app/SpringContextTest.java
similarity index 93%
rename from spring-security-modules/spring-security-core/src/test/java/com/baeldung/SpringContextTest.java
rename to spring-security-modules/spring-security-core/src/test/java/com/baeldung/app/SpringContextTest.java
index bca6450fb1..b3c31a936a 100644
--- a/spring-security-modules/spring-security-core/src/test/java/com/baeldung/SpringContextTest.java
+++ b/spring-security-modules/spring-security-core/src/test/java/com/baeldung/app/SpringContextTest.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.app;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-security-modules/spring-security-core/src/test/java/com/baeldung/test/LiveTest.java b/spring-security-modules/spring-security-core/src/test/java/com/baeldung/app/test/LiveTest.java
similarity index 96%
rename from spring-security-modules/spring-security-core/src/test/java/com/baeldung/test/LiveTest.java
rename to spring-security-modules/spring-security-core/src/test/java/com/baeldung/app/test/LiveTest.java
index 6bcb2e8f0f..d099173395 100644
--- a/spring-security-modules/spring-security-core/src/test/java/com/baeldung/test/LiveTest.java
+++ b/spring-security-modules/spring-security-core/src/test/java/com/baeldung/app/test/LiveTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.test;
+package com.baeldung.app.test;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -22,7 +22,7 @@ import org.springframework.web.context.WebApplicationContext;
 import com.baeldung.app.App;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = App.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(classes = App.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class LiveTest {
 
diff --git a/spring-security-modules/spring-security-core/src/test/java/com/baeldung/denyonmissing/DenyOnMissingControllerIntegrationTest.java b/spring-security-modules/spring-security-core/src/test/java/com/baeldung/denyonmissing/DenyOnMissingControllerIntegrationTest.java
new file mode 100644
index 0000000000..b4e4154982
--- /dev/null
+++ b/spring-security-modules/spring-security-core/src/test/java/com/baeldung/denyonmissing/DenyOnMissingControllerIntegrationTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.denyonmissing;
+
+import static org.hamcrest.core.Is.isA;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = DenyApplication.class)
+public class DenyOnMissingControllerIntegrationTest {
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+
+    @Autowired
+    private WebApplicationContext context;
+    private MockMvc mockMvc;
+
+    @Before
+    public void setUp() {
+        mockMvc = MockMvcBuilders.webAppContextSetup(context)
+                .build();
+    }
+
+    @Test
+    @WithMockUser(username = "user")
+    public void givenANormalUser_whenCallingHello_thenAccessDenied() throws Exception {
+        mockMvc.perform(get("/hello"))
+                .andExpect(status().isOk())
+                .andExpect(content().string("Hello world!"));
+    }
+
+    @Test
+    @WithMockUser(username = "user")
+    public void givenANormalUser_whenCallingBye_thenAccessDenied() throws Exception {
+        expectedException.expectCause(isA(AccessDeniedException.class));
+
+        mockMvc.perform(get("/bye"));
+    }
+}
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-core/src/test/resources/.gitignore b/spring-security-modules/spring-security-core/src/test/resources/.gitignore
deleted file mode 100644
index 83c05e60c8..0000000000
--- a/spring-security-modules/spring-security-core/src/test/resources/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.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 c1948fddd83b3693362845e43414637ce2bfa0e4 Mon Sep 17 00:00:00 2001
From: Gerardo Roza <rozagerardo@gmail.com>
Date: Thu, 19 Dec 2019 14:58:09 -0300
Subject: [PATCH 061/106] Added changes for improvement/ refactor of the code
 using the new spring-security stack

---
 .../spring-security-openid/README.md          |   7 +-
 .../spring-security-openid/pom.xml            |  34 +-----
 .../SpringOidcDiscoveryApplication.java       |  20 ++++
 .../web/controllers/UserRestController.java   |  17 +++
 .../login/SpringOidcLoginApplication.java     |  20 ++++
 .../config/OAuth2LoginSecurityConfig.java     |  28 +++++
 .../oidc/login/service/UserService.java       |  23 ++++
 .../web/controllers/UserRestController.java   |  32 ++++++
 ...pringOidcSessionManagementApplication.java |  20 ++++
 ...OAuth2SessionManagementSecurityConfig.java |  37 +++++++
 .../web/controllers/HomeRestController.java   |  14 +++
 .../web/controllers/UserRestController.java   |  17 +++
 .../oidc/utils/YamlLoaderInitializer.java     |  48 ++++++++
 .../config/GoogleOpenIdConnectConfig.java     |  51 ---------
 .../org/baeldung/config/HomeController.java   |  22 ----
 .../org/baeldung/config/SecurityConfig.java   |  49 ---------
 .../config/SpringOpenidApplication.java       |  14 ---
 .../security/OpenIdConnectFilter.java         | 103 ------------------
 .../security/OpenIdConnectUserDetails.java    |  81 --------------
 .../src/main/resources/application.properties |   8 --
 .../src/main/resources/application.yml        |   7 ++
 .../main/resources/discovery-application.yml  |  11 ++
 .../src/main/resources/logback.xml            |  13 ---
 .../src/main/resources/login-application.yml  |   8 ++
 .../sessionmanagement-application.yml         |  16 +++
 .../oidc/discovery/SpringContextTest.java     |  19 ++++
 .../openid/oidc/login/SpringContextTest.java  |  16 +++
 .../sessionmanagement/SpringContextTest.java  |  19 ++++
 .../java/org/baeldung/SpringContextTest.java  |  16 ---
 29 files changed, 380 insertions(+), 390 deletions(-)
 create mode 100644 spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java
 create mode 100644 spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/web/controllers/UserRestController.java
 create mode 100644 spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/SpringOidcLoginApplication.java
 create mode 100644 spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java
 create mode 100644 spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/service/UserService.java
 create mode 100644 spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/web/controllers/UserRestController.java
 create mode 100644 spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/SpringOidcSessionManagementApplication.java
 create mode 100644 spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java
 create mode 100644 spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/HomeRestController.java
 create mode 100644 spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/UserRestController.java
 create mode 100644 spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/utils/YamlLoaderInitializer.java
 delete mode 100644 spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/GoogleOpenIdConnectConfig.java
 delete mode 100644 spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/HomeController.java
 delete mode 100644 spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/SecurityConfig.java
 delete mode 100644 spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/SpringOpenidApplication.java
 delete mode 100644 spring-security-modules/spring-security-openid/src/main/java/org/baeldung/security/OpenIdConnectFilter.java
 delete mode 100644 spring-security-modules/spring-security-openid/src/main/java/org/baeldung/security/OpenIdConnectUserDetails.java
 delete mode 100644 spring-security-modules/spring-security-openid/src/main/resources/application.properties
 create mode 100644 spring-security-modules/spring-security-openid/src/main/resources/application.yml
 create mode 100644 spring-security-modules/spring-security-openid/src/main/resources/discovery-application.yml
 delete mode 100644 spring-security-modules/spring-security-openid/src/main/resources/logback.xml
 create mode 100644 spring-security-modules/spring-security-openid/src/main/resources/login-application.yml
 create mode 100644 spring-security-modules/spring-security-openid/src/main/resources/sessionmanagement-application.yml
 create mode 100644 spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/discovery/SpringContextTest.java
 create mode 100644 spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/login/SpringContextTest.java
 create mode 100644 spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/sessionmanagement/SpringContextTest.java
 delete mode 100644 spring-security-modules/spring-security-openid/src/test/java/org/baeldung/SpringContextTest.java

diff --git a/spring-security-modules/spring-security-openid/README.md b/spring-security-modules/spring-security-openid/README.md
index 1f856fe191..92ba60cad9 100644
--- a/spring-security-modules/spring-security-openid/README.md
+++ b/spring-security-modules/spring-security-openid/README.md
@@ -16,9 +16,8 @@ mvn spring-boot:run
 
 ### Obtain Google App - Client ID, Secret
 
-- You need to get client id and client secret by creating a new project at [Google Developer Console](https://console.developers.google.com/project/_/apiui/credential?pli=1)
-- Make sure to add OAuth2 credentials by selecting Add credentials > OAuth 2.0 client ID
-- Make sure you set redirect URI to http://localhost:8081/google-login
+- We need to get client id and client secret by creating a new project at [Google Developer Console](https://console.developers.google.com/project/_/apiui/credential?pli=1)
+- We can follow these instructions to register our client application on their platform
 
-- Once you have your client id and secret, make sure you add them to the `application.properties` of the project
+- Once we have the client id and secret, we have to make sure we add them to the YAML files of the project
 
diff --git a/spring-security-modules/spring-security-openid/pom.xml b/spring-security-modules/spring-security-openid/pom.xml
index 970182dc3b..a8637df865 100644
--- a/spring-security-modules/spring-security-openid/pom.xml
+++ b/spring-security-modules/spring-security-openid/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-security-openid</artifactId>
     <name>spring-security-openid</name>
@@ -15,43 +16,18 @@
     </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-tomcat</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security.oauth</groupId>
-            <artifactId>spring-security-oauth2</artifactId>
-            <version>${spring-security-oauth2.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-jwt</artifactId>
-            <version>${spring-security-jwt.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>jwks-rsa</artifactId>
-            <version>${jwks-rsa.version}</version>
+            <artifactId>spring-boot-starter-oauth2-client</artifactId>
         </dependency>
     </dependencies>
 
     <properties>
-        <spring-security-oauth2.version>2.2.1.RELEASE</spring-security-oauth2.version>
-        <spring-security-jwt.version>1.0.9.RELEASE</spring-security-jwt.version>
-        <jwks-rsa.version>0.3.0</jwks-rsa.version>
+        <spring-boot.version>2.2.1.RELEASE</spring-boot.version>
     </properties>
 
 </project>
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java
new file mode 100644
index 0000000000..895fe676e1
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java
@@ -0,0 +1,20 @@
+package com.baeldung.openid.oidc.discovery;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+
+import com.baeldung.openid.oidc.utils.YamlLoaderInitializer;
+
+@SpringBootApplication
+public class SpringOidcDiscoveryApplication {
+
+    public static void main(String[] args) {
+        SpringApplication application = new SpringApplication(SpringOidcDiscoveryApplication.class);
+        ApplicationContextInitializer<ConfigurableApplicationContext> yamlInitializer = new YamlLoaderInitializer("discovery-application.yml");
+        application.addInitializers(yamlInitializer);
+        application.run(args);
+    }
+
+}
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/web/controllers/UserRestController.java b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/web/controllers/UserRestController.java
new file mode 100644
index 0000000000..984a23fea3
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/web/controllers/UserRestController.java
@@ -0,0 +1,17 @@
+package com.baeldung.openid.oidc.discovery.web.controllers;
+
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/user")
+public class UserRestController {
+
+    @GetMapping("/oidc-principal")
+    public OidcUser getOidcUserPrincipal(@AuthenticationPrincipal OidcUser principal) {
+        return principal;
+    }
+}
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/SpringOidcLoginApplication.java b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/SpringOidcLoginApplication.java
new file mode 100644
index 0000000000..6ec87c4406
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/SpringOidcLoginApplication.java
@@ -0,0 +1,20 @@
+package com.baeldung.openid.oidc.login;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+
+import com.baeldung.openid.oidc.utils.YamlLoaderInitializer;
+
+@SpringBootApplication
+public class SpringOidcLoginApplication {
+
+    public static void main(String[] args) {
+        SpringApplication application = new SpringApplication(SpringOidcLoginApplication.class);
+        ApplicationContextInitializer<ConfigurableApplicationContext> yamlInitializer = new YamlLoaderInitializer("login-application.yml");
+        application.addInitializers(yamlInitializer);
+        application.run(args);
+    }
+
+}
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java
new file mode 100644
index 0000000000..5bb5cef58c
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java
@@ -0,0 +1,28 @@
+package com.baeldung.openid.oidc.login.config;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
+
+@Configuration
+public class OAuth2LoginSecurityConfig extends WebSecurityConfigurerAdapter {// @formatter:off
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        Set<String> googleScopes = new HashSet<>();
+        googleScopes.add("https://www.googleapis.com/auth/userinfo.email");
+        googleScopes.add("https://www.googleapis.com/auth/userinfo.profile");
+
+        OidcUserService googleUserService = new OidcUserService();
+        googleUserService.setAccessibleScopes(googleScopes);
+
+        http.authorizeRequests(authorizeRequests -> authorizeRequests.anyRequest()
+              .authenticated())
+            .oauth2Login(oauthLogin -> oauthLogin.userInfoEndpoint()
+              .oidcUserService(googleUserService));
+    }// @formatter:on
+}
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/service/UserService.java b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/service/UserService.java
new file mode 100644
index 0000000000..b6e35bd139
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/service/UserService.java
@@ -0,0 +1,23 @@
+package com.baeldung.openid.oidc.login.service;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserService {
+
+    public Map<String, Object> getUserClaims() {
+        Authentication authentication = SecurityContextHolder.getContext()
+            .getAuthentication();
+        if (authentication.getPrincipal() instanceof OidcUser) {
+            OidcUser principal = ((OidcUser) authentication.getPrincipal());
+            return principal.getClaims();
+        }
+        return Collections.emptyMap();
+    }
+}
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/web/controllers/UserRestController.java b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/web/controllers/UserRestController.java
new file mode 100644
index 0000000000..a4715c9310
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/web/controllers/UserRestController.java
@@ -0,0 +1,32 @@
+package com.baeldung.openid.oidc.login.web.controllers;
+
+import java.util.Map;
+
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baeldung.openid.oidc.login.service.UserService;
+
+@RestController
+@RequestMapping("/user")
+public class UserRestController {
+
+    private UserService service;
+
+    public UserRestController(UserService service) {
+        this.service = service;
+    }
+
+    @GetMapping("/oidc-principal")
+    public OidcUser getOidcUserPrincipal(@AuthenticationPrincipal OidcUser principal) {
+        return principal;
+    }
+
+    @GetMapping("/oidc-claims")
+    public Map<String, Object> getClaimsFromBean() {
+        return service.getUserClaims();
+    }
+}
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/SpringOidcSessionManagementApplication.java b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/SpringOidcSessionManagementApplication.java
new file mode 100644
index 0000000000..700fc7fbe7
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/SpringOidcSessionManagementApplication.java
@@ -0,0 +1,20 @@
+package com.baeldung.openid.oidc.sessionmanagement;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+
+import com.baeldung.openid.oidc.utils.YamlLoaderInitializer;
+
+@SpringBootApplication
+public class SpringOidcSessionManagementApplication {
+
+    public static void main(String[] args) {
+        SpringApplication application = new SpringApplication(SpringOidcSessionManagementApplication.class);
+        ApplicationContextInitializer<ConfigurableApplicationContext> yamlInitializer = new YamlLoaderInitializer("sessionmanagement-application.yml");
+        application.addInitializers(yamlInitializer);
+        application.run(args);
+    }
+
+}
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java
new file mode 100644
index 0000000000..5a55c89b05
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java
@@ -0,0 +1,37 @@
+package com.baeldung.openid.oidc.sessionmanagement.config;
+
+import java.net.URI;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.oauth2.client.oidc.web.logout.OidcClientInitiatedLogoutSuccessHandler;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
+
+@Configuration
+public class OAuth2SessionManagementSecurityConfig extends WebSecurityConfigurerAdapter {
+
+    @Autowired
+    private ClientRegistrationRepository clientRegistrationRepository;
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception { // @formatter:off
+        http.authorizeRequests(authorizeRequests -> authorizeRequests.mvcMatchers("/home")
+              .permitAll()
+              .anyRequest()
+                .authenticated())
+            .oauth2Login(oauthLogin -> oauthLogin.permitAll())
+            .logout(logout -> logout.logoutSuccessHandler(oidcLogoutSuccessHandler()));
+    }  // @formatter:on
+
+
+    private LogoutSuccessHandler oidcLogoutSuccessHandler() {
+        OidcClientInitiatedLogoutSuccessHandler oidcLogoutSuccessHandler = new OidcClientInitiatedLogoutSuccessHandler(this.clientRegistrationRepository);
+
+        oidcLogoutSuccessHandler.setPostLogoutRedirectUri(URI.create("http://localhost:8081/home"));
+
+        return oidcLogoutSuccessHandler;
+    }
+}
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/HomeRestController.java b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/HomeRestController.java
new file mode 100644
index 0000000000..88becc2456
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/HomeRestController.java
@@ -0,0 +1,14 @@
+package com.baeldung.openid.oidc.sessionmanagement.web.controllers;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HomeRestController {
+
+    @GetMapping("/home")
+    public String simpleHomepage() {
+        return "Welcome to this simple homepage!";
+    }
+
+}
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/UserRestController.java b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/UserRestController.java
new file mode 100644
index 0000000000..256d4bc389
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/UserRestController.java
@@ -0,0 +1,17 @@
+package com.baeldung.openid.oidc.sessionmanagement.web.controllers;
+
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/user")
+public class UserRestController {
+
+    @GetMapping("/oidc-principal")
+    public OidcUser getOidcUserPrincipal(@AuthenticationPrincipal OidcUser principal) {
+        return principal;
+    }
+}
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/utils/YamlLoaderInitializer.java b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/utils/YamlLoaderInitializer.java
new file mode 100644
index 0000000000..4d51dcb9a8
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/utils/YamlLoaderInitializer.java
@@ -0,0 +1,48 @@
+package com.baeldung.openid.oidc.utils;
+
+import java.io.IOException;
+
+import org.springframework.boot.env.YamlPropertySourceLoader;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+
+public class YamlLoaderInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+    private final YamlPropertySourceLoader loader = new YamlPropertySourceLoader();
+    private final String file;
+
+    public YamlLoaderInitializer() {
+        this.file = null;
+    }
+
+    public YamlLoaderInitializer(String file) {
+        this.file = file;
+    }
+
+    @Override
+    public void initialize(ConfigurableApplicationContext applicationContext) {
+        String yamlFile = (this.file == null) ? applicationContext.getEnvironment()
+            .getProperty("custom.configyaml.file") : this.file;
+        Resource path = new ClassPathResource(yamlFile);
+        PropertySource<?> propertySource = loadYaml(path);
+        applicationContext.getEnvironment()
+            .getPropertySources()
+            .addLast(propertySource);
+    }
+
+    private PropertySource<?> loadYaml(Resource path) {
+        if (!path.exists()) {
+            throw new IllegalArgumentException("Resource " + path + " does not exist");
+        }
+        try {
+            return this.loader.load("custom-resource", path)
+                .get(0);
+        } catch (IOException ex) {
+            throw new IllegalStateException("Failed to load yaml configuration from" + path, ex);
+        }
+    }
+
+}
diff --git a/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/GoogleOpenIdConnectConfig.java b/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/GoogleOpenIdConnectConfig.java
deleted file mode 100644
index 8e9c6e974e..0000000000
--- a/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/GoogleOpenIdConnectConfig.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.baeldung.config;
-
-import java.util.Arrays;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.oauth2.client.OAuth2ClientContext;
-import org.springframework.security.oauth2.client.OAuth2RestTemplate;
-import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
-import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeResourceDetails;
-import org.springframework.security.oauth2.config.annotation.web.configuration.EnableOAuth2Client;
-
-@Configuration
-@EnableOAuth2Client
-public class GoogleOpenIdConnectConfig {
-    @Value("${google.clientId}")
-    private String clientId;
-
-    @Value("${google.clientSecret}")
-    private String clientSecret;
-
-    @Value("${google.accessTokenUri}")
-    private String accessTokenUri;
-
-    @Value("${google.userAuthorizationUri}")
-    private String userAuthorizationUri;
-
-    @Value("${google.redirectUri}")
-    private String redirectUri;
-
-    @Bean
-    public OAuth2ProtectedResourceDetails googleOpenId() {
-        final AuthorizationCodeResourceDetails details = new AuthorizationCodeResourceDetails();
-        details.setClientId(clientId);
-        details.setClientSecret(clientSecret);
-        details.setAccessTokenUri(accessTokenUri);
-        details.setUserAuthorizationUri(userAuthorizationUri);
-        details.setScope(Arrays.asList("openid", "email"));
-        details.setPreEstablishedRedirectUri(redirectUri);
-        details.setUseCurrentUri(false);
-        return details;
-    }
-
-    @Bean
-    public OAuth2RestTemplate googleOpenIdTemplate(final OAuth2ClientContext clientContext) {
-        final OAuth2RestTemplate template = new OAuth2RestTemplate(googleOpenId(), clientContext);
-        return template;
-    }
-
-}
diff --git a/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/HomeController.java b/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/HomeController.java
deleted file mode 100644
index f0a5378019..0000000000
--- a/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/HomeController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.baeldung.config;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@Controller
-public class HomeController {
-    private final Logger logger = LoggerFactory.getLogger(getClass());
-
-    @RequestMapping("/")
-    @ResponseBody
-    public final String home() {
-        final String username = SecurityContextHolder.getContext().getAuthentication().getName();
-        logger.info(username);
-        return "Welcome, " + username;
-    }
-
-}
diff --git a/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/SecurityConfig.java b/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/SecurityConfig.java
deleted file mode 100644
index d929bfd631..0000000000
--- a/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/SecurityConfig.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.baeldung.config;
-
-import org.baeldung.security.OpenIdConnectFilter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.oauth2.client.OAuth2RestTemplate;
-import org.springframework.security.oauth2.client.filter.OAuth2ClientContextFilter;
-import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
-import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
-
-@Configuration
-@EnableWebSecurity
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-    @Autowired
-    private OAuth2RestTemplate restTemplate;
-
-    @Override
-    public void configure(WebSecurity web) throws Exception {
-        web.ignoring().antMatchers("/resources/**");
-    }
-
-    @Bean
-    public OpenIdConnectFilter myFilter() {
-        final OpenIdConnectFilter filter = new OpenIdConnectFilter("/google-login");
-        filter.setRestTemplate(restTemplate);
-        return filter;
-    }
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        // @formatter:off
-        http
-        .addFilterAfter(new OAuth2ClientContextFilter(), AbstractPreAuthenticatedProcessingFilter.class)
-        .addFilterAfter(myFilter(), OAuth2ClientContextFilter.class)
-        .httpBasic().authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/google-login"))
-        .and()
-        .authorizeRequests()
-       // .antMatchers("/","/index*").permitAll()
-        .anyRequest().authenticated()
-        ;
-
-     // @formatter:on
-    }
-}
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/SpringOpenidApplication.java b/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/SpringOpenidApplication.java
deleted file mode 100644
index 1acdba0623..0000000000
--- a/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/config/SpringOpenidApplication.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-@SpringBootApplication
-public class SpringOpenidApplication extends SpringBootServletInitializer {
-
-    public static void main(String[] args) {
-        SpringApplication.run(SpringOpenidApplication.class, args);
-    }
-
-}
diff --git a/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/security/OpenIdConnectFilter.java b/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/security/OpenIdConnectFilter.java
deleted file mode 100644
index f12169cb27..0000000000
--- a/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/security/OpenIdConnectFilter.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.baeldung.security;
-
-import java.io.IOException;
-import java.net.URL;
-import java.security.interfaces.RSAPublicKey;
-import java.util.Date;
-import java.util.Map;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.jwt.Jwt;
-import org.springframework.security.jwt.JwtHelper;
-import org.springframework.security.jwt.crypto.sign.RsaVerifier;
-import org.springframework.security.oauth2.client.OAuth2RestOperations;
-import org.springframework.security.oauth2.client.OAuth2RestTemplate;
-import org.springframework.security.oauth2.common.OAuth2AccessToken;
-import org.springframework.security.oauth2.common.exceptions.OAuth2Exception;
-import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
-
-import com.auth0.jwk.Jwk;
-import com.auth0.jwk.JwkProvider;
-import com.auth0.jwk.UrlJwkProvider;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class OpenIdConnectFilter extends AbstractAuthenticationProcessingFilter {
-    @Value("${google.clientId}")
-    private String clientId;
-
-    @Value("${google.issuer}")
-    private String issuer;
-
-    @Value("${google.jwkUrl}")
-    private String jwkUrl;
-
-    public OAuth2RestOperations restTemplate;
-
-    public OpenIdConnectFilter(String defaultFilterProcessesUrl) {
-        super(defaultFilterProcessesUrl);
-        setAuthenticationManager(new NoopAuthenticationManager());
-    }
-
-    @Override
-    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException, IOException, ServletException {
-
-        OAuth2AccessToken accessToken;
-        try {
-            accessToken = restTemplate.getAccessToken();
-        } catch (final OAuth2Exception e) {
-            throw new BadCredentialsException("Could not obtain access token", e);
-        }
-        try {
-            final String idToken = accessToken.getAdditionalInformation().get("id_token").toString();
-            String kid = JwtHelper.headers(idToken)
-                .get("kid");
-            final Jwt tokenDecoded = JwtHelper.decodeAndVerify(idToken, verifier(kid));
-            final Map<String, String> authInfo = new ObjectMapper().readValue(tokenDecoded.getClaims(), Map.class);
-            verifyClaims(authInfo);
-            final OpenIdConnectUserDetails user = new OpenIdConnectUserDetails(authInfo, accessToken);
-            return new UsernamePasswordAuthenticationToken(user, null, user.getAuthorities());
-        } catch (final Exception e) {
-            throw new BadCredentialsException("Could not obtain user details from token", e);
-        }
-
-    }
-
-    public void verifyClaims(Map claims) {
-        int exp = (int) claims.get("exp");
-        Date expireDate = new Date(exp * 1000L);
-        Date now = new Date();
-        if (expireDate.before(now) || !claims.get("iss").equals(issuer) || !claims.get("aud").equals(clientId)) {
-            throw new RuntimeException("Invalid claims");
-        }
-    }
-
-
-    private RsaVerifier verifier(String kid) throws Exception {
-        JwkProvider provider = new UrlJwkProvider(new URL(jwkUrl));
-        Jwk jwk = provider.get(kid);
-        return new RsaVerifier((RSAPublicKey) jwk.getPublicKey());
-    }
-
-    public void setRestTemplate(OAuth2RestTemplate restTemplate2) {
-        restTemplate = restTemplate2;
-
-    }
-
-    private static class NoopAuthenticationManager implements AuthenticationManager {
-
-        @Override
-        public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-            throw new UnsupportedOperationException("No authentication should be done with this AuthenticationManager");
-        }
-
-    }
-}
diff --git a/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/security/OpenIdConnectUserDetails.java b/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/security/OpenIdConnectUserDetails.java
deleted file mode 100644
index f0d91fdc27..0000000000
--- a/spring-security-modules/spring-security-openid/src/main/java/org/baeldung/security/OpenIdConnectUserDetails.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.baeldung.security;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.oauth2.common.OAuth2AccessToken;
-
-public class OpenIdConnectUserDetails implements UserDetails {
-
-    private static final long serialVersionUID = 1L;
-
-    private String userId;
-    private String username;
-    private OAuth2AccessToken token;
-
-    public OpenIdConnectUserDetails(Map<String, String> userInfo, OAuth2AccessToken token) {
-        this.userId = userInfo.get("sub");
-        this.username = userInfo.get("email");
-        this.token = token;
-    }
-
-    @Override
-    public String getUsername() {
-        return username;
-    }
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return Arrays.asList(new SimpleGrantedAuthority("ROLE_USER"));
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public OAuth2AccessToken getToken() {
-        return token;
-    }
-
-    public void setToken(OAuth2AccessToken token) {
-        this.token = token;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    @Override
-    public String getPassword() {
-        return null;
-    }
-
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
-
-}
diff --git a/spring-security-modules/spring-security-openid/src/main/resources/application.properties b/spring-security-modules/spring-security-openid/src/main/resources/application.properties
deleted file mode 100644
index 49022bf280..0000000000
--- a/spring-security-modules/spring-security-openid/src/main/resources/application.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-server.port=8081
-google.clientId=TODO
-google.clientSecret=TODO
-google.accessTokenUri=https://www.googleapis.com/oauth2/v3/token
-google.userAuthorizationUri=https://accounts.google.com/o/oauth2/auth
-google.redirectUri=http://localhost:8081/google-login
-google.issuer=accounts.google.com
-google.jwkUrl=https://www.googleapis.com/oauth2/v2/certs
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-openid/src/main/resources/application.yml b/spring-security-modules/spring-security-openid/src/main/resources/application.yml
new file mode 100644
index 0000000000..f303fcecd1
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/resources/application.yml
@@ -0,0 +1,7 @@
+server:
+  port: 8081
+  
+logging:
+  level:
+    org.springframework.web.client.RestTemplate: DEBUG
+            
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-openid/src/main/resources/discovery-application.yml b/spring-security-modules/spring-security-openid/src/main/resources/discovery-application.yml
new file mode 100644
index 0000000000..1cbebbcb7b
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/resources/discovery-application.yml
@@ -0,0 +1,11 @@
+spring:
+  security:
+    oauth2:
+      client:
+        registration:
+          custom-google:
+            client-id: <client-id>
+            client-secret: <client-secret>
+        provider:
+          custom-google:
+            issuer-uri: https://accounts.google.com
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-openid/src/main/resources/logback.xml b/spring-security-modules/spring-security-openid/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/spring-security-modules/spring-security-openid/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/spring-security-modules/spring-security-openid/src/main/resources/login-application.yml b/spring-security-modules/spring-security-openid/src/main/resources/login-application.yml
new file mode 100644
index 0000000000..b3220a0550
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/resources/login-application.yml
@@ -0,0 +1,8 @@
+spring:
+  security:
+    oauth2:
+      client:
+        registration:
+          google:
+            client-id: <client-id>
+            client-secret: <client-secret>
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-openid/src/main/resources/sessionmanagement-application.yml b/spring-security-modules/spring-security-openid/src/main/resources/sessionmanagement-application.yml
new file mode 100644
index 0000000000..d7dd5e6ec7
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/main/resources/sessionmanagement-application.yml
@@ -0,0 +1,16 @@
+spring:
+  security:
+    oauth2:
+      client:
+        registration:
+          okta:
+            client-id: <client-id>
+            client-secret: <client-secret>
+        provider:
+          okta:
+            issuer-uri: https://dev-123.okta.com
+            # Or, optionally:            
+            #authorization-uri https://dev-123-admin.okta.com/oauth2/v1/authorize
+            #token-uri: https://dev-123-admin.okta.com/oauth2/v1/token
+            #user-info-uri: https://dev-123-admin.okta.com/oauth2/v1/userinfo
+            #jwk-set-uri: https://dev-123-admin.okta.com/oauth2/v1/keys
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/discovery/SpringContextTest.java b/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/discovery/SpringContextTest.java
new file mode 100644
index 0000000000..25c87cdc6f
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/discovery/SpringContextTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.openid.oidc.discovery;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+
+import com.baeldung.openid.oidc.utils.YamlLoaderInitializer;
+
+//We'll ignore this test, as we don't want to depend on Google's OIDC-configuration endpoint to be available
+@Disabled
+@SpringBootTest(classes = SpringOidcDiscoveryApplication.class, properties = "custom.configyaml.file=discovery-application.yml")
+@ContextConfiguration(initializers = YamlLoaderInitializer.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/login/SpringContextTest.java b/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/login/SpringContextTest.java
new file mode 100644
index 0000000000..675dcd8727
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/login/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.openid.oidc.login;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+
+import com.baeldung.openid.oidc.utils.YamlLoaderInitializer;
+
+@SpringBootTest(classes = SpringOidcLoginApplication.class, properties = "custom.configyaml.file=login-application.yml")
+@ContextConfiguration(initializers = YamlLoaderInitializer.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/sessionmanagement/SpringContextTest.java b/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/sessionmanagement/SpringContextTest.java
new file mode 100644
index 0000000000..91ed11fbaf
--- /dev/null
+++ b/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/sessionmanagement/SpringContextTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.openid.oidc.sessionmanagement;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+
+import com.baeldung.openid.oidc.utils.YamlLoaderInitializer;
+
+//We'll ignore this test, as we don't want to depend on the Okta instance OIDC-configuration endpoint to be available
+@Disabled
+@SpringBootTest(classes = SpringOidcSessionManagementApplication.class, properties = "custom.configyaml.file=sessionmanagement-application.yml")
+@ContextConfiguration(initializers = YamlLoaderInitializer.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-modules/spring-security-openid/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-modules/spring-security-openid/src/test/java/org/baeldung/SpringContextTest.java
deleted file mode 100644
index fa346b2b31..0000000000
--- a/spring-security-modules/spring-security-openid/src/test/java/org/baeldung/SpringContextTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.SpringOpenidApplication;
-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(classes = SpringOpenidApplication.class)
-public class SpringContextTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}

From 98bdc464da4c054f7c5d62a3bb74d26137be82b9 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Fri, 20 Dec 2019 12:32:07 +0100
Subject: [PATCH 062/106] BAEL-20262: Migrate spring-exceptions module to the
 com.baeldung package

---
 .../ex/beancreationexception/cause1/BeanA.java       |  2 +-
 .../ex/beancreationexception/cause1/BeanB.java       |  5 +++++
 .../ex/beancreationexception/cause2/BeanA.java       |  2 +-
 .../ex/beancreationexception/cause2/BeanB1.java      |  2 +-
 .../ex/beancreationexception/cause2/BeanB2.java      |  2 +-
 .../ex/beancreationexception/cause2/IBeanB.java      |  5 +++++
 .../ex/beancreationexception/cause3/BeanA.java       |  2 +-
 .../ex/beancreationexception/cause4/BeanA.java       |  2 +-
 .../ex/beancreationexception/cause4/IBeanA.java      |  5 +++++
 .../ex/beancreationexception/cause5/BeanA.java       |  2 +-
 .../ex/beancreationexception/cause5/IBeanA.java      |  5 +++++
 .../ex/beancreationexception/cause6/BeanA.java       |  2 +-
 .../ex/beancreationexception/cause6/BeanB.java       |  2 +-
 .../ex/beancreationexception/cause6/IBeanB.java      |  5 +++++
 .../ex/beancreationexception/cause8/BeanA.java       |  2 +-
 .../ex/beancreationexception/cause8/BeanB.java       |  2 +-
 .../ex/beancreationexception/cause8/IBeanA.java      |  5 +++++
 .../ex/beancreationexception/cause8/IBeanB.java      |  5 +++++
 .../ex/beancreationexception/cause9/BeanA.java       |  2 +-
 .../ex/beancreationexception/cause9/BeanB.java       |  5 +++++
 .../ex/beancreationexception/cause9/IBeanA.java      |  5 +++++
 .../spring/Cause1ContextWithJavaConfig.java          |  4 ++--
 .../spring/Cause2ContextWithJavaConfig.java          |  4 ++--
 .../spring/Cause3ContextWithJavaConfig.java          |  4 ++--
 .../spring/Cause4ContextWithJavaConfig.java          |  4 ++--
 .../spring/Cause5ContextWithJavaConfig.java          |  4 ++--
 .../spring/Cause6ContextWithJavaConfig.java          |  4 ++--
 .../spring/Cause7ContextWithJavaConfig.java          |  4 ++--
 .../spring/Cause8ContextWithJavaConfig.java          |  4 ++--
 .../spring/Cause9ContextWithJavaConfig.java          |  6 +++---
 .../beandefinitionstoreexception/cause2/BeanA.java   |  2 +-
 .../spring/Cause1ContextWithJavaConfig.java          |  4 ++--
 .../spring/Cause2ContextWithJavaConfig.java          |  4 ++--
 .../spring/Cause3ContextWithJavaConfig.java          |  4 ++--
 .../spring/Cause1DataContextWithJavaConfig.java      |  6 +++---
 .../spring/Cause2DataContextWithJavaConfig.java      |  6 +++---
 .../spring/Cause3DataContextWithJavaConfig.java      |  6 +++---
 .../cause1/persistence/model/Foo.java                |  2 +-
 .../cause2/persistence/model/Foo.java                |  2 +-
 .../cause3/persistence/model/Foo.java                |  2 +-
 .../cause4/persistence/model/Foo.java                |  2 +-
 .../spring/Cause1PersistenceConfig.java              |  6 +++---
 .../spring/Cause2PersistenceConfig.java              |  6 +++---
 .../spring/Cause3PersistenceConfig.java              |  8 ++++----
 .../cause/Cause1NonTransientConfig.java              |  6 +++---
 .../cause/Cause4NonTransientConfig.java              |  6 +++---
 .../cause/Cause5NonTransientConfig.java              |  6 +++---
 .../nosuchbeandefinitionexception/cause1/BeanA.java  |  2 +-
 .../nosuchbeandefinitionexception/cause1/BeanB.java  |  5 +++++
 .../nosuchbeandefinitionexception/cause2/BeanA.java  |  2 +-
 .../nosuchbeandefinitionexception/cause2/BeanB1.java |  2 +-
 .../nosuchbeandefinitionexception/cause2/BeanB2.java |  2 +-
 .../nosuchbeandefinitionexception/cause2/IBeanB.java |  5 +++++
 .../nosuchbeandefinitionexception/cause3/BeanA.java  |  2 +-
 .../spring/Cause1ContextWithJavaConfig.java          |  4 ++--
 .../spring/Cause2ContextWithJavaConfig.java          |  4 ++--
 .../spring/Cause3ContextWithJavaConfig.java          |  4 ++--
 .../{org => com}/baeldung/persistence/Setup.java     |  2 +-
 .../persistence/common/AbstractHibernateDao.java     |  2 +-
 .../baeldung/persistence/common/AbstractService.java |  3 +--
 .../baeldung/persistence/common/IOperations.java     |  2 +-
 .../java/com/baeldung/persistence/dao/IChildDao.java |  8 ++++++++
 .../java/com/baeldung/persistence/dao/IFooDao.java   |  8 ++++++++
 .../com/baeldung/persistence/dao/IParentDao.java     |  8 ++++++++
 .../baeldung/persistence/dao/impl/ChildDao.java      |  8 ++++----
 .../baeldung/persistence/dao/impl/FooDao.java        |  8 ++++----
 .../baeldung/persistence/dao/impl/ParentDao.java     |  8 ++++----
 .../baeldung/persistence/model/Child.java            |  2 +-
 .../{org => com}/baeldung/persistence/model/Foo.java |  2 +-
 .../baeldung/persistence/model/Parent.java           |  2 +-
 .../baeldung/persistence/service/IChildService.java  |  8 ++++++++
 .../baeldung/persistence/service/IFooService.java    |  8 ++++++++
 .../baeldung/persistence/service/IParentService.java |  8 ++++++++
 .../persistence/service/impl/ChildService.java       | 12 ++++++------
 .../persistence/service/impl/FooService.java         | 12 ++++++------
 .../persistence/service/impl/ParentService.java      | 12 ++++++------
 .../core/ComponentInXmlUsingProperties.java          |  2 +-
 .../properties/core/ComponentUsingProperties.java    |  2 +-
 .../properties/spring/PropertiesWithJavaConfig.java  |  4 ++--
 .../spring/PropertiesWithJavaConfigOther.java        |  2 +-
 .../properties/spring/PropertiesWithXmlConfig.java   |  4 ++--
 .../spring/PropertiesWithXmlConfigOne.java           |  4 ++--
 .../spring/PropertiesWithXmlConfigTwo.java           |  2 +-
 .../baeldung/spring/config/CoreConfig.java           |  4 ++--
 .../spring/config/MainWebAppInitializer.java         |  4 ++--
 .../baeldung/spring/config/MvcConfig.java            |  2 +-
 .../baeldung/spring/config/PersistenceConfig.java    |  6 +++---
 .../ex/beancreationexception/cause1/BeanB.java       |  5 -----
 .../ex/beancreationexception/cause2/IBeanB.java      |  5 -----
 .../ex/beancreationexception/cause4/IBeanA.java      |  5 -----
 .../ex/beancreationexception/cause5/IBeanA.java      |  5 -----
 .../ex/beancreationexception/cause6/IBeanB.java      |  5 -----
 .../ex/beancreationexception/cause8/IBeanA.java      |  5 -----
 .../ex/beancreationexception/cause8/IBeanB.java      |  5 -----
 .../ex/beancreationexception/cause9/BeanB.java       |  5 -----
 .../ex/beancreationexception/cause9/IBeanA.java      |  5 -----
 .../nosuchbeandefinitionexception/cause1/BeanB.java  |  5 -----
 .../nosuchbeandefinitionexception/cause2/IBeanB.java |  5 -----
 .../java/org/baeldung/persistence/dao/IChildDao.java |  8 --------
 .../java/org/baeldung/persistence/dao/IFooDao.java   |  8 --------
 .../org/baeldung/persistence/dao/IParentDao.java     |  8 --------
 .../baeldung/persistence/service/IChildService.java  |  8 --------
 .../baeldung/persistence/service/IFooService.java    |  8 --------
 .../baeldung/persistence/service/IParentService.java |  8 --------
 .../main/resources/beancreationexception_cause4.xml  |  2 +-
 .../main/resources/beancreationexception_cause6.xml  |  2 +-
 .../main/resources/beancreationexception_cause7.xml  |  2 +-
 .../main/resources/beancreationexception_cause9.xml  |  2 +-
 .../src/main/resources/configForProperties.xml       |  2 +-
 .../src/main/resources/configForPropertiesOne.xml    |  2 +-
 .../src/main/webapp/WEB-INF/web_old.xml              |  2 +-
 .../{org => com}/baeldung/SpringContextLiveTest.java |  4 ++--
 .../BeanCreationExceptionTestSuite.java              |  2 +-
 .../Cause1BeanCreationExceptionManualTest.java       |  4 ++--
 .../Cause2BeanCreationExceptionManualTest.java       |  4 ++--
 .../Cause3BeanCreationExceptionManualTest.java       |  4 ++--
 .../Cause4BeanCreationExceptionManualTest.java       |  4 ++--
 .../Cause5BeanCreationExceptionManualTest.java       |  4 ++--
 .../Cause6BeanCreationExceptionManualTest.java       |  4 ++--
 .../Cause7BeanCreationExceptionManualTest.java       |  4 ++--
 .../Cause8BeanCreationExceptionManualTest.java       |  4 ++--
 .../Cause9BeanCreationExceptionManualTest.java       |  4 ++--
 ...Cause1BeanDefinitionStoreExceptionManualTest.java |  4 ++--
 ...Cause2BeanDefinitionStoreExceptionManualTest.java |  4 ++--
 ...Cause3BeanDefinitionStoreExceptionManualTest.java |  4 ++--
 ...se1DataIntegrityViolationExceptionManualTest.java | 12 ++++++------
 ...se2DataIntegrityViolationExceptionManualTest.java |  8 ++++----
 ...se3DataIntegrityViolationExceptionManualTest.java |  8 ++++----
 .../Cause1MappingExceptionManualTest.java            |  6 +++---
 .../Cause2MappingExceptionManualTest.java            |  6 +++---
 .../Cause3MappingExceptionManualTest.java            |  6 +++---
 .../Cause4MappingExceptionManualTest.java            |  4 ++--
 .../CannotGetJdbcConnectionExceptionManualTest.java  |  8 ++------
 .../DataIntegrityExceptionManualTest.java            |  8 ++++----
 .../DataRetrievalExceptionManualTest.java            |  6 +++---
 .../DataSourceLookupExceptionManualTest.java         |  4 ++--
 .../InvalidResourceUsageExceptionManualTest.java     |  6 +++---
 ...ause1NoSuchBeanDefinitionExceptionManualTest.java | 10 ++--------
 ...ause2NoSuchBeanDefinitionExceptionManualTest.java |  4 ++--
 ...ause3NoSuchBeanDefinitionExceptionManualTest.java |  4 ++--
 .../core/PropertiesWithJavaManualTest.java           |  6 +++---
 .../core/PropertiesWithMultipleXmlsManualTest.java   |  6 +++---
 .../properties/core/PropertiesWithXmlManualTest.java |  4 ++--
 143 files changed, 326 insertions(+), 337 deletions(-)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/cause1/BeanA.java (77%)
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause1/BeanB.java
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/cause2/BeanA.java (77%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/cause2/BeanB1.java (67%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/cause2/BeanB2.java (67%)
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause2/IBeanB.java
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/cause3/BeanA.java (75%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/cause4/BeanA.java (68%)
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause4/IBeanA.java
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/cause5/BeanA.java (78%)
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause5/IBeanA.java
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/cause6/BeanA.java (67%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/cause6/BeanB.java (66%)
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause6/IBeanB.java
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/cause8/BeanA.java (84%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/cause8/BeanB.java (84%)
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/IBeanA.java
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/IBeanB.java
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/cause9/BeanA.java (51%)
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause9/BeanB.java
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause9/IBeanA.java
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/spring/Cause1ContextWithJavaConfig.java (69%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/spring/Cause2ContextWithJavaConfig.java (69%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/spring/Cause3ContextWithJavaConfig.java (69%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/spring/Cause4ContextWithJavaConfig.java (76%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/spring/Cause5ContextWithJavaConfig.java (69%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/spring/Cause6ContextWithJavaConfig.java (76%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/spring/Cause7ContextWithJavaConfig.java (76%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/spring/Cause8ContextWithJavaConfig.java (69%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beancreationexception/spring/Cause9ContextWithJavaConfig.java (80%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beandefinitionstoreexception/cause2/BeanA.java (77%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beandefinitionstoreexception/spring/Cause1ContextWithJavaConfig.java (74%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beandefinitionstoreexception/spring/Cause2ContextWithJavaConfig.java (84%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/beandefinitionstoreexception/spring/Cause3ContextWithJavaConfig.java (68%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/dataintegrityviolationexception/spring/Cause1DataContextWithJavaConfig.java (78%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/dataintegrityviolationexception/spring/Cause2DataContextWithJavaConfig.java (66%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/dataintegrityviolationexception/spring/Cause3DataContextWithJavaConfig.java (66%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/mappingexception/cause1/persistence/model/Foo.java (87%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/mappingexception/cause2/persistence/model/Foo.java (88%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/mappingexception/cause3/persistence/model/Foo.java (88%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/mappingexception/cause4/persistence/model/Foo.java (88%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java (94%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java (94%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java (92%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java (94%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java (94%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java (94%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java (75%)
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java (75%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java (63%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java (63%)
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java (87%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java (68%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java (68%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java (68%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/persistence/Setup.java (94%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/persistence/common/AbstractHibernateDao.java (97%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/persistence/common/AbstractService.java (90%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/persistence/common/IOperations.java (88%)
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/persistence/dao/IChildDao.java
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/persistence/dao/IFooDao.java
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/persistence/dao/IParentDao.java
 rename spring-exceptions/src/main/java/{org => com}/baeldung/persistence/dao/impl/ChildDao.java (67%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/persistence/dao/impl/FooDao.java (66%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/persistence/dao/impl/ParentDao.java (67%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/persistence/model/Child.java (95%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/persistence/model/Foo.java (97%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/persistence/model/Parent.java (96%)
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/persistence/service/IChildService.java
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/persistence/service/IFooService.java
 create mode 100644 spring-exceptions/src/main/java/com/baeldung/persistence/service/IParentService.java
 rename spring-exceptions/src/main/java/{org => com}/baeldung/persistence/service/impl/ChildService.java (56%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/persistence/service/impl/FooService.java (56%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/persistence/service/impl/ParentService.java (57%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/properties/core/ComponentInXmlUsingProperties.java (95%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/properties/core/ComponentUsingProperties.java (95%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/properties/spring/PropertiesWithJavaConfig.java (88%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/properties/spring/PropertiesWithJavaConfigOther.java (88%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/properties/spring/PropertiesWithXmlConfig.java (82%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/properties/spring/PropertiesWithXmlConfigOne.java (82%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java (88%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/spring/config/CoreConfig.java (81%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/spring/config/MainWebAppInitializer.java (95%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/spring/config/MvcConfig.java (96%)
 rename spring-exceptions/src/main/java/{org => com}/baeldung/spring/config/PersistenceConfig.java (94%)
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause1/BeanB.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause2/IBeanB.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause4/IBeanA.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause5/IBeanA.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause6/IBeanB.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/IBeanA.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/IBeanB.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause9/BeanB.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause9/IBeanA.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/persistence/dao/IChildDao.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/persistence/dao/IFooDao.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/persistence/dao/IParentDao.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/persistence/service/IChildService.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/persistence/service/IFooService.java
 delete mode 100644 spring-exceptions/src/main/java/org/baeldung/persistence/service/IParentService.java
 rename spring-exceptions/src/test/java/{org => com}/baeldung/SpringContextLiveTest.java (87%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java (93%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/beancreationexception/Cause1BeanCreationExceptionManualTest.java (84%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/beancreationexception/Cause2BeanCreationExceptionManualTest.java (84%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/beancreationexception/Cause3BeanCreationExceptionManualTest.java (84%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/beancreationexception/Cause4BeanCreationExceptionManualTest.java (84%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/beancreationexception/Cause5BeanCreationExceptionManualTest.java (84%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/beancreationexception/Cause6BeanCreationExceptionManualTest.java (84%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/beancreationexception/Cause7BeanCreationExceptionManualTest.java (84%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/beancreationexception/Cause8BeanCreationExceptionManualTest.java (84%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/beancreationexception/Cause9BeanCreationExceptionManualTest.java (84%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/beandefinitionstoreexception/Cause1BeanDefinitionStoreExceptionManualTest.java (83%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/beandefinitionstoreexception/Cause2BeanDefinitionStoreExceptionManualTest.java (83%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/beandefinitionstoreexception/Cause3BeanDefinitionStoreExceptionManualTest.java (83%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/dataintegrityviolationexception/Cause1DataIntegrityViolationExceptionManualTest.java (82%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/dataintegrityviolationexception/Cause2DataIntegrityViolationExceptionManualTest.java (80%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/dataintegrityviolationexception/Cause3DataIntegrityViolationExceptionManualTest.java (82%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/mappingexception/Cause1MappingExceptionManualTest.java (85%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/mappingexception/Cause2MappingExceptionManualTest.java (84%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/mappingexception/Cause3MappingExceptionManualTest.java (85%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java (93%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/nontransientdataaccessexception/CannotGetJdbcConnectionExceptionManualTest.java (74%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/nontransientdataaccessexception/DataIntegrityExceptionManualTest.java (87%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/nontransientdataaccessexception/DataRetrievalExceptionManualTest.java (92%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/nontransientdataaccessexception/DataSourceLookupExceptionManualTest.java (89%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/nontransientdataaccessexception/InvalidResourceUsageExceptionManualTest.java (90%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionManualTest.java (57%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionManualTest.java (83%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionManualTest.java (83%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/properties/core/PropertiesWithJavaManualTest.java (86%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/properties/core/PropertiesWithMultipleXmlsManualTest.java (86%)
 rename spring-exceptions/src/test/java/{org => com}/baeldung/properties/core/PropertiesWithXmlManualTest.java (90%)

diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause1/BeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause1/BeanA.java
similarity index 77%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause1/BeanA.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause1/BeanA.java
index 50d07c6d39..735b6936fe 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause1/BeanA.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause1/BeanA.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beancreationexception.cause1;
+package com.baeldung.ex.beancreationexception.cause1;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause1/BeanB.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause1/BeanB.java
new file mode 100644
index 0000000000..666389bb01
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause1/BeanB.java
@@ -0,0 +1,5 @@
+package com.baeldung.ex.beancreationexception.cause1;
+
+public class BeanB {
+    //
+}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause2/BeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause2/BeanA.java
similarity index 77%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause2/BeanA.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause2/BeanA.java
index 352dd5f2db..ba139118b7 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause2/BeanA.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause2/BeanA.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beancreationexception.cause2;
+package com.baeldung.ex.beancreationexception.cause2;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause2/BeanB1.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause2/BeanB1.java
similarity index 67%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause2/BeanB1.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause2/BeanB1.java
index b9ec961d1e..b36dd1152f 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause2/BeanB1.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause2/BeanB1.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beancreationexception.cause2;
+package com.baeldung.ex.beancreationexception.cause2;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause2/BeanB2.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause2/BeanB2.java
similarity index 67%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause2/BeanB2.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause2/BeanB2.java
index aa7fe8250a..4dc5a9a7f6 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause2/BeanB2.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause2/BeanB2.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beancreationexception.cause2;
+package com.baeldung.ex.beancreationexception.cause2;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause2/IBeanB.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause2/IBeanB.java
new file mode 100644
index 0000000000..f469af842c
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause2/IBeanB.java
@@ -0,0 +1,5 @@
+package com.baeldung.ex.beancreationexception.cause2;
+
+public interface IBeanB {
+    //
+}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause3/BeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause3/BeanA.java
similarity index 75%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause3/BeanA.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause3/BeanA.java
index 2f2d1b2684..e169a267b6 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause3/BeanA.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause3/BeanA.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beancreationexception.cause3;
+package com.baeldung.ex.beancreationexception.cause3;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause4/BeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause4/BeanA.java
similarity index 68%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause4/BeanA.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause4/BeanA.java
index 7886f30f22..d1e7b157ee 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause4/BeanA.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause4/BeanA.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beancreationexception.cause4;
+package com.baeldung.ex.beancreationexception.cause4;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause4/IBeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause4/IBeanA.java
new file mode 100644
index 0000000000..495dec9180
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause4/IBeanA.java
@@ -0,0 +1,5 @@
+package com.baeldung.ex.beancreationexception.cause4;
+
+public interface IBeanA {
+    //
+}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause5/BeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause5/BeanA.java
similarity index 78%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause5/BeanA.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause5/BeanA.java
index b8f88125b2..85dc2a4c60 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause5/BeanA.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause5/BeanA.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beancreationexception.cause5;
+package com.baeldung.ex.beancreationexception.cause5;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause5/IBeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause5/IBeanA.java
new file mode 100644
index 0000000000..8429f7d5d7
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause5/IBeanA.java
@@ -0,0 +1,5 @@
+package com.baeldung.ex.beancreationexception.cause5;
+
+public interface IBeanA {
+    //
+}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause6/BeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause6/BeanA.java
similarity index 67%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause6/BeanA.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause6/BeanA.java
index 164b006340..82dcb6faf2 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause6/BeanA.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause6/BeanA.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beancreationexception.cause6;
+package com.baeldung.ex.beancreationexception.cause6;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause6/BeanB.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause6/BeanB.java
similarity index 66%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause6/BeanB.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause6/BeanB.java
index 4a7bdab280..f37cc6f50d 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause6/BeanB.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause6/BeanB.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beancreationexception.cause6;
+package com.baeldung.ex.beancreationexception.cause6;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause6/IBeanB.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause6/IBeanB.java
new file mode 100644
index 0000000000..6515c7b467
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause6/IBeanB.java
@@ -0,0 +1,5 @@
+package com.baeldung.ex.beancreationexception.cause6;
+
+public interface IBeanB {
+    //
+}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/BeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/BeanA.java
similarity index 84%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/BeanA.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/BeanA.java
index 2a0230fa3f..e301a1f13c 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/BeanA.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/BeanA.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beancreationexception.cause8;
+package com.baeldung.ex.beancreationexception.cause8;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/BeanB.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/BeanB.java
similarity index 84%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/BeanB.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/BeanB.java
index 2e8a3eed07..3c3bd9f106 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/BeanB.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/BeanB.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beancreationexception.cause8;
+package com.baeldung.ex.beancreationexception.cause8;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/IBeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/IBeanA.java
new file mode 100644
index 0000000000..42b4c7390c
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/IBeanA.java
@@ -0,0 +1,5 @@
+package com.baeldung.ex.beancreationexception.cause8;
+
+public interface IBeanA {
+    //
+}
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/IBeanB.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/IBeanB.java
new file mode 100644
index 0000000000..6ecbddf617
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause8/IBeanB.java
@@ -0,0 +1,5 @@
+package com.baeldung.ex.beancreationexception.cause8;
+
+public interface IBeanB {
+    //
+}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause9/BeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause9/BeanA.java
similarity index 51%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause9/BeanA.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause9/BeanA.java
index 28c39e2777..814c4f84ff 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause9/BeanA.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause9/BeanA.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beancreationexception.cause9;
+package com.baeldung.ex.beancreationexception.cause9;
 
 public abstract class BeanA implements IBeanA {
     //
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause9/BeanB.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause9/BeanB.java
new file mode 100644
index 0000000000..327bbfd10e
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause9/BeanB.java
@@ -0,0 +1,5 @@
+package com.baeldung.ex.beancreationexception.cause9;
+
+public class BeanB {
+    //
+}
\ No newline at end of file
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause9/IBeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause9/IBeanA.java
new file mode 100644
index 0000000000..a8abfd5ae0
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/cause9/IBeanA.java
@@ -0,0 +1,5 @@
+package com.baeldung.ex.beancreationexception.cause9;
+
+public interface IBeanA {
+    //
+}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause1ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause1ContextWithJavaConfig.java
similarity index 69%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause1ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause1ContextWithJavaConfig.java
index cb74b96b67..fcc501f7e3 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause1ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause1ContextWithJavaConfig.java
@@ -1,10 +1,10 @@
-package org.baeldung.ex.beancreationexception.spring;
+package com.baeldung.ex.beancreationexception.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.beancreationexception.cause1")
+@ComponentScan("com.baeldung.ex.beancreationexception.cause1")
 public class Cause1ContextWithJavaConfig {
 
     public Cause1ContextWithJavaConfig() {
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause2ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause2ContextWithJavaConfig.java
similarity index 69%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause2ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause2ContextWithJavaConfig.java
index 6b20439059..cd8b36f2db 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause2ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause2ContextWithJavaConfig.java
@@ -1,10 +1,10 @@
-package org.baeldung.ex.beancreationexception.spring;
+package com.baeldung.ex.beancreationexception.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.beancreationexception.cause2")
+@ComponentScan("com.baeldung.ex.beancreationexception.cause2")
 public class Cause2ContextWithJavaConfig {
 
     public Cause2ContextWithJavaConfig() {
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause3ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause3ContextWithJavaConfig.java
similarity index 69%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause3ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause3ContextWithJavaConfig.java
index 437d2c4c20..205a9b6553 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause3ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause3ContextWithJavaConfig.java
@@ -1,10 +1,10 @@
-package org.baeldung.ex.beancreationexception.spring;
+package com.baeldung.ex.beancreationexception.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.beancreationexception.cause3")
+@ComponentScan("com.baeldung.ex.beancreationexception.cause3")
 public class Cause3ContextWithJavaConfig {
 
     public Cause3ContextWithJavaConfig() {
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause4ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause4ContextWithJavaConfig.java
similarity index 76%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause4ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause4ContextWithJavaConfig.java
index b661ba4650..f2fb2b9a6d 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause4ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause4ContextWithJavaConfig.java
@@ -1,11 +1,11 @@
-package org.baeldung.ex.beancreationexception.spring;
+package com.baeldung.ex.beancreationexception.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.beancreationexception.cause4")
+@ComponentScan("com.baeldung.ex.beancreationexception.cause4")
 @ImportResource("classpath:beancreationexception_cause4.xml")
 public class Cause4ContextWithJavaConfig {
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause5ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause5ContextWithJavaConfig.java
similarity index 69%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause5ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause5ContextWithJavaConfig.java
index 821041cb0c..3d45bd6896 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause5ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause5ContextWithJavaConfig.java
@@ -1,10 +1,10 @@
-package org.baeldung.ex.beancreationexception.spring;
+package com.baeldung.ex.beancreationexception.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.beancreationexception.cause5")
+@ComponentScan("com.baeldung.ex.beancreationexception.cause5")
 public class Cause5ContextWithJavaConfig {
 
     public Cause5ContextWithJavaConfig() {
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause6ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause6ContextWithJavaConfig.java
similarity index 76%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause6ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause6ContextWithJavaConfig.java
index c76e34deec..ab4c590804 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause6ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause6ContextWithJavaConfig.java
@@ -1,11 +1,11 @@
-package org.baeldung.ex.beancreationexception.spring;
+package com.baeldung.ex.beancreationexception.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.beancreationexception.cause6")
+@ComponentScan("com.baeldung.ex.beancreationexception.cause6")
 @ImportResource("classpath:beancreationexception_cause6.xml")
 public class Cause6ContextWithJavaConfig {
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause7ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause7ContextWithJavaConfig.java
similarity index 76%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause7ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause7ContextWithJavaConfig.java
index 6b56519c1a..63f9826d25 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause7ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause7ContextWithJavaConfig.java
@@ -1,11 +1,11 @@
-package org.baeldung.ex.beancreationexception.spring;
+package com.baeldung.ex.beancreationexception.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.beancreationexception.cause7")
+@ComponentScan("com.baeldung.ex.beancreationexception.cause7")
 @ImportResource("classpath:beancreationexception_cause7.xml")
 public class Cause7ContextWithJavaConfig {
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause8ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause8ContextWithJavaConfig.java
similarity index 69%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause8ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause8ContextWithJavaConfig.java
index 084cf8d3af..c6a591df2b 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause8ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause8ContextWithJavaConfig.java
@@ -1,10 +1,10 @@
-package org.baeldung.ex.beancreationexception.spring;
+package com.baeldung.ex.beancreationexception.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.beancreationexception.cause8")
+@ComponentScan("com.baeldung.ex.beancreationexception.cause8")
 public class Cause8ContextWithJavaConfig {
 
     public Cause8ContextWithJavaConfig() {
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause9ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause9ContextWithJavaConfig.java
similarity index 80%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause9ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause9ContextWithJavaConfig.java
index d64ec9ab3d..b9e3f4befd 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/spring/Cause9ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beancreationexception/spring/Cause9ContextWithJavaConfig.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.beancreationexception.spring;
+package com.baeldung.ex.beancreationexception.spring;
 
-import org.baeldung.ex.beancreationexception.cause9.BeanB;
+import com.baeldung.ex.beancreationexception.cause9.BeanB;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.beancreationexception.cause9")
+@ComponentScan("com.baeldung.ex.beancreationexception.cause9")
 @ImportResource("classpath:beancreationexception_cause9.xml")
 public class Cause9ContextWithJavaConfig {
     @Autowired
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beandefinitionstoreexception/cause2/BeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/beandefinitionstoreexception/cause2/BeanA.java
similarity index 77%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beandefinitionstoreexception/cause2/BeanA.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beandefinitionstoreexception/cause2/BeanA.java
index a0aefda1cd..7de8a98f3b 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beandefinitionstoreexception/cause2/BeanA.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beandefinitionstoreexception/cause2/BeanA.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beandefinitionstoreexception.cause2;
+package com.baeldung.ex.beandefinitionstoreexception.cause2;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beandefinitionstoreexception/spring/Cause1ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/beandefinitionstoreexception/spring/Cause1ContextWithJavaConfig.java
similarity index 74%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beandefinitionstoreexception/spring/Cause1ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beandefinitionstoreexception/spring/Cause1ContextWithJavaConfig.java
index 3b6b4f2b8d..6684686b9a 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beandefinitionstoreexception/spring/Cause1ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beandefinitionstoreexception/spring/Cause1ContextWithJavaConfig.java
@@ -1,11 +1,11 @@
-package org.baeldung.ex.beandefinitionstoreexception.spring;
+package com.baeldung.ex.beandefinitionstoreexception.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.beandefinitionstoreexception.cause1")
+@ComponentScan("com.baeldung.ex.beandefinitionstoreexception.cause1")
 @ImportResource("beans.xml")
 public class Cause1ContextWithJavaConfig {
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beandefinitionstoreexception/spring/Cause2ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/beandefinitionstoreexception/spring/Cause2ContextWithJavaConfig.java
similarity index 84%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beandefinitionstoreexception/spring/Cause2ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beandefinitionstoreexception/spring/Cause2ContextWithJavaConfig.java
index d31890e0f3..35f69d3321 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beandefinitionstoreexception/spring/Cause2ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beandefinitionstoreexception/spring/Cause2ContextWithJavaConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beandefinitionstoreexception.spring;
+package com.baeldung.ex.beandefinitionstoreexception.spring;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.beandefinitionstoreexception.cause2")
+@ComponentScan("com.baeldung.ex.beandefinitionstoreexception.cause2")
 public class Cause2ContextWithJavaConfig {
 
     @Value("${some.property}")
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beandefinitionstoreexception/spring/Cause3ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/beandefinitionstoreexception/spring/Cause3ContextWithJavaConfig.java
similarity index 68%
rename from spring-exceptions/src/main/java/org/baeldung/ex/beandefinitionstoreexception/spring/Cause3ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/beandefinitionstoreexception/spring/Cause3ContextWithJavaConfig.java
index 11a00b1770..15a113ba79 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beandefinitionstoreexception/spring/Cause3ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/beandefinitionstoreexception/spring/Cause3ContextWithJavaConfig.java
@@ -1,10 +1,10 @@
-package org.baeldung.ex.beandefinitionstoreexception.spring;
+package com.baeldung.ex.beandefinitionstoreexception.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.beandefinitionstoreexception.cause3")
+@ComponentScan("com.baeldung.ex.beandefinitionstoreexception.cause3")
 public class Cause3ContextWithJavaConfig {
 
     public Cause3ContextWithJavaConfig() {
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/dataintegrityviolationexception/spring/Cause1DataContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/dataintegrityviolationexception/spring/Cause1DataContextWithJavaConfig.java
similarity index 78%
rename from spring-exceptions/src/main/java/org/baeldung/ex/dataintegrityviolationexception/spring/Cause1DataContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/dataintegrityviolationexception/spring/Cause1DataContextWithJavaConfig.java
index c4d98176c5..4034b45b24 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/dataintegrityviolationexception/spring/Cause1DataContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/dataintegrityviolationexception/spring/Cause1DataContextWithJavaConfig.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.dataintegrityviolationexception.spring;
+package com.baeldung.ex.dataintegrityviolationexception.spring;
 
-import org.baeldung.spring.config.PersistenceConfig;
+import com.baeldung.spring.config.PersistenceConfig;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -8,7 +8,7 @@ import org.springframework.context.annotation.Import;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.dataIntegrityviolationexception.cause1")
+@ComponentScan("com.baeldung.ex.dataIntegrityviolationexception.cause1")
 @Import(PersistenceConfig.class)
 public class Cause1DataContextWithJavaConfig {
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/dataintegrityviolationexception/spring/Cause2DataContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/dataintegrityviolationexception/spring/Cause2DataContextWithJavaConfig.java
similarity index 66%
rename from spring-exceptions/src/main/java/org/baeldung/ex/dataintegrityviolationexception/spring/Cause2DataContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/dataintegrityviolationexception/spring/Cause2DataContextWithJavaConfig.java
index 4dcae6282c..c4c0c4570d 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/dataintegrityviolationexception/spring/Cause2DataContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/dataintegrityviolationexception/spring/Cause2DataContextWithJavaConfig.java
@@ -1,12 +1,12 @@
-package org.baeldung.ex.dataintegrityviolationexception.spring;
+package com.baeldung.ex.dataintegrityviolationexception.spring;
 
-import org.baeldung.spring.config.PersistenceConfig;
+import com.baeldung.spring.config.PersistenceConfig;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.dataIntegrityviolationexception.cause2")
+@ComponentScan("com.baeldung.ex.dataIntegrityviolationexception.cause2")
 @Import(PersistenceConfig.class)
 public class Cause2DataContextWithJavaConfig {
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/dataintegrityviolationexception/spring/Cause3DataContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/dataintegrityviolationexception/spring/Cause3DataContextWithJavaConfig.java
similarity index 66%
rename from spring-exceptions/src/main/java/org/baeldung/ex/dataintegrityviolationexception/spring/Cause3DataContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/dataintegrityviolationexception/spring/Cause3DataContextWithJavaConfig.java
index bb9b905854..b4426c9224 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/dataintegrityviolationexception/spring/Cause3DataContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/dataintegrityviolationexception/spring/Cause3DataContextWithJavaConfig.java
@@ -1,12 +1,12 @@
-package org.baeldung.ex.dataintegrityviolationexception.spring;
+package com.baeldung.ex.dataintegrityviolationexception.spring;
 
-import org.baeldung.spring.config.PersistenceConfig;
+import com.baeldung.spring.config.PersistenceConfig;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.dataIntegrityviolationexception.cause3")
+@ComponentScan("com.baeldung.ex.dataIntegrityviolationexception.cause3")
 @Import(PersistenceConfig.class)
 public class Cause3DataContextWithJavaConfig {
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/model/Foo.java b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause1/persistence/model/Foo.java
similarity index 87%
rename from spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/model/Foo.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause1/persistence/model/Foo.java
index 001c14d6d6..0eda0e7236 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/model/Foo.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause1/persistence/model/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.mappingexception.cause1.persistence.model;
+package com.baeldung.ex.mappingexception.cause1.persistence.model;
 
 import java.io.Serializable;
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/model/Foo.java b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause2/persistence/model/Foo.java
similarity index 88%
rename from spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/model/Foo.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause2/persistence/model/Foo.java
index fa1200f710..602a8340df 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/model/Foo.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause2/persistence/model/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.mappingexception.cause2.persistence.model;
+package com.baeldung.ex.mappingexception.cause2.persistence.model;
 
 import java.io.Serializable;
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause3/persistence/model/Foo.java b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause3/persistence/model/Foo.java
similarity index 88%
rename from spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause3/persistence/model/Foo.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause3/persistence/model/Foo.java
index 243196786c..58e80d3b51 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause3/persistence/model/Foo.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause3/persistence/model/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.mappingexception.cause3.persistence.model;
+package com.baeldung.ex.mappingexception.cause3.persistence.model;
 
 import java.io.Serializable;
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause4/persistence/model/Foo.java b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause4/persistence/model/Foo.java
similarity index 88%
rename from spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause4/persistence/model/Foo.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause4/persistence/model/Foo.java
index 11e71edf01..82674514fc 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause4/persistence/model/Foo.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause4/persistence/model/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.mappingexception.cause4.persistence.model;
+package com.baeldung.ex.mappingexception.cause4.persistence.model;
 
 import java.io.Serializable;
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java
similarity index 94%
rename from spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java
index 11dff24e48..d2929e3d91 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.mappingexception.spring;
+package com.baeldung.ex.mappingexception.spring;
 
 import java.util.Properties;
 
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-mysql.properties" })
-@ComponentScan({ "org.baeldung.ex.mappingexception.cause1.persistence" })
+@ComponentScan({ "com.baeldung.ex.mappingexception.cause1.persistence" })
 public class Cause1PersistenceConfig {
 
     @Autowired
@@ -35,7 +35,7 @@ public class Cause1PersistenceConfig {
     public LocalSessionFactoryBean sessionFactory() {
         final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean();
         sessionFactory.setDataSource(restDataSource());
-        sessionFactory.setPackagesToScan(new String[] { "org.baeldung.ex.mappingexception.cause1.persistence.model" });
+        sessionFactory.setPackagesToScan(new String[] { "com.baeldung.ex.mappingexception.cause1.persistence.model" });
         sessionFactory.setHibernateProperties(hibernateProperties());
 
         return sessionFactory;
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java
similarity index 94%
rename from spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java
index d1d6408934..399238073c 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.mappingexception.spring;
+package com.baeldung.ex.mappingexception.spring;
 
 import java.util.Properties;
 
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-mysql.properties" })
-@ComponentScan({ "org.baeldung.ex.mappingexception.cause2.persistence" })
+@ComponentScan({ "com.baeldung.ex.mappingexception.cause2.persistence" })
 public class Cause2PersistenceConfig {
 
     @Autowired
@@ -37,7 +37,7 @@ public class Cause2PersistenceConfig {
         sessionFactory.setDataSource(restDataSource());
         sessionFactory.setHibernateProperties(hibernateProperties());
 
-        // sessionFactory.setPackagesToScan(new String[] { "org.baeldung.ex.mappingexception.cause2.persistence.model" });
+        // sessionFactory.setPackagesToScan(new String[] { "com.baeldung.ex.mappingexception.cause2.persistence.model" });
         // sessionFactory.setAnnotatedClasses(new Class[] { Foo.class });
 
         return sessionFactory;
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java
similarity index 92%
rename from spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java
index d4245e8e45..f5191d52f2 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java
@@ -1,11 +1,11 @@
-package org.baeldung.ex.mappingexception.spring;
+package com.baeldung.ex.mappingexception.spring;
 
 import java.util.Properties;
 
 import javax.sql.DataSource;
 
 import org.apache.tomcat.dbcp.dbcp.BasicDataSource;
-import org.baeldung.ex.mappingexception.cause3.persistence.model.Foo;
+import com.baeldung.ex.mappingexception.cause3.persistence.model.Foo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -22,7 +22,7 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-mysql.properties" })
-@ComponentScan({ "org.baeldung.ex.mappingexception.cause2.persistence" })
+@ComponentScan({ "com.baeldung.ex.mappingexception.cause2.persistence" })
 public class Cause3PersistenceConfig {
 
     @Autowired
@@ -38,7 +38,7 @@ public class Cause3PersistenceConfig {
         sessionFactory.setDataSource(restDataSource());
         sessionFactory.setHibernateProperties(hibernateProperties());
 
-        // sessionFactory.setPackagesToScan(new String[] { "org.baeldung.ex.mappingexception.cause2.persistence.model" });
+        // sessionFactory.setPackagesToScan(new String[] { "com.baeldung.ex.mappingexception.cause2.persistence.model" });
         sessionFactory.setAnnotatedClasses(new Class[] { Foo.class });
 
         return sessionFactory;
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
similarity index 94%
rename from spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
index 3337e4796d..118cb5da90 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.nontransientexception.cause;
+package com.baeldung.ex.nontransientexception.cause;
 
 import java.util.Properties;
 
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-derby.properties" })
-@ComponentScan({ "org.baeldung.persistence" })
+@ComponentScan({ "com.baeldung.persistence" })
 public class Cause1NonTransientConfig {
 
     @Autowired
@@ -35,7 +35,7 @@ public class Cause1NonTransientConfig {
     public LocalSessionFactoryBean sessionFactory() {
         final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean();
         sessionFactory.setDataSource(restDataSource());
-        sessionFactory.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
+        sessionFactory.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
         sessionFactory.setHibernateProperties(hibernateProperties());
 
         return sessionFactory;
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
similarity index 94%
rename from spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
index 3543526f37..e79266e9ee 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.nontransientexception.cause;
+package com.baeldung.ex.nontransientexception.cause;
 
 import java.util.Properties;
 
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-derby.properties" })
-@ComponentScan({ "org.baeldung.persistence" })
+@ComponentScan({ "com.baeldung.persistence" })
 public class Cause4NonTransientConfig {
 
     @Autowired
@@ -35,7 +35,7 @@ public class Cause4NonTransientConfig {
     public LocalSessionFactoryBean sessionFactory() {
         final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean();
         sessionFactory.setDataSource(restDataSource());
-        sessionFactory.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
+        sessionFactory.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
         sessionFactory.setHibernateProperties(hibernateProperties());
 
         return sessionFactory;
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java
similarity index 94%
rename from spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java
index 6d5d998c5b..784b36afbf 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.nontransientexception.cause;
+package com.baeldung.ex.nontransientexception.cause;
 
 import java.util.Properties;
 
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-mysql-incorrect.properties" })
-@ComponentScan({ "org.baeldung.persistence" })
+@ComponentScan({ "com.baeldung.persistence" })
 public class Cause5NonTransientConfig {
 
     @Autowired
@@ -35,7 +35,7 @@ public class Cause5NonTransientConfig {
     public LocalSessionFactoryBean sessionFactory() {
         final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean();
         sessionFactory.setDataSource(restDataSource());
-        sessionFactory.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
+        sessionFactory.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
         sessionFactory.setHibernateProperties(hibernateProperties());
 
         return sessionFactory;
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java
similarity index 75%
rename from spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java
index c664309426..3832d6e61a 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.cause1;
+package com.baeldung.ex.nosuchbeandefinitionexception.cause1;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java
new file mode 100644
index 0000000000..49915c37d7
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java
@@ -0,0 +1,5 @@
+package com.baeldung.ex.nosuchbeandefinitionexception.cause1;
+
+public class BeanB {
+    //
+}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java
similarity index 75%
rename from spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java
index 2b454bfabb..19409820ea 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.cause2;
+package com.baeldung.ex.nosuchbeandefinitionexception.cause2;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java
similarity index 63%
rename from spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java
index 877f400668..6b5fbb7c3e 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.cause2;
+package com.baeldung.ex.nosuchbeandefinitionexception.cause2;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java
similarity index 63%
rename from spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java
index 6bf4160966..0f0bcb8f7d 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.cause2;
+package com.baeldung.ex.nosuchbeandefinitionexception.cause2;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java
new file mode 100644
index 0000000000..b8acb7faa6
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java
@@ -0,0 +1,5 @@
+package com.baeldung.ex.nosuchbeandefinitionexception.cause2;
+
+public interface IBeanB {
+    //
+}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java
similarity index 87%
rename from spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java
index 091d3f1aa8..c094362629 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.cause3;
+package com.baeldung.ex.nosuchbeandefinitionexception.cause3;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java
similarity index 68%
rename from spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java
index 5ba971baa9..026ccc532b 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java
@@ -1,10 +1,10 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.spring;
+package com.baeldung.ex.nosuchbeandefinitionexception.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.nosuchbeandefinitionexception.cause1")
+@ComponentScan("com.baeldung.ex.nosuchbeandefinitionexception.cause1")
 public class Cause1ContextWithJavaConfig {
 
     public Cause1ContextWithJavaConfig() {
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java
similarity index 68%
rename from spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java
index 9f4816ef7c..30da7f2119 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java
@@ -1,10 +1,10 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.spring;
+package com.baeldung.ex.nosuchbeandefinitionexception.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.nosuchbeandefinitionexception.cause2")
+@ComponentScan("com.baeldung.ex.nosuchbeandefinitionexception.cause2")
 public class Cause2ContextWithJavaConfig {
 
     public Cause2ContextWithJavaConfig() {
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java
similarity index 68%
rename from spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java
index a8d0fbe37b..e36c2e4eab 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java
@@ -1,10 +1,10 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.spring;
+package com.baeldung.ex.nosuchbeandefinitionexception.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.ex.nosuchbeandefinitionexception.cause3")
+@ComponentScan("com.baeldung.ex.nosuchbeandefinitionexception.cause3")
 public class Cause3ContextWithJavaConfig {
 
     public Cause3ContextWithJavaConfig() {
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/Setup.java b/spring-exceptions/src/main/java/com/baeldung/persistence/Setup.java
similarity index 94%
rename from spring-exceptions/src/main/java/org/baeldung/persistence/Setup.java
rename to spring-exceptions/src/main/java/com/baeldung/persistence/Setup.java
index 5cba4e70fb..251ea4654c 100644
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/Setup.java
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/Setup.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence;
+package com.baeldung.persistence;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/common/AbstractHibernateDao.java b/spring-exceptions/src/main/java/com/baeldung/persistence/common/AbstractHibernateDao.java
similarity index 97%
rename from spring-exceptions/src/main/java/org/baeldung/persistence/common/AbstractHibernateDao.java
rename to spring-exceptions/src/main/java/com/baeldung/persistence/common/AbstractHibernateDao.java
index cadb2ac061..90e4249c68 100644
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/common/AbstractHibernateDao.java
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/common/AbstractHibernateDao.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.common;
+package com.baeldung.persistence.common;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/common/AbstractService.java b/spring-exceptions/src/main/java/com/baeldung/persistence/common/AbstractService.java
similarity index 90%
rename from spring-exceptions/src/main/java/org/baeldung/persistence/common/AbstractService.java
rename to spring-exceptions/src/main/java/com/baeldung/persistence/common/AbstractService.java
index d2e162ad7b..5e1cdcba17 100644
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/common/AbstractService.java
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/common/AbstractService.java
@@ -1,9 +1,8 @@
-package org.baeldung.persistence.common;
+package com.baeldung.persistence.common;
 
 import java.io.Serializable;
 import java.util.List;
 
-import org.baeldung.persistence.common.IOperations;
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/common/IOperations.java b/spring-exceptions/src/main/java/com/baeldung/persistence/common/IOperations.java
similarity index 88%
rename from spring-exceptions/src/main/java/org/baeldung/persistence/common/IOperations.java
rename to spring-exceptions/src/main/java/com/baeldung/persistence/common/IOperations.java
index dee27950c7..feac025a6d 100644
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/common/IOperations.java
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/common/IOperations.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.common;
+package com.baeldung.persistence.common;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/spring-exceptions/src/main/java/com/baeldung/persistence/dao/IChildDao.java b/spring-exceptions/src/main/java/com/baeldung/persistence/dao/IChildDao.java
new file mode 100644
index 0000000000..b662be5da3
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/dao/IChildDao.java
@@ -0,0 +1,8 @@
+package com.baeldung.persistence.dao;
+
+import com.baeldung.persistence.common.IOperations;
+import com.baeldung.persistence.model.Child;
+
+public interface IChildDao extends IOperations<Child> {
+    //
+}
diff --git a/spring-exceptions/src/main/java/com/baeldung/persistence/dao/IFooDao.java b/spring-exceptions/src/main/java/com/baeldung/persistence/dao/IFooDao.java
new file mode 100644
index 0000000000..131cd04768
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/dao/IFooDao.java
@@ -0,0 +1,8 @@
+package com.baeldung.persistence.dao;
+
+import com.baeldung.persistence.common.IOperations;
+import com.baeldung.persistence.model.Foo;
+
+public interface IFooDao extends IOperations<Foo> {
+    //
+}
diff --git a/spring-exceptions/src/main/java/com/baeldung/persistence/dao/IParentDao.java b/spring-exceptions/src/main/java/com/baeldung/persistence/dao/IParentDao.java
new file mode 100644
index 0000000000..63b39c05c2
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/dao/IParentDao.java
@@ -0,0 +1,8 @@
+package com.baeldung.persistence.dao;
+
+import com.baeldung.persistence.common.IOperations;
+import com.baeldung.persistence.model.Parent;
+
+public interface IParentDao extends IOperations<Parent> {
+    //
+}
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java b/spring-exceptions/src/main/java/com/baeldung/persistence/dao/impl/ChildDao.java
similarity index 67%
rename from spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java
rename to spring-exceptions/src/main/java/com/baeldung/persistence/dao/impl/ChildDao.java
index e068573c5c..428189f522 100644
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/dao/impl/ChildDao.java
@@ -1,8 +1,8 @@
-package org.baeldung.persistence.dao.impl;
+package com.baeldung.persistence.dao.impl;
 
-import org.baeldung.persistence.common.AbstractHibernateDao;
-import org.baeldung.persistence.dao.IChildDao;
-import org.baeldung.persistence.model.Child;
+import com.baeldung.persistence.common.AbstractHibernateDao;
+import com.baeldung.persistence.model.Child;
+import com.baeldung.persistence.dao.IChildDao;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java b/spring-exceptions/src/main/java/com/baeldung/persistence/dao/impl/FooDao.java
similarity index 66%
rename from spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java
rename to spring-exceptions/src/main/java/com/baeldung/persistence/dao/impl/FooDao.java
index baf29c9ecd..2754a0e96d 100644
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/dao/impl/FooDao.java
@@ -1,8 +1,8 @@
-package org.baeldung.persistence.dao.impl;
+package com.baeldung.persistence.dao.impl;
 
-import org.baeldung.persistence.common.AbstractHibernateDao;
-import org.baeldung.persistence.dao.IFooDao;
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.common.AbstractHibernateDao;
+import com.baeldung.persistence.dao.IFooDao;
+import com.baeldung.persistence.model.Foo;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java b/spring-exceptions/src/main/java/com/baeldung/persistence/dao/impl/ParentDao.java
similarity index 67%
rename from spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java
rename to spring-exceptions/src/main/java/com/baeldung/persistence/dao/impl/ParentDao.java
index 5634137b63..c1551b9f2e 100644
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/dao/impl/ParentDao.java
@@ -1,8 +1,8 @@
-package org.baeldung.persistence.dao.impl;
+package com.baeldung.persistence.dao.impl;
 
-import org.baeldung.persistence.common.AbstractHibernateDao;
-import org.baeldung.persistence.dao.IParentDao;
-import org.baeldung.persistence.model.Parent;
+import com.baeldung.persistence.common.AbstractHibernateDao;
+import com.baeldung.persistence.model.Parent;
+import com.baeldung.persistence.dao.IParentDao;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/model/Child.java b/spring-exceptions/src/main/java/com/baeldung/persistence/model/Child.java
similarity index 95%
rename from spring-exceptions/src/main/java/org/baeldung/persistence/model/Child.java
rename to spring-exceptions/src/main/java/com/baeldung/persistence/model/Child.java
index 4eec4cf1d3..19cfb2e237 100644
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/model/Child.java
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/model/Child.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import java.io.Serializable;
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/model/Foo.java b/spring-exceptions/src/main/java/com/baeldung/persistence/model/Foo.java
similarity index 97%
rename from spring-exceptions/src/main/java/org/baeldung/persistence/model/Foo.java
rename to spring-exceptions/src/main/java/com/baeldung/persistence/model/Foo.java
index 8e1dee33e8..9af3d07bed 100644
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/model/Foo.java
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/model/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import java.io.Serializable;
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/model/Parent.java b/spring-exceptions/src/main/java/com/baeldung/persistence/model/Parent.java
similarity index 96%
rename from spring-exceptions/src/main/java/org/baeldung/persistence/model/Parent.java
rename to spring-exceptions/src/main/java/com/baeldung/persistence/model/Parent.java
index 19e405615d..fa6948990b 100644
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/model/Parent.java
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/model/Parent.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import java.io.Serializable;
 
diff --git a/spring-exceptions/src/main/java/com/baeldung/persistence/service/IChildService.java b/spring-exceptions/src/main/java/com/baeldung/persistence/service/IChildService.java
new file mode 100644
index 0000000000..e7af073a4d
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/service/IChildService.java
@@ -0,0 +1,8 @@
+package com.baeldung.persistence.service;
+
+import com.baeldung.persistence.common.IOperations;
+import com.baeldung.persistence.model.Child;
+
+public interface IChildService extends IOperations<Child> {
+    //
+}
diff --git a/spring-exceptions/src/main/java/com/baeldung/persistence/service/IFooService.java b/spring-exceptions/src/main/java/com/baeldung/persistence/service/IFooService.java
new file mode 100644
index 0000000000..f154391bb5
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/service/IFooService.java
@@ -0,0 +1,8 @@
+package com.baeldung.persistence.service;
+
+import com.baeldung.persistence.common.IOperations;
+import com.baeldung.persistence.model.Foo;
+
+public interface IFooService extends IOperations<Foo> {
+    //
+}
diff --git a/spring-exceptions/src/main/java/com/baeldung/persistence/service/IParentService.java b/spring-exceptions/src/main/java/com/baeldung/persistence/service/IParentService.java
new file mode 100644
index 0000000000..1c7ee45219
--- /dev/null
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/service/IParentService.java
@@ -0,0 +1,8 @@
+package com.baeldung.persistence.service;
+
+import com.baeldung.persistence.common.IOperations;
+import com.baeldung.persistence.model.Parent;
+
+public interface IParentService extends IOperations<Parent> {
+    //
+}
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ChildService.java b/spring-exceptions/src/main/java/com/baeldung/persistence/service/impl/ChildService.java
similarity index 56%
rename from spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ChildService.java
rename to spring-exceptions/src/main/java/com/baeldung/persistence/service/impl/ChildService.java
index 89597313ea..ed913188f1 100644
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ChildService.java
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/service/impl/ChildService.java
@@ -1,10 +1,10 @@
-package org.baeldung.persistence.service.impl;
+package com.baeldung.persistence.service.impl;
 
-import org.baeldung.persistence.common.AbstractService;
-import org.baeldung.persistence.common.IOperations;
-import org.baeldung.persistence.dao.IChildDao;
-import org.baeldung.persistence.model.Child;
-import org.baeldung.persistence.service.IChildService;
+import com.baeldung.persistence.common.AbstractService;
+import com.baeldung.persistence.common.IOperations;
+import com.baeldung.persistence.service.IChildService;
+import com.baeldung.persistence.dao.IChildDao;
+import com.baeldung.persistence.model.Child;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/FooService.java b/spring-exceptions/src/main/java/com/baeldung/persistence/service/impl/FooService.java
similarity index 56%
rename from spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/FooService.java
rename to spring-exceptions/src/main/java/com/baeldung/persistence/service/impl/FooService.java
index f0a4d7a649..d3d7fe81c8 100644
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/FooService.java
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/service/impl/FooService.java
@@ -1,10 +1,10 @@
-package org.baeldung.persistence.service.impl;
+package com.baeldung.persistence.service.impl;
 
-import org.baeldung.persistence.common.AbstractService;
-import org.baeldung.persistence.common.IOperations;
-import org.baeldung.persistence.dao.IFooDao;
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.persistence.service.IFooService;
+import com.baeldung.persistence.common.AbstractService;
+import com.baeldung.persistence.common.IOperations;
+import com.baeldung.persistence.service.IFooService;
+import com.baeldung.persistence.dao.IFooDao;
+import com.baeldung.persistence.model.Foo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ParentService.java b/spring-exceptions/src/main/java/com/baeldung/persistence/service/impl/ParentService.java
similarity index 57%
rename from spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ParentService.java
rename to spring-exceptions/src/main/java/com/baeldung/persistence/service/impl/ParentService.java
index 97c44f4a2f..b7fa75a716 100644
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ParentService.java
+++ b/spring-exceptions/src/main/java/com/baeldung/persistence/service/impl/ParentService.java
@@ -1,10 +1,10 @@
-package org.baeldung.persistence.service.impl;
+package com.baeldung.persistence.service.impl;
 
-import org.baeldung.persistence.common.AbstractService;
-import org.baeldung.persistence.common.IOperations;
-import org.baeldung.persistence.dao.IParentDao;
-import org.baeldung.persistence.model.Parent;
-import org.baeldung.persistence.service.IParentService;
+import com.baeldung.persistence.common.AbstractService;
+import com.baeldung.persistence.common.IOperations;
+import com.baeldung.persistence.model.Parent;
+import com.baeldung.persistence.service.IParentService;
+import com.baeldung.persistence.dao.IParentDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/properties/core/ComponentInXmlUsingProperties.java b/spring-exceptions/src/main/java/com/baeldung/properties/core/ComponentInXmlUsingProperties.java
similarity index 95%
rename from spring-exceptions/src/main/java/org/baeldung/properties/core/ComponentInXmlUsingProperties.java
rename to spring-exceptions/src/main/java/com/baeldung/properties/core/ComponentInXmlUsingProperties.java
index f695326cd6..35f54b90e5 100644
--- a/spring-exceptions/src/main/java/org/baeldung/properties/core/ComponentInXmlUsingProperties.java
+++ b/spring-exceptions/src/main/java/com/baeldung/properties/core/ComponentInXmlUsingProperties.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.core;
+package com.baeldung.properties.core;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-exceptions/src/main/java/org/baeldung/properties/core/ComponentUsingProperties.java b/spring-exceptions/src/main/java/com/baeldung/properties/core/ComponentUsingProperties.java
similarity index 95%
rename from spring-exceptions/src/main/java/org/baeldung/properties/core/ComponentUsingProperties.java
rename to spring-exceptions/src/main/java/com/baeldung/properties/core/ComponentUsingProperties.java
index 7e082702fe..ff6e11d453 100644
--- a/spring-exceptions/src/main/java/org/baeldung/properties/core/ComponentUsingProperties.java
+++ b/spring-exceptions/src/main/java/com/baeldung/properties/core/ComponentUsingProperties.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.core;
+package com.baeldung.properties.core;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java b/spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfig.java
similarity index 88%
rename from spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfig.java
index 9b5d7ed047..80c17ef059 100644
--- a/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.spring;
+package com.baeldung.properties.spring;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -7,7 +7,7 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
 @Configuration
-@ComponentScan("org.baeldung.properties.core")
+@ComponentScan("com.baeldung.properties.core")
 @PropertySource("classpath:foo.properties")
 public class PropertiesWithJavaConfig {
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfigOther.java b/spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfigOther.java
similarity index 88%
rename from spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfigOther.java
rename to spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfigOther.java
index 594ba0a09d..54d7814045 100644
--- a/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfigOther.java
+++ b/spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfigOther.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.spring;
+package com.baeldung.properties.spring;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
diff --git a/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfig.java b/spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithXmlConfig.java
similarity index 82%
rename from spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithXmlConfig.java
index 9ad7febcb0..2a774f449f 100644
--- a/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithXmlConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.spring;
+package com.baeldung.properties.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:configForProperties.xml")
-@ComponentScan("org.baeldung.core")
+@ComponentScan("com.baeldung.core")
 public class PropertiesWithXmlConfig {
 
     public PropertiesWithXmlConfig() {
diff --git a/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigOne.java b/spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithXmlConfigOne.java
similarity index 82%
rename from spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigOne.java
rename to spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithXmlConfigOne.java
index 9061cc10d4..205741d22b 100644
--- a/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigOne.java
+++ b/spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithXmlConfigOne.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.spring;
+package com.baeldung.properties.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:configForPropertiesOne.xml")
-@ComponentScan("org.baeldung.core")
+@ComponentScan("com.baeldung.core")
 public class PropertiesWithXmlConfigOne {
 
     public PropertiesWithXmlConfigOne() {
diff --git a/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java b/spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java
similarity index 88%
rename from spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java
rename to spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java
index e4365cbc8b..98f64eb94d 100644
--- a/spring-exceptions/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java
+++ b/spring-exceptions/src/main/java/com/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.spring;
+package com.baeldung.properties.spring;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
diff --git a/spring-exceptions/src/main/java/org/baeldung/spring/config/CoreConfig.java b/spring-exceptions/src/main/java/com/baeldung/spring/config/CoreConfig.java
similarity index 81%
rename from spring-exceptions/src/main/java/org/baeldung/spring/config/CoreConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/spring/config/CoreConfig.java
index ff1742351b..8c51378ca9 100644
--- a/spring-exceptions/src/main/java/org/baeldung/spring/config/CoreConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/spring/config/CoreConfig.java
@@ -1,11 +1,11 @@
-package org.baeldung.spring.config;
+package com.baeldung.spring.config;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @Configuration
-@ComponentScan("org.baeldung.core")
+@ComponentScan("com.baeldung.core")
 public class CoreConfig extends WebMvcConfigurerAdapter {
 
     public CoreConfig() {
diff --git a/spring-exceptions/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java b/spring-exceptions/src/main/java/com/baeldung/spring/config/MainWebAppInitializer.java
similarity index 95%
rename from spring-exceptions/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java
rename to spring-exceptions/src/main/java/com/baeldung/spring/config/MainWebAppInitializer.java
index 5ef83b8afd..3aaa1c8aee 100644
--- a/spring-exceptions/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java
+++ b/spring-exceptions/src/main/java/com/baeldung/spring/config/MainWebAppInitializer.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.config;
+package com.baeldung.spring.config;
 
 import java.util.Set;
 
@@ -23,7 +23,7 @@ public class MainWebAppInitializer implements WebApplicationInitializer {
 
         // Create the 'root' Spring application context
         final AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext();
-        root.scan("org.baeldung.spring.config");
+        root.scan("com.baeldung.spring.config");
         // root.getEnvironment().setDefaultProfiles("embedded");
 
         // Manages the lifecycle of the root application context
diff --git a/spring-exceptions/src/main/java/org/baeldung/spring/config/MvcConfig.java b/spring-exceptions/src/main/java/com/baeldung/spring/config/MvcConfig.java
similarity index 96%
rename from spring-exceptions/src/main/java/org/baeldung/spring/config/MvcConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/spring/config/MvcConfig.java
index f87e400fce..717e3c9356 100644
--- a/spring-exceptions/src/main/java/org/baeldung/spring/config/MvcConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/spring/config/MvcConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.config;
+package com.baeldung.spring.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-exceptions/src/main/java/org/baeldung/spring/config/PersistenceConfig.java b/spring-exceptions/src/main/java/com/baeldung/spring/config/PersistenceConfig.java
similarity index 94%
rename from spring-exceptions/src/main/java/org/baeldung/spring/config/PersistenceConfig.java
rename to spring-exceptions/src/main/java/com/baeldung/spring/config/PersistenceConfig.java
index 4fb3fdacd5..0a31b158d9 100644
--- a/spring-exceptions/src/main/java/org/baeldung/spring/config/PersistenceConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/spring/config/PersistenceConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.config;
+package com.baeldung.spring.config;
 
 import java.util.Properties;
 
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-mysql.properties" })
-@ComponentScan({ "org.baeldung.persistence" })
+@ComponentScan({ "com.baeldung.persistence" })
 public class PersistenceConfig {
 
     @Autowired
@@ -35,7 +35,7 @@ public class PersistenceConfig {
     public LocalSessionFactoryBean sessionFactory() {
         final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean();
         sessionFactory.setDataSource(restDataSource());
-        sessionFactory.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
+        sessionFactory.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
         sessionFactory.setHibernateProperties(hibernateProperties());
 
         return sessionFactory;
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause1/BeanB.java b/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause1/BeanB.java
deleted file mode 100644
index 8b4b17a0c6..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause1/BeanB.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.ex.beancreationexception.cause1;
-
-public class BeanB {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause2/IBeanB.java b/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause2/IBeanB.java
deleted file mode 100644
index 60e8a0a429..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause2/IBeanB.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.ex.beancreationexception.cause2;
-
-public interface IBeanB {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause4/IBeanA.java b/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause4/IBeanA.java
deleted file mode 100644
index 2f25c1c365..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause4/IBeanA.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.ex.beancreationexception.cause4;
-
-public interface IBeanA {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause5/IBeanA.java b/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause5/IBeanA.java
deleted file mode 100644
index 5c575e400c..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause5/IBeanA.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.ex.beancreationexception.cause5;
-
-public interface IBeanA {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause6/IBeanB.java b/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause6/IBeanB.java
deleted file mode 100644
index 36b436ce98..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause6/IBeanB.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.ex.beancreationexception.cause6;
-
-public interface IBeanB {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/IBeanA.java b/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/IBeanA.java
deleted file mode 100644
index 3d6c4eef28..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/IBeanA.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.ex.beancreationexception.cause8;
-
-public interface IBeanA {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/IBeanB.java b/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/IBeanB.java
deleted file mode 100644
index 5f6f438968..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause8/IBeanB.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.ex.beancreationexception.cause8;
-
-public interface IBeanB {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause9/BeanB.java b/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause9/BeanB.java
deleted file mode 100644
index 5e076023f0..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause9/BeanB.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.ex.beancreationexception.cause9;
-
-public class BeanB {
-    //
-}
\ No newline at end of file
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause9/IBeanA.java b/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause9/IBeanA.java
deleted file mode 100644
index 82114b18da..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/beancreationexception/cause9/IBeanA.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.ex.beancreationexception.cause9;
-
-public interface IBeanA {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java b/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java
deleted file mode 100644
index 8a198422e8..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.cause1;
-
-public class BeanB {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java b/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java
deleted file mode 100644
index 3e70126c1a..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.cause2;
-
-public interface IBeanB {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/IChildDao.java b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/IChildDao.java
deleted file mode 100644
index 25290554f3..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/IChildDao.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.persistence.dao;
-
-import org.baeldung.persistence.common.IOperations;
-import org.baeldung.persistence.model.Child;
-
-public interface IChildDao extends IOperations<Child> {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/IFooDao.java b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/IFooDao.java
deleted file mode 100644
index b41cd9edde..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/IFooDao.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.persistence.dao;
-
-import org.baeldung.persistence.common.IOperations;
-import org.baeldung.persistence.model.Foo;
-
-public interface IFooDao extends IOperations<Foo> {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/IParentDao.java b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/IParentDao.java
deleted file mode 100644
index a047d97ef1..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/IParentDao.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.persistence.dao;
-
-import org.baeldung.persistence.common.IOperations;
-import org.baeldung.persistence.model.Parent;
-
-public interface IParentDao extends IOperations<Parent> {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/service/IChildService.java b/spring-exceptions/src/main/java/org/baeldung/persistence/service/IChildService.java
deleted file mode 100644
index e2c2055ca2..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/service/IChildService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.persistence.service;
-
-import org.baeldung.persistence.common.IOperations;
-import org.baeldung.persistence.model.Child;
-
-public interface IChildService extends IOperations<Child> {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/service/IFooService.java b/spring-exceptions/src/main/java/org/baeldung/persistence/service/IFooService.java
deleted file mode 100644
index 64b826db02..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/service/IFooService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.persistence.service;
-
-import org.baeldung.persistence.common.IOperations;
-import org.baeldung.persistence.model.Foo;
-
-public interface IFooService extends IOperations<Foo> {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/service/IParentService.java b/spring-exceptions/src/main/java/org/baeldung/persistence/service/IParentService.java
deleted file mode 100644
index a05f07658f..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/persistence/service/IParentService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.persistence.service;
-
-import org.baeldung.persistence.common.IOperations;
-import org.baeldung.persistence.model.Parent;
-
-public interface IParentService extends IOperations<Parent> {
-    //
-}
diff --git a/spring-exceptions/src/main/resources/beancreationexception_cause4.xml b/spring-exceptions/src/main/resources/beancreationexception_cause4.xml
index ad7edc3763..47f55db2d7 100644
--- a/spring-exceptions/src/main/resources/beancreationexception_cause4.xml
+++ b/spring-exceptions/src/main/resources/beancreationexception_cause4.xml
@@ -6,6 +6,6 @@
       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd
       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd">
 
-    <bean id="beanA" class="org.baeldung.ex.beancreationexception.cause4.BeanA" />
+    <bean id="beanA" class="com.baeldung.ex.beancreationexception.cause4.BeanA" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-exceptions/src/main/resources/beancreationexception_cause6.xml b/spring-exceptions/src/main/resources/beancreationexception_cause6.xml
index fe60786151..fdfed069f0 100644
--- a/spring-exceptions/src/main/resources/beancreationexception_cause6.xml
+++ b/spring-exceptions/src/main/resources/beancreationexception_cause6.xml
@@ -6,7 +6,7 @@
       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd
       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd">
 
-    <bean id="beanA" class="org.baeldung.ex.beancreationexception.cause6.BeanA">
+    <bean id="beanA" class="com.baeldung.ex.beancreationexception.cause6.BeanA">
         <property name="beanB" ref="beanB" />
     </bean>
 
diff --git a/spring-exceptions/src/main/resources/beancreationexception_cause7.xml b/spring-exceptions/src/main/resources/beancreationexception_cause7.xml
index d8ef7dd18c..29b7bab317 100644
--- a/spring-exceptions/src/main/resources/beancreationexception_cause7.xml
+++ b/spring-exceptions/src/main/resources/beancreationexception_cause7.xml
@@ -6,6 +6,6 @@
       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd
       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd">
 
-    <bean id="beanZ" class="org.baeldung.ex.beancreationexception.cause7.BeanZ" />
+    <bean id="beanZ" class="com.baeldung.ex.beancreationexception.cause7.BeanZ" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-exceptions/src/main/resources/beancreationexception_cause9.xml b/spring-exceptions/src/main/resources/beancreationexception_cause9.xml
index 5d658f819f..b059ec67c3 100644
--- a/spring-exceptions/src/main/resources/beancreationexception_cause9.xml
+++ b/spring-exceptions/src/main/resources/beancreationexception_cause9.xml
@@ -6,6 +6,6 @@
       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd
       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd">
 
-    <bean id="beanA" abstract="true" class="org.baeldung.ex.beancreationexception.cause9.BeanA" />
+    <bean id="beanA" abstract="true" class="com.baeldung.ex.beancreationexception.cause9.BeanA" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-exceptions/src/main/resources/configForProperties.xml b/spring-exceptions/src/main/resources/configForProperties.xml
index 0f766665eb..e61d883c70 100644
--- a/spring-exceptions/src/main/resources/configForProperties.xml
+++ b/spring-exceptions/src/main/resources/configForProperties.xml
@@ -9,7 +9,7 @@
 
     <context:property-placeholder location="classpath:foo.properties"/>
 
-    <bean id="componentInXmlUsingProperties" class="org.baeldung.properties.core.ComponentInXmlUsingProperties">
+    <bean id="componentInXmlUsingProperties" class="com.baeldung.properties.core.ComponentInXmlUsingProperties">
         <constructor-arg value="${key.something}"/>
     </bean>
 
diff --git a/spring-exceptions/src/main/resources/configForPropertiesOne.xml b/spring-exceptions/src/main/resources/configForPropertiesOne.xml
index 068c86a840..53072d89bb 100644
--- a/spring-exceptions/src/main/resources/configForPropertiesOne.xml
+++ b/spring-exceptions/src/main/resources/configForPropertiesOne.xml
@@ -9,7 +9,7 @@
 
     <context:property-placeholder location="classpath:foo.properties" ignore-unresolvable="true" order="1"/>
 
-    <bean id="componentInXmlUsingProperties" class="org.baeldung.properties.core.ComponentInXmlUsingProperties">
+    <bean id="componentInXmlUsingProperties" class="com.baeldung.properties.core.ComponentInXmlUsingProperties">
         <constructor-arg value="${key.something2}"/>
     </bean>
 
diff --git a/spring-exceptions/src/main/webapp/WEB-INF/web_old.xml b/spring-exceptions/src/main/webapp/WEB-INF/web_old.xml
index 016369ad27..c8b38fae30 100644
--- a/spring-exceptions/src/main/webapp/WEB-INF/web_old.xml
+++ b/spring-exceptions/src/main/webapp/WEB-INF/web_old.xml
@@ -16,7 +16,7 @@
     </context-param>
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>org.baeldung.spring.web.config</param-value>
+        <param-value>com.baeldung.spring.web.config</param-value>
     </context-param>
 
     <listener>
diff --git a/spring-exceptions/src/test/java/org/baeldung/SpringContextLiveTest.java b/spring-exceptions/src/test/java/com/baeldung/SpringContextLiveTest.java
similarity index 87%
rename from spring-exceptions/src/test/java/org/baeldung/SpringContextLiveTest.java
rename to spring-exceptions/src/test/java/com/baeldung/SpringContextLiveTest.java
index ece7e0e730..a9ba0cf5c1 100644
--- a/spring-exceptions/src/test/java/org/baeldung/SpringContextLiveTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/SpringContextLiveTest.java
@@ -1,6 +1,6 @@
-package org.baeldung;
+package com.baeldung;
 
-import org.baeldung.spring.config.PersistenceConfig;
+import com.baeldung.spring.config.PersistenceConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java
similarity index 93%
rename from spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java
index 9597c09568..81fb4770ac 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java
@@ -1,4 +1,4 @@
-package org.baeldung.ex.beancreationexception;
+package com.baeldung.ex.beancreationexception;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause1BeanCreationExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause1BeanCreationExceptionManualTest.java
similarity index 84%
rename from spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause1BeanCreationExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause1BeanCreationExceptionManualTest.java
index 350347bb19..441e17cf98 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause1BeanCreationExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause1BeanCreationExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.beancreationexception;
+package com.baeldung.ex.beancreationexception;
 
-import org.baeldung.ex.beancreationexception.spring.Cause1ContextWithJavaConfig;
+import com.baeldung.ex.beancreationexception.spring.Cause1ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause2BeanCreationExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause2BeanCreationExceptionManualTest.java
similarity index 84%
rename from spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause2BeanCreationExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause2BeanCreationExceptionManualTest.java
index c2b9561848..6b760d4fbe 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause2BeanCreationExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause2BeanCreationExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.beancreationexception;
+package com.baeldung.ex.beancreationexception;
 
-import org.baeldung.ex.beancreationexception.spring.Cause2ContextWithJavaConfig;
+import com.baeldung.ex.beancreationexception.spring.Cause2ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause3BeanCreationExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause3BeanCreationExceptionManualTest.java
similarity index 84%
rename from spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause3BeanCreationExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause3BeanCreationExceptionManualTest.java
index 7b9b49bf58..83935c2e2e 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause3BeanCreationExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause3BeanCreationExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.beancreationexception;
+package com.baeldung.ex.beancreationexception;
 
-import org.baeldung.ex.beancreationexception.spring.Cause3ContextWithJavaConfig;
+import com.baeldung.ex.beancreationexception.spring.Cause3ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause4BeanCreationExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause4BeanCreationExceptionManualTest.java
similarity index 84%
rename from spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause4BeanCreationExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause4BeanCreationExceptionManualTest.java
index 3a6e30476c..0e4d83e929 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause4BeanCreationExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause4BeanCreationExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.beancreationexception;
+package com.baeldung.ex.beancreationexception;
 
-import org.baeldung.ex.beancreationexception.spring.Cause4ContextWithJavaConfig;
+import com.baeldung.ex.beancreationexception.spring.Cause4ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause5BeanCreationExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause5BeanCreationExceptionManualTest.java
similarity index 84%
rename from spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause5BeanCreationExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause5BeanCreationExceptionManualTest.java
index e69a323f8d..828c200a3d 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause5BeanCreationExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause5BeanCreationExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.beancreationexception;
+package com.baeldung.ex.beancreationexception;
 
-import org.baeldung.ex.beancreationexception.spring.Cause5ContextWithJavaConfig;
+import com.baeldung.ex.beancreationexception.spring.Cause5ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause6BeanCreationExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause6BeanCreationExceptionManualTest.java
similarity index 84%
rename from spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause6BeanCreationExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause6BeanCreationExceptionManualTest.java
index 30fbd47635..9bae716684 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause6BeanCreationExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause6BeanCreationExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.beancreationexception;
+package com.baeldung.ex.beancreationexception;
 
-import org.baeldung.ex.beancreationexception.spring.Cause6ContextWithJavaConfig;
+import com.baeldung.ex.beancreationexception.spring.Cause6ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause7BeanCreationExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause7BeanCreationExceptionManualTest.java
similarity index 84%
rename from spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause7BeanCreationExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause7BeanCreationExceptionManualTest.java
index d832bddf72..35606d4339 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause7BeanCreationExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause7BeanCreationExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.beancreationexception;
+package com.baeldung.ex.beancreationexception;
 
-import org.baeldung.ex.beancreationexception.spring.Cause7ContextWithJavaConfig;
+import com.baeldung.ex.beancreationexception.spring.Cause7ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause8BeanCreationExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause8BeanCreationExceptionManualTest.java
similarity index 84%
rename from spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause8BeanCreationExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause8BeanCreationExceptionManualTest.java
index a9f32b6d1a..51809af8bf 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause8BeanCreationExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause8BeanCreationExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.beancreationexception;
+package com.baeldung.ex.beancreationexception;
 
-import org.baeldung.ex.beancreationexception.spring.Cause8ContextWithJavaConfig;
+import com.baeldung.ex.beancreationexception.spring.Cause8ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause9BeanCreationExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause9BeanCreationExceptionManualTest.java
similarity index 84%
rename from spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause9BeanCreationExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause9BeanCreationExceptionManualTest.java
index 6af5fb3712..9a6cee8192 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/Cause9BeanCreationExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/beancreationexception/Cause9BeanCreationExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.beancreationexception;
+package com.baeldung.ex.beancreationexception;
 
-import org.baeldung.ex.beancreationexception.spring.Cause9ContextWithJavaConfig;
+import com.baeldung.ex.beancreationexception.spring.Cause9ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beandefinitionstoreexception/Cause1BeanDefinitionStoreExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/beandefinitionstoreexception/Cause1BeanDefinitionStoreExceptionManualTest.java
similarity index 83%
rename from spring-exceptions/src/test/java/org/baeldung/ex/beandefinitionstoreexception/Cause1BeanDefinitionStoreExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/beandefinitionstoreexception/Cause1BeanDefinitionStoreExceptionManualTest.java
index 1580546fa7..f5c3cc1ed8 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/beandefinitionstoreexception/Cause1BeanDefinitionStoreExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/beandefinitionstoreexception/Cause1BeanDefinitionStoreExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.beandefinitionstoreexception;
+package com.baeldung.ex.beandefinitionstoreexception;
 
-import org.baeldung.ex.beandefinitionstoreexception.spring.Cause1ContextWithJavaConfig;
+import com.baeldung.ex.beandefinitionstoreexception.spring.Cause1ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beandefinitionstoreexception/Cause2BeanDefinitionStoreExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/beandefinitionstoreexception/Cause2BeanDefinitionStoreExceptionManualTest.java
similarity index 83%
rename from spring-exceptions/src/test/java/org/baeldung/ex/beandefinitionstoreexception/Cause2BeanDefinitionStoreExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/beandefinitionstoreexception/Cause2BeanDefinitionStoreExceptionManualTest.java
index ce0db694dc..cddbb173ec 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/beandefinitionstoreexception/Cause2BeanDefinitionStoreExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/beandefinitionstoreexception/Cause2BeanDefinitionStoreExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.beandefinitionstoreexception;
+package com.baeldung.ex.beandefinitionstoreexception;
 
-import org.baeldung.ex.beandefinitionstoreexception.spring.Cause2ContextWithJavaConfig;
+import com.baeldung.ex.beandefinitionstoreexception.spring.Cause2ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beandefinitionstoreexception/Cause3BeanDefinitionStoreExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/beandefinitionstoreexception/Cause3BeanDefinitionStoreExceptionManualTest.java
similarity index 83%
rename from spring-exceptions/src/test/java/org/baeldung/ex/beandefinitionstoreexception/Cause3BeanDefinitionStoreExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/beandefinitionstoreexception/Cause3BeanDefinitionStoreExceptionManualTest.java
index c090ac7b5f..a5c458be9f 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/beandefinitionstoreexception/Cause3BeanDefinitionStoreExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/beandefinitionstoreexception/Cause3BeanDefinitionStoreExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.beandefinitionstoreexception;
+package com.baeldung.ex.beandefinitionstoreexception;
 
-import org.baeldung.ex.beandefinitionstoreexception.spring.Cause3ContextWithJavaConfig;
+import com.baeldung.ex.beandefinitionstoreexception.spring.Cause3ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/dataintegrityviolationexception/Cause1DataIntegrityViolationExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/dataintegrityviolationexception/Cause1DataIntegrityViolationExceptionManualTest.java
similarity index 82%
rename from spring-exceptions/src/test/java/org/baeldung/ex/dataintegrityviolationexception/Cause1DataIntegrityViolationExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/dataintegrityviolationexception/Cause1DataIntegrityViolationExceptionManualTest.java
index 056e052359..e41f916000 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/dataintegrityviolationexception/Cause1DataIntegrityViolationExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/dataintegrityviolationexception/Cause1DataIntegrityViolationExceptionManualTest.java
@@ -1,10 +1,10 @@
-package org.baeldung.ex.dataintegrityviolationexception;
+package com.baeldung.ex.dataintegrityviolationexception;
 
-import org.baeldung.ex.dataintegrityviolationexception.spring.Cause1DataContextWithJavaConfig;
-import org.baeldung.persistence.model.Child;
-import org.baeldung.persistence.model.Parent;
-import org.baeldung.persistence.service.IChildService;
-import org.baeldung.persistence.service.IParentService;
+import com.baeldung.ex.dataintegrityviolationexception.spring.Cause1DataContextWithJavaConfig;
+import com.baeldung.persistence.model.Child;
+import com.baeldung.persistence.model.Parent;
+import com.baeldung.persistence.service.IChildService;
+import com.baeldung.persistence.service.IParentService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/dataintegrityviolationexception/Cause2DataIntegrityViolationExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/dataintegrityviolationexception/Cause2DataIntegrityViolationExceptionManualTest.java
similarity index 80%
rename from spring-exceptions/src/test/java/org/baeldung/ex/dataintegrityviolationexception/Cause2DataIntegrityViolationExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/dataintegrityviolationexception/Cause2DataIntegrityViolationExceptionManualTest.java
index e36a027105..b41cead90d 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/dataintegrityviolationexception/Cause2DataIntegrityViolationExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/dataintegrityviolationexception/Cause2DataIntegrityViolationExceptionManualTest.java
@@ -1,8 +1,8 @@
-package org.baeldung.ex.dataintegrityviolationexception;
+package com.baeldung.ex.dataintegrityviolationexception;
 
-import org.baeldung.ex.dataintegrityviolationexception.spring.Cause2DataContextWithJavaConfig;
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.persistence.service.IFooService;
+import com.baeldung.ex.dataintegrityviolationexception.spring.Cause2DataContextWithJavaConfig;
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.service.IFooService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/dataintegrityviolationexception/Cause3DataIntegrityViolationExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/dataintegrityviolationexception/Cause3DataIntegrityViolationExceptionManualTest.java
similarity index 82%
rename from spring-exceptions/src/test/java/org/baeldung/ex/dataintegrityviolationexception/Cause3DataIntegrityViolationExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/dataintegrityviolationexception/Cause3DataIntegrityViolationExceptionManualTest.java
index 4194e1c9fe..c41321c144 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/dataintegrityviolationexception/Cause3DataIntegrityViolationExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/dataintegrityviolationexception/Cause3DataIntegrityViolationExceptionManualTest.java
@@ -1,10 +1,10 @@
-package org.baeldung.ex.dataintegrityviolationexception;
+package com.baeldung.ex.dataintegrityviolationexception;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
-import org.baeldung.ex.dataintegrityviolationexception.spring.Cause3DataContextWithJavaConfig;
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.persistence.service.IFooService;
+import com.baeldung.ex.dataintegrityviolationexception.spring.Cause3DataContextWithJavaConfig;
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.service.IFooService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause1MappingExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/mappingexception/Cause1MappingExceptionManualTest.java
similarity index 85%
rename from spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause1MappingExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/mappingexception/Cause1MappingExceptionManualTest.java
index 7ba9618a77..b00b9d7257 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause1MappingExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/mappingexception/Cause1MappingExceptionManualTest.java
@@ -1,7 +1,7 @@
-package org.baeldung.ex.mappingexception;
+package com.baeldung.ex.mappingexception;
 
-import org.baeldung.ex.mappingexception.cause1.persistence.model.Foo;
-import org.baeldung.ex.mappingexception.spring.Cause1PersistenceConfig;
+import com.baeldung.ex.mappingexception.cause1.persistence.model.Foo;
+import com.baeldung.ex.mappingexception.spring.Cause1PersistenceConfig;
 import org.hibernate.MappingException;
 import org.hibernate.SessionFactory;
 import org.junit.Test;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause2MappingExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/mappingexception/Cause2MappingExceptionManualTest.java
similarity index 84%
rename from spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause2MappingExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/mappingexception/Cause2MappingExceptionManualTest.java
index 66923fc6a9..1ff4170276 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause2MappingExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/mappingexception/Cause2MappingExceptionManualTest.java
@@ -1,7 +1,7 @@
-package org.baeldung.ex.mappingexception;
+package com.baeldung.ex.mappingexception;
 
-import org.baeldung.ex.mappingexception.cause2.persistence.model.Foo;
-import org.baeldung.ex.mappingexception.spring.Cause2PersistenceConfig;
+import com.baeldung.ex.mappingexception.cause2.persistence.model.Foo;
+import com.baeldung.ex.mappingexception.spring.Cause2PersistenceConfig;
 import org.hibernate.SessionFactory;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause3MappingExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/mappingexception/Cause3MappingExceptionManualTest.java
similarity index 85%
rename from spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause3MappingExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/mappingexception/Cause3MappingExceptionManualTest.java
index e6888d1685..54a4c9cde3 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause3MappingExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/mappingexception/Cause3MappingExceptionManualTest.java
@@ -1,7 +1,7 @@
-package org.baeldung.ex.mappingexception;
+package com.baeldung.ex.mappingexception;
 
-import org.baeldung.ex.mappingexception.cause3.persistence.model.Foo;
-import org.baeldung.ex.mappingexception.spring.Cause3PersistenceConfig;
+import com.baeldung.ex.mappingexception.cause3.persistence.model.Foo;
+import com.baeldung.ex.mappingexception.spring.Cause3PersistenceConfig;
 import org.hibernate.MappingException;
 import org.hibernate.SessionFactory;
 import org.junit.Test;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java
similarity index 93%
rename from spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java
index ea90b3d6cc..7f6b765073 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java
@@ -1,10 +1,10 @@
-package org.baeldung.ex.mappingexception;
+package com.baeldung.ex.mappingexception;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
-import org.baeldung.ex.mappingexception.cause4.persistence.model.Foo;
+import com.baeldung.ex.mappingexception.cause4.persistence.model.Foo;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/CannotGetJdbcConnectionExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/CannotGetJdbcConnectionExceptionManualTest.java
similarity index 74%
rename from spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/CannotGetJdbcConnectionExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/CannotGetJdbcConnectionExceptionManualTest.java
index b7ed103394..2aebf6ff42 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/CannotGetJdbcConnectionExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/CannotGetJdbcConnectionExceptionManualTest.java
@@ -1,15 +1,11 @@
-package org.baeldung.ex.nontransientdataaccessexception;
+package com.baeldung.ex.nontransientdataaccessexception;
 
 import javax.sql.DataSource;
 
-import org.baeldung.ex.nontransientexception.cause.Cause1NonTransientConfig;
-import org.baeldung.ex.nontransientexception.cause.Cause5NonTransientConfig;
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.persistence.service.IFooService;
+import com.baeldung.ex.nontransientexception.cause.Cause5NonTransientConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.jdbc.CannotGetJdbcConnectionException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataIntegrityExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/DataIntegrityExceptionManualTest.java
similarity index 87%
rename from spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataIntegrityExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/DataIntegrityExceptionManualTest.java
index b98a210125..2450554055 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataIntegrityExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/DataIntegrityExceptionManualTest.java
@@ -1,10 +1,10 @@
-package org.baeldung.ex.nontransientdataaccessexception;
+package com.baeldung.ex.nontransientdataaccessexception;
 
 import javax.sql.DataSource;
 
-import org.baeldung.ex.nontransientexception.cause.Cause1NonTransientConfig;
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.persistence.service.IFooService;
+import com.baeldung.ex.nontransientexception.cause.Cause1NonTransientConfig;
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.service.IFooService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataRetrievalExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/DataRetrievalExceptionManualTest.java
similarity index 92%
rename from spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataRetrievalExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/DataRetrievalExceptionManualTest.java
index 122278580f..8f0d6d60cc 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataRetrievalExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/DataRetrievalExceptionManualTest.java
@@ -1,9 +1,9 @@
-package org.baeldung.ex.nontransientdataaccessexception;
+package com.baeldung.ex.nontransientdataaccessexception;
 
 import javax.sql.DataSource;
 
-import org.baeldung.ex.nontransientexception.cause.Cause1NonTransientConfig;
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.ex.nontransientexception.cause.Cause1NonTransientConfig;
+import com.baeldung.persistence.model.Foo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataSourceLookupExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/DataSourceLookupExceptionManualTest.java
similarity index 89%
rename from spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataSourceLookupExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/DataSourceLookupExceptionManualTest.java
index 4da5f94098..508fb77e61 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataSourceLookupExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/DataSourceLookupExceptionManualTest.java
@@ -1,8 +1,8 @@
-package org.baeldung.ex.nontransientdataaccessexception;
+package com.baeldung.ex.nontransientdataaccessexception;
 
 import javax.sql.DataSource;
 
-import org.baeldung.ex.nontransientexception.cause.Cause4NonTransientConfig;
+import com.baeldung.ex.nontransientexception.cause.Cause4NonTransientConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.jdbc.datasource.lookup.DataSourceLookupFailureException;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/InvalidResourceUsageExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/InvalidResourceUsageExceptionManualTest.java
similarity index 90%
rename from spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/InvalidResourceUsageExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/InvalidResourceUsageExceptionManualTest.java
index fc420acfe9..3e64f69884 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/InvalidResourceUsageExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/nontransientdataaccessexception/InvalidResourceUsageExceptionManualTest.java
@@ -1,7 +1,7 @@
-package org.baeldung.ex.nontransientdataaccessexception;
+package com.baeldung.ex.nontransientdataaccessexception;
 
-import org.baeldung.ex.nontransientexception.cause.Cause1NonTransientConfig;
-import org.baeldung.persistence.service.IFooService;
+import com.baeldung.ex.nontransientexception.cause.Cause1NonTransientConfig;
+import com.baeldung.persistence.service.IFooService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionManualTest.java
similarity index 57%
rename from spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionManualTest.java
index 45ffdf9096..52cd2f31ea 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionManualTest.java
@@ -1,14 +1,8 @@
-package org.baeldung.ex.nosuchbeandefinitionexception;
+package com.baeldung.ex.nosuchbeandefinitionexception;
 
-import org.baeldung.ex.nosuchbeandefinitionexception.spring.Cause1ContextWithJavaConfig;
-import org.baeldung.persistence.model.Child;
-import org.baeldung.persistence.model.Parent;
-import org.baeldung.persistence.service.IChildService;
-import org.baeldung.persistence.service.IParentService;
+import com.baeldung.ex.nosuchbeandefinitionexception.spring.Cause1ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionManualTest.java
similarity index 83%
rename from spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionManualTest.java
index 09ed2b4435..b165482ea1 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.nosuchbeandefinitionexception;
+package com.baeldung.ex.nosuchbeandefinitionexception;
 
-import org.baeldung.ex.nosuchbeandefinitionexception.spring.Cause2ContextWithJavaConfig;
+import com.baeldung.ex.nosuchbeandefinitionexception.spring.Cause2ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionManualTest.java b/spring-exceptions/src/test/java/com/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionManualTest.java
similarity index 83%
rename from spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionManualTest.java
index 7dc016a568..ec0f8c8b1e 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.ex.nosuchbeandefinitionexception;
+package com.baeldung.ex.nosuchbeandefinitionexception;
 
-import org.baeldung.ex.nosuchbeandefinitionexception.spring.Cause3ContextWithJavaConfig;
+import com.baeldung.ex.nosuchbeandefinitionexception.spring.Cause3ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithJavaManualTest.java b/spring-exceptions/src/test/java/com/baeldung/properties/core/PropertiesWithJavaManualTest.java
similarity index 86%
rename from spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithJavaManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/properties/core/PropertiesWithJavaManualTest.java
index 91db8210b3..e3f360e6a5 100644
--- a/spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithJavaManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/properties/core/PropertiesWithJavaManualTest.java
@@ -1,7 +1,7 @@
-package org.baeldung.properties.core;
+package com.baeldung.properties.core;
 
-import org.baeldung.properties.spring.PropertiesWithJavaConfig;
-import org.baeldung.properties.spring.PropertiesWithJavaConfigOther;
+import com.baeldung.properties.spring.PropertiesWithJavaConfig;
+import com.baeldung.properties.spring.PropertiesWithJavaConfigOther;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithMultipleXmlsManualTest.java b/spring-exceptions/src/test/java/com/baeldung/properties/core/PropertiesWithMultipleXmlsManualTest.java
similarity index 86%
rename from spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithMultipleXmlsManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/properties/core/PropertiesWithMultipleXmlsManualTest.java
index 201e554381..b63cd74646 100644
--- a/spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithMultipleXmlsManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/properties/core/PropertiesWithMultipleXmlsManualTest.java
@@ -1,7 +1,7 @@
-package org.baeldung.properties.core;
+package com.baeldung.properties.core;
 
-import org.baeldung.properties.spring.PropertiesWithXmlConfigOne;
-import org.baeldung.properties.spring.PropertiesWithXmlConfigTwo;
+import com.baeldung.properties.spring.PropertiesWithXmlConfigOne;
+import com.baeldung.properties.spring.PropertiesWithXmlConfigTwo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithXmlManualTest.java b/spring-exceptions/src/test/java/com/baeldung/properties/core/PropertiesWithXmlManualTest.java
similarity index 90%
rename from spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithXmlManualTest.java
rename to spring-exceptions/src/test/java/com/baeldung/properties/core/PropertiesWithXmlManualTest.java
index a54dd8a3fb..b848dab75f 100644
--- a/spring-exceptions/src/test/java/org/baeldung/properties/core/PropertiesWithXmlManualTest.java
+++ b/spring-exceptions/src/test/java/com/baeldung/properties/core/PropertiesWithXmlManualTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.properties.core;
+package com.baeldung.properties.core;
 
-import org.baeldung.properties.spring.PropertiesWithXmlConfig;
+import com.baeldung.properties.spring.PropertiesWithXmlConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

From 015d9b3f8127e2e5ba1108811d09414fc2a243b5 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Fri, 20 Dec 2019 12:36:57 +0100
Subject: [PATCH 063/106] BAEL-20262: Migrate javaxval module to the
 com.baeldung package

---
 .../baeldung/javaxval/beanvalidation/User.java         |  2 +-
 .../baeldung/javaxval/bigdecimal/Invoice.java          |  2 +-
 .../javaxval/container/validation/Customer.java        |  2 +-
 .../javaxval/container/validation/CustomerMap.java     |  2 +-
 .../javaxval/container/validation/Profile.java         |  2 +-
 .../valueextractors/ProfileValueExtractor.java         |  4 ++--
 .../javaxval/enums/CustomerTypeSubSetValidator.java    |  6 +++---
 .../javaxval/enums/EnumNamePatternValidator.java       |  4 ++--
 .../baeldung/javaxval/enums/EnumSubSetValidator.java   |  2 +-
 .../enums/InheritedCustomerTypeSubSetValidator.java    |  6 +++---
 .../baeldung/javaxval/enums/ValueOfEnumValidator.java  |  4 ++--
 .../javaxval/enums/constraints/CustomerTypeSubset.java |  6 +++---
 .../javaxval/enums/constraints/EnumNamePattern.java    |  4 ++--
 .../javaxval/enums/constraints/ValueOfEnum.java        |  4 ++--
 .../baeldung/javaxval/enums/demo/Customer.java         |  8 ++++----
 .../baeldung/javaxval/enums/demo/CustomerType.java     |  2 +-
 .../javabeanconstraints/application/Application.java   |  4 ++--
 .../javabeanconstraints/entities/UserNotBlank.java     |  2 +-
 .../javabeanconstraints/entities/UserNotEmpty.java     |  2 +-
 .../javabeanconstraints/entities/UserNotNull.java      |  2 +-
 .../baeldung/javaxval/messageinterpolator/Person.java  |  2 +-
 .../methodvalidation/MethodValidationConfig.java       |  8 ++++----
 .../constraints/ConsistentDateParameterValidator.java  |  2 +-
 .../constraints/ConsistentDateParameters.java          |  2 +-
 .../methodvalidation/constraints/ValidReservation.java |  2 +-
 .../constraints/ValidReservationValidator.java         |  4 ++--
 .../javaxval/methodvalidation/model/Customer.java      |  2 +-
 .../javaxval/methodvalidation/model/Reservation.java   |  6 +++---
 .../methodvalidation/model/ReservationManagement.java  |  4 ++--
 .../baeldung/javaxval/validationgroup/AdvanceInfo.java |  5 +++++
 .../baeldung/javaxval/validationgroup/BasicInfo.java   |  5 +++++
 .../javaxval/validationgroup/CompleteInfo.java         |  2 +-
 .../javaxval/validationgroup/RegistrationForm.java     |  2 +-
 .../baeldung/javaxval/validationgroup/AdvanceInfo.java |  5 -----
 .../baeldung/javaxval/validationgroup/BasicInfo.java   |  5 -----
 .../javax.validation.valueextraction.ValueExtractor    |  2 +-
 .../baeldung/javaxval/LocaleAwareUnitTest.java         |  2 +-
 .../beanvalidation/ValidationIntegrationTest.java      |  2 +-
 .../baeldung/javaxval/bigdecimal/InvoiceUnitTest.java  |  4 ++--
 .../validation/ContainerValidationIntegrationTest.java |  4 ++--
 .../enums/CustomerTypeSubSetValidatorUnitTest.java     |  8 ++++----
 .../enums/EnumNamePatternValidatorUnitTest.java        | 10 +++++-----
 .../javaxval/enums/ValueOfEnumValidatorUnitTest.java   |  8 ++++----
 .../baeldung/javaxval/enums/demo/CustomerUnitTest.java |  6 +++---
 .../javabeanconstraints/test/UserNotBlankUnitTest.java |  4 ++--
 .../javabeanconstraints/test/UserNotEmptyUnitTest.java |  4 ++--
 .../javabeanconstraints/test/UserNotNullUnitTest.java  |  4 ++--
 .../ParameterMessageInterpolaterIntegrationTest.java   |  2 +-
 .../ContainerValidationIntegrationTest.java            |  8 ++++----
 .../methodvalidation/ValidationIntegrationTest.java    |  8 ++++----
 .../validationgroup/RegistrationFormUnitTest.java      |  4 ++--
 51 files changed, 103 insertions(+), 103 deletions(-)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/beanvalidation/User.java (97%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/bigdecimal/Invoice.java (91%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/container/validation/Customer.java (96%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/container/validation/CustomerMap.java (89%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/container/validation/Profile.java (81%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/container/validation/valueextractors/ProfileValueExtractor.java (79%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/enums/CustomerTypeSubSetValidator.java (79%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/enums/EnumNamePatternValidator.java (89%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/enums/EnumSubSetValidator.java (94%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/enums/InheritedCustomerTypeSubSetValidator.java (61%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/enums/ValueOfEnumValidator.java (89%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/enums/constraints/CustomerTypeSubset.java (88%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/enums/constraints/EnumNamePattern.java (91%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/enums/constraints/ValueOfEnum.java (92%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/enums/demo/Customer.java (91%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/enums/demo/CustomerType.java (55%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/javabeanconstraints/application/Application.java (77%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/javabeanconstraints/entities/UserNotBlank.java (86%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/javabeanconstraints/entities/UserNotEmpty.java (86%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/javabeanconstraints/entities/UserNotNull.java (86%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/messageinterpolator/Person.java (94%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/methodvalidation/MethodValidationConfig.java (82%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameterValidator.java (94%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameters.java (92%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/methodvalidation/constraints/ValidReservation.java (92%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java (88%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/methodvalidation/model/Customer.java (94%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/methodvalidation/model/Reservation.java (86%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/methodvalidation/model/ReservationManagement.java (91%)
 create mode 100644 javaxval/src/main/java/com/baeldung/javaxval/validationgroup/AdvanceInfo.java
 create mode 100644 javaxval/src/main/java/com/baeldung/javaxval/validationgroup/BasicInfo.java
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/validationgroup/CompleteInfo.java (73%)
 rename javaxval/src/main/java/{org => com}/baeldung/javaxval/validationgroup/RegistrationForm.java (98%)
 delete mode 100644 javaxval/src/main/java/org/baeldung/javaxval/validationgroup/AdvanceInfo.java
 delete mode 100644 javaxval/src/main/java/org/baeldung/javaxval/validationgroup/BasicInfo.java
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/LocaleAwareUnitTest.java (93%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java (98%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/bigdecimal/InvoiceUnitTest.java (96%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/container/validation/ContainerValidationIntegrationTest.java (96%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/enums/CustomerTypeSubSetValidatorUnitTest.java (87%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/enums/EnumNamePatternValidatorUnitTest.java (86%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/enums/ValueOfEnumValidatorUnitTest.java (89%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/enums/demo/CustomerUnitTest.java (92%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/javabeanconstraints/test/UserNotBlankUnitTest.java (93%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/javabeanconstraints/test/UserNotEmptyUnitTest.java (92%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/javabeanconstraints/test/UserNotNullUnitTest.java (92%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/messageinterpolator/ParameterMessageInterpolaterIntegrationTest.java (97%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/methodvalidation/ContainerValidationIntegrationTest.java (92%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/methodvalidation/ValidationIntegrationTest.java (97%)
 rename javaxval/src/test/java/{org => com}/baeldung/javaxval/validationgroup/RegistrationFormUnitTest.java (98%)

diff --git a/javaxval/src/main/java/org/baeldung/javaxval/beanvalidation/User.java b/javaxval/src/main/java/com/baeldung/javaxval/beanvalidation/User.java
similarity index 97%
rename from javaxval/src/main/java/org/baeldung/javaxval/beanvalidation/User.java
rename to javaxval/src/main/java/com/baeldung/javaxval/beanvalidation/User.java
index 8303edd033..d583ac51d2 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/beanvalidation/User.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/beanvalidation/User.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.beanvalidation;
+package com.baeldung.javaxval.beanvalidation;
 
 import java.time.LocalDate;
 import java.util.List;
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/bigdecimal/Invoice.java b/javaxval/src/main/java/com/baeldung/javaxval/bigdecimal/Invoice.java
similarity index 91%
rename from javaxval/src/main/java/org/baeldung/javaxval/bigdecimal/Invoice.java
rename to javaxval/src/main/java/com/baeldung/javaxval/bigdecimal/Invoice.java
index 087701f166..c14a6bd2b1 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/bigdecimal/Invoice.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/bigdecimal/Invoice.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.bigdecimal;
+package com.baeldung.javaxval.bigdecimal;
 
 import java.math.BigDecimal;
 
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/container/validation/Customer.java b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/Customer.java
similarity index 96%
rename from javaxval/src/main/java/org/baeldung/javaxval/container/validation/Customer.java
rename to javaxval/src/main/java/com/baeldung/javaxval/container/validation/Customer.java
index 6ca5ba3ee1..03811635ee 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/container/validation/Customer.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/Customer.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.container.validation;
+package com.baeldung.javaxval.container.validation;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/container/validation/CustomerMap.java b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/CustomerMap.java
similarity index 89%
rename from javaxval/src/main/java/org/baeldung/javaxval/container/validation/CustomerMap.java
rename to javaxval/src/main/java/com/baeldung/javaxval/container/validation/CustomerMap.java
index 82cf0f2b0c..554285fbae 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/container/validation/CustomerMap.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/CustomerMap.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.container.validation;
+package com.baeldung.javaxval.container.validation;
 
 import java.util.Map;
 
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/container/validation/Profile.java b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/Profile.java
similarity index 81%
rename from javaxval/src/main/java/org/baeldung/javaxval/container/validation/Profile.java
rename to javaxval/src/main/java/com/baeldung/javaxval/container/validation/Profile.java
index 41260540fc..252e671250 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/container/validation/Profile.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/Profile.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.container.validation;
+package com.baeldung.javaxval.container.validation;
 
 public class Profile {
     private String companyName;
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/container/validation/valueextractors/ProfileValueExtractor.java b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/valueextractors/ProfileValueExtractor.java
similarity index 79%
rename from javaxval/src/main/java/org/baeldung/javaxval/container/validation/valueextractors/ProfileValueExtractor.java
rename to javaxval/src/main/java/com/baeldung/javaxval/container/validation/valueextractors/ProfileValueExtractor.java
index ebc618e80e..03e0c7aac4 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/container/validation/valueextractors/ProfileValueExtractor.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/valueextractors/ProfileValueExtractor.java
@@ -1,10 +1,10 @@
-package org.baeldung.javaxval.container.validation.valueextractors;
+package com.baeldung.javaxval.container.validation.valueextractors;
 
 import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.UnwrapByDefault;
 import javax.validation.valueextraction.ValueExtractor;
 
-import org.baeldung.javaxval.container.validation.Profile;
+import com.baeldung.javaxval.container.validation.Profile;
 
 @UnwrapByDefault
 public class ProfileValueExtractor implements ValueExtractor<@ExtractedValue(type = String.class) Profile> {
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/enums/CustomerTypeSubSetValidator.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidator.java
similarity index 79%
rename from javaxval/src/main/java/org/baeldung/javaxval/enums/CustomerTypeSubSetValidator.java
rename to javaxval/src/main/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidator.java
index c730cb937f..c91f449bad 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/enums/CustomerTypeSubSetValidator.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidator.java
@@ -1,12 +1,12 @@
-package org.baeldung.javaxval.enums;
+package com.baeldung.javaxval.enums;
 
 import java.util.Arrays;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
-import org.baeldung.javaxval.enums.constraints.CustomerTypeSubset;
-import org.baeldung.javaxval.enums.demo.CustomerType;
+import com.baeldung.javaxval.enums.constraints.CustomerTypeSubset;
+import com.baeldung.javaxval.enums.demo.CustomerType;
 
 public class CustomerTypeSubSetValidator implements ConstraintValidator<CustomerTypeSubset, CustomerType> {
     private CustomerType[] subset;
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/enums/EnumNamePatternValidator.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/EnumNamePatternValidator.java
similarity index 89%
rename from javaxval/src/main/java/org/baeldung/javaxval/enums/EnumNamePatternValidator.java
rename to javaxval/src/main/java/com/baeldung/javaxval/enums/EnumNamePatternValidator.java
index a279813461..3d56d40563 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/enums/EnumNamePatternValidator.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/EnumNamePatternValidator.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.enums;
+package com.baeldung.javaxval.enums;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -7,7 +7,7 @@ import java.util.regex.PatternSyntaxException;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
-import org.baeldung.javaxval.enums.constraints.EnumNamePattern;
+import com.baeldung.javaxval.enums.constraints.EnumNamePattern;
 
 public class EnumNamePatternValidator implements ConstraintValidator<EnumNamePattern, Enum<?>> {
     private Pattern pattern;
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/enums/EnumSubSetValidator.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/EnumSubSetValidator.java
similarity index 94%
rename from javaxval/src/main/java/org/baeldung/javaxval/enums/EnumSubSetValidator.java
rename to javaxval/src/main/java/com/baeldung/javaxval/enums/EnumSubSetValidator.java
index 339b4fb03b..04cccb8b0c 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/enums/EnumSubSetValidator.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/EnumSubSetValidator.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.enums;
+package com.baeldung.javaxval.enums;
 
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/enums/InheritedCustomerTypeSubSetValidator.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/InheritedCustomerTypeSubSetValidator.java
similarity index 61%
rename from javaxval/src/main/java/org/baeldung/javaxval/enums/InheritedCustomerTypeSubSetValidator.java
rename to javaxval/src/main/java/com/baeldung/javaxval/enums/InheritedCustomerTypeSubSetValidator.java
index 1cd31c4187..b49bc11541 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/enums/InheritedCustomerTypeSubSetValidator.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/InheritedCustomerTypeSubSetValidator.java
@@ -1,7 +1,7 @@
-package org.baeldung.javaxval.enums;
+package com.baeldung.javaxval.enums;
 
-import org.baeldung.javaxval.enums.constraints.CustomerTypeSubset;
-import org.baeldung.javaxval.enums.demo.CustomerType;
+import com.baeldung.javaxval.enums.constraints.CustomerTypeSubset;
+import com.baeldung.javaxval.enums.demo.CustomerType;
 
 public class InheritedCustomerTypeSubSetValidator extends EnumSubSetValidator<CustomerTypeSubset, CustomerType> {
     @Override
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/enums/ValueOfEnumValidator.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/ValueOfEnumValidator.java
similarity index 89%
rename from javaxval/src/main/java/org/baeldung/javaxval/enums/ValueOfEnumValidator.java
rename to javaxval/src/main/java/com/baeldung/javaxval/enums/ValueOfEnumValidator.java
index 7184dae49b..0203d63923 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/enums/ValueOfEnumValidator.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/ValueOfEnumValidator.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.enums;
+package com.baeldung.javaxval.enums;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -7,7 +7,7 @@ import java.util.stream.Stream;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
-import org.baeldung.javaxval.enums.constraints.ValueOfEnum;
+import com.baeldung.javaxval.enums.constraints.ValueOfEnum;
 
 public class ValueOfEnumValidator implements ConstraintValidator<ValueOfEnum, CharSequence> {
     private List<String> acceptedValues;
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/enums/constraints/CustomerTypeSubset.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/CustomerTypeSubset.java
similarity index 88%
rename from javaxval/src/main/java/org/baeldung/javaxval/enums/constraints/CustomerTypeSubset.java
rename to javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/CustomerTypeSubset.java
index 44009e6723..97c2137f6a 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/enums/constraints/CustomerTypeSubset.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/CustomerTypeSubset.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.enums.constraints;
+package com.baeldung.javaxval.enums.constraints;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
@@ -15,8 +15,8 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import org.baeldung.javaxval.enums.CustomerTypeSubSetValidator;
-import org.baeldung.javaxval.enums.demo.CustomerType;
+import com.baeldung.javaxval.enums.CustomerTypeSubSetValidator;
+import com.baeldung.javaxval.enums.demo.CustomerType;
 
 @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE })
 @Retention(RUNTIME)
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/enums/constraints/EnumNamePattern.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/EnumNamePattern.java
similarity index 91%
rename from javaxval/src/main/java/org/baeldung/javaxval/enums/constraints/EnumNamePattern.java
rename to javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/EnumNamePattern.java
index 403cdcd0b4..29fff857c8 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/enums/constraints/EnumNamePattern.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/EnumNamePattern.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.enums.constraints;
+package com.baeldung.javaxval.enums.constraints;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
@@ -15,7 +15,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import org.baeldung.javaxval.enums.EnumNamePatternValidator;
+import com.baeldung.javaxval.enums.EnumNamePatternValidator;
 
 @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE })
 @Retention(RUNTIME)
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/enums/constraints/ValueOfEnum.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/ValueOfEnum.java
similarity index 92%
rename from javaxval/src/main/java/org/baeldung/javaxval/enums/constraints/ValueOfEnum.java
rename to javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/ValueOfEnum.java
index 0f9677d982..29b44a1793 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/enums/constraints/ValueOfEnum.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/ValueOfEnum.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.enums.constraints;
+package com.baeldung.javaxval.enums.constraints;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
@@ -15,7 +15,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import org.baeldung.javaxval.enums.ValueOfEnumValidator;
+import com.baeldung.javaxval.enums.ValueOfEnumValidator;
 
 @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE })
 @Retention(RUNTIME)
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/enums/demo/Customer.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/demo/Customer.java
similarity index 91%
rename from javaxval/src/main/java/org/baeldung/javaxval/enums/demo/Customer.java
rename to javaxval/src/main/java/com/baeldung/javaxval/enums/demo/Customer.java
index db3486ab5f..15cd9e0da7 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/enums/demo/Customer.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/demo/Customer.java
@@ -1,10 +1,10 @@
-package org.baeldung.javaxval.enums.demo;
+package com.baeldung.javaxval.enums.demo;
 
 import javax.validation.constraints.NotNull;
 
-import org.baeldung.javaxval.enums.constraints.CustomerTypeSubset;
-import org.baeldung.javaxval.enums.constraints.EnumNamePattern;
-import org.baeldung.javaxval.enums.constraints.ValueOfEnum;
+import com.baeldung.javaxval.enums.constraints.CustomerTypeSubset;
+import com.baeldung.javaxval.enums.constraints.EnumNamePattern;
+import com.baeldung.javaxval.enums.constraints.ValueOfEnum;
 
 public class Customer {
     @ValueOfEnum(enumClass = CustomerType.class)
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/enums/demo/CustomerType.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/demo/CustomerType.java
similarity index 55%
rename from javaxval/src/main/java/org/baeldung/javaxval/enums/demo/CustomerType.java
rename to javaxval/src/main/java/com/baeldung/javaxval/enums/demo/CustomerType.java
index 937f3a3817..88eb1b359f 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/enums/demo/CustomerType.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/demo/CustomerType.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.enums.demo;
+package com.baeldung.javaxval.enums.demo;
 
 public enum CustomerType {
     NEW, OLD, DEFAULT
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/application/Application.java b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/application/Application.java
similarity index 77%
rename from javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/application/Application.java
rename to javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/application/Application.java
index 22095084c5..22157f351c 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/application/Application.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/application/Application.java
@@ -1,9 +1,9 @@
-package org.baeldung.javaxval.javabeanconstraints.application;
+package com.baeldung.javaxval.javabeanconstraints.application;
 
 import javax.validation.Validation;
 import javax.validation.Validator;
 
-import org.baeldung.javaxval.javabeanconstraints.entities.UserNotBlank;
+import com.baeldung.javaxval.javabeanconstraints.entities.UserNotBlank;
 
 public class Application {
 
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/entities/UserNotBlank.java b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotBlank.java
similarity index 86%
rename from javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/entities/UserNotBlank.java
rename to javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotBlank.java
index d86b6a65d2..5542be8c25 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/entities/UserNotBlank.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotBlank.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.javabeanconstraints.entities;
+package com.baeldung.javaxval.javabeanconstraints.entities;
 
 import javax.validation.constraints.NotBlank;
 
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/entities/UserNotEmpty.java b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotEmpty.java
similarity index 86%
rename from javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/entities/UserNotEmpty.java
rename to javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotEmpty.java
index 2082265145..e3dbe27b0e 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/entities/UserNotEmpty.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotEmpty.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.javabeanconstraints.entities;
+package com.baeldung.javaxval.javabeanconstraints.entities;
 
 import javax.validation.constraints.NotEmpty;
 
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/entities/UserNotNull.java b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotNull.java
similarity index 86%
rename from javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/entities/UserNotNull.java
rename to javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotNull.java
index e2f9e7ec57..b3a0f90d36 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/entities/UserNotNull.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotNull.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.javabeanconstraints.entities;
+package com.baeldung.javaxval.javabeanconstraints.entities;
 
 import javax.validation.constraints.NotNull;
 
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/messageinterpolator/Person.java b/javaxval/src/main/java/com/baeldung/javaxval/messageinterpolator/Person.java
similarity index 94%
rename from javaxval/src/main/java/org/baeldung/javaxval/messageinterpolator/Person.java
rename to javaxval/src/main/java/com/baeldung/javaxval/messageinterpolator/Person.java
index b9fcfdf4d4..387af48c20 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/messageinterpolator/Person.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/messageinterpolator/Person.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.messageinterpolator;
+package com.baeldung.javaxval.messageinterpolator;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.Min;
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/MethodValidationConfig.java b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/MethodValidationConfig.java
similarity index 82%
rename from javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/MethodValidationConfig.java
rename to javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/MethodValidationConfig.java
index 817f2370ef..d4046bf5f9 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/MethodValidationConfig.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/MethodValidationConfig.java
@@ -1,9 +1,9 @@
-package org.baeldung.javaxval.methodvalidation;
+package com.baeldung.javaxval.methodvalidation;
 
 import java.time.LocalDate;
 
-import org.baeldung.javaxval.methodvalidation.model.Customer;
-import org.baeldung.javaxval.methodvalidation.model.Reservation;
+import com.baeldung.javaxval.methodvalidation.model.Customer;
+import com.baeldung.javaxval.methodvalidation.model.Reservation;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
 
 @Configuration
-@ComponentScan({ "org.baeldung.javaxval.methodvalidation.model" })
+@ComponentScan({ "com.baeldung.javaxval.methodvalidation.model" })
 public class MethodValidationConfig {
 
     @Bean
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameterValidator.java b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameterValidator.java
similarity index 94%
rename from javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameterValidator.java
rename to javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameterValidator.java
index df09cfa906..6b48046b5c 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameterValidator.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameterValidator.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.methodvalidation.constraints;
+package com.baeldung.javaxval.methodvalidation.constraints;
 
 import java.time.LocalDate;
 
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameters.java b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameters.java
similarity index 92%
rename from javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameters.java
rename to javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameters.java
index bdfabe05ba..83f551d45f 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameters.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameters.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.methodvalidation.constraints;
+package com.baeldung.javaxval.methodvalidation.constraints;
 
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ValidReservation.java b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservation.java
similarity index 92%
rename from javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ValidReservation.java
rename to javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservation.java
index 842f9e0621..c28cc79004 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ValidReservation.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservation.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.methodvalidation.constraints;
+package com.baeldung.javaxval.methodvalidation.constraints;
 
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java
similarity index 88%
rename from javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java
rename to javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java
index c139d1affc..541fc15e9c 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java
@@ -1,11 +1,11 @@
-package org.baeldung.javaxval.methodvalidation.constraints;
+package com.baeldung.javaxval.methodvalidation.constraints;
 
 import java.time.LocalDate;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
-import org.baeldung.javaxval.methodvalidation.model.Reservation;
+import com.baeldung.javaxval.methodvalidation.model.Reservation;
 
 public class ValidReservationValidator implements ConstraintValidator<ValidReservation, Reservation> {
 
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/model/Customer.java b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/model/Customer.java
similarity index 94%
rename from javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/model/Customer.java
rename to javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/model/Customer.java
index 99a32d6277..e0b7fcf917 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/model/Customer.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/model/Customer.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.methodvalidation.model;
+package com.baeldung.javaxval.methodvalidation.model;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/model/Reservation.java b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/model/Reservation.java
similarity index 86%
rename from javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/model/Reservation.java
rename to javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/model/Reservation.java
index 5775bdd66b..49cf1306a9 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/model/Reservation.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/model/Reservation.java
@@ -1,12 +1,12 @@
-package org.baeldung.javaxval.methodvalidation.model;
+package com.baeldung.javaxval.methodvalidation.model;
 
 import java.time.LocalDate;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Positive;
 
-import org.baeldung.javaxval.methodvalidation.constraints.ConsistentDateParameters;
-import org.baeldung.javaxval.methodvalidation.constraints.ValidReservation;
+import com.baeldung.javaxval.methodvalidation.constraints.ValidReservation;
+import com.baeldung.javaxval.methodvalidation.constraints.ConsistentDateParameters;
 import org.springframework.validation.annotation.Validated;
 
 @Validated
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/model/ReservationManagement.java b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/model/ReservationManagement.java
similarity index 91%
rename from javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/model/ReservationManagement.java
rename to javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/model/ReservationManagement.java
index e480e7912d..41fc4c3840 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/model/ReservationManagement.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/methodvalidation/model/ReservationManagement.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.methodvalidation.model;
+package com.baeldung.javaxval.methodvalidation.model;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -9,7 +9,7 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import org.baeldung.javaxval.methodvalidation.constraints.ConsistentDateParameters;
+import com.baeldung.javaxval.methodvalidation.constraints.ConsistentDateParameters;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Controller;
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/AdvanceInfo.java b/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/AdvanceInfo.java
new file mode 100644
index 0000000000..0be96f1341
--- /dev/null
+++ b/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/AdvanceInfo.java
@@ -0,0 +1,5 @@
+package com.baeldung.javaxval.validationgroup;
+
+public interface AdvanceInfo {
+
+}
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/BasicInfo.java b/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/BasicInfo.java
new file mode 100644
index 0000000000..7413c10cda
--- /dev/null
+++ b/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/BasicInfo.java
@@ -0,0 +1,5 @@
+package com.baeldung.javaxval.validationgroup;
+
+public interface BasicInfo {
+
+}
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/validationgroup/CompleteInfo.java b/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/CompleteInfo.java
similarity index 73%
rename from javaxval/src/main/java/org/baeldung/javaxval/validationgroup/CompleteInfo.java
rename to javaxval/src/main/java/com/baeldung/javaxval/validationgroup/CompleteInfo.java
index e34f318b5f..4ecdc3c5f1 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/validationgroup/CompleteInfo.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/CompleteInfo.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.validationgroup;
+package com.baeldung.javaxval.validationgroup;
 
 import javax.validation.GroupSequence;
 
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/validationgroup/RegistrationForm.java b/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/RegistrationForm.java
similarity index 98%
rename from javaxval/src/main/java/org/baeldung/javaxval/validationgroup/RegistrationForm.java
rename to javaxval/src/main/java/com/baeldung/javaxval/validationgroup/RegistrationForm.java
index 190a0c1280..a30a074556 100644
--- a/javaxval/src/main/java/org/baeldung/javaxval/validationgroup/RegistrationForm.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/RegistrationForm.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.validationgroup;
+package com.baeldung.javaxval.validationgroup;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/validationgroup/AdvanceInfo.java b/javaxval/src/main/java/org/baeldung/javaxval/validationgroup/AdvanceInfo.java
deleted file mode 100644
index 9a398e9e7e..0000000000
--- a/javaxval/src/main/java/org/baeldung/javaxval/validationgroup/AdvanceInfo.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.javaxval.validationgroup;
-
-public interface AdvanceInfo {
-
-}
diff --git a/javaxval/src/main/java/org/baeldung/javaxval/validationgroup/BasicInfo.java b/javaxval/src/main/java/org/baeldung/javaxval/validationgroup/BasicInfo.java
deleted file mode 100644
index 6959f52bfa..0000000000
--- a/javaxval/src/main/java/org/baeldung/javaxval/validationgroup/BasicInfo.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.javaxval.validationgroup;
-
-public interface BasicInfo {
-
-}
diff --git a/javaxval/src/main/resources/META-INF/services/javax.validation.valueextraction.ValueExtractor b/javaxval/src/main/resources/META-INF/services/javax.validation.valueextraction.ValueExtractor
index 16bacf1097..0c1fcddd9b 100644
--- a/javaxval/src/main/resources/META-INF/services/javax.validation.valueextraction.ValueExtractor
+++ b/javaxval/src/main/resources/META-INF/services/javax.validation.valueextraction.ValueExtractor
@@ -1 +1 @@
-org.baeldung.javaxval.container.validation.valueextractors.ProfileValueExtractor
\ No newline at end of file
+com.baeldung.javaxval.container.validation.valueextractors.ProfileValueExtractor
\ No newline at end of file
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/LocaleAwareUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/LocaleAwareUnitTest.java
similarity index 93%
rename from javaxval/src/test/java/org/baeldung/javaxval/LocaleAwareUnitTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/LocaleAwareUnitTest.java
index 5623b50a72..ebf1ca3dc6 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/LocaleAwareUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/LocaleAwareUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval;
+package com.baeldung.javaxval;
 
 import java.util.Locale;
 
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java b/javaxval/src/test/java/com/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java
similarity index 98%
rename from javaxval/src/test/java/org/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java
index 3d54955177..3e60fa7acd 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.beanvalidation;
+package com.baeldung.javaxval.beanvalidation;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/bigdecimal/InvoiceUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/bigdecimal/InvoiceUnitTest.java
similarity index 96%
rename from javaxval/src/test/java/org/baeldung/javaxval/bigdecimal/InvoiceUnitTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/bigdecimal/InvoiceUnitTest.java
index 6a53d67f30..2df0cf81af 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/bigdecimal/InvoiceUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/bigdecimal/InvoiceUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.bigdecimal;
+package com.baeldung.javaxval.bigdecimal;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -9,7 +9,7 @@ import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.Validator;
 
-import org.baeldung.javaxval.LocaleAwareUnitTest;
+import com.baeldung.javaxval.LocaleAwareUnitTest;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/container/validation/ContainerValidationIntegrationTest.java b/javaxval/src/test/java/com/baeldung/javaxval/container/validation/ContainerValidationIntegrationTest.java
similarity index 96%
rename from javaxval/src/test/java/org/baeldung/javaxval/container/validation/ContainerValidationIntegrationTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/container/validation/ContainerValidationIntegrationTest.java
index 25c8111732..d96b641442 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/container/validation/ContainerValidationIntegrationTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/container/validation/ContainerValidationIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.container.validation;
+package com.baeldung.javaxval.container.validation;
 
 import static org.junit.Assert.assertEquals;
 
@@ -11,7 +11,7 @@ import javax.validation.Validation;
 import javax.validation.Validator;
 import javax.validation.ValidatorFactory;
 
-import org.baeldung.javaxval.container.validation.valueextractors.ProfileValueExtractor;
+import com.baeldung.javaxval.container.validation.valueextractors.ProfileValueExtractor;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/enums/CustomerTypeSubSetValidatorUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidatorUnitTest.java
similarity index 87%
rename from javaxval/src/test/java/org/baeldung/javaxval/enums/CustomerTypeSubSetValidatorUnitTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidatorUnitTest.java
index 5aae504b23..08a51de81e 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/enums/CustomerTypeSubSetValidatorUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidatorUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.enums;
+package com.baeldung.javaxval.enums;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -8,9 +8,9 @@ import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.Validator;
 
-import org.baeldung.javaxval.enums.demo.Customer;
-import org.baeldung.javaxval.enums.demo.CustomerType;
-import org.baeldung.javaxval.enums.demo.CustomerUnitTest;
+import com.baeldung.javaxval.enums.demo.CustomerUnitTest;
+import com.baeldung.javaxval.enums.demo.Customer;
+import com.baeldung.javaxval.enums.demo.CustomerType;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/enums/EnumNamePatternValidatorUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/enums/EnumNamePatternValidatorUnitTest.java
similarity index 86%
rename from javaxval/src/test/java/org/baeldung/javaxval/enums/EnumNamePatternValidatorUnitTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/enums/EnumNamePatternValidatorUnitTest.java
index 48f7de2c34..03bb1f73ba 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/enums/EnumNamePatternValidatorUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/enums/EnumNamePatternValidatorUnitTest.java
@@ -1,8 +1,8 @@
-package org.baeldung.javaxval.enums;
+package com.baeldung.javaxval.enums;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.baeldung.javaxval.enums.demo.CustomerType.DEFAULT;
-import static org.baeldung.javaxval.enums.demo.CustomerType.OLD;
+import static com.baeldung.javaxval.enums.demo.CustomerType.DEFAULT;
+import static com.baeldung.javaxval.enums.demo.CustomerType.OLD;
 
 import java.util.Set;
 
@@ -10,8 +10,8 @@ import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.Validator;
 
-import org.baeldung.javaxval.enums.demo.Customer;
-import org.baeldung.javaxval.enums.demo.CustomerUnitTest;
+import com.baeldung.javaxval.enums.demo.CustomerUnitTest;
+import com.baeldung.javaxval.enums.demo.Customer;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/enums/ValueOfEnumValidatorUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/enums/ValueOfEnumValidatorUnitTest.java
similarity index 89%
rename from javaxval/src/test/java/org/baeldung/javaxval/enums/ValueOfEnumValidatorUnitTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/enums/ValueOfEnumValidatorUnitTest.java
index 0784b58b77..723ac3cc32 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/enums/ValueOfEnumValidatorUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/enums/ValueOfEnumValidatorUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.enums;
+package com.baeldung.javaxval.enums;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -8,8 +8,8 @@ import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.Validator;
 
-import org.baeldung.javaxval.enums.demo.Customer;
-import org.baeldung.javaxval.enums.demo.CustomerUnitTest;
+import com.baeldung.javaxval.enums.demo.CustomerUnitTest;
+import com.baeldung.javaxval.enums.demo.Customer;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -47,6 +47,6 @@ public class ValueOfEnumValidatorUnitTest {
         assertThat(violations.size()).isEqualTo(1);
 
         assertThat(violations).anyMatch(CustomerUnitTest.havingPropertyPath("customerTypeString")
-            .and(CustomerUnitTest.havingMessage("must be any of enum class org.baeldung.javaxval.enums.demo.CustomerType")));
+            .and(CustomerUnitTest.havingMessage("must be any of enum class com.baeldung.javaxval.enums.demo.CustomerType")));
     }
 }
\ No newline at end of file
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/enums/demo/CustomerUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/enums/demo/CustomerUnitTest.java
similarity index 92%
rename from javaxval/src/test/java/org/baeldung/javaxval/enums/demo/CustomerUnitTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/enums/demo/CustomerUnitTest.java
index 6a064b640f..2c810bc2fe 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/enums/demo/CustomerUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/enums/demo/CustomerUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.enums.demo;
+package com.baeldung.javaxval.enums.demo;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -9,7 +9,7 @@ import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.Validator;
 
-import org.baeldung.javaxval.LocaleAwareUnitTest;
+import com.baeldung.javaxval.LocaleAwareUnitTest;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -50,7 +50,7 @@ public class CustomerUnitTest extends LocaleAwareUnitTest {
         Set<ConstraintViolation<Customer>> violations = validator.validate(customer);
         assertThat(violations.size()).isEqualTo(3);
 
-        assertThat(violations).anyMatch(havingPropertyPath("customerTypeString").and(havingMessage("must be any of enum class org.baeldung.javaxval.enums.demo.CustomerType")));
+        assertThat(violations).anyMatch(havingPropertyPath("customerTypeString").and(havingMessage("must be any of enum class com.baeldung.javaxval.enums.demo.CustomerType")));
         assertThat(violations).anyMatch(havingPropertyPath("customerTypeOfSubset").and(havingMessage("must be any of [NEW, OLD]")));
         assertThat(violations).anyMatch(havingPropertyPath("customerTypeMatchesPattern").and(havingMessage("must match \"NEW|DEFAULT\"")));
     }
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/javabeanconstraints/test/UserNotBlankUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/test/UserNotBlankUnitTest.java
similarity index 93%
rename from javaxval/src/test/java/org/baeldung/javaxval/javabeanconstraints/test/UserNotBlankUnitTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/test/UserNotBlankUnitTest.java
index e3a51d4e27..5219004c6d 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/javabeanconstraints/test/UserNotBlankUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/test/UserNotBlankUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.javabeanconstraints.test;
+package com.baeldung.javaxval.javabeanconstraints.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -8,7 +8,7 @@ import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.Validator;
 
-import org.baeldung.javaxval.javabeanconstraints.entities.UserNotBlank;
+import com.baeldung.javaxval.javabeanconstraints.entities.UserNotBlank;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/javabeanconstraints/test/UserNotEmptyUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/test/UserNotEmptyUnitTest.java
similarity index 92%
rename from javaxval/src/test/java/org/baeldung/javaxval/javabeanconstraints/test/UserNotEmptyUnitTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/test/UserNotEmptyUnitTest.java
index 22fbab6997..7017848756 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/javabeanconstraints/test/UserNotEmptyUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/test/UserNotEmptyUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.javabeanconstraints.test;
+package com.baeldung.javaxval.javabeanconstraints.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -8,7 +8,7 @@ import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.Validator;
 
-import org.baeldung.javaxval.javabeanconstraints.entities.UserNotEmpty;
+import com.baeldung.javaxval.javabeanconstraints.entities.UserNotEmpty;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/javabeanconstraints/test/UserNotNullUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/test/UserNotNullUnitTest.java
similarity index 92%
rename from javaxval/src/test/java/org/baeldung/javaxval/javabeanconstraints/test/UserNotNullUnitTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/test/UserNotNullUnitTest.java
index a684668ae3..b0df88d72b 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/javabeanconstraints/test/UserNotNullUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/test/UserNotNullUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.javabeanconstraints.test;
+package com.baeldung.javaxval.javabeanconstraints.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -8,7 +8,7 @@ import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.Validator;
 
-import org.baeldung.javaxval.javabeanconstraints.entities.UserNotNull;
+import com.baeldung.javaxval.javabeanconstraints.entities.UserNotNull;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/messageinterpolator/ParameterMessageInterpolaterIntegrationTest.java b/javaxval/src/test/java/com/baeldung/javaxval/messageinterpolator/ParameterMessageInterpolaterIntegrationTest.java
similarity index 97%
rename from javaxval/src/test/java/org/baeldung/javaxval/messageinterpolator/ParameterMessageInterpolaterIntegrationTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/messageinterpolator/ParameterMessageInterpolaterIntegrationTest.java
index 6ecb916ab4..a60550aca5 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/messageinterpolator/ParameterMessageInterpolaterIntegrationTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/messageinterpolator/ParameterMessageInterpolaterIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.messageinterpolator;
+package com.baeldung.javaxval.messageinterpolator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/methodvalidation/ContainerValidationIntegrationTest.java b/javaxval/src/test/java/com/baeldung/javaxval/methodvalidation/ContainerValidationIntegrationTest.java
similarity index 92%
rename from javaxval/src/test/java/org/baeldung/javaxval/methodvalidation/ContainerValidationIntegrationTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/methodvalidation/ContainerValidationIntegrationTest.java
index 8febdca0ee..d9daf6c4ff 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/methodvalidation/ContainerValidationIntegrationTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/methodvalidation/ContainerValidationIntegrationTest.java
@@ -1,13 +1,13 @@
-package org.baeldung.javaxval.methodvalidation;
+package com.baeldung.javaxval.methodvalidation;
 
 import java.time.LocalDate;
 import java.util.List;
 
 import javax.validation.ConstraintViolationException;
 
-import org.baeldung.javaxval.methodvalidation.model.Customer;
-import org.baeldung.javaxval.methodvalidation.model.Reservation;
-import org.baeldung.javaxval.methodvalidation.model.ReservationManagement;
+import com.baeldung.javaxval.methodvalidation.model.Customer;
+import com.baeldung.javaxval.methodvalidation.model.Reservation;
+import com.baeldung.javaxval.methodvalidation.model.ReservationManagement;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/methodvalidation/ValidationIntegrationTest.java b/javaxval/src/test/java/com/baeldung/javaxval/methodvalidation/ValidationIntegrationTest.java
similarity index 97%
rename from javaxval/src/test/java/org/baeldung/javaxval/methodvalidation/ValidationIntegrationTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/methodvalidation/ValidationIntegrationTest.java
index 9baeba7189..6f297a7c9c 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/methodvalidation/ValidationIntegrationTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/methodvalidation/ValidationIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.methodvalidation;
+package com.baeldung.javaxval.methodvalidation;
 
 import static org.junit.Assert.assertEquals;
 
@@ -13,9 +13,9 @@ import javax.validation.Validation;
 import javax.validation.ValidatorFactory;
 import javax.validation.executable.ExecutableValidator;
 
-import org.baeldung.javaxval.methodvalidation.model.Customer;
-import org.baeldung.javaxval.methodvalidation.model.Reservation;
-import org.baeldung.javaxval.methodvalidation.model.ReservationManagement;
+import com.baeldung.javaxval.methodvalidation.model.Customer;
+import com.baeldung.javaxval.methodvalidation.model.Reservation;
+import com.baeldung.javaxval.methodvalidation.model.ReservationManagement;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/javaxval/src/test/java/org/baeldung/javaxval/validationgroup/RegistrationFormUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/validationgroup/RegistrationFormUnitTest.java
similarity index 98%
rename from javaxval/src/test/java/org/baeldung/javaxval/validationgroup/RegistrationFormUnitTest.java
rename to javaxval/src/test/java/com/baeldung/javaxval/validationgroup/RegistrationFormUnitTest.java
index df70ca0bce..6b7600d201 100644
--- a/javaxval/src/test/java/org/baeldung/javaxval/validationgroup/RegistrationFormUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/validationgroup/RegistrationFormUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.javaxval.validationgroup;
+package com.baeldung.javaxval.validationgroup;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -8,7 +8,7 @@ import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.Validator;
 
-import org.baeldung.javaxval.LocaleAwareUnitTest;
+import com.baeldung.javaxval.LocaleAwareUnitTest;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

From c69b2a5ca3c3d4fdd619e9146deec1d63e97f95b Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Fri, 20 Dec 2019 12:47:57 +0100
Subject: [PATCH 064/106] BAEL-20262: Migrate spring-scheduling module to the
 com.baeldung package

---
 .../{org => com}/baeldung/async/AsyncComponent.java  |  2 +-
 .../baeldung/async/CustomAsyncExceptionHandler.java  |  2 +-
 .../baeldung/async/config/SpringAsyncConfig.java     |  6 +++---
 .../scheduling/ScheduledAnnotationExample.java       |  2 +-
 .../baeldung/scheduling/SchedulingWithXmlConfig.java |  2 +-
 .../baeldung/scheduling/SpringSchedulingConfig.java  |  4 ++--
 .../scheduling/SpringSchedulingFixedRateConfig.java  | 12 ------------
 .../{org => com}/baeldung/springretry/AppConfig.java |  4 ++--
 .../baeldung/springretry/DefaultListenerSupport.java |  2 +-
 .../{org => com}/baeldung/springretry/MyService.java |  2 +-
 .../baeldung/springretry/MyServiceImpl.java          |  2 +-
 .../taskscheduler/ThreadPoolTaskSchedulerConfig.java |  4 ++--
 .../ThreadPoolTaskSchedulerExamples.java             |  2 +-
 spring-scheduling/src/main/resources/retryadvice.xml |  2 +-
 .../src/main/resources/springAsync-config.xml        |  2 +-
 .../src/main/resources/springScheduled-config.xml    |  2 +-
 .../async/AsyncAnnotationExampleIntegrationTest.java |  4 ++--
 .../baeldung/async/AsyncWithXMLIntegrationTest.java  |  2 +-
 .../ScheduledAnnotationExampleIntegrationTest.java   |  3 ++-
 .../ScheduledFixedRateExampleIntegrationTest.java    |  2 +-
 .../SchedulingWithXmlConfigIntegrationTest.java      |  2 +-
 .../springretry/SpringRetryIntegrationTest.java      |  2 +-
 .../ThreadPoolTaskSchedulerIntegrationTest.java      |  2 +-
 23 files changed, 29 insertions(+), 40 deletions(-)
 rename spring-scheduling/src/main/java/{org => com}/baeldung/async/AsyncComponent.java (97%)
 rename spring-scheduling/src/main/java/{org => com}/baeldung/async/CustomAsyncExceptionHandler.java (95%)
 rename spring-scheduling/src/main/java/{org => com}/baeldung/async/config/SpringAsyncConfig.java (89%)
 rename spring-scheduling/src/main/java/{org => com}/baeldung/scheduling/ScheduledAnnotationExample.java (98%)
 rename spring-scheduling/src/main/java/{org => com}/baeldung/scheduling/SchedulingWithXmlConfig.java (93%)
 rename spring-scheduling/src/main/java/{org => com}/baeldung/scheduling/SpringSchedulingConfig.java (90%)
 delete mode 100644 spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java
 rename spring-scheduling/src/main/java/{org => com}/baeldung/springretry/AppConfig.java (92%)
 rename spring-scheduling/src/main/java/{org => com}/baeldung/springretry/DefaultListenerSupport.java (96%)
 rename spring-scheduling/src/main/java/{org => com}/baeldung/springretry/MyService.java (93%)
 rename spring-scheduling/src/main/java/{org => com}/baeldung/springretry/MyServiceImpl.java (96%)
 rename spring-scheduling/src/main/java/{org => com}/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java (93%)
 rename spring-scheduling/src/main/java/{org => com}/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java (97%)
 rename spring-scheduling/src/test/java/{org => com}/baeldung/async/AsyncAnnotationExampleIntegrationTest.java (96%)
 rename spring-scheduling/src/test/java/{org => com}/baeldung/async/AsyncWithXMLIntegrationTest.java (96%)
 rename spring-scheduling/src/test/java/{org => com}/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java (87%)
 rename spring-scheduling/src/test/java/{org => com}/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java (93%)
 rename spring-scheduling/src/test/java/{org => com}/baeldung/springretry/SpringRetryIntegrationTest.java (97%)
 rename spring-scheduling/src/test/java/{org => com}/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java (94%)

diff --git a/spring-scheduling/src/main/java/org/baeldung/async/AsyncComponent.java b/spring-scheduling/src/main/java/com/baeldung/async/AsyncComponent.java
similarity index 97%
rename from spring-scheduling/src/main/java/org/baeldung/async/AsyncComponent.java
rename to spring-scheduling/src/main/java/com/baeldung/async/AsyncComponent.java
index 8503f75c8f..7d18b8b784 100644
--- a/spring-scheduling/src/main/java/org/baeldung/async/AsyncComponent.java
+++ b/spring-scheduling/src/main/java/com/baeldung/async/AsyncComponent.java
@@ -1,4 +1,4 @@
-package org.baeldung.async;
+package com.baeldung.async;
 
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncResult;
diff --git a/spring-scheduling/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java b/spring-scheduling/src/main/java/com/baeldung/async/CustomAsyncExceptionHandler.java
similarity index 95%
rename from spring-scheduling/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java
rename to spring-scheduling/src/main/java/com/baeldung/async/CustomAsyncExceptionHandler.java
index a7a177f8fe..ba95f000a2 100644
--- a/spring-scheduling/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java
+++ b/spring-scheduling/src/main/java/com/baeldung/async/CustomAsyncExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.baeldung.async;
+package com.baeldung.async;
 
 import java.lang.reflect.Method;
 
diff --git a/spring-scheduling/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java b/spring-scheduling/src/main/java/com/baeldung/async/config/SpringAsyncConfig.java
similarity index 89%
rename from spring-scheduling/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java
rename to spring-scheduling/src/main/java/com/baeldung/async/config/SpringAsyncConfig.java
index 0676258207..56fa643017 100644
--- a/spring-scheduling/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java
+++ b/spring-scheduling/src/main/java/com/baeldung/async/config/SpringAsyncConfig.java
@@ -1,8 +1,8 @@
-package org.baeldung.async.config;
+package com.baeldung.async.config;
 
 import java.util.concurrent.Executor;
 
-import org.baeldung.async.CustomAsyncExceptionHandler;
+import com.baeldung.async.CustomAsyncExceptionHandler;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -14,7 +14,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 @Configuration
 @EnableAsync()
-@ComponentScan("org.baeldung.async")
+@ComponentScan("com.baeldung.async")
 public class SpringAsyncConfig implements AsyncConfigurer {
 
     @Bean(name = "threadPoolTaskExecutor")
diff --git a/spring-scheduling/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java b/spring-scheduling/src/main/java/com/baeldung/scheduling/ScheduledAnnotationExample.java
similarity index 98%
rename from spring-scheduling/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java
rename to spring-scheduling/src/main/java/com/baeldung/scheduling/ScheduledAnnotationExample.java
index 23bbee3bc3..892347d615 100644
--- a/spring-scheduling/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java
+++ b/spring-scheduling/src/main/java/com/baeldung/scheduling/ScheduledAnnotationExample.java
@@ -1,4 +1,4 @@
-package org.baeldung.scheduling;
+package com.baeldung.scheduling;
 
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
diff --git a/spring-scheduling/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java b/spring-scheduling/src/main/java/com/baeldung/scheduling/SchedulingWithXmlConfig.java
similarity index 93%
rename from spring-scheduling/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java
rename to spring-scheduling/src/main/java/com/baeldung/scheduling/SchedulingWithXmlConfig.java
index d7da9ac19c..54856442f4 100644
--- a/spring-scheduling/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java
+++ b/spring-scheduling/src/main/java/com/baeldung/scheduling/SchedulingWithXmlConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.scheduling;
+package com.baeldung.scheduling;
 
 public class SchedulingWithXmlConfig {
 
diff --git a/spring-scheduling/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java b/spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingConfig.java
similarity index 90%
rename from spring-scheduling/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java
rename to spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingConfig.java
index 1d81fa0aa8..5d7f1cf88f 100644
--- a/spring-scheduling/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java
+++ b/spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.scheduling;
+package com.baeldung.scheduling;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -9,7 +9,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 
 @Configuration
 @EnableScheduling
-@ComponentScan("org.baeldung.scheduling")
+@ComponentScan("com.baeldung.scheduling")
 @PropertySource("classpath:springScheduled.properties")
 public class SpringSchedulingConfig {
 
diff --git a/spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java b/spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java
deleted file mode 100644
index 6000f75ec2..0000000000
--- a/spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.baeldung.scheduling;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-@Configuration
-@EnableScheduling
-@ComponentScan("com.baeldung.scheduling")
-public class SpringSchedulingFixedRateConfig {
-
-}
\ No newline at end of file
diff --git a/spring-scheduling/src/main/java/org/baeldung/springretry/AppConfig.java b/spring-scheduling/src/main/java/com/baeldung/springretry/AppConfig.java
similarity index 92%
rename from spring-scheduling/src/main/java/org/baeldung/springretry/AppConfig.java
rename to spring-scheduling/src/main/java/com/baeldung/springretry/AppConfig.java
index d9b081578c..e79beb370b 100644
--- a/spring-scheduling/src/main/java/org/baeldung/springretry/AppConfig.java
+++ b/spring-scheduling/src/main/java/com/baeldung/springretry/AppConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.springretry;
+package com.baeldung.springretry;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -9,7 +9,7 @@ import org.springframework.retry.policy.SimpleRetryPolicy;
 import org.springframework.retry.support.RetryTemplate;
 
 @Configuration
-@ComponentScan(basePackages = "org.baeldung.springretry")
+@ComponentScan(basePackages = "com.baeldung.springretry")
 @EnableRetry
 // Uncomment this two lines if we need XML configuration
 // @EnableAspectJAutoProxy
diff --git a/spring-scheduling/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java b/spring-scheduling/src/main/java/com/baeldung/springretry/DefaultListenerSupport.java
similarity index 96%
rename from spring-scheduling/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java
rename to spring-scheduling/src/main/java/com/baeldung/springretry/DefaultListenerSupport.java
index bc251b4c2f..0f9f1b6f0d 100644
--- a/spring-scheduling/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java
+++ b/spring-scheduling/src/main/java/com/baeldung/springretry/DefaultListenerSupport.java
@@ -1,4 +1,4 @@
-package org.baeldung.springretry;
+package com.baeldung.springretry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-scheduling/src/main/java/org/baeldung/springretry/MyService.java b/spring-scheduling/src/main/java/com/baeldung/springretry/MyService.java
similarity index 93%
rename from spring-scheduling/src/main/java/org/baeldung/springretry/MyService.java
rename to spring-scheduling/src/main/java/com/baeldung/springretry/MyService.java
index 6306ff3c26..409bf25845 100644
--- a/spring-scheduling/src/main/java/org/baeldung/springretry/MyService.java
+++ b/spring-scheduling/src/main/java/com/baeldung/springretry/MyService.java
@@ -1,4 +1,4 @@
-package org.baeldung.springretry;
+package com.baeldung.springretry;
 
 import java.sql.SQLException;
 
diff --git a/spring-scheduling/src/main/java/org/baeldung/springretry/MyServiceImpl.java b/spring-scheduling/src/main/java/com/baeldung/springretry/MyServiceImpl.java
similarity index 96%
rename from spring-scheduling/src/main/java/org/baeldung/springretry/MyServiceImpl.java
rename to spring-scheduling/src/main/java/com/baeldung/springretry/MyServiceImpl.java
index 1b698f26c9..3e4b5ed00d 100644
--- a/spring-scheduling/src/main/java/org/baeldung/springretry/MyServiceImpl.java
+++ b/spring-scheduling/src/main/java/com/baeldung/springretry/MyServiceImpl.java
@@ -1,4 +1,4 @@
-package org.baeldung.springretry;
+package com.baeldung.springretry;
 
 import java.sql.SQLException;
 
diff --git a/spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java b/spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
similarity index 93%
rename from spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
rename to spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
index 342a5fe3e6..c24c701df5 100644
--- a/spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
+++ b/spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.taskscheduler;
+package com.baeldung.taskscheduler;
 
 import java.util.concurrent.TimeUnit;
 
@@ -10,7 +10,7 @@ import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.scheduling.support.PeriodicTrigger;
 
 @Configuration
-@ComponentScan(basePackages = "org.baeldung.taskscheduler", basePackageClasses = { ThreadPoolTaskSchedulerExamples.class })
+@ComponentScan(basePackages = "com.baeldung.taskscheduler", basePackageClasses = { ThreadPoolTaskSchedulerExamples.class })
 public class ThreadPoolTaskSchedulerConfig {
 
     @Bean
diff --git a/spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java b/spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
similarity index 97%
rename from spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
rename to spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
index 5d72ed148a..c0c6f37507 100644
--- a/spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
+++ b/spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
@@ -1,4 +1,4 @@
-package org.baeldung.taskscheduler;
+package com.baeldung.taskscheduler;
 
 import java.util.Date;
 
diff --git a/spring-scheduling/src/main/resources/retryadvice.xml b/spring-scheduling/src/main/resources/retryadvice.xml
index 79a9fc8660..8de7801a58 100644
--- a/spring-scheduling/src/main/resources/retryadvice.xml
+++ b/spring-scheduling/src/main/resources/retryadvice.xml
@@ -7,7 +7,7 @@
                            http://www.springframework.org/schema/beans/spring-beans.xsd">
     <aop:config>
         <aop:pointcut id="transactional"
-            expression="execution(* org.baeldung.springretry..*MyService.defaultXmlRetryService(..))" />
+            expression="execution(* com.baeldung.springretry..*MyService.defaultXmlRetryService(..))" />
         <aop:advisor pointcut-ref="transactional" advice-ref="taskRetryAdvice" order="-1" />
     </aop:config>
 
diff --git a/spring-scheduling/src/main/resources/springAsync-config.xml b/spring-scheduling/src/main/resources/springAsync-config.xml
index 40fc40c79f..48bfbb3f41 100644
--- a/spring-scheduling/src/main/resources/springAsync-config.xml
+++ b/spring-scheduling/src/main/resources/springAsync-config.xml
@@ -10,6 +10,6 @@
     <task:annotation-driven executor="myExecutor"/>
     <task:executor id="myExecutor" pool-size="5"/>
 
-    <bean id="asyncAnnotationExample" class="org.baeldung.async.AsyncComponent"/>
+    <bean id="asyncAnnotationExample" class="com.baeldung.async.AsyncComponent"/>
 
 </beans>
\ No newline at end of file
diff --git a/spring-scheduling/src/main/resources/springScheduled-config.xml b/spring-scheduling/src/main/resources/springScheduled-config.xml
index 4078f535da..1e42b118bd 100644
--- a/spring-scheduling/src/main/resources/springScheduled-config.xml
+++ b/spring-scheduling/src/main/resources/springScheduled-config.xml
@@ -16,7 +16,7 @@
     <bean id="myscheduler" class="org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler"/>
 
     <!-- Configure the fixedDealy, fixedRate or cron based scheduled tasks -->
-    <bean id="schedulingWithXmlConfig" class="org.baeldung.scheduling.SchedulingWithXmlConfig"/>
+    <bean id="schedulingWithXmlConfig" class="com.baeldung.scheduling.SchedulingWithXmlConfig"/>
 
     <task:scheduled-tasks scheduler="myScheduler">
         <task:scheduled ref="schedulingWithXmlConfig" method="scheduleFixedDelayTask"
diff --git a/spring-scheduling/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
similarity index 96%
rename from spring-scheduling/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
index 0c010cf732..875fb8bea8 100644
--- a/spring-scheduling/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
@@ -1,9 +1,9 @@
-package org.baeldung.async;
+package com.baeldung.async;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import org.baeldung.async.config.SpringAsyncConfig;
+import com.baeldung.async.config.SpringAsyncConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-scheduling/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/async/AsyncWithXMLIntegrationTest.java
similarity index 96%
rename from spring-scheduling/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/async/AsyncWithXMLIntegrationTest.java
index ffaa653a9a..95ef7d79ae 100644
--- a/spring-scheduling/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/async/AsyncWithXMLIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.async;
+package com.baeldung.async;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-scheduling/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
similarity index 87%
rename from spring-scheduling/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
index c5ca78aaa1..86ae6521e3 100644
--- a/spring-scheduling/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
@@ -1,5 +1,6 @@
-package org.baeldung.scheduling;
+package com.baeldung.scheduling;
 
+import com.baeldung.scheduling.SpringSchedulingConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
index ef7c7c68fd..72db6d1b47 100644
--- a/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { SpringSchedulingFixedRateConfig.class }, loader = AnnotationConfigContextLoader.class)
+@ContextConfiguration(classes = { SpringSchedulingConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class ScheduledFixedRateExampleIntegrationTest {
 
     @Test
diff --git a/spring-scheduling/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
similarity index 93%
rename from spring-scheduling/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
index 08df73f8fd..c1c1387bef 100644
--- a/spring-scheduling/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.scheduling;
+package com.baeldung.scheduling;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-scheduling/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/springretry/SpringRetryIntegrationTest.java
similarity index 97%
rename from spring-scheduling/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/springretry/SpringRetryIntegrationTest.java
index d7d0943e6b..2e5fb75482 100644
--- a/spring-scheduling/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/springretry/SpringRetryIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.springretry;
+package com.baeldung.springretry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-scheduling/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
similarity index 94%
rename from spring-scheduling/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
index 94c58cb17e..0b87b14ab6 100644
--- a/spring-scheduling/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.taskscheduler;
+package com.baeldung.taskscheduler;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

From fd92e64815ce2403551dc46e82d16f3fa9b4e6d1 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Fri, 20 Dec 2019 12:56:36 +0100
Subject: [PATCH 065/106] BAEL-20262: Migrate spring-core-2 module to the
 com.baeldung package

---
 spring-core-2/pom.xml                                       | 2 +-
 .../java/{org => com}/baeldung/autowire/sample/App.java     | 2 +-
 .../{org => com}/baeldung/autowire/sample/AppConfig.java    | 4 ++--
 .../{org => com}/baeldung/autowire/sample/BarFormatter.java | 2 +-
 .../src/main/java/com/baeldung/autowire/sample/FooDAO.java  | 5 +++++
 .../{org => com}/baeldung/autowire/sample/FooFormatter.java | 2 +-
 .../{org => com}/baeldung/autowire/sample/FooService.java   | 2 +-
 .../{org => com}/baeldung/autowire/sample/Formatter.java    | 2 +-
 .../baeldung/autowire/sample/FormatterType.java             | 2 +-
 .../baeldung/bean/config/ConstructorBasedShipConfig.java    | 6 +++---
 .../baeldung/bean/config/SetterBasedShipConfig.java         | 6 +++---
 .../java/{org => com}/baeldung/bean/injection/Helm.java     | 2 +-
 .../java/{org => com}/baeldung/bean/injection/Ship.java     | 2 +-
 .../customannotation/CustomAnnotationConfiguration.java     | 4 ++--
 .../{org => com}/baeldung/customannotation/DataAccess.java  | 2 +-
 .../customannotation/DataAccessAnnotationProcessor.java     | 2 +-
 .../baeldung/customannotation/DataAccessFieldCallback.java  | 2 +-
 .../{org => com}/baeldung/customannotation/GenericDAO.java  | 2 +-
 .../java/{org => com}/baeldung/customscope/TenantBean.java  | 2 +-
 .../customscope/TenantBeanFactoryPostProcessor.java         | 2 +-
 .../baeldung/customscope/TenantBeansConfig.java             | 2 +-
 .../java/{org => com}/baeldung/customscope/TenantScope.java | 2 +-
 .../baeldung/customscope/TenantScopeConfig.java             | 2 +-
 .../main/java/{org => com}/baeldung/nullibility/Person.java | 2 +-
 .../main/java/com/baeldung/nullibility/package-info.java    | 6 ++++++
 .../src/main/java/{org => com}/baeldung/order/Average.java  | 2 +-
 .../main/java/{org => com}/baeldung/order/Excellent.java    | 2 +-
 .../src/main/java/{org => com}/baeldung/order/Good.java     | 2 +-
 .../src/main/java/{org => com}/baeldung/order/Rating.java   | 2 +-
 .../main/java/{org => com}/baeldung/persistence/Setup.java  | 2 +-
 .../src/main/java/{org => com}/baeldung/primary/Config.java | 4 ++--
 .../{org => com}/baeldung/primary/DepartmentManager.java    | 2 +-
 .../main/java/{org => com}/baeldung/primary/Employee.java   | 2 +-
 .../java/{org => com}/baeldung/primary/GeneralManager.java  | 2 +-
 .../main/java/{org => com}/baeldung/primary/Manager.java    | 2 +-
 .../java/{org => com}/baeldung/primary/ManagerService.java  | 2 +-
 .../{org => com}/baeldung/primary/PrimaryApplication.java   | 2 +-
 .../{org => com}/baeldung/profiles/DatasourceConfig.java    | 2 +-
 .../{org => com}/baeldung/profiles/DevDatasourceConfig.java | 2 +-
 .../baeldung/profiles/ProductionDatasourceConfig.java       | 2 +-
 .../java/{org => com}/baeldung/profiles/ProfileManager.java | 2 +-
 .../baeldung/profiles/SpringProfilesConfig.java             | 4 ++--
 spring-core-2/src/main/java/com/baeldung/sample/Bar.java    | 5 +++++
 spring-core-2/src/main/java/com/baeldung/sample/Foo.java    | 5 +++++
 .../{org => com}/baeldung/sampleabstract/BallService.java   | 2 +-
 .../baeldung/sampleabstract/BasketballService.java          | 2 +-
 .../java/{org => com}/baeldung/sampleabstract/DemoApp.java  | 4 ++--
 .../{org => com}/baeldung/sampleabstract/LogRepository.java | 2 +-
 .../baeldung/sampleabstract/RuleRepository.java             | 2 +-
 .../{org => com}/baeldung/scopes/HelloMessageGenerator.java | 2 +-
 .../src/main/java/{org => com}/baeldung/scopes/Person.java  | 2 +-
 .../java/{org => com}/baeldung/scopes/ScopesController.java | 2 +-
 .../{org => com}/baeldung/spring/config/CleanupBean.java    | 2 +-
 .../{org => com}/baeldung/spring/config/CoreConfig.java     | 4 ++--
 .../baeldung/spring/config/MainWebAppInitializer.java       | 4 ++--
 .../java/{org => com}/baeldung/spring/config/MvcConfig.java | 2 +-
 .../baeldung/spring/config/PersistenceConfig.java           | 6 +++---
 .../{org => com}/baeldung/spring/config/ScopesConfig.java   | 0
 .../asynchronous/AsynchronousSpringEventsConfig.java        | 4 ++--
 .../synchronous/AnnotationDrivenEventListener.java          | 2 +-
 .../springevents/synchronous/ContextRefreshedListener.java  | 2 +-
 .../springevents/synchronous/CustomSpringEvent.java         | 2 +-
 .../springevents/synchronous/CustomSpringEventListener.java | 2 +-
 .../synchronous/CustomSpringEventPublisher.java             | 2 +-
 .../springevents/synchronous/GenericSpringAppEvent.java     | 2 +-
 .../springevents/synchronous/GenericSpringEvent.java        | 2 +-
 .../synchronous/GenericSpringEventListener.java             | 2 +-
 .../synchronous/GenericStringSpringAppEvent.java            | 2 +-
 .../springevents/synchronous/GenericStringSpringEvent.java  | 2 +-
 .../synchronous/SynchronousSpringEventsConfig.java          | 4 ++--
 .../baeldung/startup/AllStrategiesExampleBean.java          | 2 +-
 .../baeldung/startup/EventListenerExampleBean.java          | 2 +-
 .../baeldung/startup/InitMethodExampleBean.java             | 2 +-
 .../baeldung/startup/InitializingBeanExampleBean.java       | 2 +-
 .../baeldung/startup/InvalidInitExampleBean.java            | 2 +-
 .../baeldung/startup/LogicInConstructorExampleBean.java     | 2 +-
 .../baeldung/startup/PostConstructExampleBean.java          | 2 +-
 .../{org => com}/baeldung/startup/SpringStartupConfig.java  | 4 ++--
 .../baeldung/startup/StartupApplicationListenerExample.java | 2 +-
 .../src/main/java/org/baeldung/autowire/sample/FooDAO.java  | 5 -----
 .../main/java/org/baeldung/nullibility/package-info.java    | 6 ------
 spring-core-2/src/main/java/org/baeldung/sample/Bar.java    | 5 -----
 spring-core-2/src/main/java/org/baeldung/sample/Foo.java    | 5 -----
 .../src/main/resources/beanInjection-constructor.xml        | 4 ++--
 spring-core-2/src/main/resources/beanInjection-setter.xml   | 4 ++--
 spring-core-2/src/main/resources/jdbc/springJdbc-config.xml | 2 +-
 spring-core-2/src/main/resources/scopes.xml                 | 4 ++--
 spring-core-2/src/main/resources/springProfiles-config.xml  | 4 ++--
 spring-core-2/src/main/resources/startupConfig.xml          | 4 ++--
 .../baeldung/autowire/sample/FooServiceIntegrationTest.java | 2 +-
 ...ctorBasedBeanInjectionWithJavaConfigIntegrationTest.java | 4 ++--
 ...uctorBasedBeanInjectionWithXMLConfigIntegrationTest.java | 2 +-
 ...tterBasedBeanInjectionWithJavaConfigIntegrationTest.java | 4 ++--
 ...etterBasedBeanInjectionWithXMLConfigIntegrationTest.java | 2 +-
 .../{org => com}/baeldung/customannotation/Account.java     | 2 +-
 .../baeldung/customannotation/BeanWithGenericDAO.java       | 2 +-
 .../DataAccessAnnotationIntegrationTest.java                | 2 +-
 .../DataAccessFieldCallbackIntegrationTest.java             | 2 +-
 .../java/{org => com}/baeldung/customannotation/Person.java | 2 +-
 .../baeldung/customscope/TenantScopeIntegrationTest.java    | 4 ++--
 .../baeldung/order/RatingRetrieverUnitTest.java             | 4 ++--
 .../profiles/DevProfileWithAnnotationIntegrationTest.java   | 2 +-
 .../ProductionProfileWithAnnotationIntegrationTest.java     | 2 +-
 .../SpringProfilesWithMavenPropertiesIntegrationTest.java   | 2 +-
 .../profiles/SpringProfilesWithXMLIntegrationTest.java      | 2 +-
 .../{org => com}/baeldung/scopes/ScopesIntegrationTest.java | 2 +-
 .../AsynchronousCustomSpringEventsIntegrationTest.java      | 4 ++--
 .../ContextRefreshedListenerIntegrationTest.java            | 3 +--
 .../synchronous/GenericAppEventListenerIntegrationTest.java | 2 +-
 .../SynchronousCustomSpringEventsIntegrationTest.java       | 2 +-
 .../baeldung/startup/SpringStartupIntegrationTest.java      | 2 +-
 .../startup/SpringStartupXMLConfigIntegrationTest.java      | 2 +-
 112 files changed, 150 insertions(+), 151 deletions(-)
 rename spring-core-2/src/main/java/{org => com}/baeldung/autowire/sample/App.java (90%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/autowire/sample/AppConfig.java (66%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/autowire/sample/BarFormatter.java (83%)
 create mode 100644 spring-core-2/src/main/java/com/baeldung/autowire/sample/FooDAO.java
 rename spring-core-2/src/main/java/{org => com}/baeldung/autowire/sample/FooFormatter.java (83%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/autowire/sample/FooService.java (88%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/autowire/sample/Formatter.java (59%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/autowire/sample/FormatterType.java (91%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/bean/config/ConstructorBasedShipConfig.java (73%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/bean/config/SetterBasedShipConfig.java (66%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/bean/injection/Helm.java (86%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/bean/injection/Ship.java (91%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/customannotation/CustomAnnotationConfiguration.java (68%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/customannotation/DataAccess.java (90%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/customannotation/DataAccessAnnotationProcessor.java (97%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/customannotation/DataAccessFieldCallback.java (99%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/customannotation/GenericDAO.java (94%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/customscope/TenantBean.java (89%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/customscope/TenantBeanFactoryPostProcessor.java (93%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/customscope/TenantBeansConfig.java (93%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/customscope/TenantScope.java (97%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/customscope/TenantScopeConfig.java (91%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/nullibility/Person.java (95%)
 create mode 100644 spring-core-2/src/main/java/com/baeldung/nullibility/package-info.java
 rename spring-core-2/src/main/java/{org => com}/baeldung/order/Average.java (91%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/order/Excellent.java (89%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/order/Good.java (89%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/order/Rating.java (66%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/persistence/Setup.java (94%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/primary/Config.java (84%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/primary/DepartmentManager.java (87%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/primary/Employee.java (91%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/primary/GeneralManager.java (89%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/primary/Manager.java (77%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/primary/ManagerService.java (91%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/primary/PrimaryApplication.java (95%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/profiles/DatasourceConfig.java (64%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/profiles/DevDatasourceConfig.java (91%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/profiles/ProductionDatasourceConfig.java (91%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/profiles/ProfileManager.java (93%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/profiles/SpringProfilesConfig.java (80%)
 create mode 100644 spring-core-2/src/main/java/com/baeldung/sample/Bar.java
 create mode 100644 spring-core-2/src/main/java/com/baeldung/sample/Foo.java
 rename spring-core-2/src/main/java/{org => com}/baeldung/sampleabstract/BallService.java (94%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/sampleabstract/BasketballService.java (88%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/sampleabstract/DemoApp.java (82%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/sampleabstract/LogRepository.java (82%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/sampleabstract/RuleRepository.java (82%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/scopes/HelloMessageGenerator.java (88%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/scopes/Person.java (93%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/scopes/ScopesController.java (98%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/spring/config/CleanupBean.java (95%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/spring/config/CoreConfig.java (92%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/spring/config/MainWebAppInitializer.java (95%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/spring/config/MvcConfig.java (96%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/spring/config/PersistenceConfig.java (94%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/spring/config/ScopesConfig.java (100%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java (89%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java (97%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/springevents/synchronous/ContextRefreshedListener.java (93%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/springevents/synchronous/CustomSpringEvent.java (89%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/springevents/synchronous/CustomSpringEventListener.java (88%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/springevents/synchronous/CustomSpringEventPublisher.java (96%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/springevents/synchronous/GenericSpringAppEvent.java (87%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/springevents/synchronous/GenericSpringEvent.java (88%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/springevents/synchronous/GenericSpringEventListener.java (92%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java (80%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/springevents/synchronous/GenericStringSpringEvent.java (80%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java (64%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/startup/AllStrategiesExampleBean.java (96%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/startup/EventListenerExampleBean.java (94%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/startup/InitMethodExampleBean.java (95%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/startup/InitializingBeanExampleBean.java (96%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/startup/InvalidInitExampleBean.java (93%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/startup/LogicInConstructorExampleBean.java (95%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/startup/PostConstructExampleBean.java (95%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/startup/SpringStartupConfig.java (71%)
 rename spring-core-2/src/main/java/{org => com}/baeldung/startup/StartupApplicationListenerExample.java (95%)
 delete mode 100644 spring-core-2/src/main/java/org/baeldung/autowire/sample/FooDAO.java
 delete mode 100644 spring-core-2/src/main/java/org/baeldung/nullibility/package-info.java
 delete mode 100644 spring-core-2/src/main/java/org/baeldung/sample/Bar.java
 delete mode 100644 spring-core-2/src/main/java/org/baeldung/sample/Foo.java
 rename spring-core-2/src/test/java/{org => com}/baeldung/autowire/sample/FooServiceIntegrationTest.java (94%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java (87%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java (95%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java (87%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java (94%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/customannotation/Account.java (94%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/customannotation/BeanWithGenericDAO.java (89%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java (98%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java (98%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/customannotation/Person.java (92%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/customscope/TenantScopeIntegrationTest.java (96%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/order/RatingRetrieverUnitTest.java (93%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java (96%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java (97%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java (95%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java (98%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/scopes/ScopesIntegrationTest.java (98%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java (88%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java (87%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java (95%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java (97%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/startup/SpringStartupIntegrationTest.java (98%)
 rename spring-core-2/src/test/java/{org => com}/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java (96%)

diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml
index f89a093f30..12b6972a79 100644
--- a/spring-core-2/pom.xml
+++ b/spring-core-2/pom.xml
@@ -201,7 +201,7 @@
     </profiles>
 
     <properties>
-        <start-class>org.baeldung.sample.App</start-class>
+        <start-class>com.baeldung.sample.App</start-class>
         <!-- Spring -->
         <org.springframework.version>5.0.6.RELEASE</org.springframework.version>
         <annotation-api.version>1.3.2</annotation-api.version>
diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/App.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/App.java
similarity index 90%
rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/App.java
rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/App.java
index ed0c90d5b1..18ff11a49c 100644
--- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/App.java
+++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/App.java
@@ -1,4 +1,4 @@
-package org.baeldung.autowire.sample;
+package com.baeldung.autowire.sample;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/AppConfig.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/AppConfig.java
similarity index 66%
rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/AppConfig.java
rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/AppConfig.java
index 117dfe1027..f948e2bf8e 100644
--- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/AppConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/AppConfig.java
@@ -1,10 +1,10 @@
-package org.baeldung.autowire.sample;
+package com.baeldung.autowire.sample;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.autowire.sample")
+@ComponentScan("com.baeldung.autowire.sample")
 public class AppConfig {
 
 }
diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/BarFormatter.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/BarFormatter.java
similarity index 83%
rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/BarFormatter.java
rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/BarFormatter.java
index f7e730fdc6..e67a376d25 100644
--- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/BarFormatter.java
+++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/BarFormatter.java
@@ -1,4 +1,4 @@
-package org.baeldung.autowire.sample;
+package com.baeldung.autowire.sample;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooDAO.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooDAO.java
new file mode 100644
index 0000000000..aec26202ab
--- /dev/null
+++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooDAO.java
@@ -0,0 +1,5 @@
+package com.baeldung.autowire.sample;
+
+public class FooDAO {
+
+}
diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooFormatter.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooFormatter.java
similarity index 83%
rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/FooFormatter.java
rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/FooFormatter.java
index 5fdacbadd4..57f93a53d7 100644
--- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooFormatter.java
+++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooFormatter.java
@@ -1,4 +1,4 @@
-package org.baeldung.autowire.sample;
+package com.baeldung.autowire.sample;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooService.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooService.java
similarity index 88%
rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/FooService.java
rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/FooService.java
index a3638960cc..c55d93da11 100644
--- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooService.java
+++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooService.java
@@ -1,4 +1,4 @@
-package org.baeldung.autowire.sample;
+package com.baeldung.autowire.sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/Formatter.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/Formatter.java
similarity index 59%
rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/Formatter.java
rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/Formatter.java
index 05cd5f1c26..59d718050a 100644
--- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/Formatter.java
+++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/Formatter.java
@@ -1,4 +1,4 @@
-package org.baeldung.autowire.sample;
+package com.baeldung.autowire.sample;
 
 public interface Formatter {
 
diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FormatterType.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FormatterType.java
similarity index 91%
rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/FormatterType.java
rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/FormatterType.java
index ea1eec055a..f2961745b5 100644
--- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FormatterType.java
+++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FormatterType.java
@@ -1,4 +1,4 @@
-package org.baeldung.autowire.sample;
+package com.baeldung.autowire.sample;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-core-2/src/main/java/org/baeldung/bean/config/ConstructorBasedShipConfig.java b/spring-core-2/src/main/java/com/baeldung/bean/config/ConstructorBasedShipConfig.java
similarity index 73%
rename from spring-core-2/src/main/java/org/baeldung/bean/config/ConstructorBasedShipConfig.java
rename to spring-core-2/src/main/java/com/baeldung/bean/config/ConstructorBasedShipConfig.java
index f0e6e8868e..f9f23ee304 100644
--- a/spring-core-2/src/main/java/org/baeldung/bean/config/ConstructorBasedShipConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/bean/config/ConstructorBasedShipConfig.java
@@ -1,7 +1,7 @@
-package org.baeldung.bean.config;
+package com.baeldung.bean.config;
 
-import org.baeldung.bean.injection.Helm;
-import org.baeldung.bean.injection.Ship;
+import com.baeldung.bean.injection.Helm;
+import com.baeldung.bean.injection.Ship;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/bean/config/SetterBasedShipConfig.java b/spring-core-2/src/main/java/com/baeldung/bean/config/SetterBasedShipConfig.java
similarity index 66%
rename from spring-core-2/src/main/java/org/baeldung/bean/config/SetterBasedShipConfig.java
rename to spring-core-2/src/main/java/com/baeldung/bean/config/SetterBasedShipConfig.java
index 7cd6de1c74..cea6385fd9 100644
--- a/spring-core-2/src/main/java/org/baeldung/bean/config/SetterBasedShipConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/bean/config/SetterBasedShipConfig.java
@@ -1,7 +1,7 @@
-package org.baeldung.bean.config;
+package com.baeldung.bean.config;
 
-import org.baeldung.bean.injection.Helm;
-import org.baeldung.bean.injection.Ship;
+import com.baeldung.bean.injection.Helm;
+import com.baeldung.bean.injection.Ship;
 import org.springframework.context.annotation.Bean;
 
 public class SetterBasedShipConfig {
diff --git a/spring-core-2/src/main/java/org/baeldung/bean/injection/Helm.java b/spring-core-2/src/main/java/com/baeldung/bean/injection/Helm.java
similarity index 86%
rename from spring-core-2/src/main/java/org/baeldung/bean/injection/Helm.java
rename to spring-core-2/src/main/java/com/baeldung/bean/injection/Helm.java
index 86f71ce795..e1477bd0d9 100644
--- a/spring-core-2/src/main/java/org/baeldung/bean/injection/Helm.java
+++ b/spring-core-2/src/main/java/com/baeldung/bean/injection/Helm.java
@@ -1,4 +1,4 @@
-package org.baeldung.bean.injection;
+package com.baeldung.bean.injection;
 
 public class Helm {
 
diff --git a/spring-core-2/src/main/java/org/baeldung/bean/injection/Ship.java b/spring-core-2/src/main/java/com/baeldung/bean/injection/Ship.java
similarity index 91%
rename from spring-core-2/src/main/java/org/baeldung/bean/injection/Ship.java
rename to spring-core-2/src/main/java/com/baeldung/bean/injection/Ship.java
index 69d9fa1276..f69a3a51ca 100644
--- a/spring-core-2/src/main/java/org/baeldung/bean/injection/Ship.java
+++ b/spring-core-2/src/main/java/com/baeldung/bean/injection/Ship.java
@@ -1,4 +1,4 @@
-package org.baeldung.bean.injection;
+package com.baeldung.bean.injection;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/customannotation/CustomAnnotationConfiguration.java b/spring-core-2/src/main/java/com/baeldung/customannotation/CustomAnnotationConfiguration.java
similarity index 68%
rename from spring-core-2/src/main/java/org/baeldung/customannotation/CustomAnnotationConfiguration.java
rename to spring-core-2/src/main/java/com/baeldung/customannotation/CustomAnnotationConfiguration.java
index b8f312d778..2e42a3f744 100644
--- a/spring-core-2/src/main/java/org/baeldung/customannotation/CustomAnnotationConfiguration.java
+++ b/spring-core-2/src/main/java/com/baeldung/customannotation/CustomAnnotationConfiguration.java
@@ -1,9 +1,9 @@
-package org.baeldung.customannotation;
+package com.baeldung.customannotation;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.customannotation")
+@ComponentScan("com.baeldung.customannotation")
 public class CustomAnnotationConfiguration {
 }
diff --git a/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccess.java b/spring-core-2/src/main/java/com/baeldung/customannotation/DataAccess.java
similarity index 90%
rename from spring-core-2/src/main/java/org/baeldung/customannotation/DataAccess.java
rename to spring-core-2/src/main/java/com/baeldung/customannotation/DataAccess.java
index 9a8a493a6d..4160bad16d 100644
--- a/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccess.java
+++ b/spring-core-2/src/main/java/com/baeldung/customannotation/DataAccess.java
@@ -1,4 +1,4 @@
-package org.baeldung.customannotation;
+package com.baeldung.customannotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessAnnotationProcessor.java b/spring-core-2/src/main/java/com/baeldung/customannotation/DataAccessAnnotationProcessor.java
similarity index 97%
rename from spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessAnnotationProcessor.java
rename to spring-core-2/src/main/java/com/baeldung/customannotation/DataAccessAnnotationProcessor.java
index c792073745..27008176a8 100644
--- a/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessAnnotationProcessor.java
+++ b/spring-core-2/src/main/java/com/baeldung/customannotation/DataAccessAnnotationProcessor.java
@@ -1,4 +1,4 @@
-package org.baeldung.customannotation;
+package com.baeldung.customannotation;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessFieldCallback.java b/spring-core-2/src/main/java/com/baeldung/customannotation/DataAccessFieldCallback.java
similarity index 99%
rename from spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessFieldCallback.java
rename to spring-core-2/src/main/java/com/baeldung/customannotation/DataAccessFieldCallback.java
index 8cb62affc4..07b5298ea9 100644
--- a/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessFieldCallback.java
+++ b/spring-core-2/src/main/java/com/baeldung/customannotation/DataAccessFieldCallback.java
@@ -1,4 +1,4 @@
-package org.baeldung.customannotation;
+package com.baeldung.customannotation;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
diff --git a/spring-core-2/src/main/java/org/baeldung/customannotation/GenericDAO.java b/spring-core-2/src/main/java/com/baeldung/customannotation/GenericDAO.java
similarity index 94%
rename from spring-core-2/src/main/java/org/baeldung/customannotation/GenericDAO.java
rename to spring-core-2/src/main/java/com/baeldung/customannotation/GenericDAO.java
index 1916b7de6e..0edd33b049 100644
--- a/spring-core-2/src/main/java/org/baeldung/customannotation/GenericDAO.java
+++ b/spring-core-2/src/main/java/com/baeldung/customannotation/GenericDAO.java
@@ -1,4 +1,4 @@
-package org.baeldung.customannotation;
+package com.baeldung.customannotation;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/spring-core-2/src/main/java/org/baeldung/customscope/TenantBean.java b/spring-core-2/src/main/java/com/baeldung/customscope/TenantBean.java
similarity index 89%
rename from spring-core-2/src/main/java/org/baeldung/customscope/TenantBean.java
rename to spring-core-2/src/main/java/com/baeldung/customscope/TenantBean.java
index 874fcda9f2..e892ae9d9b 100644
--- a/spring-core-2/src/main/java/org/baeldung/customscope/TenantBean.java
+++ b/spring-core-2/src/main/java/com/baeldung/customscope/TenantBean.java
@@ -1,4 +1,4 @@
-package org.baeldung.customscope;
+package com.baeldung.customscope;
 
 public class TenantBean {
 
diff --git a/spring-core-2/src/main/java/org/baeldung/customscope/TenantBeanFactoryPostProcessor.java b/spring-core-2/src/main/java/com/baeldung/customscope/TenantBeanFactoryPostProcessor.java
similarity index 93%
rename from spring-core-2/src/main/java/org/baeldung/customscope/TenantBeanFactoryPostProcessor.java
rename to spring-core-2/src/main/java/com/baeldung/customscope/TenantBeanFactoryPostProcessor.java
index 2757399fa6..84ed0b46d7 100644
--- a/spring-core-2/src/main/java/org/baeldung/customscope/TenantBeanFactoryPostProcessor.java
+++ b/spring-core-2/src/main/java/com/baeldung/customscope/TenantBeanFactoryPostProcessor.java
@@ -1,4 +1,4 @@
-package org.baeldung.customscope;
+package com.baeldung.customscope;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
diff --git a/spring-core-2/src/main/java/org/baeldung/customscope/TenantBeansConfig.java b/spring-core-2/src/main/java/com/baeldung/customscope/TenantBeansConfig.java
similarity index 93%
rename from spring-core-2/src/main/java/org/baeldung/customscope/TenantBeansConfig.java
rename to spring-core-2/src/main/java/com/baeldung/customscope/TenantBeansConfig.java
index be3ac001fb..c219000fe6 100644
--- a/spring-core-2/src/main/java/org/baeldung/customscope/TenantBeansConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/customscope/TenantBeansConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.customscope;
+package com.baeldung.customscope;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-core-2/src/main/java/org/baeldung/customscope/TenantScope.java b/spring-core-2/src/main/java/com/baeldung/customscope/TenantScope.java
similarity index 97%
rename from spring-core-2/src/main/java/org/baeldung/customscope/TenantScope.java
rename to spring-core-2/src/main/java/com/baeldung/customscope/TenantScope.java
index 144d092be6..f3077bc4c2 100644
--- a/spring-core-2/src/main/java/org/baeldung/customscope/TenantScope.java
+++ b/spring-core-2/src/main/java/com/baeldung/customscope/TenantScope.java
@@ -1,4 +1,4 @@
-package org.baeldung.customscope;
+package com.baeldung.customscope;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/spring-core-2/src/main/java/org/baeldung/customscope/TenantScopeConfig.java b/spring-core-2/src/main/java/com/baeldung/customscope/TenantScopeConfig.java
similarity index 91%
rename from spring-core-2/src/main/java/org/baeldung/customscope/TenantScopeConfig.java
rename to spring-core-2/src/main/java/com/baeldung/customscope/TenantScopeConfig.java
index d1159b0f60..1829e1e8c4 100644
--- a/spring-core-2/src/main/java/org/baeldung/customscope/TenantScopeConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/customscope/TenantScopeConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.customscope;
+package com.baeldung.customscope;
 
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.context.annotation.Bean;
diff --git a/spring-core-2/src/main/java/org/baeldung/nullibility/Person.java b/spring-core-2/src/main/java/com/baeldung/nullibility/Person.java
similarity index 95%
rename from spring-core-2/src/main/java/org/baeldung/nullibility/Person.java
rename to spring-core-2/src/main/java/com/baeldung/nullibility/Person.java
index 08c77c9e9c..8fb60fb7a7 100644
--- a/spring-core-2/src/main/java/org/baeldung/nullibility/Person.java
+++ b/spring-core-2/src/main/java/com/baeldung/nullibility/Person.java
@@ -1,4 +1,4 @@
-package org.baeldung.nullibility;
+package com.baeldung.nullibility;
 
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
diff --git a/spring-core-2/src/main/java/com/baeldung/nullibility/package-info.java b/spring-core-2/src/main/java/com/baeldung/nullibility/package-info.java
new file mode 100644
index 0000000000..11a3f7c7aa
--- /dev/null
+++ b/spring-core-2/src/main/java/com/baeldung/nullibility/package-info.java
@@ -0,0 +1,6 @@
+@NonNullApi
+@NonNullFields
+package com.baeldung.nullibility;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-core-2/src/main/java/org/baeldung/order/Average.java b/spring-core-2/src/main/java/com/baeldung/order/Average.java
similarity index 91%
rename from spring-core-2/src/main/java/org/baeldung/order/Average.java
rename to spring-core-2/src/main/java/com/baeldung/order/Average.java
index 3deffaf1ae..0f84f1b436 100644
--- a/spring-core-2/src/main/java/org/baeldung/order/Average.java
+++ b/spring-core-2/src/main/java/com/baeldung/order/Average.java
@@ -1,4 +1,4 @@
-package org.baeldung.order;
+package com.baeldung.order;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
diff --git a/spring-core-2/src/main/java/org/baeldung/order/Excellent.java b/spring-core-2/src/main/java/com/baeldung/order/Excellent.java
similarity index 89%
rename from spring-core-2/src/main/java/org/baeldung/order/Excellent.java
rename to spring-core-2/src/main/java/com/baeldung/order/Excellent.java
index 96fea4ac9b..5fd1d18796 100644
--- a/spring-core-2/src/main/java/org/baeldung/order/Excellent.java
+++ b/spring-core-2/src/main/java/com/baeldung/order/Excellent.java
@@ -1,4 +1,4 @@
-package org.baeldung.order;
+package com.baeldung.order;
 
 import org.springframework.stereotype.Component;
 import org.springframework.core.annotation.Order;
diff --git a/spring-core-2/src/main/java/org/baeldung/order/Good.java b/spring-core-2/src/main/java/com/baeldung/order/Good.java
similarity index 89%
rename from spring-core-2/src/main/java/org/baeldung/order/Good.java
rename to spring-core-2/src/main/java/com/baeldung/order/Good.java
index 4b3e268504..a176904c64 100644
--- a/spring-core-2/src/main/java/org/baeldung/order/Good.java
+++ b/spring-core-2/src/main/java/com/baeldung/order/Good.java
@@ -1,4 +1,4 @@
-package org.baeldung.order;
+package com.baeldung.order;
 
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
diff --git a/spring-core-2/src/main/java/org/baeldung/order/Rating.java b/spring-core-2/src/main/java/com/baeldung/order/Rating.java
similarity index 66%
rename from spring-core-2/src/main/java/org/baeldung/order/Rating.java
rename to spring-core-2/src/main/java/com/baeldung/order/Rating.java
index 10f2780522..9125019b5c 100644
--- a/spring-core-2/src/main/java/org/baeldung/order/Rating.java
+++ b/spring-core-2/src/main/java/com/baeldung/order/Rating.java
@@ -1,4 +1,4 @@
-package org.baeldung.order;
+package com.baeldung.order;
 
 public interface Rating {
     
diff --git a/spring-core-2/src/main/java/org/baeldung/persistence/Setup.java b/spring-core-2/src/main/java/com/baeldung/persistence/Setup.java
similarity index 94%
rename from spring-core-2/src/main/java/org/baeldung/persistence/Setup.java
rename to spring-core-2/src/main/java/com/baeldung/persistence/Setup.java
index 5cba4e70fb..251ea4654c 100644
--- a/spring-core-2/src/main/java/org/baeldung/persistence/Setup.java
+++ b/spring-core-2/src/main/java/com/baeldung/persistence/Setup.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence;
+package com.baeldung.persistence;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
diff --git a/spring-core-2/src/main/java/org/baeldung/primary/Config.java b/spring-core-2/src/main/java/com/baeldung/primary/Config.java
similarity index 84%
rename from spring-core-2/src/main/java/org/baeldung/primary/Config.java
rename to spring-core-2/src/main/java/com/baeldung/primary/Config.java
index bdcfe019e6..eec9fb2ceb 100644
--- a/spring-core-2/src/main/java/org/baeldung/primary/Config.java
+++ b/spring-core-2/src/main/java/com/baeldung/primary/Config.java
@@ -1,4 +1,4 @@
-package org.baeldung.primary;
+package com.baeldung.primary;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
 @Configuration
-@ComponentScan(basePackages="org.baeldung.primary")
+@ComponentScan(basePackages="com.baeldung.primary")
 public class Config {
 
     @Bean
diff --git a/spring-core-2/src/main/java/org/baeldung/primary/DepartmentManager.java b/spring-core-2/src/main/java/com/baeldung/primary/DepartmentManager.java
similarity index 87%
rename from spring-core-2/src/main/java/org/baeldung/primary/DepartmentManager.java
rename to spring-core-2/src/main/java/com/baeldung/primary/DepartmentManager.java
index 2603951b4e..161b39337b 100644
--- a/spring-core-2/src/main/java/org/baeldung/primary/DepartmentManager.java
+++ b/spring-core-2/src/main/java/com/baeldung/primary/DepartmentManager.java
@@ -1,4 +1,4 @@
-package org.baeldung.primary;
+package com.baeldung.primary;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/primary/Employee.java b/spring-core-2/src/main/java/com/baeldung/primary/Employee.java
similarity index 91%
rename from spring-core-2/src/main/java/org/baeldung/primary/Employee.java
rename to spring-core-2/src/main/java/com/baeldung/primary/Employee.java
index 9168387613..48c5502921 100644
--- a/spring-core-2/src/main/java/org/baeldung/primary/Employee.java
+++ b/spring-core-2/src/main/java/com/baeldung/primary/Employee.java
@@ -1,4 +1,4 @@
-package org.baeldung.primary;
+package com.baeldung.primary;
 
 /**
  * Created by Gebruiker on 7/17/2018.
diff --git a/spring-core-2/src/main/java/org/baeldung/primary/GeneralManager.java b/spring-core-2/src/main/java/com/baeldung/primary/GeneralManager.java
similarity index 89%
rename from spring-core-2/src/main/java/org/baeldung/primary/GeneralManager.java
rename to spring-core-2/src/main/java/com/baeldung/primary/GeneralManager.java
index 0a94f0f96a..80b5a79471 100644
--- a/spring-core-2/src/main/java/org/baeldung/primary/GeneralManager.java
+++ b/spring-core-2/src/main/java/com/baeldung/primary/GeneralManager.java
@@ -1,4 +1,4 @@
-package org.baeldung.primary;
+package com.baeldung.primary;
 
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
diff --git a/spring-core-2/src/main/java/org/baeldung/primary/Manager.java b/spring-core-2/src/main/java/com/baeldung/primary/Manager.java
similarity index 77%
rename from spring-core-2/src/main/java/org/baeldung/primary/Manager.java
rename to spring-core-2/src/main/java/com/baeldung/primary/Manager.java
index 4666a1babf..45e02b2b05 100644
--- a/spring-core-2/src/main/java/org/baeldung/primary/Manager.java
+++ b/spring-core-2/src/main/java/com/baeldung/primary/Manager.java
@@ -1,4 +1,4 @@
-package org.baeldung.primary;
+package com.baeldung.primary;
 
 /**
  * Created by Gebruiker on 7/19/2018.
diff --git a/spring-core-2/src/main/java/org/baeldung/primary/ManagerService.java b/spring-core-2/src/main/java/com/baeldung/primary/ManagerService.java
similarity index 91%
rename from spring-core-2/src/main/java/org/baeldung/primary/ManagerService.java
rename to spring-core-2/src/main/java/com/baeldung/primary/ManagerService.java
index 94ea6785c9..86390327c2 100644
--- a/spring-core-2/src/main/java/org/baeldung/primary/ManagerService.java
+++ b/spring-core-2/src/main/java/com/baeldung/primary/ManagerService.java
@@ -1,4 +1,4 @@
-package org.baeldung.primary;
+package com.baeldung.primary;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/spring-core-2/src/main/java/org/baeldung/primary/PrimaryApplication.java b/spring-core-2/src/main/java/com/baeldung/primary/PrimaryApplication.java
similarity index 95%
rename from spring-core-2/src/main/java/org/baeldung/primary/PrimaryApplication.java
rename to spring-core-2/src/main/java/com/baeldung/primary/PrimaryApplication.java
index ffa2a4028d..f66bf8285b 100644
--- a/spring-core-2/src/main/java/org/baeldung/primary/PrimaryApplication.java
+++ b/spring-core-2/src/main/java/com/baeldung/primary/PrimaryApplication.java
@@ -1,4 +1,4 @@
-package org.baeldung.primary;
+package com.baeldung.primary;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/profiles/DatasourceConfig.java b/spring-core-2/src/main/java/com/baeldung/profiles/DatasourceConfig.java
similarity index 64%
rename from spring-core-2/src/main/java/org/baeldung/profiles/DatasourceConfig.java
rename to spring-core-2/src/main/java/com/baeldung/profiles/DatasourceConfig.java
index 8fde925fd8..9724477666 100644
--- a/spring-core-2/src/main/java/org/baeldung/profiles/DatasourceConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/profiles/DatasourceConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.profiles;
+package com.baeldung.profiles;
 
 public interface DatasourceConfig {
     void setup();
diff --git a/spring-core-2/src/main/java/org/baeldung/profiles/DevDatasourceConfig.java b/spring-core-2/src/main/java/com/baeldung/profiles/DevDatasourceConfig.java
similarity index 91%
rename from spring-core-2/src/main/java/org/baeldung/profiles/DevDatasourceConfig.java
rename to spring-core-2/src/main/java/com/baeldung/profiles/DevDatasourceConfig.java
index e357280c43..b4b14eaf50 100644
--- a/spring-core-2/src/main/java/org/baeldung/profiles/DevDatasourceConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/profiles/DevDatasourceConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.profiles;
+package com.baeldung.profiles;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
diff --git a/spring-core-2/src/main/java/org/baeldung/profiles/ProductionDatasourceConfig.java b/spring-core-2/src/main/java/com/baeldung/profiles/ProductionDatasourceConfig.java
similarity index 91%
rename from spring-core-2/src/main/java/org/baeldung/profiles/ProductionDatasourceConfig.java
rename to spring-core-2/src/main/java/com/baeldung/profiles/ProductionDatasourceConfig.java
index f1adff9c96..57943d1b17 100644
--- a/spring-core-2/src/main/java/org/baeldung/profiles/ProductionDatasourceConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/profiles/ProductionDatasourceConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.profiles;
+package com.baeldung.profiles;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
diff --git a/spring-core-2/src/main/java/org/baeldung/profiles/ProfileManager.java b/spring-core-2/src/main/java/com/baeldung/profiles/ProfileManager.java
similarity index 93%
rename from spring-core-2/src/main/java/org/baeldung/profiles/ProfileManager.java
rename to spring-core-2/src/main/java/com/baeldung/profiles/ProfileManager.java
index b4cb10e690..81d4592782 100644
--- a/spring-core-2/src/main/java/org/baeldung/profiles/ProfileManager.java
+++ b/spring-core-2/src/main/java/com/baeldung/profiles/ProfileManager.java
@@ -1,4 +1,4 @@
-package org.baeldung.profiles;
+package com.baeldung.profiles;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
diff --git a/spring-core-2/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java b/spring-core-2/src/main/java/com/baeldung/profiles/SpringProfilesConfig.java
similarity index 80%
rename from spring-core-2/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java
rename to spring-core-2/src/main/java/com/baeldung/profiles/SpringProfilesConfig.java
index 2d1905ee9c..cdd96ad953 100644
--- a/spring-core-2/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/profiles/SpringProfilesConfig.java
@@ -1,11 +1,11 @@
-package org.baeldung.profiles;
+package com.baeldung.profiles;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
 @Configuration
-@ComponentScan("org.baeldung.profiles")
+@ComponentScan("com.baeldung.profiles")
 @PropertySource(value = "classpath:application.properties")
 public class SpringProfilesConfig {
 
diff --git a/spring-core-2/src/main/java/com/baeldung/sample/Bar.java b/spring-core-2/src/main/java/com/baeldung/sample/Bar.java
new file mode 100644
index 0000000000..42302b5563
--- /dev/null
+++ b/spring-core-2/src/main/java/com/baeldung/sample/Bar.java
@@ -0,0 +1,5 @@
+package com.baeldung.sample;
+
+public class Bar {
+
+}
diff --git a/spring-core-2/src/main/java/com/baeldung/sample/Foo.java b/spring-core-2/src/main/java/com/baeldung/sample/Foo.java
new file mode 100644
index 0000000000..b25c9ecfb5
--- /dev/null
+++ b/spring-core-2/src/main/java/com/baeldung/sample/Foo.java
@@ -0,0 +1,5 @@
+package com.baeldung.sample;
+
+public class Foo {
+
+}
diff --git a/spring-core-2/src/main/java/org/baeldung/sampleabstract/BallService.java b/spring-core-2/src/main/java/com/baeldung/sampleabstract/BallService.java
similarity index 94%
rename from spring-core-2/src/main/java/org/baeldung/sampleabstract/BallService.java
rename to spring-core-2/src/main/java/com/baeldung/sampleabstract/BallService.java
index 9a75de7fa1..0d951aac8b 100644
--- a/spring-core-2/src/main/java/org/baeldung/sampleabstract/BallService.java
+++ b/spring-core-2/src/main/java/com/baeldung/sampleabstract/BallService.java
@@ -1,4 +1,4 @@
-package org.baeldung.sampleabstract;
+package com.baeldung.sampleabstract;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/sampleabstract/BasketballService.java b/spring-core-2/src/main/java/com/baeldung/sampleabstract/BasketballService.java
similarity index 88%
rename from spring-core-2/src/main/java/org/baeldung/sampleabstract/BasketballService.java
rename to spring-core-2/src/main/java/com/baeldung/sampleabstract/BasketballService.java
index c117231d3c..4d6345b069 100644
--- a/spring-core-2/src/main/java/org/baeldung/sampleabstract/BasketballService.java
+++ b/spring-core-2/src/main/java/com/baeldung/sampleabstract/BasketballService.java
@@ -1,4 +1,4 @@
-package org.baeldung.sampleabstract;
+package com.baeldung.sampleabstract;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/spring-core-2/src/main/java/org/baeldung/sampleabstract/DemoApp.java b/spring-core-2/src/main/java/com/baeldung/sampleabstract/DemoApp.java
similarity index 82%
rename from spring-core-2/src/main/java/org/baeldung/sampleabstract/DemoApp.java
rename to spring-core-2/src/main/java/com/baeldung/sampleabstract/DemoApp.java
index 615d354ecf..5a308b2671 100644
--- a/spring-core-2/src/main/java/org/baeldung/sampleabstract/DemoApp.java
+++ b/spring-core-2/src/main/java/com/baeldung/sampleabstract/DemoApp.java
@@ -1,4 +1,4 @@
-package org.baeldung.sampleabstract;
+package com.baeldung.sampleabstract;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan(basePackages = "org.baeldung.sampleabstract")
+@ComponentScan(basePackages = "com.baeldung.sampleabstract")
 public class DemoApp {
 
 
diff --git a/spring-core-2/src/main/java/org/baeldung/sampleabstract/LogRepository.java b/spring-core-2/src/main/java/com/baeldung/sampleabstract/LogRepository.java
similarity index 82%
rename from spring-core-2/src/main/java/org/baeldung/sampleabstract/LogRepository.java
rename to spring-core-2/src/main/java/com/baeldung/sampleabstract/LogRepository.java
index 3a65671493..84979768b5 100644
--- a/spring-core-2/src/main/java/org/baeldung/sampleabstract/LogRepository.java
+++ b/spring-core-2/src/main/java/com/baeldung/sampleabstract/LogRepository.java
@@ -1,4 +1,4 @@
-package org.baeldung.sampleabstract;
+package com.baeldung.sampleabstract;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/sampleabstract/RuleRepository.java b/spring-core-2/src/main/java/com/baeldung/sampleabstract/RuleRepository.java
similarity index 82%
rename from spring-core-2/src/main/java/org/baeldung/sampleabstract/RuleRepository.java
rename to spring-core-2/src/main/java/com/baeldung/sampleabstract/RuleRepository.java
index fd42178ab6..a1c5b5067f 100644
--- a/spring-core-2/src/main/java/org/baeldung/sampleabstract/RuleRepository.java
+++ b/spring-core-2/src/main/java/com/baeldung/sampleabstract/RuleRepository.java
@@ -1,4 +1,4 @@
-package org.baeldung.sampleabstract;
+package com.baeldung.sampleabstract;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java b/spring-core-2/src/main/java/com/baeldung/scopes/HelloMessageGenerator.java
similarity index 88%
rename from spring-core-2/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java
rename to spring-core-2/src/main/java/com/baeldung/scopes/HelloMessageGenerator.java
index 562069bc9a..9b912fc04e 100644
--- a/spring-core-2/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java
+++ b/spring-core-2/src/main/java/com/baeldung/scopes/HelloMessageGenerator.java
@@ -1,4 +1,4 @@
-package org.baeldung.scopes;
+package com.baeldung.scopes;
 
 public class HelloMessageGenerator {
 
diff --git a/spring-core-2/src/main/java/org/baeldung/scopes/Person.java b/spring-core-2/src/main/java/com/baeldung/scopes/Person.java
similarity index 93%
rename from spring-core-2/src/main/java/org/baeldung/scopes/Person.java
rename to spring-core-2/src/main/java/com/baeldung/scopes/Person.java
index b070007a5c..e2ea2ce1d7 100644
--- a/spring-core-2/src/main/java/org/baeldung/scopes/Person.java
+++ b/spring-core-2/src/main/java/com/baeldung/scopes/Person.java
@@ -1,4 +1,4 @@
-package org.baeldung.scopes;
+package com.baeldung.scopes;
 
 public class Person {
     private String name;
diff --git a/spring-core-2/src/main/java/org/baeldung/scopes/ScopesController.java b/spring-core-2/src/main/java/com/baeldung/scopes/ScopesController.java
similarity index 98%
rename from spring-core-2/src/main/java/org/baeldung/scopes/ScopesController.java
rename to spring-core-2/src/main/java/com/baeldung/scopes/ScopesController.java
index 9257a3aa3a..1ca4dc4050 100644
--- a/spring-core-2/src/main/java/org/baeldung/scopes/ScopesController.java
+++ b/spring-core-2/src/main/java/com/baeldung/scopes/ScopesController.java
@@ -1,4 +1,4 @@
-package org.baeldung.scopes;
+package com.baeldung.scopes;
 
 import javax.annotation.Resource;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/spring/config/CleanupBean.java b/spring-core-2/src/main/java/com/baeldung/spring/config/CleanupBean.java
similarity index 95%
rename from spring-core-2/src/main/java/org/baeldung/spring/config/CleanupBean.java
rename to spring-core-2/src/main/java/com/baeldung/spring/config/CleanupBean.java
index ac90319745..155b8af9c4 100644
--- a/spring-core-2/src/main/java/org/baeldung/spring/config/CleanupBean.java
+++ b/spring-core-2/src/main/java/com/baeldung/spring/config/CleanupBean.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.config;
+package com.baeldung.spring.config;
 
 import java.util.concurrent.ExecutorService;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/spring/config/CoreConfig.java b/spring-core-2/src/main/java/com/baeldung/spring/config/CoreConfig.java
similarity index 92%
rename from spring-core-2/src/main/java/org/baeldung/spring/config/CoreConfig.java
rename to spring-core-2/src/main/java/com/baeldung/spring/config/CoreConfig.java
index 0d753dc447..35d245a17e 100644
--- a/spring-core-2/src/main/java/org/baeldung/spring/config/CoreConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/spring/config/CoreConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.config;
+package com.baeldung.spring.config;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-@ComponentScan("org.baeldung.core")
+@ComponentScan("com.baeldung.core")
 public class CoreConfig implements WebMvcConfigurer {
 
     public CoreConfig() {
diff --git a/spring-core-2/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java b/spring-core-2/src/main/java/com/baeldung/spring/config/MainWebAppInitializer.java
similarity index 95%
rename from spring-core-2/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java
rename to spring-core-2/src/main/java/com/baeldung/spring/config/MainWebAppInitializer.java
index 9f4b73f609..dd396a653f 100644
--- a/spring-core-2/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java
+++ b/spring-core-2/src/main/java/com/baeldung/spring/config/MainWebAppInitializer.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.config;
+package com.baeldung.spring.config;
 
 import java.util.Set;
 
@@ -26,7 +26,7 @@ public class MainWebAppInitializer implements WebApplicationInitializer
 
         // Create the 'root' Spring application context
         final AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext();
-        root.scan("org.baeldung.spring.config");
+        root.scan("com.baeldung.spring.config");
         // root.getEnvironment().setDefaultProfiles("embedded");
 
         sc.addListener(new ContextLoaderListener(root));
diff --git a/spring-core-2/src/main/java/org/baeldung/spring/config/MvcConfig.java b/spring-core-2/src/main/java/com/baeldung/spring/config/MvcConfig.java
similarity index 96%
rename from spring-core-2/src/main/java/org/baeldung/spring/config/MvcConfig.java
rename to spring-core-2/src/main/java/com/baeldung/spring/config/MvcConfig.java
index e550733c47..cd31cd1128 100644
--- a/spring-core-2/src/main/java/org/baeldung/spring/config/MvcConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/spring/config/MvcConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.config;
+package com.baeldung.spring.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-core-2/src/main/java/org/baeldung/spring/config/PersistenceConfig.java b/spring-core-2/src/main/java/com/baeldung/spring/config/PersistenceConfig.java
similarity index 94%
rename from spring-core-2/src/main/java/org/baeldung/spring/config/PersistenceConfig.java
rename to spring-core-2/src/main/java/com/baeldung/spring/config/PersistenceConfig.java
index ffe88596fa..f27543af46 100644
--- a/spring-core-2/src/main/java/org/baeldung/spring/config/PersistenceConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/spring/config/PersistenceConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.config;
+package com.baeldung.spring.config;
 
 import java.util.Properties;
 
@@ -20,7 +20,7 @@ import com.google.common.base.Preconditions;
 // @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-mysql.properties" })
-@ComponentScan({ "org.baeldung.persistence" })
+@ComponentScan({ "com.baeldung.persistence" })
 public class PersistenceConfig {
 
     @Autowired
@@ -34,7 +34,7 @@ public class PersistenceConfig {
     public LocalSessionFactoryBean sessionFactory() {
         final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean();
         sessionFactory.setDataSource(restDataSource());
-        sessionFactory.setPackagesToScan(new String[] { "org.baeldung.spring.persistence.model" });
+        sessionFactory.setPackagesToScan(new String[] { "com.baeldung.spring.persistence.model" });
         sessionFactory.setHibernateProperties(hibernateProperties());
 
         return sessionFactory;
diff --git a/spring-core-2/src/main/java/org/baeldung/spring/config/ScopesConfig.java b/spring-core-2/src/main/java/com/baeldung/spring/config/ScopesConfig.java
similarity index 100%
rename from spring-core-2/src/main/java/org/baeldung/spring/config/ScopesConfig.java
rename to spring-core-2/src/main/java/com/baeldung/spring/config/ScopesConfig.java
diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java b/spring-core-2/src/main/java/com/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java
similarity index 89%
rename from spring-core-2/src/main/java/org/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java
rename to spring-core-2/src/main/java/com/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java
index 082a986974..085f3b0706 100644
--- a/spring-core-2/src/main/java/org/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.springevents.asynchronous;
+package com.baeldung.springevents.asynchronous;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -8,7 +8,7 @@ import org.springframework.context.event.SimpleApplicationEventMulticaster;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 
 @Configuration
-@ComponentScan("org.baeldung.springevents.synchronous")
+@ComponentScan("com.baeldung.springevents.synchronous")
 public class AsynchronousSpringEventsConfig {
 
     @Bean(name = "applicationEventMulticaster")
diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java
similarity index 97%
rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java
rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java
index f750c40a6e..bbb2b5f008 100644
--- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java
+++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java
@@ -1,4 +1,4 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
 import org.springframework.context.event.ContextStartedEvent;
 import org.springframework.context.event.EventListener;
diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/ContextRefreshedListener.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/ContextRefreshedListener.java
similarity index 93%
rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/ContextRefreshedListener.java
rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/ContextRefreshedListener.java
index 9f8b2e6e83..31a6c78d00 100644
--- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/ContextRefreshedListener.java
+++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/ContextRefreshedListener.java
@@ -1,4 +1,4 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEvent.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEvent.java
similarity index 89%
rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEvent.java
rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEvent.java
index 1631801ffe..3cf4980be3 100644
--- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEvent.java
+++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEvent.java
@@ -1,4 +1,4 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
 import org.springframework.context.ApplicationEvent;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventListener.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEventListener.java
similarity index 88%
rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventListener.java
rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEventListener.java
index 69f96966ec..ff7ca7fe39 100644
--- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventListener.java
+++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEventListener.java
@@ -1,4 +1,4 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventPublisher.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEventPublisher.java
similarity index 96%
rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventPublisher.java
rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEventPublisher.java
index 3182090d5d..e4d7fcdc99 100644
--- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventPublisher.java
+++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEventPublisher.java
@@ -1,4 +1,4 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringAppEvent.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringAppEvent.java
similarity index 87%
rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringAppEvent.java
rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringAppEvent.java
index 6804312189..8a50a55f31 100644
--- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringAppEvent.java
+++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringAppEvent.java
@@ -1,4 +1,4 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
 import org.springframework.context.ApplicationEvent;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEvent.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringEvent.java
similarity index 88%
rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEvent.java
rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringEvent.java
index ce2c223fec..86471221d2 100644
--- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEvent.java
+++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringEvent.java
@@ -1,4 +1,4 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
 public class GenericSpringEvent<T> {
 
diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEventListener.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringEventListener.java
similarity index 92%
rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEventListener.java
rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringEventListener.java
index 1f5e3e7068..7b0a9727e4 100644
--- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEventListener.java
+++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringEventListener.java
@@ -1,4 +1,4 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.lang.NonNull;
diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java
similarity index 80%
rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java
rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java
index fd214696e7..74839b4708 100644
--- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java
+++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java
@@ -1,4 +1,4 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
 class GenericStringSpringAppEvent extends GenericSpringAppEvent<String> {
 
diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringEvent.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericStringSpringEvent.java
similarity index 80%
rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringEvent.java
rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericStringSpringEvent.java
index dd4e4e3ed4..70dda99aa3 100644
--- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringEvent.java
+++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericStringSpringEvent.java
@@ -1,4 +1,4 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
 public class GenericStringSpringEvent extends GenericSpringEvent<String> {
 
diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java
similarity index 64%
rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java
rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java
index fff8a7e4b5..58cb220ecb 100644
--- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java
@@ -1,10 +1,10 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.springevents.synchronous")
+@ComponentScan("com.baeldung.springevents.synchronous")
 public class SynchronousSpringEventsConfig {
 
 }
diff --git a/spring-core-2/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/AllStrategiesExampleBean.java
similarity index 96%
rename from spring-core-2/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java
rename to spring-core-2/src/main/java/com/baeldung/startup/AllStrategiesExampleBean.java
index f36b8703ea..e08309d474 100644
--- a/spring-core-2/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java
+++ b/spring-core-2/src/main/java/com/baeldung/startup/AllStrategiesExampleBean.java
@@ -1,4 +1,4 @@
-package org.baeldung.startup;
+package com.baeldung.startup;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-core-2/src/main/java/org/baeldung/startup/EventListenerExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/EventListenerExampleBean.java
similarity index 94%
rename from spring-core-2/src/main/java/org/baeldung/startup/EventListenerExampleBean.java
rename to spring-core-2/src/main/java/com/baeldung/startup/EventListenerExampleBean.java
index 58e42337cc..a76fc6a2b2 100644
--- a/spring-core-2/src/main/java/org/baeldung/startup/EventListenerExampleBean.java
+++ b/spring-core-2/src/main/java/com/baeldung/startup/EventListenerExampleBean.java
@@ -1,4 +1,4 @@
-package org.baeldung.startup;
+package com.baeldung.startup;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-core-2/src/main/java/org/baeldung/startup/InitMethodExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/InitMethodExampleBean.java
similarity index 95%
rename from spring-core-2/src/main/java/org/baeldung/startup/InitMethodExampleBean.java
rename to spring-core-2/src/main/java/com/baeldung/startup/InitMethodExampleBean.java
index f3d30011f8..a3b12028d1 100644
--- a/spring-core-2/src/main/java/org/baeldung/startup/InitMethodExampleBean.java
+++ b/spring-core-2/src/main/java/com/baeldung/startup/InitMethodExampleBean.java
@@ -1,4 +1,4 @@
-package org.baeldung.startup;
+package com.baeldung.startup;
 
 import java.util.Arrays;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/InitializingBeanExampleBean.java
similarity index 96%
rename from spring-core-2/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java
rename to spring-core-2/src/main/java/com/baeldung/startup/InitializingBeanExampleBean.java
index 5d6f8c9d88..c625a172fd 100644
--- a/spring-core-2/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java
+++ b/spring-core-2/src/main/java/com/baeldung/startup/InitializingBeanExampleBean.java
@@ -1,4 +1,4 @@
-package org.baeldung.startup;
+package com.baeldung.startup;
 
 import java.util.Arrays;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/startup/InvalidInitExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/InvalidInitExampleBean.java
similarity index 93%
rename from spring-core-2/src/main/java/org/baeldung/startup/InvalidInitExampleBean.java
rename to spring-core-2/src/main/java/com/baeldung/startup/InvalidInitExampleBean.java
index 0b9c6f0c7d..d31aee8acd 100644
--- a/spring-core-2/src/main/java/org/baeldung/startup/InvalidInitExampleBean.java
+++ b/spring-core-2/src/main/java/com/baeldung/startup/InvalidInitExampleBean.java
@@ -1,4 +1,4 @@
-package org.baeldung.startup;
+package com.baeldung.startup;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
diff --git a/spring-core-2/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/LogicInConstructorExampleBean.java
similarity index 95%
rename from spring-core-2/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java
rename to spring-core-2/src/main/java/com/baeldung/startup/LogicInConstructorExampleBean.java
index d25a83942a..ade7573bbe 100644
--- a/spring-core-2/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java
+++ b/spring-core-2/src/main/java/com/baeldung/startup/LogicInConstructorExampleBean.java
@@ -1,4 +1,4 @@
-package org.baeldung.startup;
+package com.baeldung.startup;
 
 import java.util.Arrays;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/startup/PostConstructExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/PostConstructExampleBean.java
similarity index 95%
rename from spring-core-2/src/main/java/org/baeldung/startup/PostConstructExampleBean.java
rename to spring-core-2/src/main/java/com/baeldung/startup/PostConstructExampleBean.java
index 2397c3a0a2..1001043d86 100644
--- a/spring-core-2/src/main/java/org/baeldung/startup/PostConstructExampleBean.java
+++ b/spring-core-2/src/main/java/com/baeldung/startup/PostConstructExampleBean.java
@@ -1,4 +1,4 @@
-package org.baeldung.startup;
+package com.baeldung.startup;
 
 import java.util.Arrays;
 
diff --git a/spring-core-2/src/main/java/org/baeldung/startup/SpringStartupConfig.java b/spring-core-2/src/main/java/com/baeldung/startup/SpringStartupConfig.java
similarity index 71%
rename from spring-core-2/src/main/java/org/baeldung/startup/SpringStartupConfig.java
rename to spring-core-2/src/main/java/com/baeldung/startup/SpringStartupConfig.java
index 12854e1be5..ad6492dadc 100644
--- a/spring-core-2/src/main/java/org/baeldung/startup/SpringStartupConfig.java
+++ b/spring-core-2/src/main/java/com/baeldung/startup/SpringStartupConfig.java
@@ -1,9 +1,9 @@
-package org.baeldung.startup;
+package com.baeldung.startup;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("org.baeldung.startup")
+@ComponentScan("com.baeldung.startup")
 public class SpringStartupConfig {
 }
\ No newline at end of file
diff --git a/spring-core-2/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java b/spring-core-2/src/main/java/com/baeldung/startup/StartupApplicationListenerExample.java
similarity index 95%
rename from spring-core-2/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java
rename to spring-core-2/src/main/java/com/baeldung/startup/StartupApplicationListenerExample.java
index e02388dea3..2cc5e6abcb 100644
--- a/spring-core-2/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java
+++ b/spring-core-2/src/main/java/com/baeldung/startup/StartupApplicationListenerExample.java
@@ -1,4 +1,4 @@
-package org.baeldung.startup;
+package com.baeldung.startup;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooDAO.java b/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooDAO.java
deleted file mode 100644
index 3d3deaa077..0000000000
--- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooDAO.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.autowire.sample;
-
-public class FooDAO {
-
-}
diff --git a/spring-core-2/src/main/java/org/baeldung/nullibility/package-info.java b/spring-core-2/src/main/java/org/baeldung/nullibility/package-info.java
deleted file mode 100644
index 446f2e316e..0000000000
--- a/spring-core-2/src/main/java/org/baeldung/nullibility/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-@NonNullApi
-@NonNullFields
-package org.baeldung.nullibility;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-core-2/src/main/java/org/baeldung/sample/Bar.java b/spring-core-2/src/main/java/org/baeldung/sample/Bar.java
deleted file mode 100644
index 54e8d54418..0000000000
--- a/spring-core-2/src/main/java/org/baeldung/sample/Bar.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.sample;
-
-public class Bar {
-
-}
diff --git a/spring-core-2/src/main/java/org/baeldung/sample/Foo.java b/spring-core-2/src/main/java/org/baeldung/sample/Foo.java
deleted file mode 100644
index 562a00121a..0000000000
--- a/spring-core-2/src/main/java/org/baeldung/sample/Foo.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.sample;
-
-public class Foo {
-
-}
diff --git a/spring-core-2/src/main/resources/beanInjection-constructor.xml b/spring-core-2/src/main/resources/beanInjection-constructor.xml
index 5a2ffe767c..cbb8f98bb9 100644
--- a/spring-core-2/src/main/resources/beanInjection-constructor.xml
+++ b/spring-core-2/src/main/resources/beanInjection-constructor.xml
@@ -4,12 +4,12 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
 	   					   http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="ship" class="org.baeldung.bean.injection.Ship">
+    <bean id="ship" class="com.baeldung.bean.injection.Ship">
         <constructor-arg>
             <ref bean="helm"/>
         </constructor-arg>
     </bean>
 
-    <bean id="helm" class="org.baeldung.bean.injection.Helm"/>
+    <bean id="helm" class="com.baeldung.bean.injection.Helm"/>
 
 </beans>
\ No newline at end of file
diff --git a/spring-core-2/src/main/resources/beanInjection-setter.xml b/spring-core-2/src/main/resources/beanInjection-setter.xml
index 0e82e3be1c..1440df9702 100644
--- a/spring-core-2/src/main/resources/beanInjection-setter.xml
+++ b/spring-core-2/src/main/resources/beanInjection-setter.xml
@@ -4,11 +4,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
 	   					   http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="ship" class="org.baeldung.bean.injection.Ship">
+    <bean id="ship" class="com.baeldung.bean.injection.Ship">
         <property name="helm">
             <ref bean="helm"/>
         </property>
     </bean>
 
-    <bean id="helm" class="org.baeldung.bean.injection.Helm"/>
+    <bean id="helm" class="com.baeldung.bean.injection.Helm"/>
 </beans>
\ No newline at end of file
diff --git a/spring-core-2/src/main/resources/jdbc/springJdbc-config.xml b/spring-core-2/src/main/resources/jdbc/springJdbc-config.xml
index 5fd2699b41..e3d7452eb1 100644
--- a/spring-core-2/src/main/resources/jdbc/springJdbc-config.xml
+++ b/spring-core-2/src/main/resources/jdbc/springJdbc-config.xml
@@ -4,7 +4,7 @@
 		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">
+    <bean id="employeeDao" class="com.baeldung.jdbc.EmployeeDAO">
         <property name="dataSource" ref="dataSource"/>
     </bean>
 
diff --git a/spring-core-2/src/main/resources/scopes.xml b/spring-core-2/src/main/resources/scopes.xml
index 8fdb186c28..f7b554ec49 100644
--- a/spring-core-2/src/main/resources/scopes.xml
+++ b/spring-core-2/src/main/resources/scopes.xml
@@ -3,8 +3,8 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="personSingleton" class="org.baeldung.scopes.Person" scope="singleton"/>
+    <bean id="personSingleton" class="com.baeldung.scopes.Person" scope="singleton"/>
 
-    <bean id="personPrototype" class="org.baeldung.scopes.Person" scope="prototype"/>
+    <bean id="personPrototype" class="com.baeldung.scopes.Person" scope="prototype"/>
 
 </beans>
diff --git a/spring-core-2/src/main/resources/springProfiles-config.xml b/spring-core-2/src/main/resources/springProfiles-config.xml
index 985ab6ba86..5eb6bfcd7f 100644
--- a/spring-core-2/src/main/resources/springProfiles-config.xml
+++ b/spring-core-2/src/main/resources/springProfiles-config.xml
@@ -6,10 +6,10 @@
 >
 
     <beans profile="dev">
-        <bean id="devDatasourceConfig" class="org.baeldung.profiles.DevDatasourceConfig"/>
+        <bean id="devDatasourceConfig" class="com.baeldung.profiles.DevDatasourceConfig"/>
     </beans>
 
     <beans profile="production">
-        <bean id="productionDatasourceConfig" class="org.baeldung.profiles.ProductionDatasourceConfig"/>
+        <bean id="productionDatasourceConfig" class="com.baeldung.profiles.ProductionDatasourceConfig"/>
     </beans>
 </beans>
\ No newline at end of file
diff --git a/spring-core-2/src/main/resources/startupConfig.xml b/spring-core-2/src/main/resources/startupConfig.xml
index 8226665a90..d42e0f6c2b 100644
--- a/spring-core-2/src/main/resources/startupConfig.xml
+++ b/spring-core-2/src/main/resources/startupConfig.xml
@@ -4,13 +4,13 @@
 	http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
     <bean id="initMethodExampleBean"
-          class="org.baeldung.startup.InitMethodExampleBean"
+          class="com.baeldung.startup.InitMethodExampleBean"
           scope="prototype"
           init-method="init">
     </bean>
 
     <bean id="allStrategiesExampleBean"
-          class="org.baeldung.startup.AllStrategiesExampleBean"
+          class="com.baeldung.startup.AllStrategiesExampleBean"
           init-method="init">
     </bean>
 </beans>
\ No newline at end of file
diff --git a/spring-core-2/src/test/java/org/baeldung/autowire/sample/FooServiceIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java
similarity index 94%
rename from spring-core-2/src/test/java/org/baeldung/autowire/sample/FooServiceIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java
index 941fc4baff..34ba7902ca 100644
--- a/spring-core-2/src/test/java/org/baeldung/autowire/sample/FooServiceIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.autowire.sample;
+package com.baeldung.autowire.sample;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java
similarity index 87%
rename from spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java
index 447a09d69e..fb3f973f29 100644
--- a/spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.bean.injection;
+package com.baeldung.bean.injection;
 
-import org.baeldung.bean.config.ConstructorBasedShipConfig;
+import com.baeldung.bean.config.ConstructorBasedShipConfig;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
diff --git a/spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java
similarity index 95%
rename from spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java
index 9f6011d851..18ce5ce8ed 100644
--- a/spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.bean.injection;
+package com.baeldung.bean.injection;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java
similarity index 87%
rename from spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java
index 1c15775093..1e2147d2bc 100644
--- a/spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.bean.injection;
+package com.baeldung.bean.injection;
 
-import org.baeldung.bean.config.SetterBasedShipConfig;
+import com.baeldung.bean.config.SetterBasedShipConfig;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
diff --git a/spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java
similarity index 94%
rename from spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java
index bc17a08383..9c7526a7be 100644
--- a/spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.bean.injection;
+package com.baeldung.bean.injection;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/spring-core-2/src/test/java/org/baeldung/customannotation/Account.java b/spring-core-2/src/test/java/com/baeldung/customannotation/Account.java
similarity index 94%
rename from spring-core-2/src/test/java/org/baeldung/customannotation/Account.java
rename to spring-core-2/src/test/java/com/baeldung/customannotation/Account.java
index 04545e5b83..cfdd8815e4 100644
--- a/spring-core-2/src/test/java/org/baeldung/customannotation/Account.java
+++ b/spring-core-2/src/test/java/com/baeldung/customannotation/Account.java
@@ -1,4 +1,4 @@
-package org.baeldung.customannotation;
+package com.baeldung.customannotation;
 
 import java.io.Serializable;
 
diff --git a/spring-core-2/src/test/java/org/baeldung/customannotation/BeanWithGenericDAO.java b/spring-core-2/src/test/java/com/baeldung/customannotation/BeanWithGenericDAO.java
similarity index 89%
rename from spring-core-2/src/test/java/org/baeldung/customannotation/BeanWithGenericDAO.java
rename to spring-core-2/src/test/java/com/baeldung/customannotation/BeanWithGenericDAO.java
index 9ba915f296..a0707f263b 100644
--- a/spring-core-2/src/test/java/org/baeldung/customannotation/BeanWithGenericDAO.java
+++ b/spring-core-2/src/test/java/com/baeldung/customannotation/BeanWithGenericDAO.java
@@ -1,4 +1,4 @@
-package org.baeldung.customannotation;
+package com.baeldung.customannotation;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java
similarity index 98%
rename from spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java
index ae3d53fb9b..1baea4505b 100644
--- a/spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.customannotation;
+package com.baeldung.customannotation;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
diff --git a/spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java
similarity index 98%
rename from spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java
index bab2574cd2..bc7a5f7246 100644
--- a/spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.customannotation;
+package com.baeldung.customannotation;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
diff --git a/spring-core-2/src/test/java/org/baeldung/customannotation/Person.java b/spring-core-2/src/test/java/com/baeldung/customannotation/Person.java
similarity index 92%
rename from spring-core-2/src/test/java/org/baeldung/customannotation/Person.java
rename to spring-core-2/src/test/java/com/baeldung/customannotation/Person.java
index 3babc8f0a2..4fa70e51af 100644
--- a/spring-core-2/src/test/java/org/baeldung/customannotation/Person.java
+++ b/spring-core-2/src/test/java/com/baeldung/customannotation/Person.java
@@ -1,4 +1,4 @@
-package org.baeldung.customannotation;
+package com.baeldung.customannotation;
 
 import java.io.Serializable;
 
diff --git a/spring-core-2/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/customscope/TenantScopeIntegrationTest.java
similarity index 96%
rename from spring-core-2/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/customscope/TenantScopeIntegrationTest.java
index e873ac5065..1cd7357a09 100644
--- a/spring-core-2/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/customscope/TenantScopeIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.customscope;
+package com.baeldung.customscope;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
@@ -46,7 +46,7 @@ public class TenantScopeIntegrationTest {
     public final void whenComponentScan_thenContextContainsFooAndBar() {
         AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
         try {
-            ctx.scan("org.baeldung.customscope");
+            ctx.scan("com.baeldung.customscope");
             ctx.refresh();
 
             TenantBean foo = (TenantBean) ctx.getBean("foo", TenantBean.class);
diff --git a/spring-core-2/src/test/java/org/baeldung/order/RatingRetrieverUnitTest.java b/spring-core-2/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java
similarity index 93%
rename from spring-core-2/src/test/java/org/baeldung/order/RatingRetrieverUnitTest.java
rename to spring-core-2/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java
index 96993ccd7c..342a4c5f05 100644
--- a/spring-core-2/src/test/java/org/baeldung/order/RatingRetrieverUnitTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.order;
+package com.baeldung.order;
 
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -21,7 +21,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 public class RatingRetrieverUnitTest {
     
     @Configuration 
-    @ComponentScan(basePackages = {"org.baeldung.order"}) 
+    @ComponentScan(basePackages = {"com.baeldung.order"})
     static class ContextConfiguration {} 
     
     @Autowired
diff --git a/spring-core-2/src/test/java/org/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java
similarity index 96%
rename from spring-core-2/src/test/java/org/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java
index cf5ca132e6..81b136f5ba 100644
--- a/spring-core-2/src/test/java/org/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.profiles;
+package com.baeldung.profiles;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/spring-core-2/src/test/java/org/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java
similarity index 97%
rename from spring-core-2/src/test/java/org/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java
index 5bacaef07b..b863fe30c1 100644
--- a/spring-core-2/src/test/java/org/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.profiles;
+package com.baeldung.profiles;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java
similarity index 95%
rename from spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java
index 929d088a14..60e9499d4b 100644
--- a/spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.profiles;
+package com.baeldung.profiles;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
similarity index 98%
rename from spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
index 2b46a50588..4fc90b2e7c 100644
--- a/spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.profiles;
+package com.baeldung.profiles;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/spring-core-2/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/scopes/ScopesIntegrationTest.java
similarity index 98%
rename from spring-core-2/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/scopes/ScopesIntegrationTest.java
index 0ae99610f6..ae4df3b632 100644
--- a/spring-core-2/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/scopes/ScopesIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.scopes;
+package com.baeldung.scopes;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/spring-core-2/src/test/java/org/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java
similarity index 88%
rename from spring-core-2/src/test/java/org/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java
index e12baed7e0..4f8035bcbe 100644
--- a/spring-core-2/src/test/java/org/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.springevents.asynchronous;
+package com.baeldung.springevents.asynchronous;
 
-import org.baeldung.springevents.synchronous.CustomSpringEventPublisher;
+import com.baeldung.springevents.synchronous.CustomSpringEventPublisher;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java
similarity index 87%
rename from spring-core-2/src/test/java/org/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java
index e8e6f91b06..0ba43cdcbb 100644
--- a/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java
@@ -1,6 +1,5 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
-import org.baeldung.springevents.synchronous.SynchronousSpringEventsConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java
similarity index 95%
rename from spring-core-2/src/test/java/org/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java
index f183314b6d..7f5314b420 100644
--- a/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java
similarity index 97%
rename from spring-core-2/src/test/java/org/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java
index b169cfec36..1d624d2289 100644
--- a/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.springevents.synchronous;
+package com.baeldung.springevents.synchronous;
 
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/spring-core-2/src/test/java/org/baeldung/startup/SpringStartupIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/startup/SpringStartupIntegrationTest.java
similarity index 98%
rename from spring-core-2/src/test/java/org/baeldung/startup/SpringStartupIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/startup/SpringStartupIntegrationTest.java
index 6263482948..b58c093c31 100644
--- a/spring-core-2/src/test/java/org/baeldung/startup/SpringStartupIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/startup/SpringStartupIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.startup;
+package com.baeldung.startup;
 
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
diff --git a/spring-core-2/src/test/java/org/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java
similarity index 96%
rename from spring-core-2/src/test/java/org/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java
index a46d24fa3b..3dfd4835df 100644
--- a/spring-core-2/src/test/java/org/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.startup;
+package com.baeldung.startup;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

From d2aca3b7742e76a7787d09eaffb52a7313710964 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Fri, 20 Dec 2019 22:22:30 +0100
Subject: [PATCH 066/106] BAEL-3242: Fix formatting

---
 .../java/com/baeldung/vertxspring/config/PortConfiguration.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spring-vertx/src/main/java/com/baeldung/vertxspring/config/PortConfiguration.java b/spring-vertx/src/main/java/com/baeldung/vertxspring/config/PortConfiguration.java
index 50beb6c549..23ca74ae80 100644
--- a/spring-vertx/src/main/java/com/baeldung/vertxspring/config/PortConfiguration.java
+++ b/spring-vertx/src/main/java/com/baeldung/vertxspring/config/PortConfiguration.java
@@ -12,7 +12,6 @@ public class PortConfiguration {
 
     private static final int DEFAULT_PORT = 8069;
 
-
     @Profile("default")
     @Bean
     public Integer defaultPort() {

From 1cd015500f8a27d0caa3b281a6e9bd47671f194e Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sat, 21 Dec 2019 20:24:04 +0200
Subject: [PATCH 067/106] Update README.md

---
 spring-mvc-java/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spring-mvc-java/README.md b/spring-mvc-java/README.md
index 7088162496..b8f41195ac 100644
--- a/spring-mvc-java/README.md
+++ b/spring-mvc-java/README.md
@@ -20,4 +20,3 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [A Quick Example of Spring Websockets’ @SendToUser Annotation](https://www.baeldung.com/spring-websockets-sendtouser)
 - [Working with Date Parameters in Spring](https://www.baeldung.com/spring-date-parameters)
 - [A Java Web Application Without a web.xml](https://www.baeldung.com/java-web-app-without-web-xml)
-- [The HttpMediaTypeNotAcceptableException in Spring MVC](https://www.baeldung.com/spring-httpmediatypenotacceptable)

From 7385382a11a55c37f0320dc03dbfba7994c0eb67 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sat, 21 Dec 2019 20:34:34 +0200
Subject: [PATCH 068/106] Update README.md

---
 spring-mvc-basics-2/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spring-mvc-basics-2/README.md b/spring-mvc-basics-2/README.md
index 880d5dfa0f..9d1402a210 100644
--- a/spring-mvc-basics-2/README.md
+++ b/spring-mvc-basics-2/README.md
@@ -11,6 +11,5 @@ This module contains articles about Spring MVC
 - [Guide to Spring Email](https://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)
-- [Spring Optional Path Variables](https://www.baeldung.com/spring-optional-path-variables)
 - More articles: [[more -->]](/spring-mvc-basics-3)
 - More articles: [[<-- prev]](/spring-mvc-basics)

From 4d4328da8be9760011c6d784b7576bc57d81089a Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Sun, 22 Dec 2019 18:50:33 +0530
Subject: [PATCH 069/106] BAEL-19376 Do we have any Spring Milestone/RC repos
 defined?

- Removed spring milestone repositories dependencies, used Central GA releases as a fix
---
 parent-kotlin/pom.xml                         |  7 +---
 persistence-modules/r2dbc/pom.xml             | 26 ++-------------
 spring-5-data-reactive/pom.xml                | 26 ++++-----------
 .../r2dbc/repository/PlayerRepository.java    |  6 ++--
 .../R2dbcApplicationIntegrationTest.java      |  3 +-
 spring-5-webflux/pom.xml                      | 32 -------------------
 spring-boot-mvc-2/pom.xml                     | 32 -------------------
 7 files changed, 14 insertions(+), 118 deletions(-)

diff --git a/parent-kotlin/pom.xml b/parent-kotlin/pom.xml
index a180343378..621d3fca6e 100644
--- a/parent-kotlin/pom.xml
+++ b/parent-kotlin/pom.xml
@@ -26,11 +26,6 @@
             <id>kotlin-eap</id>
             <url>http://dl.bintray.com/kotlin/kotlin-eap</url>
         </repository>
-        <repository>
-            <id>spring-milestone</id>
-            <name>Spring Milestone Repository</name>
-            <url>http://repo.spring.io/milestone</url>
-        </repository>
     </repositories>
 
     <pluginRepositories>
@@ -45,7 +40,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.2.0.M4</version>
+                <version>2.2.2.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/persistence-modules/r2dbc/pom.xml b/persistence-modules/r2dbc/pom.xml
index 3b2a57401c..2c06931487 100644
--- a/persistence-modules/r2dbc/pom.xml
+++ b/persistence-modules/r2dbc/pom.xml
@@ -61,32 +61,10 @@
         </plugins>
     </build>
 
-    <!-- Extra repositories for R2DBC-H2 -->
-    <repositories>
-
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-
-    </repositories>
-
     <properties>
         <java.version>1.8</java.version>
-        <r2dbc-h2.version>0.8.0.M8</r2dbc-h2.version>
+        <r2dbc-h2.version>0.8.1.RELEASE</r2dbc-h2.version>
+        <h2.version>1.4.200</h2.version>
     </properties>
 
 </project>
diff --git a/spring-5-data-reactive/pom.xml b/spring-5-data-reactive/pom.xml
index 230f25768e..aeaf6daf1a 100644
--- a/spring-5-data-reactive/pom.xml
+++ b/spring-5-data-reactive/pom.xml
@@ -17,6 +17,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
+            <version>${reactor-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -213,31 +214,16 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-
     <properties>
         <kotlin.version>1.2.40</kotlin.version>
         <kotlin-maven-plugin.version>1.2.40</kotlin-maven-plugin.version>
-        <spring-tx.version>5.2.0.M2</spring-tx.version>
-        <spring-data-r2dbc.version>1.0.0.M2</spring-data-r2dbc.version>
-        <r2dbc-h2.version>0.8.0.M8</r2dbc-h2.version>
+        <spring-tx.version>5.2.2.RELEASE</spring-tx.version>
+        <spring-data-r2dbc.version>1.0.0.RELEASE</spring-data-r2dbc.version>
+        <r2dbc-h2.version>0.8.1.RELEASE</r2dbc-h2.version>
         <httpclient.version>4.5.2</httpclient.version>
-        <h2.version>1.4.199</h2.version>
+        <h2.version>1.4.200</h2.version>
         <couchbaseMock.version>1.5.23</couchbaseMock.version>
+        <reactor-core.version>3.3.1.RELEASE</reactor-core.version>
     </properties>
 
 </project>
diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java b/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java
index 33b653140e..20f7642a7c 100644
--- a/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java
+++ b/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java
@@ -1,8 +1,10 @@
 package com.baeldung.r2dbc.repository;
 
-import com.baeldung.r2dbc.model.Player;
-import org.springframework.data.r2dbc.repository.query.Query;
+import org.springframework.data.r2dbc.repository.Query;
 import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+
+import com.baeldung.r2dbc.model.Player;
+
 import reactor.core.publisher.Flux;
 
 public interface PlayerRepository extends ReactiveCrudRepository<Player, Integer> {
diff --git a/spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java b/spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java
index ffd2e98f8e..1af570587e 100644
--- a/spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java
+++ b/spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java
@@ -43,8 +43,7 @@ public class R2dbcApplicationIntegrationTest {
                 "DROP TABLE IF EXISTS player;",
                 "CREATE table player (id INT AUTO_INCREMENT NOT NULL, name VARCHAR2, age INT NOT NULL);");
 
-        statements.forEach(it -> client.execute() //
-                .sql(it) //
+        statements.forEach(it -> client.execute(it) //
                 .fetch() //
                 .rowsUpdated() //
                 .as(StepVerifier::create) //
diff --git a/spring-5-webflux/pom.xml b/spring-5-webflux/pom.xml
index 84ee3e332c..22f429da2a 100644
--- a/spring-5-webflux/pom.xml
+++ b/spring-5-webflux/pom.xml
@@ -64,38 +64,6 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <properties>
         <spring-boot.version>2.2.0.RELEASE</spring-boot.version>
     </properties>
diff --git a/spring-boot-mvc-2/pom.xml b/spring-boot-mvc-2/pom.xml
index e6538c4418..fcc0fc8b82 100644
--- a/spring-boot-mvc-2/pom.xml
+++ b/spring-boot-mvc-2/pom.xml
@@ -35,36 +35,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
-
 </project>
\ No newline at end of file

From c67e1df5b5bf54ed98aae6b96b76a061b7e26904 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Sun, 22 Dec 2019 18:59:29 +0530
Subject: [PATCH 070/106] BAEL-19376 Reverted repository change for kotlin
 projects

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

diff --git a/parent-kotlin/pom.xml b/parent-kotlin/pom.xml
index 621d3fca6e..a180343378 100644
--- a/parent-kotlin/pom.xml
+++ b/parent-kotlin/pom.xml
@@ -26,6 +26,11 @@
             <id>kotlin-eap</id>
             <url>http://dl.bintray.com/kotlin/kotlin-eap</url>
         </repository>
+        <repository>
+            <id>spring-milestone</id>
+            <name>Spring Milestone Repository</name>
+            <url>http://repo.spring.io/milestone</url>
+        </repository>
     </repositories>
 
     <pluginRepositories>
@@ -40,7 +45,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.2.2.RELEASE</version>
+                <version>2.2.0.M4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

From 670189655157916e9e73704c175250bfad3c14b1 Mon Sep 17 00:00:00 2001
From: KevinGilmore <kpg102@gmail.com>
Date: Sun, 22 Dec 2019 09:01:50 -0600
Subject: [PATCH 071/106] BAEL-3198 BAEL-3479 update README files (#8416)

* BAEL-3336 BAEL-3058 add links

* BAEL-3319: add link

* BAEL-3284: add link

* BAEL-3198: add link to article

* BAEL-3479: add link to article
---
 algorithms-miscellaneous-5/README.md | 1 +
 webrtc/README.md                     | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 webrtc/README.md

diff --git a/algorithms-miscellaneous-5/README.md b/algorithms-miscellaneous-5/README.md
index 271765e91d..3c49b5f01c 100644
--- a/algorithms-miscellaneous-5/README.md
+++ b/algorithms-miscellaneous-5/README.md
@@ -11,4 +11,5 @@ This module contains articles about algorithms. Some classes of algorithms, e.g.
 - [Knapsack Problem Implementation in Java](https://www.baeldung.com/java-knapsack)
 - [How to Determine if a Binary Tree is Balanced](https://www.baeldung.com/java-balanced-binary-tree)
 - [The Caesar Cipher in Java](https://www.baeldung.com/java-caesar-cipher)
+- [Overview of Combinatorial Problems in Java](https://www.baeldung.com/java-combinatorial-algorithms)
 - More articles: [[<-- prev]](/../algorithms-miscellaneous-4)
diff --git a/webrtc/README.md b/webrtc/README.md
new file mode 100644
index 0000000000..42c06341b4
--- /dev/null
+++ b/webrtc/README.md
@@ -0,0 +1,8 @@
+## WebRTC
+
+This module contains articles about WebRTC
+
+### Relevant Articles:
+
+- [Guide to WebRTC](https://www.baeldung.com/webrtc)
+

From f8d612969c8049cb4ce50e5f787f222142832867 Mon Sep 17 00:00:00 2001
From: Thabo Ntsoko <thabo.ntsoko@standardbank.co.za>
Date: Sun, 22 Dec 2019 17:08:39 +0200
Subject: [PATCH 072/106] Moving CatchingThrowable.java to the
 core-java-exceptions-2 module

---
 .../exceptions/CatchingThrowable.java         | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 core-java-modules/core-java-exceptions-2/src/main/java/com/baeldung/exceptions/CatchingThrowable.java

diff --git a/core-java-modules/core-java-exceptions-2/src/main/java/com/baeldung/exceptions/CatchingThrowable.java b/core-java-modules/core-java-exceptions-2/src/main/java/com/baeldung/exceptions/CatchingThrowable.java
new file mode 100644
index 0000000000..20b06cdd26
--- /dev/null
+++ b/core-java-modules/core-java-exceptions-2/src/main/java/com/baeldung/exceptions/CatchingThrowable.java
@@ -0,0 +1,38 @@
+package com.baeldung.exceptions;
+
+import java.util.Set;
+import java.util.UUID;
+
+public class CatchingThrowable  {
+
+    class CapacityException extends Exception {
+        CapacityException(String message) {
+            super(message);
+        }
+    }
+
+    class StorageAPI {
+
+        public void addIDsToStorage(int capacity, Set<String> storage) throws CapacityException {
+            if (capacity < 1) {
+                throw new CapacityException("Capacity of less than 1 is not allowed");
+            }
+            int count = 0;
+            while (count < capacity) {
+                storage.add(UUID.randomUUID().toString());
+                count++;
+            }
+        }
+
+        // other methods go here ...
+    }
+
+    public void add(StorageAPI api, int capacity, Set<String> storage) {
+        try {
+            api.addIDsToStorage(capacity, storage);
+        } catch (Throwable throwable) {
+            // do something here
+        }
+    }
+
+}

From 7c8a7412d2f648e4ac87362651cbbc2cf36fecc0 Mon Sep 17 00:00:00 2001
From: rdevarakonda <Ramprasad.Devarakonda@gmail.com>
Date: Mon, 23 Dec 2019 00:51:19 +0000
Subject: [PATCH 073/106] [BAEL-3152] - Examples for the article 'Using the Not
 Operator in If (#8368)

Conditions in Java'
---
 .../operators/notoperator/NotOperator.java    | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/operators/notoperator/NotOperator.java

diff --git a/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/operators/notoperator/NotOperator.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/operators/notoperator/NotOperator.java
new file mode 100644
index 0000000000..4e0cf98ff2
--- /dev/null
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/operators/notoperator/NotOperator.java
@@ -0,0 +1,99 @@
+package com.baeldung.core.operators.notoperator;
+
+/**
+ * Examples used in the article `Using the Not Operator in If Conditions in Java`.
+ */
+public class NotOperator {
+
+    public static void ifElseStatementExample() {
+        boolean isValid = true;
+
+        if (isValid) {
+            System.out.println("Valid");
+        } else {
+            System.out.println("Invalid");
+        }
+    }
+
+    public static void checkIsValidIsFalseWithEmptyIfBlock() {
+        boolean isValid = true;
+
+        if (isValid) {
+
+        } else {
+            System.out.println("Invalid");
+        }
+    }
+
+    public static void checkIsValidIsFalseWithJustTheIfBlock() {
+        boolean isValid = true;
+
+        if (isValid == false) {
+            System.out.println("Invalid");
+        }
+    }
+
+    public static void checkIsValidIsFalseWithTheNotOperator() {
+        boolean isValid = true;
+
+        if (!isValid) {
+            System.out.println("Invalid");
+        }
+    }
+
+    public static void notOperatorWithBooleanValueAsOperand() {
+        System.out.println(!true);   // prints false
+        System.out.println(!false);  // prints true
+        System.out.println(!!false); // prints false
+    }
+
+    public static void applyNotOperatorToAnExpression_example1() {
+        int count = 2;
+
+        System.out.println(!(count > 2));  // prints true
+        System.out.println(!(count <= 2)); // prints false
+    }
+
+    public static void applyNotOperatorToAnExpression_LogicalOperators() {
+        boolean x = true;
+        boolean y = false;
+
+        System.out.println(!(x && y));  // prints true
+        System.out.println(!(x || y));  // prints false
+    }
+
+    public static void precedence_example() {
+        boolean x = true;
+        boolean y = false;
+
+        System.out.println(!x && y);   // prints false
+        System.out.println(!(x && y)); // prints true
+    }
+
+    public static void pitfalls_ComplexConditionsExample() {
+        int count = 9;
+        int total = 100;
+
+        if (!(count >= 10 || total >= 1000)) {
+            System.out.println("Some more work to do");
+        }
+    }
+
+    public static void pitfalls_simplifyComplexConditionsByReversingLogicExample() {
+        int count = 9;
+        int total = 100;
+
+        if (count < 10 && total < 1000) {
+            System.out.println("Some more work to do");
+        }
+    }
+
+    public static void exitEarlyExample() {
+        boolean isValid = false;
+
+        if(!isValid) {
+            throw new IllegalArgumentException("Invalid input");
+        }
+        // Code to execute when isValid == true goes here
+    }
+}
\ No newline at end of file

From 103b04cb8e94dc17702a10b4a343cf89d930e55f Mon Sep 17 00:00:00 2001
From: Gang <Wu>
Date: Sun, 22 Dec 2019 18:53:01 -0700
Subject: [PATCH 074/106] BAEL-3406, refactor Kruskal algorithm by using more
 classes.

---
 algorithms-miscellaneous-5/pom.xml            |  6 +-
 .../algorithms/kruskal/CycleDetector.java     | 72 +++++++++++++++++++
 .../algorithms/kruskal/DisjointSetInfo.java   | 28 ++++++++
 .../baeldung/algorithms/kruskal/Kruskal.java  | 43 ++---------
 .../algorithms/kruskal/KruskalUnitTest.java   |  1 +
 5 files changed, 108 insertions(+), 42 deletions(-)
 create mode 100644 algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java
 create mode 100644 algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java

diff --git a/algorithms-miscellaneous-5/pom.xml b/algorithms-miscellaneous-5/pom.xml
index 83a30f420c..95036da775 100644
--- a/algorithms-miscellaneous-5/pom.xml
+++ b/algorithms-miscellaneous-5/pom.xml
@@ -35,9 +35,9 @@
             <version>${tradukisto.version}</version>
         </dependency>
         <dependency>
-           <groupId>com.google.guava</groupId>
-           <artifactId>guava</artifactId>
-           <version>28.1-jre</version>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>28.1-jre</version>
         </dependency>
 
         <dependency>
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java
new file mode 100644
index 0000000000..dec0bcdd85
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java
@@ -0,0 +1,72 @@
+package com.baeldung.algorithms.kruskal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CycleDetector {
+
+    List<DisjointSetInfo> nodes;
+
+    public CycleDetector(int totalNodes) {
+        initDisjointSets(totalNodes);
+    }
+
+    public boolean detectCycle(Integer u, Integer v) {
+        Integer rootU = pathCompressionFind(u);
+        Integer rootV = pathCompressionFind(v);
+        if (rootU.equals(rootV)) {
+            return true;
+        }
+        unionByRank(rootU, rootV);
+        return false;
+    }
+
+    private void initDisjointSets(int totalNodes) {
+        nodes = new ArrayList<>(totalNodes);
+        for (int i = 0; i < totalNodes; i++) {
+            nodes.add(new DisjointSetInfo(i));
+        }
+    }
+
+    private Integer find(Integer node) {
+        Integer parent = nodes.get(node).getParentNode();
+        if (parent.equals(node)) {
+            return node;
+        } else {
+            return find(parent);
+        }
+    }
+
+    private Integer pathCompressionFind(Integer node) {
+        DisjointSetInfo setInfo = nodes.get(node);
+        Integer parent = setInfo.getParentNode();
+        if (parent.equals(node)) {
+            return node;
+        } else {
+            Integer parentNode = find(parent);
+            setInfo.setParentNode(parentNode);
+            return parentNode;
+        }
+    }
+
+    private void union(Integer rootU, Integer rootV) {
+        DisjointSetInfo setInfoU = nodes.get(rootU);
+        setInfoU.setParentNode(rootV);
+    }
+
+    private void unionByRank(int rootU, int rootV) {
+        DisjointSetInfo setInfoU = nodes.get(rootU);
+        DisjointSetInfo setInfoV = nodes.get(rootV);
+        int rankU = setInfoU.getRank();
+        int rankV = setInfoV.getRank();
+        if (rankU < rankV) {
+            setInfoU.setParentNode(rootV);
+        } else {
+            setInfoV.setParentNode(rootU);
+            if (rankU == rankV) {
+                setInfoU.setRank(rankU + 1);
+            }
+        }
+    }
+
+}
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java
new file mode 100644
index 0000000000..ecdc42587a
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java
@@ -0,0 +1,28 @@
+package com.baeldung.algorithms.kruskal;
+
+public class DisjointSetInfo {
+
+    private Integer parentNode;
+    private int rank;
+
+    DisjointSetInfo(Integer nodeNumber) {
+        setParentNode(nodeNumber);
+        setRank(1);
+    }
+
+    public Integer getParentNode() {
+        return parentNode;
+    }
+
+    public void setParentNode(Integer parentNode) {
+        this.parentNode = parentNode;
+    }
+
+    public int getRank() {
+        return rank;
+    }
+
+    public void setRank(int rank) {
+        this.rank = rank;
+    }
+}
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java
index 62b260c71e..da405679d1 100644
--- a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java
@@ -14,7 +14,7 @@ import java.util.Set;
 public class Kruskal {
 
     public ValueGraph<Integer, Double> minSpanningTree(ValueGraph<Integer, Double> graph) {
-        
+
         return spanningTree(graph, true);
     }
 
@@ -32,20 +32,13 @@ public class Kruskal {
             edgeList.sort(Collections.reverseOrder(Comparator.comparing(e -> graph.edgeValue(e).get())));
         }
 
-        int totalEdges = edgeList.size();
         int totalNodes = graph.nodes().size();
+        CycleDetector cycleDetector = new CycleDetector(totalNodes);
         int edgeCount = 0;
-        List<Integer> roots = new ArrayList<>(totalNodes);
-        List<Integer> sizes = new ArrayList<>(totalNodes);
-        for (int i = 0; i < totalNodes; i++) {
-            roots.add(i);
-            sizes.add(1);
-        }
 
         MutableValueGraph<Integer, Double> spanningTree = ValueGraphBuilder.undirected().build();
-        for (int i = 0; i < totalEdges; i++) {
-            EndpointPair<Integer> edge = edgeList.get(i);
-            if (detectCycle(edge.nodeU(), edge.nodeV(), roots, sizes)) {
+        for (EndpointPair<Integer> edge : edgeList) {
+            if (cycleDetector.detectCycle(edge.nodeU(), edge.nodeV())) {
                 continue;
             }
             spanningTree.putEdgeValue(edge.nodeU(), edge.nodeV(), graph.edgeValue(edge).get());
@@ -57,32 +50,4 @@ public class Kruskal {
         return spanningTree;
     }
 
-    private Integer find(Integer x, List<Integer> roots) {
-        Integer root = roots.get(x);
-        if (!root.equals(x)) {
-            roots.set(x, find(root, roots));
-        }
-        return roots.get(x);
-    }
-
-    private void unionBySize(Integer rootU, Integer rootV, List<Integer> roots, List<Integer> sizes) {
-        Integer total = sizes.get(rootU) + sizes.get(rootV);
-        if (sizes.get(rootU) < sizes.get(rootV)) {
-            roots.set(rootU, rootV);
-            sizes.set(rootV, total);
-        } else {
-            roots.set(rootV, rootU);
-            sizes.set(rootU, total);
-        }
-    }
-
-    private boolean detectCycle(Integer u, Integer v, List<Integer> roots, List<Integer> sizes) {
-        Integer rootU = find(u, roots);
-        Integer rootV = find(v, roots);
-        if (rootU.equals(rootV)) {
-            return true;
-        }
-        unionBySize(rootU, rootV, roots, sizes);
-        return false;
-    }
 }
diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java
index e944d2894c..a7206c6cd0 100644
--- a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java
+++ b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java
@@ -9,6 +9,7 @@ import org.junit.Test;
 import com.google.common.graph.MutableValueGraph;
 import com.google.common.graph.ValueGraph;
 import com.google.common.graph.ValueGraphBuilder;
+import com.baeldung.algorithms.kruskal.Kruskal;
 
 public class KruskalUnitTest {
 

From e9613ec0210d2467bda3d1de932ca2cb96b9197c Mon Sep 17 00:00:00 2001
From: kwoyke <krzysztofwoyke@gmail.com>
Date: Mon, 23 Dec 2019 09:40:25 +0100
Subject: [PATCH 075/106] BAEL-3248: Restore maven-dependency-plugin
 configuration (#8419)

---
 .../spring-data-dynamodb/pom.xml              | 20 +++++++++++++++++++
 .../baeldung/SpringContextTest.java           |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 rename persistence-modules/spring-data-dynamodb/src/test/java/{org => com}/baeldung/SpringContextTest.java (94%)

diff --git a/persistence-modules/spring-data-dynamodb/pom.xml b/persistence-modules/spring-data-dynamodb/pom.xml
index 7b936817d1..871f99125a 100644
--- a/persistence-modules/spring-data-dynamodb/pom.xml
+++ b/persistence-modules/spring-data-dynamodb/pom.xml
@@ -151,6 +151,25 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>${maven-dependency-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeScope>test</includeScope>
+                            <includeTypes>so,dll,dylib</includeTypes>
+                            <outputDirectory>${project.basedir}/native-libs</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -174,6 +193,7 @@
         <dynamodb.version>1.11.106</dynamodb.version>
         <dynamodblocal.version>1.11.86</dynamodblocal.version>
         <dynamodblocal.repository.url>https://s3-us-west-2.amazonaws.com/dynamodb-local/release</dynamodblocal.repository.url>
+        <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/spring-data-dynamodb/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-data-dynamodb/src/test/java/com/baeldung/SpringContextTest.java
similarity index 94%
rename from persistence-modules/spring-data-dynamodb/src/test/java/org/baeldung/SpringContextTest.java
rename to persistence-modules/spring-data-dynamodb/src/test/java/com/baeldung/SpringContextTest.java
index 5e68a8e64f..3ad54e2267 100644
--- a/persistence-modules/spring-data-dynamodb/src/test/java/org/baeldung/SpringContextTest.java
+++ b/persistence-modules/spring-data-dynamodb/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

From 8a5941ceb0fde83a62dc2ead0a6ccc1e0c606955 Mon Sep 17 00:00:00 2001
From: Fabio Silva <silva_fabio@hotmail.com>
Date: Mon, 23 Dec 2019 09:15:37 -0300
Subject: [PATCH 076/106] Loredana Crusoveanu suggestions: shorten the names of
 the test methods, as they're causing a horizontal scroll bar to appear.

---
 .../java/com/baeldung/patternreuse/PatternJava11UnitTest.java | 2 +-
 .../test/java/com/baeldung/patternreuse/PatternUnitTest.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core-java-modules/core-java-11/src/test/java/com/baeldung/patternreuse/PatternJava11UnitTest.java b/core-java-modules/core-java-11/src/test/java/com/baeldung/patternreuse/PatternJava11UnitTest.java
index 94c8a39c95..e334d2c843 100644
--- a/core-java-modules/core-java-11/src/test/java/com/baeldung/patternreuse/PatternJava11UnitTest.java
+++ b/core-java-modules/core-java-11/src/test/java/com/baeldung/patternreuse/PatternJava11UnitTest.java
@@ -14,7 +14,7 @@ import static org.junit.Assert.assertTrue;
 public class PatternJava11UnitTest {
 
     @Test
-    public void givenPreCompiledPattern_whenCallAsMatchPredicate_thenReturnMatchPredicateToMatchesThePatternInTheListElements() {
+    public void givenPreCompiledPattern_whenCallAsMatchPredicate_thenReturnMatchPredicateToMatchesPattern() {
         List<String> namesToValidate = Arrays.asList("Fabio Silva", "Fabio Luis Silva");
         Pattern firstLastNamePreCompiledPattern = Pattern.compile("[a-zA-Z]{3,} [a-zA-Z]{3,}");
 
diff --git a/core-java-modules/core-java-text/src/test/java/com/baeldung/patternreuse/PatternUnitTest.java b/core-java-modules/core-java-text/src/test/java/com/baeldung/patternreuse/PatternUnitTest.java
index 70f5c59a95..c7331471ec 100644
--- a/core-java-modules/core-java-text/src/test/java/com/baeldung/patternreuse/PatternUnitTest.java
+++ b/core-java-modules/core-java-text/src/test/java/com/baeldung/patternreuse/PatternUnitTest.java
@@ -30,7 +30,7 @@ public class PatternUnitTest {
     }
 
     @Test
-    public void givenPreCompiledPattern_whenCallAsPredicate_thenReturnPredicateToFindThePatternInTheListElements() {
+    public void givenPreCompiledPattern_whenCallAsPredicate_thenReturnPredicateToFindPatternInTheList() {
         List<String> namesToValidate = Arrays.asList("Fabio Silva", "Mr. Silva");
         Predicate<String> patternsAsPredicate = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.asPredicate();
 
@@ -52,7 +52,7 @@ public class PatternUnitTest {
     }
 
     @Test
-    public void givenPreCompiledPattern_whenCallSplitAsStream_thenReturnArrayWithValuesSplitByThePattern() {
+    public void givenPreCompiledPattern_whenCallSplitAsStream_thenReturnArraySplitByThePattern() {
         Stream<String> textSplitAsStream = SPLIT_PRE_COMPILED_PATTERN.splitAsStream("My_Name__is__Fabio_Silva");
         String[] textSplit = textSplitAsStream.toArray(String[]::new);
 

From e86eeeb593f1849bc7fa9a095a78599693568aab Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Tue, 24 Dec 2019 10:38:48 +0100
Subject: [PATCH 077/106] BAEL-20537: Migrate apache-* modules to the
 com.baeldung package

---
 apache-fop/src/main/webapp/WEB-INF/web.xml               | 2 +-
 .../java/ApacheFOPConvertHTMLIntegrationTest.java        | 2 +-
 .../baeldung/java/ApacheFOPHeroldLiveTest.java           | 2 +-
 apache-olingo/olingo2/pom.xml                            | 2 +-
 .../examples/olingo2/CarsODataJPAServiceFactory.java     | 9 ++-------
 .../baeldung/examples/olingo2/JerseyConfig.java          | 3 +--
 .../examples/olingo2/Olingo2SampleApplication.java       | 3 +--
 .../baeldung/examples/olingo2/domain/CarMaker.java       | 2 +-
 .../baeldung/examples/olingo2/domain/CarModel.java       | 2 +-
 .../olingo2/Olingo2SampleApplicationUnitTest.java        | 2 +-
 10 files changed, 11 insertions(+), 18 deletions(-)
 rename apache-fop/src/test/java/{org => com}/baeldung/java/ApacheFOPConvertHTMLIntegrationTest.java (99%)
 rename apache-fop/src/test/java/{org => com}/baeldung/java/ApacheFOPHeroldLiveTest.java (99%)
 rename apache-olingo/olingo2/src/main/java/{org => com}/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java (95%)
 rename apache-olingo/olingo2/src/main/java/{org => com}/baeldung/examples/olingo2/JerseyConfig.java (97%)
 rename apache-olingo/olingo2/src/main/java/{org => com}/baeldung/examples/olingo2/Olingo2SampleApplication.java (80%)
 rename apache-olingo/olingo2/src/main/java/{org => com}/baeldung/examples/olingo2/domain/CarMaker.java (98%)
 rename apache-olingo/olingo2/src/main/java/{org => com}/baeldung/examples/olingo2/domain/CarModel.java (98%)
 rename apache-olingo/olingo2/src/test/java/{org => com}/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java (89%)

diff --git a/apache-fop/src/main/webapp/WEB-INF/web.xml b/apache-fop/src/main/webapp/WEB-INF/web.xml
index 935beae648..31187b8064 100644
--- a/apache-fop/src/main/webapp/WEB-INF/web.xml
+++ b/apache-fop/src/main/webapp/WEB-INF/web.xml
@@ -16,7 +16,7 @@
     </context-param>
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>org.baeldung.config</param-value>
+        <param-value>com.baeldung.config</param-value>
     </context-param>
 
     <listener>
diff --git a/apache-fop/src/test/java/org/baeldung/java/ApacheFOPConvertHTMLIntegrationTest.java b/apache-fop/src/test/java/com/baeldung/java/ApacheFOPConvertHTMLIntegrationTest.java
similarity index 99%
rename from apache-fop/src/test/java/org/baeldung/java/ApacheFOPConvertHTMLIntegrationTest.java
rename to apache-fop/src/test/java/com/baeldung/java/ApacheFOPConvertHTMLIntegrationTest.java
index 5e2da6fd1e..bfc34d83b5 100644
--- a/apache-fop/src/test/java/org/baeldung/java/ApacheFOPConvertHTMLIntegrationTest.java
+++ b/apache-fop/src/test/java/com/baeldung/java/ApacheFOPConvertHTMLIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java;
+package com.baeldung.java;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
diff --git a/apache-fop/src/test/java/org/baeldung/java/ApacheFOPHeroldLiveTest.java b/apache-fop/src/test/java/com/baeldung/java/ApacheFOPHeroldLiveTest.java
similarity index 99%
rename from apache-fop/src/test/java/org/baeldung/java/ApacheFOPHeroldLiveTest.java
rename to apache-fop/src/test/java/com/baeldung/java/ApacheFOPHeroldLiveTest.java
index 8496222394..af36f46d02 100644
--- a/apache-fop/src/test/java/org/baeldung/java/ApacheFOPHeroldLiveTest.java
+++ b/apache-fop/src/test/java/com/baeldung/java/ApacheFOPHeroldLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java;
+package com.baeldung.java;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
diff --git a/apache-olingo/olingo2/pom.xml b/apache-olingo/olingo2/pom.xml
index fdbc9b4390..4689fa0ca9 100644
--- a/apache-olingo/olingo2/pom.xml
+++ b/apache-olingo/olingo2/pom.xml
@@ -3,7 +3,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>
-    <groupId>org.baeldung.examples.olingo2</groupId>
+    <groupId>com.baeldung.examples.olingo2</groupId>
     <artifactId>olingo2</artifactId>
     <name>olingo2</name>
     <description>Sample Olingo 2 Project</description>
diff --git a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java b/apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java
similarity index 95%
rename from apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java
rename to apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java
index 65a0428154..55155732c8 100644
--- a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java
+++ b/apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java
@@ -1,4 +1,4 @@
-package org.baeldung.examples.olingo2;
+package com.baeldung.examples.olingo2;
 
 import java.util.List;
 import java.util.Map;
@@ -9,10 +9,8 @@ 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;
@@ -25,11 +23,8 @@ 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;
 
 /**
@@ -58,7 +53,7 @@ public class CarsODataJPAServiceFactory extends ODataJPAServiceFactory {
         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);
+        EntityManager em = (EntityManager)request.getAttribute(JerseyConfig.EntityManagerFilter.EM_REQUEST_ATTRIBUTE);
                 
         // Here we're passing the EM that was created by the EntityManagerFilter (see JerseyConfig)
         ctx.setEntityManager(new EntityManagerWrapper(em));
diff --git a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/JerseyConfig.java b/apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/JerseyConfig.java
similarity index 97%
rename from apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/JerseyConfig.java
rename to apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/JerseyConfig.java
index 78caf99861..02e5ce5adf 100644
--- a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/JerseyConfig.java
+++ b/apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/JerseyConfig.java
@@ -1,11 +1,10 @@
-    package org.baeldung.examples.olingo2;
+    package com.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;
diff --git a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/Olingo2SampleApplication.java b/apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/Olingo2SampleApplication.java
similarity index 80%
rename from apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/Olingo2SampleApplication.java
rename to apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/Olingo2SampleApplication.java
index fa58612088..f76e0e00e3 100644
--- a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/Olingo2SampleApplication.java
+++ b/apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/Olingo2SampleApplication.java
@@ -1,8 +1,7 @@
-package org.baeldung.examples.olingo2;
+package com.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
diff --git a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarMaker.java b/apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/domain/CarMaker.java
similarity index 98%
rename from apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarMaker.java
rename to apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/domain/CarMaker.java
index e66d266062..d56a42374c 100644
--- a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarMaker.java
+++ b/apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/domain/CarMaker.java
@@ -1,4 +1,4 @@
-package org.baeldung.examples.olingo2.domain;
+package com.baeldung.examples.olingo2.domain;
 
 import java.util.List;
 
diff --git a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarModel.java b/apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/domain/CarModel.java
similarity index 98%
rename from apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarModel.java
rename to apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/domain/CarModel.java
index f9f563e01e..6bbaa3ad0c 100644
--- a/apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarModel.java
+++ b/apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/domain/CarModel.java
@@ -1,4 +1,4 @@
-package org.baeldung.examples.olingo2.domain;
+package com.baeldung.examples.olingo2.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
diff --git a/apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java b/apache-olingo/olingo2/src/test/java/com/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java
similarity index 89%
rename from apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java
rename to apache-olingo/olingo2/src/test/java/com/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java
index 7cb685e3e9..74033a49cd 100644
--- a/apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java
+++ b/apache-olingo/olingo2/src/test/java/com/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.examples.olingo2;
+package com.baeldung.examples.olingo2;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

From 736b684c2440bb03f5ce33cb24b387ed8fd71112 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Tue, 24 Dec 2019 10:44:49 +0100
Subject: [PATCH 078/106] BAEL-20537: Migrate custom-pmd module to the
 com.baeldung package

---
 custom-pmd/pom.xml                                              | 2 +-
 .../{org => com}/baeldung/pmd/UnitTestNamingConventionRule.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename custom-pmd/src/main/java/{org => com}/baeldung/pmd/UnitTestNamingConventionRule.java (97%)

diff --git a/custom-pmd/pom.xml b/custom-pmd/pom.xml
index 601eedf08f..a011b6a121 100644
--- a/custom-pmd/pom.xml
+++ b/custom-pmd/pom.xml
@@ -2,7 +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>org.baeldung.pmd</groupId>
+    <groupId>com.baeldung.pmd</groupId>
     <artifactId>custom-pmd</artifactId>
     <version>0.0.1</version>
     <name>custom-pmd</name>
diff --git a/custom-pmd/src/main/java/org/baeldung/pmd/UnitTestNamingConventionRule.java b/custom-pmd/src/main/java/com/baeldung/pmd/UnitTestNamingConventionRule.java
similarity index 97%
rename from custom-pmd/src/main/java/org/baeldung/pmd/UnitTestNamingConventionRule.java
rename to custom-pmd/src/main/java/com/baeldung/pmd/UnitTestNamingConventionRule.java
index 2cbab782ee..e30164ac4f 100644
--- a/custom-pmd/src/main/java/org/baeldung/pmd/UnitTestNamingConventionRule.java
+++ b/custom-pmd/src/main/java/com/baeldung/pmd/UnitTestNamingConventionRule.java
@@ -1,4 +1,4 @@
-package org.baeldung.pmd;
+package com.baeldung.pmd;
 
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
 import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;

From 2ece7dbb4fe24789d4b7be869011b371e054abc3 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Tue, 24 Dec 2019 11:00:12 +0100
Subject: [PATCH 079/106] BAEL-20537: Migrate grpc module to the com.baeldung
 package

---
 .../{org => com}/baeldung/grpc/client/GrpcClient.java     | 8 ++++----
 .../{org => com}/baeldung/grpc/server/GrpcServer.java     | 2 +-
 .../baeldung/grpc/server/HelloServiceImpl.java            | 8 ++++----
 grpc/src/main/proto/HelloService.proto                    | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename grpc/src/main/java/{org => com}/baeldung/grpc/client/GrpcClient.java (81%)
 rename grpc/src/main/java/{org => com}/baeldung/grpc/server/GrpcServer.java (93%)
 rename grpc/src/main/java/{org => com}/baeldung/grpc/server/HelloServiceImpl.java (79%)

diff --git a/grpc/src/main/java/org/baeldung/grpc/client/GrpcClient.java b/grpc/src/main/java/com/baeldung/grpc/client/GrpcClient.java
similarity index 81%
rename from grpc/src/main/java/org/baeldung/grpc/client/GrpcClient.java
rename to grpc/src/main/java/com/baeldung/grpc/client/GrpcClient.java
index f653e17910..f10b24faa7 100644
--- a/grpc/src/main/java/org/baeldung/grpc/client/GrpcClient.java
+++ b/grpc/src/main/java/com/baeldung/grpc/client/GrpcClient.java
@@ -1,8 +1,8 @@
-package org.baeldung.grpc.client;
+package com.baeldung.grpc.client;
 
-import org.baeldung.grpc.HelloRequest;
-import org.baeldung.grpc.HelloResponse;
-import org.baeldung.grpc.HelloServiceGrpc;
+import com.baeldung.grpc.HelloRequest;
+import com.baeldung.grpc.HelloResponse;
+import com.baeldung.grpc.HelloServiceGrpc;
 
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
diff --git a/grpc/src/main/java/org/baeldung/grpc/server/GrpcServer.java b/grpc/src/main/java/com/baeldung/grpc/server/GrpcServer.java
similarity index 93%
rename from grpc/src/main/java/org/baeldung/grpc/server/GrpcServer.java
rename to grpc/src/main/java/com/baeldung/grpc/server/GrpcServer.java
index 8a2b94e53b..2380d73a8c 100644
--- a/grpc/src/main/java/org/baeldung/grpc/server/GrpcServer.java
+++ b/grpc/src/main/java/com/baeldung/grpc/server/GrpcServer.java
@@ -1,4 +1,4 @@
-package org.baeldung.grpc.server;
+package com.baeldung.grpc.server;
 
 import java.io.IOException;
 
diff --git a/grpc/src/main/java/org/baeldung/grpc/server/HelloServiceImpl.java b/grpc/src/main/java/com/baeldung/grpc/server/HelloServiceImpl.java
similarity index 79%
rename from grpc/src/main/java/org/baeldung/grpc/server/HelloServiceImpl.java
rename to grpc/src/main/java/com/baeldung/grpc/server/HelloServiceImpl.java
index b08ad02c97..8609477fe9 100644
--- a/grpc/src/main/java/org/baeldung/grpc/server/HelloServiceImpl.java
+++ b/grpc/src/main/java/com/baeldung/grpc/server/HelloServiceImpl.java
@@ -1,8 +1,8 @@
-package org.baeldung.grpc.server;
+package com.baeldung.grpc.server;
 
-import org.baeldung.grpc.HelloRequest;
-import org.baeldung.grpc.HelloResponse;
-import org.baeldung.grpc.HelloServiceGrpc.HelloServiceImplBase;
+import com.baeldung.grpc.HelloRequest;
+import com.baeldung.grpc.HelloResponse;
+import com.baeldung.grpc.HelloServiceGrpc.HelloServiceImplBase;
 
 import io.grpc.stub.StreamObserver;
 
diff --git a/grpc/src/main/proto/HelloService.proto b/grpc/src/main/proto/HelloService.proto
index 4f53191ab9..a008fad4b0 100644
--- a/grpc/src/main/proto/HelloService.proto
+++ b/grpc/src/main/proto/HelloService.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option java_multiple_files = true;
-package org.baeldung.grpc;
+package com.baeldung.grpc;
 
 message HelloRequest {
     string firstName = 1;

From b99b7b8b25619e744c499c7e53310e132eb22f0a Mon Sep 17 00:00:00 2001
From: "amit.pandey" <amit.pandey2103@gmail.com>
Date: Tue, 24 Dec 2019 17:17:09 +0530
Subject: [PATCH 080/106] [BAEL-18774] - extracted versions into properties

---
 spring-boot-data/pom.xml                      | 14 +++++++------
 .../spring-boot-with-starter-parent/pom.xml   |  3 ++-
 .../property-exp-custom-config/pom.xml        |  6 ++++--
 spring-boot-testing/pom.xml                   |  3 ++-
 spring-cloud/spring-cloud-aws/pom.xml         |  3 ++-
 .../spring-cloud-contract-producer/pom.xml    |  6 +++++-
 spring-cloud/spring-cloud-functions/pom.xml   |  3 ++-
 .../travel-agency-service/pom.xml             |  3 ++-
 spring-core-2/pom.xml                         |  3 ++-
 spring-data-rest-querydsl/pom.xml             | 11 +++++++---
 spring-data-rest/pom.xml                      |  3 ++-
 spring-ejb/wildfly/wildfly-ear/pom.xml        |  3 ++-
 spring-integration/pom.xml                    |  3 ++-
 spring-jms/pom.xml                            |  3 ++-
 spring-mvc-java/pom.xml                       | 21 ++++++++++++-------
 .../remoting-hessian-burlap-client/pom.xml    |  5 ++++-
 spring-rest-hal-browser/pom.xml               | 20 ++++++++++++------
 spring-resttemplate/pom.xml                   | 12 +++++++----
 18 files changed, 85 insertions(+), 40 deletions(-)

diff --git a/spring-boot-data/pom.xml b/spring-boot-data/pom.xml
index 663ee640f3..f9e51920c2 100644
--- a/spring-boot-data/pom.xml
+++ b/spring-boot-data/pom.xml
@@ -97,8 +97,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>${source.version}</source>
+                    <target>${target.version}</target>
                 </configuration>
             </plugin>
         </plugins>
@@ -121,8 +121,8 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
-                            <source>8</source>
-                            <target>8</target>
+                            <source>${source.version}</source>
+                            <target>${target.version}</target>
                         </configuration>
                     </plugin>
                     <plugin>
@@ -156,8 +156,8 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
-                            <source>1.8</source>
-                            <target>1.8</target>
+                            <source>${source.version}</source>
+                            <target>${target.version}</target>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -168,6 +168,8 @@
     <properties>
         <javers.version>5.6.3</javers.version>
         <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
+        <source.version>1.8</source.version>
+        <target.version>1.8</target.version>
     </properties>
     
 </project>
diff --git a/spring-boot-parent/spring-boot-with-starter-parent/pom.xml b/spring-boot-parent/spring-boot-with-starter-parent/pom.xml
index 9ea26e49fe..ed2cb8646c 100644
--- a/spring-boot-parent/spring-boot-with-starter-parent/pom.xml
+++ b/spring-boot-parent/spring-boot-with-starter-parent/pom.xml
@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-data-jpa</artifactId>
-                <version>2.1.1.RELEASE</version>
+                <version>${spring-boot.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -38,6 +38,7 @@
 
     <properties>
         <java.version>1.8</java.version>
+        <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
         <junit.version>4.11</junit.version>
     </properties>
 
diff --git a/spring-boot-property-exp/property-exp-custom-config/pom.xml b/spring-boot-property-exp/property-exp-custom-config/pom.xml
index f9c3d6ef62..0118de7396 100644
--- a/spring-boot-property-exp/property-exp-custom-config/pom.xml
+++ b/spring-boot-property-exp/property-exp-custom-config/pom.xml
@@ -52,7 +52,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.7</version>
+                <version>${apache-maven.version}</version>
                 <configuration>
                     <delimiters>
                         <delimiter>@</delimiter>
@@ -63,7 +63,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
+                <version>${exec-maven-plugin.version}</version>
                 <configuration>
                     <mainClass>com.baeldung.propertyexpansion.SpringBootPropertyExpansionApp</mainClass>
                 </configuration>
@@ -74,6 +74,8 @@
     <properties>
         <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
         <custom.property>Custom Property Value</custom.property>
+        <apache-maven.version>2.7</apache-maven.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
     </properties>
 
 </project>
diff --git a/spring-boot-testing/pom.xml b/spring-boot-testing/pom.xml
index ebe87fdd70..5f358072d3 100644
--- a/spring-boot-testing/pom.xml
+++ b/spring-boot-testing/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>it.ozimov</groupId>
             <artifactId>embedded-redis</artifactId>
-            <version>0.7.2</version>
+            <version>${redis.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- Spock & Spring -->
@@ -131,6 +131,7 @@
         <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
         <spock.version>1.2-groovy-2.4</spock.version>
         <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
+        <redis.version>0.7.2</redis.version>
     </properties>
 
 </project>
diff --git a/spring-cloud/spring-cloud-aws/pom.xml b/spring-cloud/spring-cloud-aws/pom.xml
index c1fc458a24..abf9363288 100644
--- a/spring-cloud/spring-cloud-aws/pom.xml
+++ b/spring-cloud/spring-cloud-aws/pom.xml
@@ -50,7 +50,7 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-aws</artifactId>
-                <version>2.0.1.RELEASE</version>
+                <version>${spring-cloud}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -60,6 +60,7 @@
     <properties>
         <start-class>com.baeldung.spring.cloud.aws.SpringCloudAwsApplication</start-class>
         <spring-cloud.version>Dalston.SR4</spring-cloud.version>
+        <spring-cloud>2.0.1.RELEASE</spring-cloud>
     </properties>
     
 </project>
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 c41ad687ed..e909dbc253 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
@@ -36,7 +36,7 @@
             <plugin>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-contract-maven-plugin</artifactId>
-                <version>2.1.1.RELEASE</version>
+                <version>${spring-cloud.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <baseClassForTests>com.baeldung.spring.cloud.springcloudcontractproducer.BaseTestClass
@@ -45,4 +45,8 @@
             </plugin>
         </plugins>
     </build>
+
+    <properties>
+        <spring-cloud.version>2.1.1.RELEASE</spring-cloud.version>
+    </properties>
 </project>
diff --git a/spring-cloud/spring-cloud-functions/pom.xml b/spring-cloud/spring-cloud-functions/pom.xml
index 2e1b747c2e..03510d0504 100644
--- a/spring-cloud/spring-cloud-functions/pom.xml
+++ b/spring-cloud/spring-cloud-functions/pom.xml
@@ -65,7 +65,7 @@
                     <dependency>
                         <groupId>org.springframework.boot.experimental</groupId>
                         <artifactId>spring-boot-thin-layout</artifactId>
-                        <version>1.0.10.RELEASE</version>
+                        <version>${spring-boot-thin.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -88,6 +88,7 @@
         <aws-lambda-events.version>2.0.2</aws-lambda-events.version>
         <aws-lambda-java-core.version>1.1.0</aws-lambda-java-core.version>
         <spring-boot.version>2.0.4.RELEASE</spring-boot.version>
+        <spring-boot-thin.version>1.0.10.RELEASE</spring-boot-thin.version>
     </properties>
 
 </project>
diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml b/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml
index 93734a19a7..5459b77682 100644
--- a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml
+++ b/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml
@@ -24,7 +24,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.2.3</version>
+                <version>${logback.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -71,6 +71,7 @@
 
     <properties>
         <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
+        <logback.version>1.2.3</logback.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml
index 12b6972a79..78b94880d0 100644
--- a/spring-core-2/pom.xml
+++ b/spring-core-2/pom.xml
@@ -174,7 +174,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>${maven.version}</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
@@ -214,6 +214,7 @@
         <assertj.version>3.6.1</assertj.version>
         <shedlock.version>2.1.0</shedlock.version>
         <javassist.version>3.22.0-GA</javassist.version>
+        <maven.version>3.2.2</maven.version>
     </properties>
 
 </project>
diff --git a/spring-data-rest-querydsl/pom.xml b/spring-data-rest-querydsl/pom.xml
index 9f53f6b55f..c0ad43fe0b 100644
--- a/spring-data-rest-querydsl/pom.xml
+++ b/spring-data-rest-querydsl/pom.xml
@@ -72,8 +72,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>${maven.source}</source>
+                    <target>${maven.target}</target>
                     <compilerArgs>
                         <arg>-verbose</arg>
                         <arg>-parameters</arg>
@@ -83,7 +83,7 @@
             <plugin>
                 <groupId>com.mysema.maven</groupId>
                 <artifactId>apt-maven-plugin</artifactId>
-                <version>1.1.3</version>
+                <version>${mysema.version}</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -99,5 +99,10 @@
             </plugin>
         </plugins>
     </build>
+    <properties>
+        <maven.source>1.8</maven.source>
+        <maven.target>1.8</maven.target>
+        <mysema.version>1.1.3</mysema.version>
+    </properties>
 
 </project>
diff --git a/spring-data-rest/pom.xml b/spring-data-rest/pom.xml
index 05f2ccbbae..bb592c08d5 100644
--- a/spring-data-rest/pom.xml
+++ b/spring-data-rest/pom.xml
@@ -66,7 +66,7 @@
             <plugin>
                 <groupId>com.mysema.maven</groupId>
                 <artifactId>maven-apt-plugin</artifactId>
-                <version>1.0</version>
+                <version>${maven.version}</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -90,6 +90,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <start-class>com.baeldung.books.SpringDataRestApplication</start-class>
+        <maven.version>1.0</maven.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-ejb/wildfly/wildfly-ear/pom.xml b/spring-ejb/wildfly/wildfly-ear/pom.xml
index 9393820b12..07f53358bf 100644
--- a/spring-ejb/wildfly/wildfly-ear/pom.xml
+++ b/spring-ejb/wildfly/wildfly-ear/pom.xml
@@ -45,7 +45,7 @@
                 <version>${maven-ear-plugin.version}</version>
                 <configuration>
                     <defaultLibBundleDir>lib/</defaultLibBundleDir>
-                    <version>7</version>
+                    <version>${defaultLibBundleDir.version}</version>
                     <modules>
                         <webModule>
                             <groupId>com.baeldung.wildfly</groupId>
@@ -66,6 +66,7 @@
     <properties>
         <maven-ear-plugin.version>2.10.1</maven-ear-plugin.version>
         <wildfly-maven-plugin.version>1.2.0.Final</wildfly-maven-plugin.version>
+        <defaultLibBundleDir.version>7</defaultLibBundleDir.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-integration/pom.xml b/spring-integration/pom.xml
index ebdde5a1ee..a985f55d89 100644
--- a/spring-integration/pom.xml
+++ b/spring-integration/pom.xml
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.197</version>
+            <version>${h2.version}</version>
         </dependency>
     </dependencies>
 
@@ -124,6 +124,7 @@
         <javax-activation.version>1.1.1</javax-activation.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
         <exec-maven-plugin.version>1.5.0</exec-maven-plugin.version>
+        <h2.version>1.4.197</h2.version>
     </properties>
 
 </project>
diff --git a/spring-jms/pom.xml b/spring-jms/pom.xml
index a0d2625477..9cd9126fac 100644
--- a/spring-jms/pom.xml
+++ b/spring-jms/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
-			<version>1.5.10.RELEASE</version>
+			<version>${spring-boot-test.version}</version>
 			<scope>test</scope>
 		</dependency>
     </dependencies>
@@ -64,6 +64,7 @@
     <properties>
         <springframework.version>4.3.4.RELEASE</springframework.version>
         <activemq.version>5.14.1</activemq.version>
+        <spring-boot-test.version>1.5.10.RELEASE</spring-boot-test.version>
     </properties>
 
 </project>
diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml
index 7d0afd85ec..dd197bbeb5 100644
--- a/spring-mvc-java/pom.xml
+++ b/spring-mvc-java/pom.xml
@@ -26,12 +26,12 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>4.0.1</version>
+            <version>${javax.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>javax.servlet.jsp-api</artifactId>
-            <version>2.3.3</version>
+            <version>${javax-servlet-api.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -53,19 +53,19 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>1.9.1</version>
+            <version>${aspectjrt.version}</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
-            <version>1.9.1</version>
+            <version>${aspectjweaver.version}</version>
         </dependency>
 
         <!-- common -->
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.32</version>
+            <version>${htmlunit.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>commons-logging</artifactId>
@@ -99,7 +99,7 @@
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
             <scope>test</scope>
-            <version>2.4.0</version>
+            <version>${json-path.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -126,7 +126,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.5</version>
+            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -283,6 +283,13 @@
         <poi.version>3.16-beta1</poi.version>
 
         <javax.el.version>3.0.1-b09</javax.el.version>
+        <javax.version>4.0.1</javax.version>
+        <javax-servlet-api.version>2.3.3</javax-servlet-api.version>
+        <aspectjrt.version>1.9.1</aspectjrt.version>
+        <aspectjweaver.version>1.9.1</aspectjweaver.version>
+        <htmlunit.version>2.32</htmlunit.version>
+        <json-path.version>2.4.0</json-path.version>
+        <gson.version>2.8.5</gson.version>
         <start-class>com.baeldung.SpringMVCApplication</start-class>
     </properties>
 
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
index 1f6181a365..20680d5880 100644
--- a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
+++ b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.caucho</groupId>
             <artifactId>hessian</artifactId>
-            <version>4.0.38</version>
+            <version>${hessian.version}</version>
         </dependency>
 
         <!-- test -->
@@ -58,5 +58,8 @@
         </dependency>
         <!-- test -->
     </dependencies>
+    <properties>
+        <hessian.version>4.0.38</hessian.version>
+    </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-rest-hal-browser/pom.xml b/spring-rest-hal-browser/pom.xml
index 94ce837b27..adef8bf2b0 100644
--- a/spring-rest-hal-browser/pom.xml
+++ b/spring-rest-hal-browser/pom.xml
@@ -19,25 +19,25 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.0.3.RELEASE</version>
+            <version>${spring-boot.version}</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-jpa -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>2.0.3.RELEASE</version>
+            <version>${spring-boot.version}</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.springframework.data/spring-data-rest-hal-browser -->
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-rest-hal-browser</artifactId>
-            <version>3.0.8.RELEASE</version>
+            <version>${spring-data.version}</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.197</version>
+            <version>${h2.version}</version>
         </dependency>
     </dependencies>
 
@@ -47,11 +47,19 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>${source.version}</source>
+                    <target>${target.version}</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
+    <properties>
+        <spring-boot.version>2.0.3.RELEASE</spring-boot.version>
+        <spring-data.version>3.0.8.RELEASE</spring-data.version>
+        <h2.version>1.4.197</h2.version>
+        <source.version>1.8</source.version>
+        <target.version>1.8</target.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spring-resttemplate/pom.xml b/spring-resttemplate/pom.xml
index 0b5d0b20d0..138fde3b45 100644
--- a/spring-resttemplate/pom.xml
+++ b/spring-resttemplate/pom.xml
@@ -125,7 +125,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit.version}</version>
         </dependency>
 
         <dependency>
@@ -162,10 +162,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>${maven.version}</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>${source.version}</source>
+                    <target>${target.version}</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -308,6 +308,10 @@
         <!-- okhttp -->
         <com.squareup.okhttp3.version>3.4.1</com.squareup.okhttp3.version>
         <pact.version>3.5.11</pact.version>
+        <source.version>1.8</source.version>
+        <target.version>1.8</target.version>
+        <junit.version>4.12</junit.version>
+        <maven.version>3.7.0</maven.version>
     </properties>
 
 </project>

From f342d284028375ecc1b538349a29be0e1194c351 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Tue, 24 Dec 2019 13:08:05 +0100
Subject: [PATCH 081/106] BAEL-20537: Migrate tensorflow-java module to the
 com.baeldung package

---
 .../java/{org => com}/baeldung/tensorflow/TensorflowGraph.java  | 2 +-
 .../{org => com}/baeldung/tensorflow/TensorflowSavedModel.java  | 2 +-
 .../baeldung/tensorflow/TensorflowGraphUnitTest.java            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename tensorflow-java/src/main/java/{org => com}/baeldung/tensorflow/TensorflowGraph.java (98%)
 rename tensorflow-java/src/main/java/{org => com}/baeldung/tensorflow/TensorflowSavedModel.java (93%)
 rename tensorflow-java/src/test/java/{org => com}/baeldung/tensorflow/TensorflowGraphUnitTest.java (92%)

diff --git a/tensorflow-java/src/main/java/org/baeldung/tensorflow/TensorflowGraph.java b/tensorflow-java/src/main/java/com/baeldung/tensorflow/TensorflowGraph.java
similarity index 98%
rename from tensorflow-java/src/main/java/org/baeldung/tensorflow/TensorflowGraph.java
rename to tensorflow-java/src/main/java/com/baeldung/tensorflow/TensorflowGraph.java
index a44ef4c4ee..5d9a85a491 100644
--- a/tensorflow-java/src/main/java/org/baeldung/tensorflow/TensorflowGraph.java
+++ b/tensorflow-java/src/main/java/com/baeldung/tensorflow/TensorflowGraph.java
@@ -1,4 +1,4 @@
-package org.baeldung.tensorflow;
+package com.baeldung.tensorflow;
 
 import org.tensorflow.DataType;
 import org.tensorflow.Graph;
diff --git a/tensorflow-java/src/main/java/org/baeldung/tensorflow/TensorflowSavedModel.java b/tensorflow-java/src/main/java/com/baeldung/tensorflow/TensorflowSavedModel.java
similarity index 93%
rename from tensorflow-java/src/main/java/org/baeldung/tensorflow/TensorflowSavedModel.java
rename to tensorflow-java/src/main/java/com/baeldung/tensorflow/TensorflowSavedModel.java
index 4259a787e8..96a063dff2 100644
--- a/tensorflow-java/src/main/java/org/baeldung/tensorflow/TensorflowSavedModel.java
+++ b/tensorflow-java/src/main/java/com/baeldung/tensorflow/TensorflowSavedModel.java
@@ -1,4 +1,4 @@
-package org.baeldung.tensorflow;
+package com.baeldung.tensorflow;
 
 import org.tensorflow.SavedModelBundle;
 import org.tensorflow.Tensor;
diff --git a/tensorflow-java/src/test/java/org/baeldung/tensorflow/TensorflowGraphUnitTest.java b/tensorflow-java/src/test/java/com/baeldung/tensorflow/TensorflowGraphUnitTest.java
similarity index 92%
rename from tensorflow-java/src/test/java/org/baeldung/tensorflow/TensorflowGraphUnitTest.java
rename to tensorflow-java/src/test/java/com/baeldung/tensorflow/TensorflowGraphUnitTest.java
index 51df6a4322..c2799a4bb1 100644
--- a/tensorflow-java/src/test/java/org/baeldung/tensorflow/TensorflowGraphUnitTest.java
+++ b/tensorflow-java/src/test/java/com/baeldung/tensorflow/TensorflowGraphUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.tensorflow;
+package com.baeldung.tensorflow;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

From c4fc1b9aefac65b254927216091dc5b4341ef930 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Tue, 24 Dec 2019 13:13:41 +0100
Subject: [PATCH 082/106] BAEL-20537: Migrate guava-* modules to the
 com.baeldung package

---
 .../test/java/{org => com}/baeldung/guava/GuavaMapFromSet.java  | 2 +-
 .../{org => com}/baeldung/guava/GuavaMapFromSetUnitTest.java    | 2 +-
 .../java/{org => com}/baeldung/guava/GuavaMultiSetUnitTest.java | 2 +-
 .../java/{org => com}/baeldung/guava/GuavaRangeSetUnitTest.java | 2 +-
 .../{org => com}/baeldung/guava/GuavaSetOperationsUnitTest.java | 2 +-
 .../com/baeldung/guava/GuavaCountingOutputStreamUnitTest.java   | 2 +-
 .../src/main/test/java/com/baeldung/guava/GuavaIOUnitTest.java  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename guava-collections-set/src/test/java/{org => com}/baeldung/guava/GuavaMapFromSet.java (98%)
 rename guava-collections-set/src/test/java/{org => com}/baeldung/guava/GuavaMapFromSetUnitTest.java (98%)
 rename guava-collections-set/src/test/java/{org => com}/baeldung/guava/GuavaMultiSetUnitTest.java (99%)
 rename guava-collections-set/src/test/java/{org => com}/baeldung/guava/GuavaRangeSetUnitTest.java (99%)
 rename guava-collections-set/src/test/java/{org => com}/baeldung/guava/GuavaSetOperationsUnitTest.java (99%)

diff --git a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java b/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSet.java
similarity index 98%
rename from guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
rename to guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSet.java
index f474fcb17b..d2c772080d 100644
--- a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
+++ b/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSet.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.base.Function;
 
diff --git a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSetUnitTest.java b/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSetUnitTest.java
similarity index 98%
rename from guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSetUnitTest.java
rename to guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSetUnitTest.java
index 03f2d8f891..71a526601b 100644
--- a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMapFromSetUnitTest.java
+++ b/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSetUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.base.Function;
 import org.junit.Test;
diff --git a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMultiSetUnitTest.java b/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMultiSetUnitTest.java
similarity index 99%
rename from guava-collections-set/src/test/java/org/baeldung/guava/GuavaMultiSetUnitTest.java
rename to guava-collections-set/src/test/java/com/baeldung/guava/GuavaMultiSetUnitTest.java
index e74db29881..dc1489f7ea 100644
--- a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaMultiSetUnitTest.java
+++ b/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMultiSetUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Multiset;
diff --git a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java b/guava-collections-set/src/test/java/com/baeldung/guava/GuavaRangeSetUnitTest.java
similarity index 99%
rename from guava-collections-set/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java
rename to guava-collections-set/src/test/java/com/baeldung/guava/GuavaRangeSetUnitTest.java
index edefc61fc4..bd9aa09941 100644
--- a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java
+++ b/guava-collections-set/src/test/java/com/baeldung/guava/GuavaRangeSetUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.collect.ImmutableRangeSet;
 import com.google.common.collect.Range;
diff --git a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java b/guava-collections-set/src/test/java/com/baeldung/guava/GuavaSetOperationsUnitTest.java
similarity index 99%
rename from guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java
rename to guava-collections-set/src/test/java/com/baeldung/guava/GuavaSetOperationsUnitTest.java
index dfd90ad738..eaa6d8a832 100644
--- a/guava-collections-set/src/test/java/org/baeldung/guava/GuavaSetOperationsUnitTest.java
+++ b/guava-collections-set/src/test/java/com/baeldung/guava/GuavaSetOperationsUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
diff --git a/guava-io/src/main/test/java/com/baeldung/guava/GuavaCountingOutputStreamUnitTest.java b/guava-io/src/main/test/java/com/baeldung/guava/GuavaCountingOutputStreamUnitTest.java
index 7293b1631e..5d846933f9 100644
--- a/guava-io/src/main/test/java/com/baeldung/guava/GuavaCountingOutputStreamUnitTest.java
+++ b/guava-io/src/main/test/java/com/baeldung/guava/GuavaCountingOutputStreamUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/guava-io/src/main/test/java/com/baeldung/guava/GuavaIOUnitTest.java b/guava-io/src/main/test/java/com/baeldung/guava/GuavaIOUnitTest.java
index 4a827dfbc0..7d7b0ea04d 100644
--- a/guava-io/src/main/test/java/com/baeldung/guava/GuavaIOUnitTest.java
+++ b/guava-io/src/main/test/java/com/baeldung/guava/GuavaIOUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import static org.hamcrest.Matchers.contains;
 import static org.junit.Assert.assertEquals;

From a31800fbb7a13487f828c49bdf94211db052e887 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Tue, 24 Dec 2019 13:20:50 +0100
Subject: [PATCH 083/106] BAEL-20537: Migrate to the com.baeldung package

---
 .../baeldung/java/io/remote/SftpFileTransferLiveTest.java     | 2 +-
 .../src/main/java/com/baeldung/enforcer/MyCustomRule.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename libraries-io/src/test/java/{org => com}/baeldung/java/io/remote/SftpFileTransferLiveTest.java (99%)

diff --git a/libraries-io/src/test/java/org/baeldung/java/io/remote/SftpFileTransferLiveTest.java b/libraries-io/src/test/java/com/baeldung/java/io/remote/SftpFileTransferLiveTest.java
similarity index 99%
rename from libraries-io/src/test/java/org/baeldung/java/io/remote/SftpFileTransferLiveTest.java
rename to libraries-io/src/test/java/com/baeldung/java/io/remote/SftpFileTransferLiveTest.java
index 192153bc90..5846128082 100644
--- a/libraries-io/src/test/java/org/baeldung/java/io/remote/SftpFileTransferLiveTest.java
+++ b/libraries-io/src/test/java/com/baeldung/java/io/remote/SftpFileTransferLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java.io.remote;
+package com.baeldung.java.io.remote;
 
 import java.io.IOException;
 
diff --git a/maven-all/maven/custom-rule/src/main/java/com/baeldung/enforcer/MyCustomRule.java b/maven-all/maven/custom-rule/src/main/java/com/baeldung/enforcer/MyCustomRule.java
index 9b72f40bf1..db636c2308 100644
--- a/maven-all/maven/custom-rule/src/main/java/com/baeldung/enforcer/MyCustomRule.java
+++ b/maven-all/maven/custom-rule/src/main/java/com/baeldung/enforcer/MyCustomRule.java
@@ -19,8 +19,8 @@ public class MyCustomRule implements EnforcerRule {
 
             String groupId = (String) enforcerRuleHelper.evaluate("${project.groupId}");
 
-            if (groupId == null || !groupId.startsWith("org.baeldung")) {
-                throw new EnforcerRuleException("Project group id does not start with org.baeldung");
+            if (groupId == null || !groupId.startsWith("com.baeldung")) {
+                throw new EnforcerRuleException("Project group id does not start with com.baeldung");
             }
 
         }

From 6fd77ddd65baf80edc8df2464cd1cc268c3bbcd7 Mon Sep 17 00:00:00 2001
From: sumit-bhawsar <56178733+sumit-bhawsar@users.noreply.github.com>
Date: Tue, 24 Dec 2019 17:03:31 +0000
Subject: [PATCH 084/106] Bael 3512-difference between logical and bitwise &
 (#8203)

* BAEL-3512 unit tests for Bitwise and Logical AND operators

* BAEL-3512 readme.md is updated and added new tests for bitwise & with booleans

* BAEL-3512 updated variables names to more meaningful names

* BAEL-3512 added example for short circuit
---
 .../core-java-lang-operators/README.md        |  1 +
 ...BitwiseAndLogicalANDOperatorsUnitTest.java | 71 +++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/andoperators/BitwiseAndLogicalANDOperatorsUnitTest.java

diff --git a/core-java-modules/core-java-lang-operators/README.md b/core-java-modules/core-java-lang-operators/README.md
index 1fe524948c..3af2c8885b 100644
--- a/core-java-modules/core-java-lang-operators/README.md
+++ b/core-java-modules/core-java-lang-operators/README.md
@@ -11,4 +11,5 @@ This module contains articles about Java operators
 - [Java Compound Operators](https://www.baeldung.com/java-compound-operators)
 - [The XOR Operator in Java](https://www.baeldung.com/java-xor-operator)
 - [Java Bitwise Operators](https://www.baeldung.com/java-bitwise-operators)
+- [Bitwise & vs Logical && Operators](https://www.baeldung.com/bitwise-vs-logical-operators/)
 
diff --git a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/andoperators/BitwiseAndLogicalANDOperatorsUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/andoperators/BitwiseAndLogicalANDOperatorsUnitTest.java
new file mode 100644
index 0000000000..6158c2870d
--- /dev/null
+++ b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/andoperators/BitwiseAndLogicalANDOperatorsUnitTest.java
@@ -0,0 +1,71 @@
+package com.baeldung.andoperators;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.*;
+
+public class BitwiseAndLogicalANDOperatorsUnitTest {
+
+    @Test
+    public void givenTwoTrueBooleans_whenBitwiseAndOperator_thenTrue() {
+        boolean trueBool = true;
+        boolean anotherTrueBool = true;
+        boolean trueANDTrue = trueBool & anotherTrueBool;
+        assertTrue(trueANDTrue);
+    }
+
+    @Test
+    public void givenOneFalseAndOneTrueBooleans_whenBitwiseAndOperator_thenFalse() {
+        boolean trueBool = true;
+        boolean falseBool = false;
+        boolean trueANDFalse = trueBool & falseBool;
+        assertFalse(trueANDFalse);
+    }
+
+    @Test
+    public void givenTwoFalseBooleans_whenBitwiseAndOperator_thenFalse() {
+        boolean falseBool = false;
+        boolean anotherFalseBool = false;
+        boolean falseANDFalse = falseBool & anotherFalseBool;
+        assertFalse(falseANDFalse);
+    }
+
+    @Test
+    public void givenTwoIntegers_whenBitwiseAndOperator_thenNewDecimalNumber() {
+        int six = 6;
+        int five = 5;
+        int shouldBeFour = six & five;
+        assertEquals(4, shouldBeFour);
+    }
+
+    @Test
+    public void givenTwoTrueBooleans_whenLogicalAndOperator_thenTrue() {
+        boolean trueBool = true;
+        boolean anotherTrueBool = true;
+        boolean trueANDTrue = trueBool && anotherTrueBool;
+        assertTrue(trueANDTrue);
+    }
+
+    @Test
+    public void givenOneFalseAndOneTrueBooleans_whenLogicalAndOperator_thenFalse() {
+        boolean trueBool = true;
+        boolean falseBool = false;
+        boolean trueANDFalse = trueBool && falseBool;
+        assertFalse(trueANDFalse);
+    }
+
+    @Test
+    public void givenTwoFalseBooleans_whenLogicalAndOperator_thenFalse() {
+        boolean falseBool = false;
+        boolean anotherFalseBool = false;
+        boolean falseANDFalse = falseBool && anotherFalseBool;
+        assertFalse(falseANDFalse);
+    }
+
+    @Test
+    public void givenTwoFalseExpressions_whenLogicalAndOperator_thenShortCircuitFalse() {
+        boolean shortCircuitResult = (2<1) && (4<5);
+        assertFalse(shortCircuitResult);
+    }
+
+}

From 04f9c4888e8857077cf2714280bae943bd89ce63 Mon Sep 17 00:00:00 2001
From: Gerardo Roza <rozagerardo@gmail.com>
Date: Thu, 26 Dec 2019 12:06:02 -0300
Subject: [PATCH 085/106] renamed
 spring-security-modules/spring-security-openid to
 spring-security-modules/spring-security-oidc

---
 .gitignore                                                  | 1 -
 pom.xml                                                     | 2 +-
 .../README.md                                               | 0
 .../pom.xml                                                 | 6 +++---
 .../oidc/discovery/SpringOidcDiscoveryApplication.java      | 0
 .../oidc/discovery/web/controllers/UserRestController.java  | 0
 .../openid/oidc/login/SpringOidcLoginApplication.java       | 0
 .../openid/oidc/login/config/OAuth2LoginSecurityConfig.java | 0
 .../com/baeldung/openid/oidc/login/service/UserService.java | 0
 .../oidc/login/web/controllers/UserRestController.java      | 0
 .../SpringOidcSessionManagementApplication.java             | 0
 .../config/OAuth2SessionManagementSecurityConfig.java       | 0
 .../web/controllers/HomeRestController.java                 | 0
 .../web/controllers/UserRestController.java                 | 0
 .../baeldung/openid/oidc/utils/YamlLoaderInitializer.java   | 0
 .../src/main/resources/application.yml                      | 0
 .../src/main/resources/discovery-application.yml            | 0
 .../src/main/resources/login-application.yml                | 0
 .../src/main/resources/sessionmanagement-application.yml    | 0
 .../baeldung/openid/oidc/discovery/SpringContextTest.java   | 0
 .../com/baeldung/openid/oidc/login/SpringContextTest.java   | 0
 .../openid/oidc/sessionmanagement/SpringContextTest.java    | 0
 22 files changed, 4 insertions(+), 5 deletions(-)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/README.md (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/pom.xml (86%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/java/com/baeldung/openid/oidc/discovery/web/controllers/UserRestController.java (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/java/com/baeldung/openid/oidc/login/SpringOidcLoginApplication.java (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/java/com/baeldung/openid/oidc/login/service/UserService.java (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/java/com/baeldung/openid/oidc/login/web/controllers/UserRestController.java (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/java/com/baeldung/openid/oidc/sessionmanagement/SpringOidcSessionManagementApplication.java (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/HomeRestController.java (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/UserRestController.java (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/java/com/baeldung/openid/oidc/utils/YamlLoaderInitializer.java (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/resources/application.yml (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/resources/discovery-application.yml (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/resources/login-application.yml (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/main/resources/sessionmanagement-application.yml (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/test/java/com/baeldung/openid/oidc/discovery/SpringContextTest.java (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/test/java/com/baeldung/openid/oidc/login/SpringContextTest.java (100%)
 rename spring-security-modules/{spring-security-openid => spring-security-oidc}/src/test/java/com/baeldung/openid/oidc/sessionmanagement/SpringContextTest.java (100%)

diff --git a/.gitignore b/.gitignore
index 349efbcb67..9c100eaded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,6 @@ target/
 spring-openid/src/main/resources/application.properties
 .recommenders/
 /spring-hibernate4/nbproject/
-spring-security-openid/src/main/resources/application.properties
 
 spring-all/*.log
 
diff --git a/pom.xml b/pom.xml
index cfb3fe1889..1ee50933db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -830,7 +830,7 @@
                 <module>spring-security-modules/spring-security-mvc-login</module>
                 <module>spring-security-modules/spring-security-mvc-persisted-remember-me</module>
                 <module>spring-security-modules/spring-security-mvc-socket</module>
-                <module>spring-security-modules/spring-security-openid</module>
+                <module>spring-security-modules/spring-security-oidc</module>
                 <!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
                 <module>spring-security-modules/spring-security-rest</module>
                 <module>spring-security-modules/spring-security-rest-basic-auth</module>
diff --git a/spring-security-modules/spring-security-openid/README.md b/spring-security-modules/spring-security-oidc/README.md
similarity index 100%
rename from spring-security-modules/spring-security-openid/README.md
rename to spring-security-modules/spring-security-oidc/README.md
diff --git a/spring-security-modules/spring-security-openid/pom.xml b/spring-security-modules/spring-security-oidc/pom.xml
similarity index 86%
rename from spring-security-modules/spring-security-openid/pom.xml
rename to spring-security-modules/spring-security-oidc/pom.xml
index a8637df865..91e4641450 100644
--- a/spring-security-modules/spring-security-openid/pom.xml
+++ b/spring-security-modules/spring-security-oidc/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>spring-security-openid</artifactId>
-    <name>spring-security-openid</name>
+    <artifactId>spring-security-oidc</artifactId>
+    <name>spring-security-oidc</name>
     <packaging>war</packaging>
-    <description>Spring OpenID sample project</description>
+    <description>Spring OpenID Connect sample project</description>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/web/controllers/UserRestController.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/discovery/web/controllers/UserRestController.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/web/controllers/UserRestController.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/discovery/web/controllers/UserRestController.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/SpringOidcLoginApplication.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/SpringOidcLoginApplication.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/SpringOidcLoginApplication.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/SpringOidcLoginApplication.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/service/UserService.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/service/UserService.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/service/UserService.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/service/UserService.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/web/controllers/UserRestController.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/web/controllers/UserRestController.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/web/controllers/UserRestController.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/web/controllers/UserRestController.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/SpringOidcSessionManagementApplication.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/SpringOidcSessionManagementApplication.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/SpringOidcSessionManagementApplication.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/SpringOidcSessionManagementApplication.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/HomeRestController.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/HomeRestController.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/HomeRestController.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/HomeRestController.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/UserRestController.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/UserRestController.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/UserRestController.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/UserRestController.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/utils/YamlLoaderInitializer.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/utils/YamlLoaderInitializer.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/utils/YamlLoaderInitializer.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/utils/YamlLoaderInitializer.java
diff --git a/spring-security-modules/spring-security-openid/src/main/resources/application.yml b/spring-security-modules/spring-security-oidc/src/main/resources/application.yml
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/resources/application.yml
rename to spring-security-modules/spring-security-oidc/src/main/resources/application.yml
diff --git a/spring-security-modules/spring-security-openid/src/main/resources/discovery-application.yml b/spring-security-modules/spring-security-oidc/src/main/resources/discovery-application.yml
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/resources/discovery-application.yml
rename to spring-security-modules/spring-security-oidc/src/main/resources/discovery-application.yml
diff --git a/spring-security-modules/spring-security-openid/src/main/resources/login-application.yml b/spring-security-modules/spring-security-oidc/src/main/resources/login-application.yml
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/resources/login-application.yml
rename to spring-security-modules/spring-security-oidc/src/main/resources/login-application.yml
diff --git a/spring-security-modules/spring-security-openid/src/main/resources/sessionmanagement-application.yml b/spring-security-modules/spring-security-oidc/src/main/resources/sessionmanagement-application.yml
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/resources/sessionmanagement-application.yml
rename to spring-security-modules/spring-security-oidc/src/main/resources/sessionmanagement-application.yml
diff --git a/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/discovery/SpringContextTest.java b/spring-security-modules/spring-security-oidc/src/test/java/com/baeldung/openid/oidc/discovery/SpringContextTest.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/discovery/SpringContextTest.java
rename to spring-security-modules/spring-security-oidc/src/test/java/com/baeldung/openid/oidc/discovery/SpringContextTest.java
diff --git a/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/login/SpringContextTest.java b/spring-security-modules/spring-security-oidc/src/test/java/com/baeldung/openid/oidc/login/SpringContextTest.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/login/SpringContextTest.java
rename to spring-security-modules/spring-security-oidc/src/test/java/com/baeldung/openid/oidc/login/SpringContextTest.java
diff --git a/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/sessionmanagement/SpringContextTest.java b/spring-security-modules/spring-security-oidc/src/test/java/com/baeldung/openid/oidc/sessionmanagement/SpringContextTest.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/sessionmanagement/SpringContextTest.java
rename to spring-security-modules/spring-security-oidc/src/test/java/com/baeldung/openid/oidc/sessionmanagement/SpringContextTest.java

From 1973c49acbbe09a67a9b1730b8e335a5e4ab54e6 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Thu, 26 Dec 2019 22:36:10 +0100
Subject: [PATCH 086/106] BAEL-3674: Remove the broken test

---
 .../datetime/sql/TimestampUtilsUnitTest.java        | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/TimestampUtilsUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/TimestampUtilsUnitTest.java
index 2faf8fab0e..836d0d55e7 100644
--- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/TimestampUtilsUnitTest.java
+++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/TimestampUtilsUnitTest.java
@@ -1,22 +1,13 @@
 package com.baeldung.datetime.sql;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Test;
 
-import com.baeldung.datetime.sql.TimestampUtils;
-
 import java.text.ParseException;
-import java.util.Date;
+
+import static org.junit.Assert.assertEquals;
 
 public class TimestampUtilsUnitTest {
 
-    @Test
-    public void givenCurrentTimestamp_thenNowIsReturned() {
-        assertEquals(TimestampUtils.getNow()
-            .getTime(), new Date().getTime());
-    }
-
     @Test(expected = IllegalArgumentException.class)
     public void givenTimestampAsString_whenPatternIsNotRespected_thenExceptionIsThrown() {
         TimestampUtils.getTimestamp("2020/01/01 10:11-12");

From 123a5cfd55e11ba1679cb46b6fc554f64c2cbf27 Mon Sep 17 00:00:00 2001
From: "amit.pandey" <amit.pandey2103@gmail.com>
Date: Fri, 27 Dec 2019 12:48:31 +0530
Subject: [PATCH 087/106] renamed the package name

---
 spring-boot-mvc/pom.xml                                     | 6 ------
 .../MySQLAutoconfiguration.java                             | 2 +-
 .../src/test/java/org/baeldung/SpringContextLiveTest.java   | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)
 rename spring-boot-mvc/src/main/java/com/baeldung/{autoconfiguration => springbootannotations}/MySQLAutoconfiguration.java (99%)

diff --git a/spring-boot-mvc/pom.xml b/spring-boot-mvc/pom.xml
index c03a8e04ac..77b1c09605 100644
--- a/spring-boot-mvc/pom.xml
+++ b/spring-boot-mvc/pom.xml
@@ -97,12 +97,6 @@
             <version>${spring.fox.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-jasper</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <!-- AOP -->
         <dependency>
             <groupId>org.aspectj</groupId>
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/autoconfiguration/MySQLAutoconfiguration.java b/spring-boot-mvc/src/main/java/com/baeldung/springbootannotations/MySQLAutoconfiguration.java
similarity index 99%
rename from spring-boot-mvc/src/main/java/com/baeldung/autoconfiguration/MySQLAutoconfiguration.java
rename to spring-boot-mvc/src/main/java/com/baeldung/springbootannotations/MySQLAutoconfiguration.java
index 295e0d74c9..62b1329a54 100644
--- a/spring-boot-mvc/src/main/java/com/baeldung/autoconfiguration/MySQLAutoconfiguration.java
+++ b/spring-boot-mvc/src/main/java/com/baeldung/springbootannotations/MySQLAutoconfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.autoconfiguration;
+package com.baeldung.springbootannotations;
 
 import java.util.Arrays;
 import java.util.Properties;
diff --git a/spring-boot-mvc/src/test/java/org/baeldung/SpringContextLiveTest.java b/spring-boot-mvc/src/test/java/org/baeldung/SpringContextLiveTest.java
index d3ced53483..069dd41b8d 100644
--- a/spring-boot-mvc/src/test/java/org/baeldung/SpringContextLiveTest.java
+++ b/spring-boot-mvc/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -6,7 +6,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-import com.baeldung.autoconfiguration.MySQLAutoconfiguration;
+import com.baeldung.springbootannotations.MySQLAutoconfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MySQLAutoconfiguration.class)

From b3ec0955bbbe81f046e5147dc3a754bbc55f0caa Mon Sep 17 00:00:00 2001
From: "amit.pandey" <amit.pandey2103@gmail.com>
Date: Fri, 27 Dec 2019 13:32:29 +0530
Subject: [PATCH 088/106] rename package name

---
 .../com/baeldung/modelmapper/service/IUserService.java |  9 ---------
 .../controller/PostRestController.java                 | 10 +++++-----
 .../{modelmapper => springpagination}/dto/PostDto.java |  2 +-
 .../{modelmapper => springpagination}/dto/UserDto.java |  2 +-
 .../{modelmapper => springpagination}/model/Post.java  |  2 +-
 .../model/Preference.java                              |  2 +-
 .../model/Subject.java                                 |  2 +-
 .../{modelmapper => springpagination}/model/User.java  |  2 +-
 .../repository/PostRepository.java                     |  6 +++---
 .../repository/SubjectRepository.java                  |  4 ++--
 .../service/IPostService.java                          |  4 ++--
 .../springpagination/service/IUserService.java         |  9 +++++++++
 .../service/PostService.java                           |  6 +++---
 .../service/UserService.java                           |  6 +++---
 .../PostDtoUnitTest.java                               |  6 +++---
 15 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 spring-boot-rest/src/main/java/com/baeldung/modelmapper/service/IUserService.java
 rename spring-boot-rest/src/main/java/com/baeldung/{modelmapper => springpagination}/controller/PostRestController.java (91%)
 rename spring-boot-rest/src/main/java/com/baeldung/{modelmapper => springpagination}/dto/PostDto.java (96%)
 rename spring-boot-rest/src/main/java/com/baeldung/{modelmapper => springpagination}/dto/UserDto.java (80%)
 rename spring-boot-rest/src/main/java/com/baeldung/{modelmapper => springpagination}/model/Post.java (97%)
 rename spring-boot-rest/src/main/java/com/baeldung/{modelmapper => springpagination}/model/Preference.java (92%)
 rename spring-boot-rest/src/main/java/com/baeldung/{modelmapper => springpagination}/model/Subject.java (93%)
 rename spring-boot-rest/src/main/java/com/baeldung/{modelmapper => springpagination}/model/User.java (94%)
 rename spring-boot-rest/src/main/java/com/baeldung/{modelmapper => springpagination}/repository/PostRepository.java (82%)
 rename spring-boot-rest/src/main/java/com/baeldung/{modelmapper => springpagination}/repository/SubjectRepository.java (83%)
 rename spring-boot-rest/src/main/java/com/baeldung/{modelmapper => springpagination}/service/IPostService.java (71%)
 create mode 100644 spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IUserService.java
 rename spring-boot-rest/src/main/java/com/baeldung/{modelmapper => springpagination}/service/PostService.java (87%)
 rename spring-boot-rest/src/main/java/com/baeldung/{modelmapper => springpagination}/service/UserService.java (75%)
 rename spring-boot-rest/src/test/java/com/baeldung/{modelmapper => springpagination}/PostDtoUnitTest.java (89%)

diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/service/IUserService.java b/spring-boot-rest/src/main/java/com/baeldung/modelmapper/service/IUserService.java
deleted file mode 100644
index 79934114c1..0000000000
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/service/IUserService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.baeldung.modelmapper.service;
-
-import com.baeldung.modelmapper.model.User;
-
-public interface IUserService {
-
-    User getCurrentUser();
-
-}
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/controller/PostRestController.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/controller/PostRestController.java
similarity index 91%
rename from spring-boot-rest/src/main/java/com/baeldung/modelmapper/controller/PostRestController.java
rename to spring-boot-rest/src/main/java/com/baeldung/springpagination/controller/PostRestController.java
index e2def62466..c52960b365 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/controller/PostRestController.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/controller/PostRestController.java
@@ -1,9 +1,9 @@
-package com.baeldung.modelmapper.controller;
+package com.baeldung.springpagination.controller;
 
-import com.baeldung.modelmapper.dto.PostDto;
-import com.baeldung.modelmapper.model.Post;
-import com.baeldung.modelmapper.service.IPostService;
-import com.baeldung.modelmapper.service.IUserService;
+import com.baeldung.springpagination.dto.PostDto;
+import com.baeldung.springpagination.model.Post;
+import com.baeldung.springpagination.service.IPostService;
+import com.baeldung.springpagination.service.IUserService;
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/dto/PostDto.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/PostDto.java
similarity index 96%
rename from spring-boot-rest/src/main/java/com/baeldung/modelmapper/dto/PostDto.java
rename to spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/PostDto.java
index 6fe2b23888..81cec5ed8c 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/dto/PostDto.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/PostDto.java
@@ -1,4 +1,4 @@
-package com.baeldung.modelmapper.dto;
+package com.baeldung.springpagination.dto;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/dto/UserDto.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/UserDto.java
similarity index 80%
rename from spring-boot-rest/src/main/java/com/baeldung/modelmapper/dto/UserDto.java
rename to spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/UserDto.java
index 23110ecbaa..2e4f667b30 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/dto/UserDto.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/UserDto.java
@@ -1,4 +1,4 @@
-package com.baeldung.modelmapper.dto;
+package com.baeldung.springpagination.dto;
 
 public class UserDto {
 
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Post.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Post.java
similarity index 97%
rename from spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Post.java
rename to spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Post.java
index be65ce34a2..88e9ef67bb 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Post.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Post.java
@@ -1,4 +1,4 @@
-package com.baeldung.modelmapper.model;
+package com.baeldung.springpagination.model;
 
 import java.util.Date;
 
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Preference.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Preference.java
similarity index 92%
rename from spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Preference.java
rename to spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Preference.java
index 0ab5b1eddf..44f8f41aff 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Preference.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Preference.java
@@ -1,4 +1,4 @@
-package com.baeldung.modelmapper.model;
+package com.baeldung.springpagination.model;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Subject.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Subject.java
similarity index 93%
rename from spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Subject.java
rename to spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Subject.java
index 9efa449dfe..80598ae07d 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Subject.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Subject.java
@@ -1,4 +1,4 @@
-package com.baeldung.modelmapper.model;
+package com.baeldung.springpagination.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/User.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/User.java
similarity index 94%
rename from spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/User.java
rename to spring-boot-rest/src/main/java/com/baeldung/springpagination/model/User.java
index a458b26f4a..4d33834b28 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/User.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/User.java
@@ -1,4 +1,4 @@
-package com.baeldung.modelmapper.model;
+package com.baeldung.springpagination.model;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/repository/PostRepository.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/PostRepository.java
similarity index 82%
rename from spring-boot-rest/src/main/java/com/baeldung/modelmapper/repository/PostRepository.java
rename to spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/PostRepository.java
index fc3f5733c3..acdc01df94 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/repository/PostRepository.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/PostRepository.java
@@ -1,4 +1,4 @@
-package com.baeldung.modelmapper.repository;
+package com.baeldung.springpagination.repository;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -7,8 +7,8 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
 
-import com.baeldung.modelmapper.model.Post;
-import com.baeldung.modelmapper.model.User;
+import com.baeldung.springpagination.model.Post;
+import com.baeldung.springpagination.model.User;
 
 public interface PostRepository extends JpaRepository<Post, Long>, PagingAndSortingRepository<Post, Long> {
 
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/repository/SubjectRepository.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/SubjectRepository.java
similarity index 83%
rename from spring-boot-rest/src/main/java/com/baeldung/modelmapper/repository/SubjectRepository.java
rename to spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/SubjectRepository.java
index ddbf3334ec..03c66f8d72 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/repository/SubjectRepository.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/SubjectRepository.java
@@ -1,4 +1,4 @@
-package com.baeldung.modelmapper.repository;
+package com.baeldung.springpagination.repository;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -6,7 +6,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.rest.core.annotation.RestResource;
 
-import com.baeldung.modelmapper.model.Subject;
+import com.baeldung.springpagination.model.Subject;
 
 public interface SubjectRepository extends PagingAndSortingRepository<Subject, Long> {
 
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/service/IPostService.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IPostService.java
similarity index 71%
rename from spring-boot-rest/src/main/java/com/baeldung/modelmapper/service/IPostService.java
rename to spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IPostService.java
index 0182a0da41..d1d9bee2c6 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/service/IPostService.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IPostService.java
@@ -1,8 +1,8 @@
-package com.baeldung.modelmapper.service;
+package com.baeldung.springpagination.service;
 
 import java.util.List;
 
-import com.baeldung.modelmapper.model.Post;
+import com.baeldung.springpagination.model.Post;
 
 public interface IPostService {
 
diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IUserService.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IUserService.java
new file mode 100644
index 0000000000..92dce3ed78
--- /dev/null
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IUserService.java
@@ -0,0 +1,9 @@
+package com.baeldung.springpagination.service;
+
+import com.baeldung.springpagination.model.User;
+
+public interface IUserService {
+
+    User getCurrentUser();
+
+}
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/service/PostService.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/PostService.java
similarity index 87%
rename from spring-boot-rest/src/main/java/com/baeldung/modelmapper/service/PostService.java
rename to spring-boot-rest/src/main/java/com/baeldung/springpagination/service/PostService.java
index 5980c30837..bb4869dd33 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/service/PostService.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/PostService.java
@@ -1,4 +1,4 @@
-package com.baeldung.modelmapper.service;
+package com.baeldung.springpagination.service;
 
 import java.util.List;
 
@@ -8,8 +8,8 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
-import com.baeldung.modelmapper.model.Post;
-import com.baeldung.modelmapper.repository.PostRepository;
+import com.baeldung.springpagination.model.Post;
+import com.baeldung.springpagination.repository.PostRepository;
 
 @Service
 public class PostService implements IPostService {
diff --git a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/service/UserService.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/UserService.java
similarity index 75%
rename from spring-boot-rest/src/main/java/com/baeldung/modelmapper/service/UserService.java
rename to spring-boot-rest/src/main/java/com/baeldung/springpagination/service/UserService.java
index e445f836a4..0694450f44 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/modelmapper/service/UserService.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/UserService.java
@@ -1,9 +1,9 @@
-package com.baeldung.modelmapper.service;
+package com.baeldung.springpagination.service;
 
 import org.springframework.stereotype.Service;
 
-import com.baeldung.modelmapper.model.Preference;
-import com.baeldung.modelmapper.model.User;
+import com.baeldung.springpagination.model.Preference;
+import com.baeldung.springpagination.model.User;
 
 @Service
 public class UserService implements IUserService {
diff --git a/spring-boot-rest/src/test/java/com/baeldung/modelmapper/PostDtoUnitTest.java b/spring-boot-rest/src/test/java/com/baeldung/springpagination/PostDtoUnitTest.java
similarity index 89%
rename from spring-boot-rest/src/test/java/com/baeldung/modelmapper/PostDtoUnitTest.java
rename to spring-boot-rest/src/test/java/com/baeldung/springpagination/PostDtoUnitTest.java
index 6e94cc4289..948247e166 100644
--- a/spring-boot-rest/src/test/java/com/baeldung/modelmapper/PostDtoUnitTest.java
+++ b/spring-boot-rest/src/test/java/com/baeldung/springpagination/PostDtoUnitTest.java
@@ -1,12 +1,12 @@
-package com.baeldung.modelmapper;
+package com.baeldung.springpagination;
 
 import static org.junit.Assert.assertEquals;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import org.junit.Test;
 import org.modelmapper.ModelMapper;
 
-import com.baeldung.modelmapper.dto.PostDto;
-import com.baeldung.modelmapper.model.Post;
+import com.baeldung.springpagination.dto.PostDto;
+import com.baeldung.springpagination.model.Post;
 
 public class PostDtoUnitTest {
     

From 6a67c8c71924b35e5bd249f5660c0581609ac828 Mon Sep 17 00:00:00 2001
From: "amit.pandey" <amit.pandey2103@gmail.com>
Date: Fri, 27 Dec 2019 13:36:36 +0530
Subject: [PATCH 089/106] rename package name

---
 .../main/java/com/baeldung/spring/PersistenceConfig.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-boot-rest/src/main/java/com/baeldung/spring/PersistenceConfig.java b/spring-boot-rest/src/main/java/com/baeldung/spring/PersistenceConfig.java
index 2e967751ad..8887510eca 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/spring/PersistenceConfig.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/spring/PersistenceConfig.java
@@ -24,8 +24,8 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-${envTarget:h2}.properties" })
-@ComponentScan(basePackages = { "com.baeldung.persistence", "com.baeldung.modelmapper" })
-@EnableJpaRepositories(basePackages = {"com.baeldung.persistence.dao", "com.baeldung.modelmapper.repository"})
+@ComponentScan(basePackages = { "com.baeldung.persistence", "com.baeldung.springpagination" })
+@EnableJpaRepositories(basePackages = {"com.baeldung.persistence.dao", "com.baeldung.springpagination.repository"})
 public class PersistenceConfig {
 
     @Autowired
@@ -39,7 +39,7 @@ public class PersistenceConfig {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "com.baeldung.persistence.model", "com.baeldung.modelmapper.model" });
+        em.setPackagesToScan(new String[] { "com.baeldung.persistence.model", "com.baeldung.springpagination.model" });
 
         final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         // vendorAdapter.set

From bb3f4f5a01700c90cf06d63ac7455da1d75cfe7c Mon Sep 17 00:00:00 2001
From: "amit.pandey" <amit.pandey2103@gmail.com>
Date: Fri, 27 Dec 2019 13:52:53 +0530
Subject: [PATCH 090/106] resolve merge conflict

---
 .../com/baeldung/multipledb/dao/product/ProductRepository.java | 3 +++
 1 file changed, 3 insertions(+)

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
index 92fd47cb34..f1256e2c72 100755
--- 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
@@ -1,5 +1,8 @@
 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.Product;

From 3254a03d8ae810ccb2bcaf7953ea4537b10af9a0 Mon Sep 17 00:00:00 2001
From: catalin-burcea <burcea.iulian.catalin@gmail.com>
Date: Fri, 27 Dec 2019 13:36:41 +0200
Subject: [PATCH 091/106] [BAEL-19885] - Move articles out of core-kotlin part4

---
 core-kotlin-2/README.md                       |  3 --
 .../core-kotlin-advanced/README.md            | 11 +++++
 .../core-kotlin-advanced/pom.xml              | 41 ++++++++++++++++
 .../baeldung/contract/CallsInPlaceEffect.kt   |  0
 .../com/baeldung/contract/ReturnsEffect.kt    |  0
 .../kotlin/com/baeldung/datamapping/User.kt   |  0
 .../baeldung/datamapping/UserExtensions.kt    |  8 ++--
 .../com/baeldung/datamapping/UserView.kt      |  0
 .../main/kotlin/com/baeldung}/dsl/SqlDsl.kt   |  2 +-
 .../logging/LoggerAsExtensionOnAny.kt         |  2 +-
 .../LoggerAsExtensionOnMarkerInterface.kt     |  2 +-
 .../com/baeldung}/logging/LoggerAsProperty.kt |  2 +-
 .../logging/LoggerAsPropertyDelegate.kt       |  4 +-
 .../logging/LoggerInCompanionObject.kt        |  2 +-
 .../main/kotlin/com/baeldung}/logging/Util.kt |  2 +-
 .../com/baeldung/datamapping/UserTest.kt      |  0
 .../kotlin/com/baeldung}/dsl/SqlDslTest.kt    |  3 +-
 .../reflection/JavaReflectionTest.kt          |  2 +-
 .../com/baeldung}/reflection/KClassTest.kt    |  2 +-
 .../com/baeldung}/reflection/KMethodTest.kt   |  2 +-
 .../kotlin/com/baeldung/regex}/RegexTest.kt   |  7 +--
 .../core-kotlin-collections/README.md         | 10 ++++
 .../core-kotlin-collections/pom.xml           | 47 +++++++++++++++++++
 .../baeldung/collections}/CollectionsTest.kt  |  8 ++--
 .../kotlin/com/baeldung/filter/ChunkedTest.kt |  0
 .../com/baeldung/filter/DistinctTest.kt       |  0
 .../kotlin/com/baeldung/filter/DropTest.kt    |  0
 .../kotlin/com/baeldung/filter/FilterTest.kt  |  0
 .../kotlin/com/baeldung/filter/SliceTest.kt   |  0
 .../kotlin/com/baeldung/filter/TakeTest.kt    |  0
 .../FindAnElementInAListUnitTest.kt           |  4 +-
 .../com/baeldung/listtomap}/ListToMapTest.kt  |  2 +-
 .../kotlin/com/baeldung/listtomap/User.kt     |  3 ++
 .../splitlist/SplitListIntoPartsTest.kt       |  4 +-
 .../core-kotlin-concurrency/README.md         |  7 +++
 .../core-kotlin-concurrency/pom.xml           | 41 ++++++++++++++++
 .../threadsvscoroutines}/SimpleRunnable.kt    |  2 +-
 .../threadsvscoroutines}/SimpleThread.kt      |  2 +-
 .../coroutines}/CoroutinesUnitTest.kt         |  2 +-
 .../threadsvscoroutines}/CoroutineUnitTest.kt |  2 +-
 .../threadsvscoroutines}/ThreadUnitTest.kt    |  2 +-
 core-kotlin-modules/pom.xml                   |  3 ++
 core-kotlin/README.md                         | 11 -----
 core-kotlin/pom.xml                           |  6 ---
 44 files changed, 194 insertions(+), 57 deletions(-)
 create mode 100644 core-kotlin-modules/core-kotlin-advanced/README.md
 create mode 100644 core-kotlin-modules/core-kotlin-advanced/pom.xml
 rename {core-kotlin => core-kotlin-modules/core-kotlin-advanced}/src/main/kotlin/com/baeldung/contract/CallsInPlaceEffect.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-advanced}/src/main/kotlin/com/baeldung/contract/ReturnsEffect.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-advanced}/src/main/kotlin/com/baeldung/datamapping/User.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-advanced}/src/main/kotlin/com/baeldung/datamapping/UserExtensions.kt (82%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-advanced}/src/main/kotlin/com/baeldung/datamapping/UserView.kt (100%)
 rename {core-kotlin/src/main/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung}/dsl/SqlDsl.kt (98%)
 rename {core-kotlin/src/main/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung}/logging/LoggerAsExtensionOnAny.kt (93%)
 rename {core-kotlin/src/main/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung}/logging/LoggerAsExtensionOnMarkerInterface.kt (95%)
 rename {core-kotlin/src/main/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung}/logging/LoggerAsProperty.kt (88%)
 rename {core-kotlin/src/main/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung}/logging/LoggerAsPropertyDelegate.kt (92%)
 rename {core-kotlin/src/main/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung}/logging/LoggerInCompanionObject.kt (97%)
 rename {core-kotlin/src/main/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung}/logging/Util.kt (90%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-advanced}/src/test/kotlin/com/baeldung/datamapping/UserTest.kt (100%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung}/dsl/SqlDslTest.kt (97%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung}/reflection/JavaReflectionTest.kt (95%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung}/reflection/KClassTest.kt (98%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung}/reflection/KMethodTest.kt (98%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin/stdlib => core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/regex}/RegexTest.kt (95%)
 create mode 100644 core-kotlin-modules/core-kotlin-collections/README.md
 create mode 100644 core-kotlin-modules/core-kotlin-collections/pom.xml
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/collections}/CollectionsTest.kt (99%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-collections}/src/test/kotlin/com/baeldung/filter/ChunkedTest.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-collections}/src/test/kotlin/com/baeldung/filter/DistinctTest.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-collections}/src/test/kotlin/com/baeldung/filter/DropTest.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-collections}/src/test/kotlin/com/baeldung/filter/FilterTest.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-collections}/src/test/kotlin/com/baeldung/filter/SliceTest.kt (100%)
 rename {core-kotlin => core-kotlin-modules/core-kotlin-collections}/src/test/kotlin/com/baeldung/filter/TakeTest.kt (100%)
 rename core-kotlin-2/src/test/kotlin/com/baeldung/lists/ListsUnitTest.kt => core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/findelement/FindAnElementInAListUnitTest.kt (95%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/listtomap}/ListToMapTest.kt (98%)
 create mode 100644 core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/listtomap/User.kt
 rename core-kotlin-2/src/test/kotlin/com/baeldung/splitting/SplittingTest.kt => core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/splitlist/SplitListIntoPartsTest.kt (97%)
 create mode 100644 core-kotlin-modules/core-kotlin-concurrency/README.md
 create mode 100644 core-kotlin-modules/core-kotlin-concurrency/pom.xml
 rename {core-kotlin/src/main/kotlin/com/baeldung/thread => core-kotlin-modules/core-kotlin-concurrency/src/main/kotlin/com/baeldung/threadsvscoroutines}/SimpleRunnable.kt (74%)
 rename {core-kotlin/src/main/kotlin/com/baeldung/thread => core-kotlin-modules/core-kotlin-concurrency/src/main/kotlin/com/baeldung/threadsvscoroutines}/SimpleThread.kt (73%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/kotlin => core-kotlin-modules/core-kotlin-concurrency/src/test/kotlin/com/baeldung/coroutines}/CoroutinesUnitTest.kt (99%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/thread => core-kotlin-modules/core-kotlin-concurrency/src/test/kotlin/com/baeldung/threadsvscoroutines}/CoroutineUnitTest.kt (96%)
 rename {core-kotlin/src/test/kotlin/com/baeldung/thread => core-kotlin-modules/core-kotlin-concurrency/src/test/kotlin/com/baeldung/threadsvscoroutines}/ThreadUnitTest.kt (94%)

diff --git a/core-kotlin-2/README.md b/core-kotlin-2/README.md
index 89e30bc5fe..544c0b57ec 100644
--- a/core-kotlin-2/README.md
+++ b/core-kotlin-2/README.md
@@ -5,7 +5,4 @@ This module contains articles about core Kotlin.
 ### Relevant articles:
 
 - [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)
-- [Finding an Element in a List Using Kotlin](https://www.baeldung.com/kotlin-finding-element-in-list)
 - More articles: [[<-- prev]](/core-kotlin)
diff --git a/core-kotlin-modules/core-kotlin-advanced/README.md b/core-kotlin-modules/core-kotlin-advanced/README.md
new file mode 100644
index 0000000000..2e99e3b078
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin-advanced/README.md
@@ -0,0 +1,11 @@
+## Core Kotlin Advanced
+
+This module contains articles about advanced topics in Kotlin.
+
+### Relevant articles:
+- [Building DSLs in Kotlin](https://www.baeldung.com/kotlin-dsl)
+- [Regular Expressions in Kotlin](https://www.baeldung.com/kotlin-regular-expressions)
+- [Idiomatic Logging in Kotlin](https://www.baeldung.com/kotlin-logging)
+- [Mapping of Data Objects in Kotlin](https://www.baeldung.com/kotlin-data-objects)
+- [Reflection with Kotlin](https://www.baeldung.com/kotlin-reflection)
+- [Kotlin Contracts](https://www.baeldung.com/kotlin-contracts)
diff --git a/core-kotlin-modules/core-kotlin-advanced/pom.xml b/core-kotlin-modules/core-kotlin-advanced/pom.xml
new file mode 100644
index 0000000000..5ddfef23cc
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin-advanced/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>core-kotlin-advanced</artifactId>
+    <name>core-kotlin-advanced</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-kotlin-modules</groupId>
+        <artifactId>core-kotlin-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <kotlin.version>1.3.30</kotlin.version>
+        <assertj.version>3.10.0</assertj.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/contract/CallsInPlaceEffect.kt b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/contract/CallsInPlaceEffect.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/contract/CallsInPlaceEffect.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/contract/CallsInPlaceEffect.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/contract/ReturnsEffect.kt b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/contract/ReturnsEffect.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/contract/ReturnsEffect.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/contract/ReturnsEffect.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/datamapping/User.kt b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/datamapping/User.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/datamapping/User.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/datamapping/User.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/datamapping/UserExtensions.kt b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/datamapping/UserExtensions.kt
similarity index 82%
rename from core-kotlin/src/main/kotlin/com/baeldung/datamapping/UserExtensions.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/datamapping/UserExtensions.kt
index 6113ed3591..1f3d7f3b47 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/datamapping/UserExtensions.kt
+++ b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/datamapping/UserExtensions.kt
@@ -3,10 +3,10 @@ package com.baeldung.datamapping
 import kotlin.reflect.full.memberProperties
 
 fun User.toUserView() = UserView(
-  name = "$firstName $lastName",
-  address = "$street $houseNumber",
-  telephone = phone,
-  age = age
+        name = "$firstName $lastName",
+        address = "$street $houseNumber",
+        telephone = phone,
+        age = age
 )
 
 fun User.toUserViewReflection() = with(::UserView) {
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/datamapping/UserView.kt b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/datamapping/UserView.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/datamapping/UserView.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/datamapping/UserView.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/dsl/SqlDsl.kt b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/dsl/SqlDsl.kt
similarity index 98%
rename from core-kotlin/src/main/kotlin/com/baeldung/kotlin/dsl/SqlDsl.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/dsl/SqlDsl.kt
index 5296d301a3..207e9dbd53 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/dsl/SqlDsl.kt
+++ b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/dsl/SqlDsl.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.dsl
+package com.baeldung.dsl
 
 abstract class Condition {
 
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerAsExtensionOnAny.kt b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerAsExtensionOnAny.kt
similarity index 93%
rename from core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerAsExtensionOnAny.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerAsExtensionOnAny.kt
index 32d968fff5..01edf5e871 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerAsExtensionOnAny.kt
+++ b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerAsExtensionOnAny.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.logging
+package com.baeldung.logging
 
 import org.slf4j.Logger
 
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerAsExtensionOnMarkerInterface.kt b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerAsExtensionOnMarkerInterface.kt
similarity index 95%
rename from core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerAsExtensionOnMarkerInterface.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerAsExtensionOnMarkerInterface.kt
index b33d4c9f93..8210361345 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerAsExtensionOnMarkerInterface.kt
+++ b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerAsExtensionOnMarkerInterface.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.logging
+package com.baeldung.logging
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerAsProperty.kt b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerAsProperty.kt
similarity index 88%
rename from core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerAsProperty.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerAsProperty.kt
index 979b3b3a10..60ac0800e2 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerAsProperty.kt
+++ b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerAsProperty.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.logging
+package com.baeldung.logging
 
 open class LoggerAsProperty {
     private val logger = getLogger(javaClass)
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerAsPropertyDelegate.kt b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerAsPropertyDelegate.kt
similarity index 92%
rename from core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerAsPropertyDelegate.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerAsPropertyDelegate.kt
index 23f04722be..83cde2b446 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerAsPropertyDelegate.kt
+++ b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerAsPropertyDelegate.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.logging
+package com.baeldung.logging
 
 import org.slf4j.Logger
 import kotlin.properties.ReadOnlyProperty
@@ -43,5 +43,5 @@ fun main(args: Array<String>) {
 
 class LoggerDelegate<in R : Any> : ReadOnlyProperty<R, Logger> {
     override fun getValue(thisRef: R, property: KProperty<*>) =
-        getLogger(getClassForLogging(thisRef.javaClass))
+            getLogger(getClassForLogging(thisRef.javaClass))
 }
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerInCompanionObject.kt b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerInCompanionObject.kt
similarity index 97%
rename from core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerInCompanionObject.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerInCompanionObject.kt
index f973606369..6a44675e45 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/LoggerInCompanionObject.kt
+++ b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/LoggerInCompanionObject.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.logging
+package com.baeldung.logging
 
 open class LoggerInCompanionObject {
     companion object {
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/Util.kt b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/Util.kt
similarity index 90%
rename from core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/Util.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/Util.kt
index b9c0d9e34c..44dba53cb7 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/logging/Util.kt
+++ b/core-kotlin-modules/core-kotlin-advanced/src/main/kotlin/com/baeldung/logging/Util.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.logging
+package com.baeldung.logging
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/datamapping/UserTest.kt b/core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/datamapping/UserTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/datamapping/UserTest.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/datamapping/UserTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/dsl/SqlDslTest.kt b/core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/dsl/SqlDslTest.kt
similarity index 97%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/dsl/SqlDslTest.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/dsl/SqlDslTest.kt
index 55ae44e4dc..a370e7f15d 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/dsl/SqlDslTest.kt
+++ b/core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/dsl/SqlDslTest.kt
@@ -1,8 +1,7 @@
-package com.baeldung.kotlin.dsl
+package com.baeldung.dsl
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
-import java.lang.Exception
 
 class SqlDslTest {
 
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/reflection/JavaReflectionTest.kt b/core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/reflection/JavaReflectionTest.kt
similarity index 95%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/reflection/JavaReflectionTest.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/reflection/JavaReflectionTest.kt
index 0d0e7b724d..c77774dd81 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/reflection/JavaReflectionTest.kt
+++ b/core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/reflection/JavaReflectionTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.reflection
+package com.baeldung.reflection
 
 import org.junit.Ignore
 import org.junit.Test
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/reflection/KClassTest.kt b/core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/reflection/KClassTest.kt
similarity index 98%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/reflection/KClassTest.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/reflection/KClassTest.kt
index 56183b50be..f5d83cd13d 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/reflection/KClassTest.kt
+++ b/core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/reflection/KClassTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.reflection
+package com.baeldung.reflection
 
 import org.junit.Assert
 import org.junit.Ignore
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/reflection/KMethodTest.kt b/core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/reflection/KMethodTest.kt
similarity index 98%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/reflection/KMethodTest.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/reflection/KMethodTest.kt
index 17e9913731..b58c199a7c 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/reflection/KMethodTest.kt
+++ b/core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/reflection/KMethodTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.reflection
+package com.baeldung.reflection
 
 import org.junit.Assert
 import org.junit.Test
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/stdlib/RegexTest.kt b/core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/regex/RegexTest.kt
similarity index 95%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/stdlib/RegexTest.kt
rename to core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/regex/RegexTest.kt
index eeb587ee22..5cb54b4dda 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/stdlib/RegexTest.kt
+++ b/core-kotlin-modules/core-kotlin-advanced/src/test/kotlin/com/baeldung/regex/RegexTest.kt
@@ -1,12 +1,7 @@
-package com.baeldung.kotlin.stdlib
+package com.baeldung.regex
 
 import org.junit.Test
-import java.beans.ExceptionListener
-import java.beans.XMLEncoder
-import java.io.*
-import java.lang.Exception
 import kotlin.test.*
-import kotlin.text.RegexOption.*
 
 class RegexTest {
 
diff --git a/core-kotlin-modules/core-kotlin-collections/README.md b/core-kotlin-modules/core-kotlin-collections/README.md
new file mode 100644
index 0000000000..bbea5869af
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin-collections/README.md
@@ -0,0 +1,10 @@
+## Core Kotlin Collections
+
+This module contains articles about core Kotlin collections.
+
+### Relevant articles:
+- [Split a List Into Parts in Kotlin](https://www.baeldung.com/kotlin-split-list-into-parts)
+- [Finding an Element in a List Using Kotlin](https://www.baeldung.com/kotlin-finding-element-in-list)
+- [Overview of Kotlin Collections API](https://www.baeldung.com/kotlin-collections-api)
+- [Converting a List to Map in Kotlin](https://www.baeldung.com/kotlin-list-to-map)
+- [Filtering Kotlin Collections](https://www.baeldung.com/kotlin-filter-collection)
diff --git a/core-kotlin-modules/core-kotlin-collections/pom.xml b/core-kotlin-modules/core-kotlin-collections/pom.xml
new file mode 100644
index 0000000000..52401d267c
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin-collections/pom.xml
@@ -0,0 +1,47 @@
+<?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-kotlin-collections</artifactId>
+    <name>core-kotlin-collections</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-kotlin-modules</groupId>
+        <artifactId>core-kotlin-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>${commons-math3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <kotlin.version>1.3.30</kotlin.version>
+        <commons-math3.version>3.6.1</commons-math3.version>
+        <assertj.version>3.10.0</assertj.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CollectionsTest.kt b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/collections/CollectionsTest.kt
similarity index 99%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/CollectionsTest.kt
rename to core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/collections/CollectionsTest.kt
index 59d6adccac..64b1f72eab 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CollectionsTest.kt
+++ b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/collections/CollectionsTest.kt
@@ -1,9 +1,9 @@
-package com.baeldung.kotlin
+package com.baeldung.collections
 
 import org.junit.Test
-import kotlin.test.assertTrue
-import kotlin.test.assertFalse
 import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class CollectionsTest {
 
@@ -142,5 +142,5 @@ class CollectionsTest {
         val  finalResult = theList.fold( 1000, { oldResult, currentItem -> oldResult + (currentItem *currentItem)})
         print(finalResult)
         assertEquals(1091, finalResult)
-    }        
+    }
 }
\ No newline at end of file
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/filter/ChunkedTest.kt b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/filter/ChunkedTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/filter/ChunkedTest.kt
rename to core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/filter/ChunkedTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/filter/DistinctTest.kt b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/filter/DistinctTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/filter/DistinctTest.kt
rename to core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/filter/DistinctTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/filter/DropTest.kt b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/filter/DropTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/filter/DropTest.kt
rename to core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/filter/DropTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/filter/FilterTest.kt b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/filter/FilterTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/filter/FilterTest.kt
rename to core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/filter/FilterTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/filter/SliceTest.kt b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/filter/SliceTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/filter/SliceTest.kt
rename to core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/filter/SliceTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/filter/TakeTest.kt b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/filter/TakeTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/filter/TakeTest.kt
rename to core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/filter/TakeTest.kt
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/lists/ListsUnitTest.kt b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/findelement/FindAnElementInAListUnitTest.kt
similarity index 95%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/lists/ListsUnitTest.kt
rename to core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/findelement/FindAnElementInAListUnitTest.kt
index 6fa7983689..52e7e2a5b5 100644
--- a/core-kotlin-2/src/test/kotlin/com/baeldung/lists/ListsUnitTest.kt
+++ b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/findelement/FindAnElementInAListUnitTest.kt
@@ -1,11 +1,11 @@
-package com.baeldung.lists
+package com.baeldung.findelement
 
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
-class ListsUnitTest {
+class FindAnElementInAListUnitTest {
 
     var batmans: List<String> = listOf("Christian Bale", "Michael Keaton", "Ben Affleck", "George Clooney")
 
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/ListToMapTest.kt b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/listtomap/ListToMapTest.kt
similarity index 98%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/ListToMapTest.kt
rename to core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/listtomap/ListToMapTest.kt
index e3477931bb..93e4f11fdf 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/ListToMapTest.kt
+++ b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/listtomap/ListToMapTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.listtomap
 
 import org.junit.Test
 import kotlin.test.assertTrue
diff --git a/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/listtomap/User.kt b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/listtomap/User.kt
new file mode 100644
index 0000000000..89eb9ac701
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/listtomap/User.kt
@@ -0,0 +1,3 @@
+package com.baeldung.listtomap
+
+data class User(val name: String, val age: Int, val hobbies: List<String>)
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/splitting/SplittingTest.kt b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/splitlist/SplitListIntoPartsTest.kt
similarity index 97%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/splitting/SplittingTest.kt
rename to core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/splitlist/SplitListIntoPartsTest.kt
index a9ddc99992..627c7eaacf 100644
--- a/core-kotlin-2/src/test/kotlin/com/baeldung/splitting/SplittingTest.kt
+++ b/core-kotlin-modules/core-kotlin-collections/src/test/kotlin/com/baeldung/splitlist/SplitListIntoPartsTest.kt
@@ -1,9 +1,9 @@
-package com.baeldung.lambda
+package com.baeldung.splitlist
 
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 
-class SplittingTest {
+class SplitListIntoPartsTest {
     private val evenList = listOf(0, "a", 1, "b", 2, "c");
 
     private val unevenList = listOf(0, "a", 1, "b", 2, "c", 3);
diff --git a/core-kotlin-modules/core-kotlin-concurrency/README.md b/core-kotlin-modules/core-kotlin-concurrency/README.md
new file mode 100644
index 0000000000..09d9055a2b
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin-concurrency/README.md
@@ -0,0 +1,7 @@
+## Core Kotlin Concurrency
+
+This module contains articles about concurrency in Kotlin.
+
+### Relevant articles:
+- [Threads vs Coroutines in Kotlin](https://www.baeldung.com/kotlin-threads-coroutines)
+- [Introduction to Kotlin Coroutines](https://www.baeldung.com/kotlin-coroutines)
diff --git a/core-kotlin-modules/core-kotlin-concurrency/pom.xml b/core-kotlin-modules/core-kotlin-concurrency/pom.xml
new file mode 100644
index 0000000000..7c3b0fb5b6
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin-concurrency/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>core-kotlin-concurrency</artifactId>
+    <name>core-kotlin-concurrency</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-kotlin-modules</groupId>
+        <artifactId>core-kotlin-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <kotlin.version>1.3.30</kotlin.version>
+        <assertj.version>3.10.0</assertj.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/thread/SimpleRunnable.kt b/core-kotlin-modules/core-kotlin-concurrency/src/main/kotlin/com/baeldung/threadsvscoroutines/SimpleRunnable.kt
similarity index 74%
rename from core-kotlin/src/main/kotlin/com/baeldung/thread/SimpleRunnable.kt
rename to core-kotlin-modules/core-kotlin-concurrency/src/main/kotlin/com/baeldung/threadsvscoroutines/SimpleRunnable.kt
index 7bc0528d06..80ffb4077a 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/thread/SimpleRunnable.kt
+++ b/core-kotlin-modules/core-kotlin-concurrency/src/main/kotlin/com/baeldung/threadsvscoroutines/SimpleRunnable.kt
@@ -1,4 +1,4 @@
-package com.baeldung.thread
+package com.baeldung.threadsvscoroutines
 
 class SimpleRunnable: Runnable {
 
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/thread/SimpleThread.kt b/core-kotlin-modules/core-kotlin-concurrency/src/main/kotlin/com/baeldung/threadsvscoroutines/SimpleThread.kt
similarity index 73%
rename from core-kotlin/src/main/kotlin/com/baeldung/thread/SimpleThread.kt
rename to core-kotlin-modules/core-kotlin-concurrency/src/main/kotlin/com/baeldung/threadsvscoroutines/SimpleThread.kt
index 2b2827ae02..6647dac0ef 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/thread/SimpleThread.kt
+++ b/core-kotlin-modules/core-kotlin-concurrency/src/main/kotlin/com/baeldung/threadsvscoroutines/SimpleThread.kt
@@ -1,4 +1,4 @@
-package com.baeldung.thread
+package com.baeldung.threadsvscoroutines
 
 class SimpleThread: Thread() {
 
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesUnitTest.kt b/core-kotlin-modules/core-kotlin-concurrency/src/test/kotlin/com/baeldung/coroutines/CoroutinesUnitTest.kt
similarity index 99%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesUnitTest.kt
rename to core-kotlin-modules/core-kotlin-concurrency/src/test/kotlin/com/baeldung/coroutines/CoroutinesUnitTest.kt
index 324cf1109b..6b9437a8ab 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesUnitTest.kt
+++ b/core-kotlin-modules/core-kotlin-concurrency/src/test/kotlin/com/baeldung/coroutines/CoroutinesUnitTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.coroutines
 
 import kotlinx.coroutines.*
 import org.junit.Test
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/thread/CoroutineUnitTest.kt b/core-kotlin-modules/core-kotlin-concurrency/src/test/kotlin/com/baeldung/threadsvscoroutines/CoroutineUnitTest.kt
similarity index 96%
rename from core-kotlin/src/test/kotlin/com/baeldung/thread/CoroutineUnitTest.kt
rename to core-kotlin-modules/core-kotlin-concurrency/src/test/kotlin/com/baeldung/threadsvscoroutines/CoroutineUnitTest.kt
index 1f1609b06b..ff385d0869 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/thread/CoroutineUnitTest.kt
+++ b/core-kotlin-modules/core-kotlin-concurrency/src/test/kotlin/com/baeldung/threadsvscoroutines/CoroutineUnitTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.thread
+package com.baeldung.threadsvscoroutines
 
 import kotlinx.coroutines.*
 import org.junit.jupiter.api.Test
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/thread/ThreadUnitTest.kt b/core-kotlin-modules/core-kotlin-concurrency/src/test/kotlin/com/baeldung/threadsvscoroutines/ThreadUnitTest.kt
similarity index 94%
rename from core-kotlin/src/test/kotlin/com/baeldung/thread/ThreadUnitTest.kt
rename to core-kotlin-modules/core-kotlin-concurrency/src/test/kotlin/com/baeldung/threadsvscoroutines/ThreadUnitTest.kt
index fa2f1edc36..9503751fa3 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/thread/ThreadUnitTest.kt
+++ b/core-kotlin-modules/core-kotlin-concurrency/src/test/kotlin/com/baeldung/threadsvscoroutines/ThreadUnitTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.thread
+package com.baeldung.threadsvscoroutines
 
 import org.junit.jupiter.api.Test
 import kotlin.concurrent.thread
diff --git a/core-kotlin-modules/pom.xml b/core-kotlin-modules/pom.xml
index 1abea86289..c178febdfd 100644
--- a/core-kotlin-modules/pom.xml
+++ b/core-kotlin-modules/pom.xml
@@ -15,7 +15,10 @@
     </parent>
 
     <modules>
+        <module>core-kotlin-advanced</module>
         <module>core-kotlin-annotations</module>
+        <module>core-kotlin-collections</module>
+        <module>core-kotlin-concurrency</module>
         <module>core-kotlin-io</module>
         <module>core-kotlin-lang</module>
         <module>core-kotlin-lang-2</module>
diff --git a/core-kotlin/README.md b/core-kotlin/README.md
index 785eb0b689..89e1b7287e 100644
--- a/core-kotlin/README.md
+++ b/core-kotlin/README.md
@@ -7,37 +7,26 @@ This module contains articles about core Kotlin.
 - [Introduction to the Kotlin Language](https://www.baeldung.com/kotlin)
 - [Kotlin Java Interoperability](https://www.baeldung.com/kotlin-java-interoperability)
 - [Generics in Kotlin](https://www.baeldung.com/kotlin-generics)
-- [Introduction to Kotlin Coroutines](https://www.baeldung.com/kotlin-coroutines)
-- [Overview of Kotlin Collections API](https://www.baeldung.com/kotlin-collections-api)
-- [Converting a List to Map in Kotlin](https://www.baeldung.com/kotlin-list-to-map)
 - [Data Classes in Kotlin](https://www.baeldung.com/kotlin-data-classes)
 - [Delegated Properties in Kotlin](https://www.baeldung.com/kotlin-delegated-properties)
 - [Sealed Classes in Kotlin](https://www.baeldung.com/kotlin-sealed-classes)
 - [JUnit 5 for Kotlin Developers](https://www.baeldung.com/junit-5-kotlin)
 - [Extension Methods in Kotlin](https://www.baeldung.com/kotlin-extension-methods)
-- [Regular Expressions in Kotlin](https://www.baeldung.com/kotlin-regular-expressions)
 - [Objects in Kotlin](https://www.baeldung.com/kotlin-objects)
-- [Filtering Kotlin Collections](https://www.baeldung.com/kotlin-filter-collection)
 - [Working with Enums in Kotlin](https://www.baeldung.com/kotlin-enum)
 - [Create a Java and Kotlin Project with Maven](https://www.baeldung.com/kotlin-maven-java-project)
-- [Reflection with Kotlin](https://www.baeldung.com/kotlin-reflection)
 - [Get a Random Number in Kotlin](https://www.baeldung.com/kotlin-random-number)
-- [Idiomatic Logging in Kotlin](https://www.baeldung.com/kotlin-logging)
 - [Kotlin Constructors](https://www.baeldung.com/kotlin-constructors)
 - [Creational Design Patterns in Kotlin: Builder](https://www.baeldung.com/kotlin-builder-pattern)
 - [Kotlin Nested and Inner Classes](https://www.baeldung.com/kotlin-inner-classes)
 - [Fuel HTTP Library with Kotlin](https://www.baeldung.com/kotlin-fuel)
 - [Introduction to Kovenant Library for Kotlin](https://www.baeldung.com/kotlin-kovenant)
 - [Converting Kotlin Data Class from JSON using GSON](https://www.baeldung.com/kotlin-json-convert-data-class)
-- [Mapping of Data Objects in Kotlin](https://www.baeldung.com/kotlin-data-objects)
-- [Threads vs Coroutines in Kotlin](https://www.baeldung.com/kotlin-threads-coroutines)
 - [Guide to Kotlin Interfaces](https://www.baeldung.com/kotlin-interfaces)
 - [Guide to Sorting in Kotlin](https://www.baeldung.com/kotlin-sort)
 - [Dependency Injection for Kotlin with Injekt](https://www.baeldung.com/kotlin-dependency-injection-with-injekt)
 - [Implementing a Binary Tree in Kotlin](https://www.baeldung.com/kotlin-binary-tree)
-- [Kotlin Contracts](https://www.baeldung.com/kotlin-contracts)
 - [Inline Classes in Kotlin](https://www.baeldung.com/kotlin-inline-classes)
-- [Building DSLs in Kotlin](https://www.baeldung.com/kotlin-dsl)
 - [Static Methods Behavior in Kotlin](https://www.baeldung.com/kotlin-static-methods)
 - [Delegation Pattern in Kotlin](https://www.baeldung.com/kotlin-delegation-pattern)
 - More articles: [[next -->]](/core-kotlin-2)
diff --git a/core-kotlin/pom.xml b/core-kotlin/pom.xml
index 63a6d8035e..5fe8a47f62 100644
--- a/core-kotlin/pom.xml
+++ b/core-kotlin/pom.xml
@@ -14,11 +14,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
-            <version>${commons-math3.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -75,7 +70,6 @@
     </dependencies>
 
     <properties>
-        <commons-math3.version>3.6.1</commons-math3.version>
         <junit.platform.version>1.1.1</junit.platform.version>
         <junit.vintage.version>5.2.0</junit.vintage.version>
         <assertj.version>3.10.0</assertj.version>

From 7a827f178f75a388e41956c83a9d052d90db98e0 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Fri, 27 Dec 2019 14:35:32 +0100
Subject: [PATCH 092/106] BAEL-20552: Migrate spring-4 module to the
 com.baeldung package

---
 .../AttributeAnnotationsTestController.java                  | 2 +-
 .../spring43/attributeannotations/ParamInterceptor.java      | 2 +-
 .../main/java/{org => com}/baeldung/spring43/cache/Foo.java  | 2 +-
 .../{org => com}/baeldung/spring43/cache/FooService.java     | 2 +-
 .../com/baeldung/spring43/composedmapping/Appointment.java   | 5 +++++
 .../spring43/composedmapping/AppointmentService.java         | 2 +-
 .../spring43/composedmapping/AppointmentsController.java     | 2 +-
 .../main/java/com/baeldung/spring43/ctor/FooRepository.java  | 5 +++++
 .../java/{org => com}/baeldung/spring43/ctor/FooService.java | 2 +-
 .../baeldung/spring43/defaultmethods/DateHolder.java         | 2 +-
 .../baeldung/spring43/defaultmethods/IDateHolder.java        | 2 +-
 .../baeldung/spring43/depresolution/FooRepository.java       | 2 +-
 .../baeldung/spring43/depresolution/FooService.java          | 2 +-
 .../baeldung/spring43/scopeannotations/AppPreferences.java   | 2 +-
 .../spring43/scopeannotations/InstanceCountingService.java   | 2 +-
 .../baeldung/spring43/scopeannotations/LoginAction.java      | 2 +-
 .../spring43/scopeannotations/ScopeTestController.java       | 2 +-
 .../baeldung/spring43/scopeannotations/UserPreferences.java  | 2 +-
 .../org/baeldung/spring43/composedmapping/Appointment.java   | 5 -----
 .../main/java/org/baeldung/spring43/ctor/FooRepository.java  | 5 -----
 spring-4/src/main/resources/defaultmethods-context.xml       | 2 +-
 spring-4/src/main/resources/implicit-ctor-context.xml        | 4 ++--
 .../test/java/{org => com}/baeldung/SpringContextTest.java   | 2 +-
 .../AttributeAnnotationConfiguration.java                    | 2 +-
 .../AttributeAnnotationIntegrationTest.java                  | 2 +-
 .../spring43/cache/CacheRefinementsConfiguration.java        | 2 +-
 .../spring43/cache/CacheRefinementsIntegrationTest.java      | 2 +-
 .../composedmapping/ComposedMappingConfiguration.java        | 2 +-
 .../composedmapping/ComposedMappingIntegrationTest.java      | 2 +-
 .../ConfigurationConstructorInjectionIntegrationTest.java    | 2 +-
 .../baeldung/spring43/ctor/FooRepositoryConfiguration.java   | 2 +-
 .../baeldung/spring43/ctor/FooServiceConfiguration.java      | 2 +-
 .../spring43/ctor/ImplicitConstructorIntegrationTest.java    | 2 +-
 .../DefaultMethodsInjectionIntegrationTest.java              | 2 +-
 .../spring43/defaultmethods/ITransactionalUnitTest.java      | 2 +-
 .../defaultmethods/TransactionalIntegrationTest.java         | 2 +-
 .../defaultmethods/TransactionalTestConfiguration.java       | 2 +-
 .../spring43/depresolution/ObjectProviderConfiguration.java  | 2 +-
 .../depresolution/ObjectProviderIntegrationTest.java         | 2 +-
 .../scopeannotations/ScopeAnnotationsConfiguration.java      | 2 +-
 .../scopeannotations/ScopeAnnotationsIntegrationTest.java    | 2 +-
 41 files changed, 48 insertions(+), 48 deletions(-)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java (85%)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/attributeannotations/ParamInterceptor.java (91%)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/cache/Foo.java (94%)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/cache/FooService.java (87%)
 create mode 100644 spring-4/src/main/java/com/baeldung/spring43/composedmapping/Appointment.java
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/composedmapping/AppointmentService.java (72%)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/composedmapping/AppointmentsController.java (94%)
 create mode 100644 spring-4/src/main/java/com/baeldung/spring43/ctor/FooRepository.java
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/ctor/FooService.java (86%)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/defaultmethods/DateHolder.java (87%)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/defaultmethods/IDateHolder.java (87%)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/depresolution/FooRepository.java (68%)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/depresolution/FooService.java (90%)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/scopeannotations/AppPreferences.java (81%)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/scopeannotations/InstanceCountingService.java (86%)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/scopeannotations/LoginAction.java (80%)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/scopeannotations/ScopeTestController.java (95%)
 rename spring-4/src/main/java/{org => com}/baeldung/spring43/scopeannotations/UserPreferences.java (81%)
 delete mode 100644 spring-4/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java
 delete mode 100644 spring-4/src/main/java/org/baeldung/spring43/ctor/FooRepository.java
 rename spring-4/src/test/java/{org => com}/baeldung/SpringContextTest.java (96%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java (95%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java (96%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/cache/CacheRefinementsConfiguration.java (95%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java (96%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java (96%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java (96%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java (94%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/ctor/FooRepositoryConfiguration.java (88%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/ctor/FooServiceConfiguration.java (92%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java (94%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java (93%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java (92%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java (91%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java (95%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/depresolution/ObjectProviderConfiguration.java (81%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java (93%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java (93%)
 rename spring-4/src/test/java/{org => com}/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java (98%)

diff --git a/spring-4/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java b/spring-4/src/main/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
similarity index 85%
rename from spring-4/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
rename to spring-4/src/main/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
index df1d173bd2..d11ca10873 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.attributeannotations;
+package com.baeldung.spring43.attributeannotations;
 
 import org.springframework.web.bind.annotation.*;
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java b/spring-4/src/main/java/com/baeldung/spring43/attributeannotations/ParamInterceptor.java
similarity index 91%
rename from spring-4/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java
rename to spring-4/src/main/java/com/baeldung/spring43/attributeannotations/ParamInterceptor.java
index 9cf6020a93..3d6e0ad8b9 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/attributeannotations/ParamInterceptor.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.attributeannotations;
+package com.baeldung.spring43.attributeannotations;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/cache/Foo.java b/spring-4/src/main/java/com/baeldung/spring43/cache/Foo.java
similarity index 94%
rename from spring-4/src/main/java/org/baeldung/spring43/cache/Foo.java
rename to spring-4/src/main/java/com/baeldung/spring43/cache/Foo.java
index ce34adf6c1..731ac68e70 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/cache/Foo.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/cache/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.cache;
+package com.baeldung.spring43.cache;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/cache/FooService.java b/spring-4/src/main/java/com/baeldung/spring43/cache/FooService.java
similarity index 87%
rename from spring-4/src/main/java/org/baeldung/spring43/cache/FooService.java
rename to spring-4/src/main/java/com/baeldung/spring43/cache/FooService.java
index ad4c8b395f..9c0aa583c5 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/cache/FooService.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/cache/FooService.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.cache;
+package com.baeldung.spring43.cache;
 
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
diff --git a/spring-4/src/main/java/com/baeldung/spring43/composedmapping/Appointment.java b/spring-4/src/main/java/com/baeldung/spring43/composedmapping/Appointment.java
new file mode 100644
index 0000000000..4d8ba86f4b
--- /dev/null
+++ b/spring-4/src/main/java/com/baeldung/spring43/composedmapping/Appointment.java
@@ -0,0 +1,5 @@
+package com.baeldung.spring43.composedmapping;
+
+public class Appointment {
+
+}
diff --git a/spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java b/spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentService.java
similarity index 72%
rename from spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java
rename to spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentService.java
index c4c5e82f65..1ca389e16b 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentService.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.composedmapping;
+package com.baeldung.spring43.composedmapping;
 
 import java.util.Map;
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java b/spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentsController.java
similarity index 94%
rename from spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java
rename to spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentsController.java
index e83a33eb89..3ff3a237ac 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentsController.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.composedmapping;
+package com.baeldung.spring43.composedmapping;
 
 import java.util.Map;
 
diff --git a/spring-4/src/main/java/com/baeldung/spring43/ctor/FooRepository.java b/spring-4/src/main/java/com/baeldung/spring43/ctor/FooRepository.java
new file mode 100644
index 0000000000..f1d8425682
--- /dev/null
+++ b/spring-4/src/main/java/com/baeldung/spring43/ctor/FooRepository.java
@@ -0,0 +1,5 @@
+package com.baeldung.spring43.ctor;
+
+public class FooRepository {
+
+}
diff --git a/spring-4/src/main/java/org/baeldung/spring43/ctor/FooService.java b/spring-4/src/main/java/com/baeldung/spring43/ctor/FooService.java
similarity index 86%
rename from spring-4/src/main/java/org/baeldung/spring43/ctor/FooService.java
rename to spring-4/src/main/java/com/baeldung/spring43/ctor/FooService.java
index bf92d1bd32..cb481f99b2 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/ctor/FooService.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/ctor/FooService.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 public class FooService {
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java b/spring-4/src/main/java/com/baeldung/spring43/defaultmethods/DateHolder.java
similarity index 87%
rename from spring-4/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java
rename to spring-4/src/main/java/com/baeldung/spring43/defaultmethods/DateHolder.java
index 9ae62cf484..a5307ec37c 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/defaultmethods/DateHolder.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import java.time.LocalDate;
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java b/spring-4/src/main/java/com/baeldung/spring43/defaultmethods/IDateHolder.java
similarity index 87%
rename from spring-4/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java
rename to spring-4/src/main/java/com/baeldung/spring43/defaultmethods/IDateHolder.java
index e37d27f9fc..66eca031c0 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/defaultmethods/IDateHolder.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java b/spring-4/src/main/java/com/baeldung/spring43/depresolution/FooRepository.java
similarity index 68%
rename from spring-4/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java
rename to spring-4/src/main/java/com/baeldung/spring43/depresolution/FooRepository.java
index 313f6fc8c5..281a4f29fd 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/depresolution/FooRepository.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.depresolution;
+package com.baeldung.spring43.depresolution;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/depresolution/FooService.java b/spring-4/src/main/java/com/baeldung/spring43/depresolution/FooService.java
similarity index 90%
rename from spring-4/src/main/java/org/baeldung/spring43/depresolution/FooService.java
rename to spring-4/src/main/java/com/baeldung/spring43/depresolution/FooService.java
index b76fa84749..1a6b13dc23 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/depresolution/FooService.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/depresolution/FooService.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.depresolution;
+package com.baeldung.spring43.depresolution;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.stereotype.Service;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/AppPreferences.java
similarity index 81%
rename from spring-4/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java
rename to spring-4/src/main/java/com/baeldung/spring43/scopeannotations/AppPreferences.java
index 45b90c4609..ede2849a51 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/AppPreferences.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.ApplicationScope;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/InstanceCountingService.java
similarity index 86%
rename from spring-4/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java
rename to spring-4/src/main/java/com/baeldung/spring43/scopeannotations/InstanceCountingService.java
index 4fb90566d8..e6879e0544 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/InstanceCountingService.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/LoginAction.java
similarity index 80%
rename from spring-4/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java
rename to spring-4/src/main/java/com/baeldung/spring43/scopeannotations/LoginAction.java
index 60017b4b94..132e701b5a 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/LoginAction.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/ScopeTestController.java
similarity index 95%
rename from spring-4/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java
rename to spring-4/src/main/java/com/baeldung/spring43/scopeannotations/ScopeTestController.java
index 8f4390dfc0..bd3e3e9b92 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/ScopeTestController.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/UserPreferences.java
similarity index 81%
rename from spring-4/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java
rename to spring-4/src/main/java/com/baeldung/spring43/scopeannotations/UserPreferences.java
index ce49c4b1fe..27f313b2cb 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/UserPreferences.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.SessionScope;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java b/spring-4/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java
deleted file mode 100644
index af06249768..0000000000
--- a/spring-4/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.spring43.composedmapping;
-
-public class Appointment {
-
-}
diff --git a/spring-4/src/main/java/org/baeldung/spring43/ctor/FooRepository.java b/spring-4/src/main/java/org/baeldung/spring43/ctor/FooRepository.java
deleted file mode 100644
index 96dbeb8642..0000000000
--- a/spring-4/src/main/java/org/baeldung/spring43/ctor/FooRepository.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.spring43.ctor;
-
-public class FooRepository {
-
-}
diff --git a/spring-4/src/main/resources/defaultmethods-context.xml b/spring-4/src/main/resources/defaultmethods-context.xml
index 2b55037405..5725d0cabf 100644
--- a/spring-4/src/main/resources/defaultmethods-context.xml
+++ b/spring-4/src/main/resources/defaultmethods-context.xml
@@ -3,7 +3,7 @@
        xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="dateHolder" class="org.baeldung.spring43.defaultmethods.DateHolder">
+    <bean id="dateHolder" class="com.baeldung.spring43.defaultmethods.DateHolder">
         <property name="stringDate" value="15.10.1982"/>
     </bean>
 
diff --git a/spring-4/src/main/resources/implicit-ctor-context.xml b/spring-4/src/main/resources/implicit-ctor-context.xml
index c978ca17bd..3dc0058f94 100644
--- a/spring-4/src/main/resources/implicit-ctor-context.xml
+++ b/spring-4/src/main/resources/implicit-ctor-context.xml
@@ -3,8 +3,8 @@
        xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean class="org.baeldung.spring43.ctor.FooRepository"/>
+    <bean class="com.baeldung.spring43.ctor.FooRepository"/>
 
-    <bean class="org.baeldung.spring43.ctor.FooService"/>
+    <bean class="com.baeldung.spring43.ctor.FooService"/>
 
 </beans>
diff --git a/spring-4/src/test/java/org/baeldung/SpringContextTest.java b/spring-4/src/test/java/com/baeldung/SpringContextTest.java
similarity index 96%
rename from spring-4/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-4/src/test/java/com/baeldung/SpringContextTest.java
index cccdaff0cd..46308d41ea 100644
--- a/spring-4/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-4/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
similarity index 95%
rename from spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
index 97ae651473..97b92a943c 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.attributeannotations;
+package com.baeldung.spring43.attributeannotations;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
similarity index 96%
rename from spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
index fff2716a64..f696a6f537 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.attributeannotations;
+package com.baeldung.spring43.attributeannotations;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsConfiguration.java
similarity index 95%
rename from spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsConfiguration.java
index e4610e5a83..45acb11f72 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.cache;
+package com.baeldung.spring43.cache;
 
 import java.util.Collections;
 
diff --git a/spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
similarity index 96%
rename from spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
index fa72ed6d43..3f56bb21ff 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.cache;
+package com.baeldung.spring43.cache;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
similarity index 96%
rename from spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
index f1028ebefb..c3a0ceba36 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.composedmapping;
+package com.baeldung.spring43.composedmapping;
 
 import java.util.Collections;
 
diff --git a/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
similarity index 96%
rename from spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
index d0af48cd0e..d5c912b69b 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.composedmapping;
+package com.baeldung.spring43.composedmapping;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
similarity index 94%
rename from spring-4/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
index 871a985479..848fa44365 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/ctor/FooRepositoryConfiguration.java
similarity index 88%
rename from spring-4/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/ctor/FooRepositoryConfiguration.java
index a05a36529f..fb33942844 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/ctor/FooRepositoryConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/ctor/FooServiceConfiguration.java
similarity index 92%
rename from spring-4/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/ctor/FooServiceConfiguration.java
index 41f1719320..5ab09e37ec 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/ctor/FooServiceConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
similarity index 94%
rename from spring-4/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
index 83fa11294e..5296927ef2 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
similarity index 93%
rename from spring-4/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
index 956df44821..f617d48920 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import java.time.LocalDate;
 
diff --git a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
similarity index 92%
rename from spring-4/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
index 3c180e91c8..a8f44d722d 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
similarity index 91%
rename from spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
index dde153487d..7df6040456 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
similarity index 95%
rename from spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
index 8a8cec3f86..6323854099 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import javax.sql.DataSource;
 
diff --git a/spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
similarity index 81%
rename from spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
index 530c4d9f4a..020b50ceb2 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.depresolution;
+package com.baeldung.spring43.depresolution;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
similarity index 93%
rename from spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
index 6d06bfdc2a..29ce530a50 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.depresolution;
+package com.baeldung.spring43.depresolution;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
similarity index 93%
rename from spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
index 24c1ec2f34..a7d9c16721 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
similarity index 98%
rename from spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
index 69cce15029..f2cea121cc 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.junit.Before;
 import org.junit.Test;

From 411140ccebe7b2786a3593cc9c9740550be6916a Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Fri, 27 Dec 2019 14:38:30 +0100
Subject: [PATCH 093/106] BAEL-20552: Migrate spring-vault module to the
 com.baeldung package

---
 .../{org => com}/baeldung/springvault/Credentials.java    | 2 +-
 .../baeldung/springvault/CredentialsService.java          | 8 +-------
 .../baeldung/springvault/SpringVaultApplication.java      | 2 +-
 .../{org => com}/baeldung/springvault/VaultConfig.java    | 2 +-
 .../baeldung/springvault/VaultEnvironmentConfig.java      | 2 +-
 .../baeldung/springvault}/SpringContextLiveTest.java      | 4 ++--
 .../baeldung/springvault/VaultInitializer.java            | 2 +-
 .../baeldung/springvault/VaultIntegrationTest.java        | 2 +-
 .../baeldung/springvault/VaultTestConfiguration.java      | 2 +-
 9 files changed, 10 insertions(+), 16 deletions(-)
 rename spring-vault/src/main/java/{org => com}/baeldung/springvault/Credentials.java (93%)
 rename spring-vault/src/main/java/{org => com}/baeldung/springvault/CredentialsService.java (76%)
 rename spring-vault/src/main/java/{org => com}/baeldung/springvault/SpringVaultApplication.java (91%)
 rename spring-vault/src/main/java/{org => com}/baeldung/springvault/VaultConfig.java (95%)
 rename spring-vault/src/main/java/{org => com}/baeldung/springvault/VaultEnvironmentConfig.java (95%)
 rename spring-vault/src/test/java/{org/baeldung => com/baeldung/springvault}/SpringContextLiveTest.java (86%)
 rename spring-vault/src/test/java/{org => com}/baeldung/springvault/VaultInitializer.java (99%)
 rename spring-vault/src/test/java/{org => com}/baeldung/springvault/VaultIntegrationTest.java (98%)
 rename spring-vault/src/test/java/{org => com}/baeldung/springvault/VaultTestConfiguration.java (96%)

diff --git a/spring-vault/src/main/java/org/baeldung/springvault/Credentials.java b/spring-vault/src/main/java/com/baeldung/springvault/Credentials.java
similarity index 93%
rename from spring-vault/src/main/java/org/baeldung/springvault/Credentials.java
rename to spring-vault/src/main/java/com/baeldung/springvault/Credentials.java
index f90ab66a4e..548ebd4ff6 100644
--- a/spring-vault/src/main/java/org/baeldung/springvault/Credentials.java
+++ b/spring-vault/src/main/java/com/baeldung/springvault/Credentials.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 public class Credentials {
 
diff --git a/spring-vault/src/main/java/org/baeldung/springvault/CredentialsService.java b/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java
similarity index 76%
rename from spring-vault/src/main/java/org/baeldung/springvault/CredentialsService.java
rename to spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java
index 87c24bd947..6a4b7cb784 100644
--- a/spring-vault/src/main/java/org/baeldung/springvault/CredentialsService.java
+++ b/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java
@@ -1,16 +1,10 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
-import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.vault.authentication.TokenAuthentication;
-import org.springframework.vault.client.VaultEndpoint;
 import org.springframework.vault.core.VaultTemplate;
-import org.springframework.vault.core.env.VaultPropertySource;
-import org.springframework.vault.support.VaultResponse;
 import org.springframework.vault.support.VaultResponseSupport;
 
 /**
diff --git a/spring-vault/src/main/java/org/baeldung/springvault/SpringVaultApplication.java b/spring-vault/src/main/java/com/baeldung/springvault/SpringVaultApplication.java
similarity index 91%
rename from spring-vault/src/main/java/org/baeldung/springvault/SpringVaultApplication.java
rename to spring-vault/src/main/java/com/baeldung/springvault/SpringVaultApplication.java
index 916a809be5..979b2fb42e 100644
--- a/spring-vault/src/main/java/org/baeldung/springvault/SpringVaultApplication.java
+++ b/spring-vault/src/main/java/com/baeldung/springvault/SpringVaultApplication.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-vault/src/main/java/org/baeldung/springvault/VaultConfig.java b/spring-vault/src/main/java/com/baeldung/springvault/VaultConfig.java
similarity index 95%
rename from spring-vault/src/main/java/org/baeldung/springvault/VaultConfig.java
rename to spring-vault/src/main/java/com/baeldung/springvault/VaultConfig.java
index 106a1a3d42..f13c605bd8 100644
--- a/spring-vault/src/main/java/org/baeldung/springvault/VaultConfig.java
+++ b/spring-vault/src/main/java/com/baeldung/springvault/VaultConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.vault.authentication.ClientAuthentication;
diff --git a/spring-vault/src/main/java/org/baeldung/springvault/VaultEnvironmentConfig.java b/spring-vault/src/main/java/com/baeldung/springvault/VaultEnvironmentConfig.java
similarity index 95%
rename from spring-vault/src/main/java/org/baeldung/springvault/VaultEnvironmentConfig.java
rename to spring-vault/src/main/java/com/baeldung/springvault/VaultEnvironmentConfig.java
index 6c796bc718..4f5777e94c 100644
--- a/spring-vault/src/main/java/org/baeldung/springvault/VaultEnvironmentConfig.java
+++ b/spring-vault/src/main/java/com/baeldung/springvault/VaultEnvironmentConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
diff --git a/spring-vault/src/test/java/org/baeldung/SpringContextLiveTest.java b/spring-vault/src/test/java/com/baeldung/springvault/SpringContextLiveTest.java
similarity index 86%
rename from spring-vault/src/test/java/org/baeldung/SpringContextLiveTest.java
rename to spring-vault/src/test/java/com/baeldung/springvault/SpringContextLiveTest.java
index 60dc119f13..8139522745 100644
--- a/spring-vault/src/test/java/org/baeldung/SpringContextLiveTest.java
+++ b/spring-vault/src/test/java/com/baeldung/springvault/SpringContextLiveTest.java
@@ -1,6 +1,6 @@
-package org.baeldung;
+package com.baeldung.springvault;
 
-import org.baeldung.springvault.SpringVaultApplication;
+import com.baeldung.springvault.SpringVaultApplication;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-vault/src/test/java/org/baeldung/springvault/VaultInitializer.java b/spring-vault/src/test/java/com/baeldung/springvault/VaultInitializer.java
similarity index 99%
rename from spring-vault/src/test/java/org/baeldung/springvault/VaultInitializer.java
rename to spring-vault/src/test/java/com/baeldung/springvault/VaultInitializer.java
index c7db5eb199..a823a4cd27 100644
--- a/spring-vault/src/test/java/org/baeldung/springvault/VaultInitializer.java
+++ b/spring-vault/src/test/java/com/baeldung/springvault/VaultInitializer.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import java.io.BufferedReader;
 import java.io.Closeable;
diff --git a/spring-vault/src/test/java/org/baeldung/springvault/VaultIntegrationTest.java b/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java
similarity index 98%
rename from spring-vault/src/test/java/org/baeldung/springvault/VaultIntegrationTest.java
rename to spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java
index 9f4b5d82a4..dd8797aacc 100644
--- a/spring-vault/src/test/java/org/baeldung/springvault/VaultIntegrationTest.java
+++ b/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import org.junit.FixMethodOrder;
 import org.junit.Ignore;
diff --git a/spring-vault/src/test/java/org/baeldung/springvault/VaultTestConfiguration.java b/spring-vault/src/test/java/com/baeldung/springvault/VaultTestConfiguration.java
similarity index 96%
rename from spring-vault/src/test/java/org/baeldung/springvault/VaultTestConfiguration.java
rename to spring-vault/src/test/java/com/baeldung/springvault/VaultTestConfiguration.java
index 09a1445788..42f0bfbce9 100644
--- a/spring-vault/src/test/java/org/baeldung/springvault/VaultTestConfiguration.java
+++ b/spring-vault/src/test/java/com/baeldung/springvault/VaultTestConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import java.net.URI;
 import java.net.URISyntaxException;

From 066ac494880ddf2ac3ebf3483bd73e159b7c1900 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Fri, 27 Dec 2019 14:43:10 +0100
Subject: [PATCH 094/106] BAEL-20552: Migrate spring-webflux-amqp module to the
 com.baeldung package

---
 spring-webflux-amqp/pom.xml                   |   2 +-
 .../spring/amqp/AmqpReactiveController.java   |  15 +--
 .../spring/amqp/DestinationsConfig.java       | 118 +++++++++---------
 .../amqp/MessageListenerContainerFactory.java |   2 +-
 .../amqp/SpringWebfluxAmqpApplication.java    |   2 +-
 .../baeldung/SpringContextLiveTest.java       |   4 +-
 .../amqp/SpringWebfluxAmqpLiveTest.java       |   2 +-
 7 files changed, 71 insertions(+), 74 deletions(-)
 rename spring-webflux-amqp/src/main/java/{org => com}/baeldung/spring/amqp/AmqpReactiveController.java (94%)
 rename spring-webflux-amqp/src/main/java/{org => com}/baeldung/spring/amqp/DestinationsConfig.java (93%)
 mode change 100755 => 100644
 rename spring-webflux-amqp/src/main/java/{org => com}/baeldung/spring/amqp/MessageListenerContainerFactory.java (96%)
 rename spring-webflux-amqp/src/main/java/{org => com}/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java (97%)
 mode change 100755 => 100644
 rename spring-webflux-amqp/src/test/java/{org => com}/baeldung/SpringContextLiveTest.java (87%)
 rename spring-webflux-amqp/src/test/java/{org => com}/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java (93%)
 mode change 100755 => 100644

diff --git a/spring-webflux-amqp/pom.xml b/spring-webflux-amqp/pom.xml
index f9b14eea06..7a7f6ef600 100755
--- a/spring-webflux-amqp/pom.xml
+++ b/spring-webflux-amqp/pom.xml
@@ -2,7 +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>org.baeldung.spring</groupId>
+    <groupId>com.baeldung.spring</groupId>
     <artifactId>spring-webflux-amqp</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <name>spring-webflux-amqp</name>
diff --git a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/AmqpReactiveController.java b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java
similarity index 94%
rename from spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/AmqpReactiveController.java
rename to spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java
index 52f6d924fa..b71c32bd05 100644
--- a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/AmqpReactiveController.java
+++ b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java
@@ -1,11 +1,9 @@
-package org.baeldung.spring.amqp;
+package com.baeldung.spring.amqp;
 
 import java.time.Duration;
-import java.util.Date;
 
 import javax.annotation.PostConstruct;
 
-import org.baeldung.spring.amqp.DestinationsConfig.DestinationInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.AmqpAdmin;
@@ -29,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
 
 @RestController
 public class AmqpReactiveController {
@@ -105,7 +102,7 @@ public class AmqpReactiveController {
     public Mono<ResponseEntity<?>> sendMessageToQueue(@PathVariable String name, @RequestBody String payload) {
 
         // Lookup exchange details
-        final DestinationInfo d = destinationsConfig.getQueues()
+        final DestinationsConfig.DestinationInfo d = destinationsConfig.getQueues()
             .get(name);
 
         if (d == null) {
@@ -135,7 +132,7 @@ public class AmqpReactiveController {
     @GetMapping(value = "/queue/{name}", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     public Flux<?> receiveMessagesFromQueue(@PathVariable String name) {
 
-        DestinationInfo d = destinationsConfig.getQueues()
+        DestinationsConfig.DestinationInfo d = destinationsConfig.getQueues()
             .get(name);
 
         if (d == null) {
@@ -201,7 +198,7 @@ public class AmqpReactiveController {
     public Mono<ResponseEntity<?>> sendMessageToTopic(@PathVariable String name, @RequestBody String payload) {
 
         // Lookup exchange details
-        final DestinationInfo d = destinationsConfig.getTopics()
+        final DestinationsConfig.DestinationInfo d = destinationsConfig.getTopics()
             .get(name);
         if (d == null) {
             // Destination not found.
@@ -223,7 +220,7 @@ public class AmqpReactiveController {
     @GetMapping(value = "/topic/{name}", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     public Flux<?> receiveMessagesFromTopic(@PathVariable String name) {
 
-        DestinationInfo d = destinationsConfig.getTopics()
+        DestinationsConfig.DestinationInfo d = destinationsConfig.getTopics()
             .get(name);
 
         if (d == null) {
@@ -281,7 +278,7 @@ public class AmqpReactiveController {
 
     }
 
-    private Queue createTopicQueue(DestinationInfo destination) {
+    private Queue createTopicQueue(DestinationsConfig.DestinationInfo destination) {
 
         Exchange ex = ExchangeBuilder.topicExchange(destination.getExchange())
           .durable(true)
diff --git a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/DestinationsConfig.java b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java
old mode 100755
new mode 100644
similarity index 93%
rename from spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/DestinationsConfig.java
rename to spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java
index 410b87c764..0f9a0d890f
--- a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/DestinationsConfig.java
+++ b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java
@@ -1,59 +1,59 @@
-package org.baeldung.spring.amqp;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties("destinations")
-public class DestinationsConfig {
-    
-    
-    private Map<String,DestinationInfo> queues = new HashMap<>();
-    
-    private Map<String,DestinationInfo> topics = new HashMap<>();
-    
-    
-
-    public Map<String, DestinationInfo> getQueues() {
-        return queues;
-    }
-
-    public void setQueues(Map<String, DestinationInfo> queues) {
-        this.queues = queues;
-    }
-
-    public Map<String, DestinationInfo> getTopics() {
-        return topics;
-    }
-
-    public void setTopics(Map<String, DestinationInfo> topics) {
-        this.topics = topics;
-    }
-
-    // DestinationInfo stores the Exchange name and routing key used
-    // by our producers when posting messages
-    static class DestinationInfo {
-        
-        private String exchange;
-        private String routingKey;
-        
-        
-        public String getExchange() {
-            return exchange;
-        }
-        public void setExchange(String exchange) {
-            this.exchange = exchange;
-        }
-        public String getRoutingKey() {
-            return routingKey;
-        }
-        public void setRoutingKey(String routingKey) {
-            this.routingKey = routingKey;
-        }
-        
-        
-        
-    }
-    
-}
+package com.baeldung.spring.amqp;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("destinations")
+public class DestinationsConfig {
+    
+    
+    private Map<String,DestinationInfo> queues = new HashMap<>();
+    
+    private Map<String,DestinationInfo> topics = new HashMap<>();
+    
+    
+
+    public Map<String, DestinationInfo> getQueues() {
+        return queues;
+    }
+
+    public void setQueues(Map<String, DestinationInfo> queues) {
+        this.queues = queues;
+    }
+
+    public Map<String, DestinationInfo> getTopics() {
+        return topics;
+    }
+
+    public void setTopics(Map<String, DestinationInfo> topics) {
+        this.topics = topics;
+    }
+
+    // DestinationInfo stores the Exchange name and routing key used
+    // by our producers when posting messages
+    static class DestinationInfo {
+        
+        private String exchange;
+        private String routingKey;
+        
+        
+        public String getExchange() {
+            return exchange;
+        }
+        public void setExchange(String exchange) {
+            this.exchange = exchange;
+        }
+        public String getRoutingKey() {
+            return routingKey;
+        }
+        public void setRoutingKey(String routingKey) {
+            this.routingKey = routingKey;
+        }
+        
+        
+        
+    }
+    
+}
diff --git a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/MessageListenerContainerFactory.java b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java
similarity index 96%
rename from spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/MessageListenerContainerFactory.java
rename to spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java
index 29b8d28a80..d868e6afa8 100644
--- a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/MessageListenerContainerFactory.java
+++ b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.amqp;
+package com.baeldung.spring.amqp;
 
 import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
diff --git a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
old mode 100755
new mode 100644
similarity index 97%
rename from spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
rename to spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
index 8a31299333..d6a7a84d30
--- a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
+++ b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.amqp;
+package com.baeldung.spring.amqp;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextLiveTest.java b/spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java
similarity index 87%
rename from spring-webflux-amqp/src/test/java/org/baeldung/SpringContextLiveTest.java
rename to spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java
index 4d9f658cdc..c443042d3d 100644
--- a/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextLiveTest.java
+++ b/spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java
@@ -1,6 +1,6 @@
-package org.baeldung;
+package com.baeldung;
 
-import org.baeldung.spring.amqp.SpringWebfluxAmqpApplication;
+import com.baeldung.spring.amqp.SpringWebfluxAmqpApplication;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-webflux-amqp/src/test/java/org/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java b/spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java
old mode 100755
new mode 100644
similarity index 93%
rename from spring-webflux-amqp/src/test/java/org/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java
rename to spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java
index bda490c189..81782ce575
--- a/spring-webflux-amqp/src/test/java/org/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java
+++ b/spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.amqp;
+package com.baeldung.spring.amqp;
 
 import org.junit.Test;
 import org.springframework.test.web.reactive.server.WebTestClient;

From bcfa591f931246dc9110b110dd4166bf5a54fa80 Mon Sep 17 00:00:00 2001
From: Gerardo Roza <rozagerardo@gmail.com>
Date: Fri, 27 Dec 2019 11:04:23 -0300
Subject: [PATCH 095/106] upgraded parent-spring-5 version

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

diff --git a/parent-spring-5/pom.xml b/parent-spring-5/pom.xml
index 9260f88de5..85a4645aa7 100644
--- a/parent-spring-5/pom.xml
+++ b/parent-spring-5/pom.xml
@@ -30,8 +30,8 @@
     </dependencies>
 
     <properties>
-        <spring.version>5.1.9.RELEASE</spring.version>
-        <spring-security.version>5.1.6.RELEASE</spring-security.version>
+        <spring.version>5.2.2.RELEASE</spring.version>
+        <spring-security.version>5.2.1.RELEASE</spring-security.version>
     </properties>
 
 </project>
\ No newline at end of file

From 12b178c4bb62f653b5bd37daa78bb1db9a2a2d1e Mon Sep 17 00:00:00 2001
From: Gerardo Roza <rozagerardo@gmail.com>
Date: Fri, 27 Dec 2019 11:06:26 -0300
Subject: [PATCH 096/106] fixed errors due to spring-5 version upgrade

---
 .../basic/MyBasicAuthenticationEntryPoint.java   | 16 ++++++++--------
 .../resources/RedirectionWebSecurityConfig.xml   |  4 ++--
 .../main/resources/channelWebSecurityConfig.xml  |  4 ++--
 .../src/main/resources/webSecurityConfig.xml     |  4 ++--
 .../src/main/webapp/WEB-INF/mvc-servlet.xml      |  2 +-
 .../src/test/resources/mvc-servlet.xml           |  2 +-
 .../basic/MyBasicAuthenticationEntryPoint.java   |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/httpclient-simple/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java b/httpclient-simple/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
index 380ff9df6b..cafd8cfb7b 100644
--- a/httpclient-simple/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
+++ b/httpclient-simple/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
@@ -1,20 +1,20 @@
 package com.baeldung.basic;
 
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-
 @Component
 public class MyBasicAuthenticationEntryPoint extends BasicAuthenticationEntryPoint {
 
     @Override
-    public void commence(final HttpServletRequest request, final HttpServletResponse response, final AuthenticationException authException) throws IOException, ServletException {
+    public void commence(final HttpServletRequest request, final HttpServletResponse response, final AuthenticationException authException) throws IOException {
         response.addHeader("WWW-Authenticate", "Basic realm=\"" + getRealmName() + "\"");
         response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
         final PrintWriter writer = response.getWriter();
@@ -22,7 +22,7 @@ public class MyBasicAuthenticationEntryPoint extends BasicAuthenticationEntryPoi
     }
 
     @Override
-    public void afterPropertiesSet() throws Exception {
+    public void afterPropertiesSet() {
         setRealmName("Baeldung");
         super.afterPropertiesSet();
     }
diff --git a/spring-security-modules/spring-security-mvc-login/src/main/resources/RedirectionWebSecurityConfig.xml b/spring-security-modules/spring-security-mvc-login/src/main/resources/RedirectionWebSecurityConfig.xml
index 659347f610..6c0f24e2c4 100644
--- a/spring-security-modules/spring-security-mvc-login/src/main/resources/RedirectionWebSecurityConfig.xml
+++ b/spring-security-modules/spring-security-mvc-login/src/main/resources/RedirectionWebSecurityConfig.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
              xsi:schemaLocation="
 		http://www.springframework.org/schema/security
-        http://www.springframework.org/schema/security/spring-security-4.2.xsd
+        https://www.springframework.org/schema/security/spring-security.xsd
 		http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"
+        https://www.springframework.org/schema/beans/spring-beans.xsd"
 >
     <http use-expressions="true">
         <intercept-url pattern="/login*" access="permitAll"/>
diff --git a/spring-security-modules/spring-security-mvc-login/src/main/resources/channelWebSecurityConfig.xml b/spring-security-modules/spring-security-mvc-login/src/main/resources/channelWebSecurityConfig.xml
index 516829f5eb..eff3e1a1a1 100644
--- a/spring-security-modules/spring-security-mvc-login/src/main/resources/channelWebSecurityConfig.xml
+++ b/spring-security-modules/spring-security-mvc-login/src/main/resources/channelWebSecurityConfig.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
     xsi:schemaLocation="
 		http://www.springframework.org/schema/security 
-        http://www.springframework.org/schema/security/spring-security-4.2.xsd
+        https://www.springframework.org/schema/security/spring-security.xsd
 		http://www.springframework.org/schema/beans 
-        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"
+        https://www.springframework.org/schema/beans/spring-beans.xsd"
 >
 
     <http use-expressions="true">
diff --git a/spring-security-modules/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml b/spring-security-modules/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml
index 189522889f..8a83bf5e93 100644
--- a/spring-security-modules/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml
+++ b/spring-security-modules/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
     xsi:schemaLocation="
 		http://www.springframework.org/schema/security 
-        http://www.springframework.org/schema/security/spring-security-4.2.xsd
+        https://www.springframework.org/schema/security/spring-security.xsd
 		http://www.springframework.org/schema/beans 
-        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"
+        https://www.springframework.org/schema/beans/spring-beans.xsd"
 >
 
     <http use-expressions="true">
diff --git a/spring-security-modules/spring-security-mvc-login/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-security-modules/spring-security-mvc-login/src/main/webapp/WEB-INF/mvc-servlet.xml
index 4ba9642448..fa2fae4148 100644
--- a/spring-security-modules/spring-security-mvc-login/src/main/webapp/WEB-INF/mvc-servlet.xml
+++ b/spring-security-modules/spring-security-mvc-login/src/main/webapp/WEB-INF/mvc-servlet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" >
+  xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd" >
 
 </beans>
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-mvc-login/src/test/resources/mvc-servlet.xml b/spring-security-modules/spring-security-mvc-login/src/test/resources/mvc-servlet.xml
index aa5488b116..4568d319b8 100644
--- a/spring-security-modules/spring-security-mvc-login/src/test/resources/mvc-servlet.xml
+++ b/spring-security-modules/spring-security-mvc-login/src/test/resources/mvc-servlet.xml
@@ -1,7 +1,7 @@
 <?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.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
     <context:component-scan base-package="org.baeldung.controller" />
 
diff --git a/spring-security-modules/spring-security-rest-basic-auth/src/main/java/org/baeldung/basic/MyBasicAuthenticationEntryPoint.java b/spring-security-modules/spring-security-rest-basic-auth/src/main/java/org/baeldung/basic/MyBasicAuthenticationEntryPoint.java
index 6e580e7a22..f440bbd10c 100644
--- a/spring-security-modules/spring-security-rest-basic-auth/src/main/java/org/baeldung/basic/MyBasicAuthenticationEntryPoint.java
+++ b/spring-security-modules/spring-security-rest-basic-auth/src/main/java/org/baeldung/basic/MyBasicAuthenticationEntryPoint.java
@@ -14,7 +14,7 @@ import java.io.PrintWriter;
 public class MyBasicAuthenticationEntryPoint extends BasicAuthenticationEntryPoint {
 
     @Override
-    public void commence(final HttpServletRequest request, final HttpServletResponse response, final AuthenticationException authException) throws IOException, ServletException {
+    public void commence(final HttpServletRequest request, final HttpServletResponse response, final AuthenticationException authException) throws IOException {
         response.addHeader("WWW-Authenticate", "Basic realm=\"" + getRealmName() + "\"");
         response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
         final PrintWriter writer = response.getWriter();
@@ -22,7 +22,7 @@ public class MyBasicAuthenticationEntryPoint extends BasicAuthenticationEntryPoi
     }
 
     @Override
-    public void afterPropertiesSet() throws Exception {
+    public void afterPropertiesSet() {
         setRealmName("Baeldung");
         super.afterPropertiesSet();
     }

From 9d77b85aed82a8a1fd928d4647e53e4b221fc396 Mon Sep 17 00:00:00 2001
From: catalin-burcea <burcea.iulian.catalin@gmail.com>
Date: Tue, 24 Dec 2019 16:35:22 +0200
Subject: [PATCH 097/106] [BAEL-16663] - Split or move spring-mvc-java module

---
 pom.xml                                       |   2 +
 spring-aop/README.md                          |   3 +-
 .../com/baeldung/pointcutadvice}/Foo.java     |   4 +-
 .../pointcutadvice}/LoggingAspect.java        |   8 +-
 .../pointcutadvice}/PerformanceAspect.java    |   4 +-
 .../pointcutadvice}/PublishingAspect.java     |   8 +-
 .../pointcutadvice}/annotations/Entity.java   |   2 +-
 .../pointcutadvice}/annotations/Loggable.java |   2 +-
 .../baeldung/pointcutadvice}/dao/FooDao.java  |   6 +-
 .../events/FooCreationEvent.java              |   2 +-
 .../events/FooCreationEventListener.java      |   2 +-
 .../main/resources/pointcutadvice}/beans.xml  |   4 +-
 .../test/java/com/baeldung}/TestConfig.java   |   4 +-
 .../AopLoggingIntegrationTest.java            |   7 +-
 .../AopPerformanceIntegrationTest.java        |   6 +-
 .../AopPublishingIntegrationTest.java         |   9 +-
 ...opXmlConfigPerformanceIntegrationTest.java |   6 +-
 spring-mvc-java/README.md                     |   4 -
 spring-mvc-java/pom.xml                       |  28 ---
 .../java/com/baeldung/SpringContextTest.java  |  18 --
 spring-websockets/README.md                   |   7 +
 spring-websockets/pom.xml                     |  37 ++++
 .../main/java/com/baeldung/SpringBootApp.java |  12 ++
 .../WebSocketSendToUserConfig.java            |   2 +-
 .../WebsocketSendToUserController.java        |   9 +-
 .../baeldung/websockets}/ChatController.java  |   4 +-
 .../com/baeldung/websockets}/Message.java     |   2 +-
 .../baeldung/websockets}/OutputMessage.java   |   2 +-
 .../baeldung/websockets}/WebSocketConfig.java |   2 +-
 .../src/main/webapp/resources/chat.html       | 174 +++++++++---------
 .../main/webapp/resources/js/sockjs-0.3.4.js  |   0
 .../src/main/webapp/resources/js/stomp.js     |   0
 .../resources/js/webSocketSendToUserApp.js    |   0
 33 files changed, 192 insertions(+), 188 deletions(-)
 rename {spring-mvc-java/src/main/java/com/baeldung/model => spring-aop/src/main/java/com/baeldung/pointcutadvice}/Foo.java (76%)
 rename {spring-mvc-java/src/main/java/com/baeldung/aop => spring-aop/src/main/java/com/baeldung/pointcutadvice}/LoggingAspect.java (87%)
 rename {spring-mvc-java/src/main/java/com/baeldung/aop => spring-aop/src/main/java/com/baeldung/pointcutadvice}/PerformanceAspect.java (93%)
 rename {spring-mvc-java/src/main/java/com/baeldung/aop => spring-aop/src/main/java/com/baeldung/pointcutadvice}/PublishingAspect.java (86%)
 rename {spring-mvc-java/src/main/java/com/baeldung/aop => spring-aop/src/main/java/com/baeldung/pointcutadvice}/annotations/Entity.java (83%)
 rename {spring-mvc-java/src/main/java/com/baeldung/aop => spring-aop/src/main/java/com/baeldung/pointcutadvice}/annotations/Loggable.java (84%)
 rename {spring-mvc-java/src/main/java/com/baeldung => spring-aop/src/main/java/com/baeldung/pointcutadvice}/dao/FooDao.java (69%)
 rename {spring-mvc-java/src/main/java/com/baeldung => spring-aop/src/main/java/com/baeldung/pointcutadvice}/events/FooCreationEvent.java (81%)
 rename {spring-mvc-java/src/main/java/com/baeldung => spring-aop/src/main/java/com/baeldung/pointcutadvice}/events/FooCreationEventListener.java (91%)
 rename {spring-mvc-java/src/main/resources/com/baeldung/aop => spring-aop/src/main/resources/pointcutadvice}/beans.xml (82%)
 rename {spring-mvc-java/src/test/java/com/baeldung/config => spring-aop/src/test/java/com/baeldung}/TestConfig.java (67%)
 rename {spring-mvc-java/src/test/java/com/baeldung/aop => spring-aop/src/test/java/com/baeldung/pointcutadvice}/AopLoggingIntegrationTest.java (95%)
 rename {spring-mvc-java/src/test/java/com/baeldung/aop => spring-aop/src/test/java/com/baeldung/pointcutadvice}/AopPerformanceIntegrationTest.java (94%)
 rename {spring-mvc-java/src/test/java/com/baeldung/aop => spring-aop/src/test/java/com/baeldung/pointcutadvice}/AopPublishingIntegrationTest.java (90%)
 rename {spring-mvc-java/src/test/java/com/baeldung/aop => spring-aop/src/test/java/com/baeldung/pointcutadvice}/AopXmlConfigPerformanceIntegrationTest.java (93%)
 delete mode 100644 spring-mvc-java/src/test/java/com/baeldung/SpringContextTest.java
 create mode 100644 spring-websockets/README.md
 create mode 100644 spring-websockets/pom.xml
 create mode 100644 spring-websockets/src/main/java/com/baeldung/SpringBootApp.java
 rename {spring-mvc-java/src/main/java/com/baeldung/spring/web/config => spring-websockets/src/main/java/com/baeldung/sendtouser}/WebSocketSendToUserConfig.java (98%)
 rename {spring-mvc-java/src/main/java/com/baeldung/web/controller => spring-websockets/src/main/java/com/baeldung/sendtouser}/WebsocketSendToUserController.java (96%)
 rename {spring-mvc-java/src/main/java/com/baeldung/web/controller => spring-websockets/src/main/java/com/baeldung/websockets}/ChatController.java (83%)
 rename {spring-mvc-java/src/main/java/com/baeldung/model => spring-websockets/src/main/java/com/baeldung/websockets}/Message.java (85%)
 rename {spring-mvc-java/src/main/java/com/baeldung/model => spring-websockets/src/main/java/com/baeldung/websockets}/OutputMessage.java (93%)
 rename {spring-mvc-java/src/main/java/com/baeldung/spring/web/config => spring-websockets/src/main/java/com/baeldung/websockets}/WebSocketConfig.java (95%)
 rename {spring-mvc-java => spring-websockets}/src/main/webapp/resources/chat.html (96%)
 rename {spring-mvc-java => spring-websockets}/src/main/webapp/resources/js/sockjs-0.3.4.js (100%)
 rename {spring-mvc-java => spring-websockets}/src/main/webapp/resources/js/stomp.js (100%)
 rename {spring-mvc-java => spring-websockets}/src/main/webapp/resources/js/webSocketSendToUserApp.js (100%)

diff --git a/pom.xml b/pom.xml
index 630077b1a4..b8978ab067 100644
--- a/pom.xml
+++ b/pom.xml
@@ -780,6 +780,7 @@
 
                 <module>spring-mobile</module>
                 <module>spring-mockito</module>
+                <module>spring-websockets</module>
                 <module>spring-mvc-basics-4</module>
                 <module>spring-mvc-forms-jsp</module>
                 <module>spring-mvc-forms-thymeleaf</module>
@@ -1377,6 +1378,7 @@
 
                 <module>spring-mobile</module>
                 <module>spring-mockito</module>
+                <module>spring-websockets</module>
                 <module>spring-mvc-forms-jsp</module>
                 <module>spring-mvc-forms-thymeleaf</module>
                 <module>spring-mvc-java</module>
diff --git a/spring-aop/README.md b/spring-aop/README.md
index 061e736d31..4522cd63c1 100644
--- a/spring-aop/README.md
+++ b/spring-aop/README.md
@@ -3,8 +3,9 @@
 This module contains articles about Spring aspect oriented programming (AOP)
 
 ### Relevant articles
-
 - [Implementing a Custom Spring AOP Annotation](https://www.baeldung.com/spring-aop-annotation)
 - [Intro to AspectJ](https://www.baeldung.com/aspectj)
 - [Spring Performance Logging](https://www.baeldung.com/spring-performance-logging)
 - [Introduction to Spring AOP](https://www.baeldung.com/spring-aop)
+- [Introduction to Pointcut Expressions in Spring](https://www.baeldung.com/spring-aop-pointcut-tutorial)
+- [Introduction to Advice Types in Spring](https://www.baeldung.com/spring-aop-advice-tutorial)
\ No newline at end of file
diff --git a/spring-mvc-java/src/main/java/com/baeldung/model/Foo.java b/spring-aop/src/main/java/com/baeldung/pointcutadvice/Foo.java
similarity index 76%
rename from spring-mvc-java/src/main/java/com/baeldung/model/Foo.java
rename to spring-aop/src/main/java/com/baeldung/pointcutadvice/Foo.java
index 01f5f43f60..b20c9a3ccf 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/model/Foo.java
+++ b/spring-aop/src/main/java/com/baeldung/pointcutadvice/Foo.java
@@ -1,6 +1,6 @@
-package com.baeldung.model;
+package com.baeldung.pointcutadvice;
 
-import com.baeldung.aop.annotations.Entity;
+import com.baeldung.pointcutadvice.annotations.Entity;
 
 @Entity
 public class Foo {
diff --git a/spring-mvc-java/src/main/java/com/baeldung/aop/LoggingAspect.java b/spring-aop/src/main/java/com/baeldung/pointcutadvice/LoggingAspect.java
similarity index 87%
rename from spring-mvc-java/src/main/java/com/baeldung/aop/LoggingAspect.java
rename to spring-aop/src/main/java/com/baeldung/pointcutadvice/LoggingAspect.java
index 169d664471..481e1d323a 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/aop/LoggingAspect.java
+++ b/spring-aop/src/main/java/com/baeldung/pointcutadvice/LoggingAspect.java
@@ -1,4 +1,4 @@
-package com.baeldung.aop;
+package com.baeldung.pointcutadvice;
 
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
@@ -23,15 +23,15 @@ public class LoggingAspect {
         }
     };
 
-    @Pointcut("within(com.baeldung..*) && execution(* com.baeldung.dao.FooDao.*(..))")
+    @Pointcut("within(com.baeldung..*) && execution(* com.baeldung.pointcutadvice.dao.FooDao.*(..))")
     public void repositoryMethods() {
     }
 
-    @Pointcut("within(com.baeldung..*) && @annotation(com.baeldung.aop.annotations.Loggable)")
+    @Pointcut("within(com.baeldung..*) && @annotation(com.baeldung.pointcutadvice.annotations.Loggable)")
     public void loggableMethods() {
     }
 
-    @Pointcut("within(com.baeldung..*) && @args(com.baeldung.aop.annotations.Entity)")
+    @Pointcut("within(com.baeldung..*) && @args(com.baeldung.pointcutadvice.annotations.Entity)")
     public void methodsAcceptingEntities() {
     }
 
diff --git a/spring-mvc-java/src/main/java/com/baeldung/aop/PerformanceAspect.java b/spring-aop/src/main/java/com/baeldung/pointcutadvice/PerformanceAspect.java
similarity index 93%
rename from spring-mvc-java/src/main/java/com/baeldung/aop/PerformanceAspect.java
rename to spring-aop/src/main/java/com/baeldung/pointcutadvice/PerformanceAspect.java
index 8f374cc1e5..4f445e301e 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/aop/PerformanceAspect.java
+++ b/spring-aop/src/main/java/com/baeldung/pointcutadvice/PerformanceAspect.java
@@ -1,4 +1,4 @@
-package com.baeldung.aop;
+package com.baeldung.pointcutadvice;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -15,7 +15,7 @@ public class PerformanceAspect {
 
     private static Logger logger = Logger.getLogger(PerformanceAspect.class.getName());
 
-    @Pointcut("within(com.baeldung..*) && execution(* com.baeldung.dao.FooDao.*(..))")
+    @Pointcut("within(com.baeldung..*) && execution(* com.baeldung.pointcutadvice.dao.FooDao.*(..))")
     public void repositoryClassMethods() {
     }
 
diff --git a/spring-mvc-java/src/main/java/com/baeldung/aop/PublishingAspect.java b/spring-aop/src/main/java/com/baeldung/pointcutadvice/PublishingAspect.java
similarity index 86%
rename from spring-mvc-java/src/main/java/com/baeldung/aop/PublishingAspect.java
rename to spring-aop/src/main/java/com/baeldung/pointcutadvice/PublishingAspect.java
index a45402dc18..bb96e08772 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/aop/PublishingAspect.java
+++ b/spring-aop/src/main/java/com/baeldung/pointcutadvice/PublishingAspect.java
@@ -1,6 +1,6 @@
-package com.baeldung.aop;
+package com.baeldung.pointcutadvice;
 
-import com.baeldung.events.FooCreationEvent;
+import com.baeldung.pointcutadvice.events.FooCreationEvent;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -20,11 +20,11 @@ public class PublishingAspect {
         this.eventPublisher = eventPublisher;
     }
 
-    @Pointcut("within(com.baeldung..*) && execution(* com.baeldung.dao.FooDao.*(..))")
+    @Pointcut("within(com.baeldung..*) && execution(* com.baeldung.pointcutadvice.dao.FooDao.*(..))")
     public void repositoryMethods() {
     }
 
-    @Pointcut("within(com.baeldung..*) && execution(* com.baeldung.dao.FooDao.create*(Long,..))")
+    @Pointcut("within(com.baeldung..*) && execution(* com.baeldung.pointcutadvice.dao.FooDao.create*(Long,..))")
     public void firstLongParamMethods() {
     }
 
diff --git a/spring-mvc-java/src/main/java/com/baeldung/aop/annotations/Entity.java b/spring-aop/src/main/java/com/baeldung/pointcutadvice/annotations/Entity.java
similarity index 83%
rename from spring-mvc-java/src/main/java/com/baeldung/aop/annotations/Entity.java
rename to spring-aop/src/main/java/com/baeldung/pointcutadvice/annotations/Entity.java
index 61d91b0777..e6753cdd61 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/aop/annotations/Entity.java
+++ b/spring-aop/src/main/java/com/baeldung/pointcutadvice/annotations/Entity.java
@@ -1,4 +1,4 @@
-package com.baeldung.aop.annotations;
+package com.baeldung.pointcutadvice.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-mvc-java/src/main/java/com/baeldung/aop/annotations/Loggable.java b/spring-aop/src/main/java/com/baeldung/pointcutadvice/annotations/Loggable.java
similarity index 84%
rename from spring-mvc-java/src/main/java/com/baeldung/aop/annotations/Loggable.java
rename to spring-aop/src/main/java/com/baeldung/pointcutadvice/annotations/Loggable.java
index 92aa950e58..921003be63 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/aop/annotations/Loggable.java
+++ b/spring-aop/src/main/java/com/baeldung/pointcutadvice/annotations/Loggable.java
@@ -1,4 +1,4 @@
-package com.baeldung.aop.annotations;
+package com.baeldung.pointcutadvice.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-mvc-java/src/main/java/com/baeldung/dao/FooDao.java b/spring-aop/src/main/java/com/baeldung/pointcutadvice/dao/FooDao.java
similarity index 69%
rename from spring-mvc-java/src/main/java/com/baeldung/dao/FooDao.java
rename to spring-aop/src/main/java/com/baeldung/pointcutadvice/dao/FooDao.java
index 1d28b082ec..72a9762991 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/dao/FooDao.java
+++ b/spring-aop/src/main/java/com/baeldung/pointcutadvice/dao/FooDao.java
@@ -1,7 +1,7 @@
-package com.baeldung.dao;
+package com.baeldung.pointcutadvice.dao;
 
-import com.baeldung.aop.annotations.Loggable;
-import com.baeldung.model.Foo;
+import com.baeldung.pointcutadvice.Foo;
+import com.baeldung.pointcutadvice.annotations.Loggable;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/spring-mvc-java/src/main/java/com/baeldung/events/FooCreationEvent.java b/spring-aop/src/main/java/com/baeldung/pointcutadvice/events/FooCreationEvent.java
similarity index 81%
rename from spring-mvc-java/src/main/java/com/baeldung/events/FooCreationEvent.java
rename to spring-aop/src/main/java/com/baeldung/pointcutadvice/events/FooCreationEvent.java
index 5ea4b46c04..8cee80fa0c 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/events/FooCreationEvent.java
+++ b/spring-aop/src/main/java/com/baeldung/pointcutadvice/events/FooCreationEvent.java
@@ -1,4 +1,4 @@
-package com.baeldung.events;
+package com.baeldung.pointcutadvice.events;
 
 import org.springframework.context.ApplicationEvent;
 
diff --git a/spring-mvc-java/src/main/java/com/baeldung/events/FooCreationEventListener.java b/spring-aop/src/main/java/com/baeldung/pointcutadvice/events/FooCreationEventListener.java
similarity index 91%
rename from spring-mvc-java/src/main/java/com/baeldung/events/FooCreationEventListener.java
rename to spring-aop/src/main/java/com/baeldung/pointcutadvice/events/FooCreationEventListener.java
index c0aa744bc1..4a55b2138d 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/events/FooCreationEventListener.java
+++ b/spring-aop/src/main/java/com/baeldung/pointcutadvice/events/FooCreationEventListener.java
@@ -1,4 +1,4 @@
-package com.baeldung.events;
+package com.baeldung.pointcutadvice.events;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
diff --git a/spring-mvc-java/src/main/resources/com/baeldung/aop/beans.xml b/spring-aop/src/main/resources/pointcutadvice/beans.xml
similarity index 82%
rename from spring-mvc-java/src/main/resources/com/baeldung/aop/beans.xml
rename to spring-aop/src/main/resources/pointcutadvice/beans.xml
index e6aa9d77c4..ad96827a13 100644
--- a/spring-mvc-java/src/main/resources/com/baeldung/aop/beans.xml
+++ b/spring-aop/src/main/resources/pointcutadvice/beans.xml
@@ -7,8 +7,8 @@
         http://www.springframework.org/schema/aop
         http://www.springframework.org/schema/aop/spring-aop-4.2.xsd">
 
-    <bean id="perfomanceMeter" class="com.baeldung.aop.PerformanceAspect"/>
-    <bean id="fooDao" class="com.baeldung.dao.FooDao"/>
+    <bean id="perfomanceMeter" class="com.baeldung.pointcutadvice.PerformanceAspect"/>
+    <bean id="fooDao" class="com.baeldung.pointcutadvice.dao.FooDao"/>
 
     <aop:config>
         <aop:pointcut id="anyDaoMethod" expression="@target(org.springframework.stereotype.Repository)"/>
diff --git a/spring-mvc-java/src/test/java/com/baeldung/config/TestConfig.java b/spring-aop/src/test/java/com/baeldung/TestConfig.java
similarity index 67%
rename from spring-mvc-java/src/test/java/com/baeldung/config/TestConfig.java
rename to spring-aop/src/test/java/com/baeldung/TestConfig.java
index 641513a24a..e5db2508e4 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/config/TestConfig.java
+++ b/spring-aop/src/test/java/com/baeldung/TestConfig.java
@@ -1,11 +1,11 @@
-package com.baeldung.config;
+package com.baeldung;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
 @Configuration
-@ComponentScan(basePackages = { "com.baeldung.dao", "com.baeldung.aop", "com.baeldung.events" })
+@ComponentScan(basePackages = { "com.baeldung.pointcutadvice" })
 @EnableAspectJAutoProxy
 public class TestConfig {
 }
diff --git a/spring-mvc-java/src/test/java/com/baeldung/aop/AopLoggingIntegrationTest.java b/spring-aop/src/test/java/com/baeldung/pointcutadvice/AopLoggingIntegrationTest.java
similarity index 95%
rename from spring-mvc-java/src/test/java/com/baeldung/aop/AopLoggingIntegrationTest.java
rename to spring-aop/src/test/java/com/baeldung/pointcutadvice/AopLoggingIntegrationTest.java
index 698bae4c0f..eff3d2eb19 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/aop/AopLoggingIntegrationTest.java
+++ b/spring-aop/src/test/java/com/baeldung/pointcutadvice/AopLoggingIntegrationTest.java
@@ -1,8 +1,7 @@
-package com.baeldung.aop;
+package com.baeldung.pointcutadvice;
 
-import com.baeldung.config.TestConfig;
-import com.baeldung.dao.FooDao;
-import com.baeldung.model.Foo;
+import com.baeldung.TestConfig;
+import com.baeldung.pointcutadvice.dao.FooDao;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-mvc-java/src/test/java/com/baeldung/aop/AopPerformanceIntegrationTest.java b/spring-aop/src/test/java/com/baeldung/pointcutadvice/AopPerformanceIntegrationTest.java
similarity index 94%
rename from spring-mvc-java/src/test/java/com/baeldung/aop/AopPerformanceIntegrationTest.java
rename to spring-aop/src/test/java/com/baeldung/pointcutadvice/AopPerformanceIntegrationTest.java
index c9ab2fb4bb..452609d730 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/aop/AopPerformanceIntegrationTest.java
+++ b/spring-aop/src/test/java/com/baeldung/pointcutadvice/AopPerformanceIntegrationTest.java
@@ -1,7 +1,7 @@
-package com.baeldung.aop;
+package com.baeldung.pointcutadvice;
 
-import com.baeldung.config.TestConfig;
-import com.baeldung.dao.FooDao;
+import com.baeldung.TestConfig;
+import com.baeldung.pointcutadvice.dao.FooDao;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-mvc-java/src/test/java/com/baeldung/aop/AopPublishingIntegrationTest.java b/spring-aop/src/test/java/com/baeldung/pointcutadvice/AopPublishingIntegrationTest.java
similarity index 90%
rename from spring-mvc-java/src/test/java/com/baeldung/aop/AopPublishingIntegrationTest.java
rename to spring-aop/src/test/java/com/baeldung/pointcutadvice/AopPublishingIntegrationTest.java
index 2503900e69..559dc52cb5 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/aop/AopPublishingIntegrationTest.java
+++ b/spring-aop/src/test/java/com/baeldung/pointcutadvice/AopPublishingIntegrationTest.java
@@ -1,9 +1,8 @@
-package com.baeldung.aop;
+package com.baeldung.pointcutadvice;
 
-import com.baeldung.config.TestConfig;
-import com.baeldung.dao.FooDao;
-import com.baeldung.events.FooCreationEventListener;
-import com.baeldung.model.Foo;
+import com.baeldung.TestConfig;
+import com.baeldung.pointcutadvice.dao.FooDao;
+import com.baeldung.pointcutadvice.events.FooCreationEventListener;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-mvc-java/src/test/java/com/baeldung/aop/AopXmlConfigPerformanceIntegrationTest.java b/spring-aop/src/test/java/com/baeldung/pointcutadvice/AopXmlConfigPerformanceIntegrationTest.java
similarity index 93%
rename from spring-mvc-java/src/test/java/com/baeldung/aop/AopXmlConfigPerformanceIntegrationTest.java
rename to spring-aop/src/test/java/com/baeldung/pointcutadvice/AopXmlConfigPerformanceIntegrationTest.java
index 3b380315e8..5727cfd7bc 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/aop/AopXmlConfigPerformanceIntegrationTest.java
+++ b/spring-aop/src/test/java/com/baeldung/pointcutadvice/AopXmlConfigPerformanceIntegrationTest.java
@@ -1,6 +1,6 @@
-package com.baeldung.aop;
+package com.baeldung.pointcutadvice;
 
-import com.baeldung.dao.FooDao;
+import com.baeldung.pointcutadvice.dao.FooDao;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("/com/baeldung/aop/beans.xml")
+@ContextConfiguration("/pointcutadvice/beans.xml")
 public class AopXmlConfigPerformanceIntegrationTest {
 
     @Before
diff --git a/spring-mvc-java/README.md b/spring-mvc-java/README.md
index 7088162496..4859e28147 100644
--- a/spring-mvc-java/README.md
+++ b/spring-mvc-java/README.md
@@ -7,17 +7,13 @@ This module contains articles about Spring MVC with Java configuration
 The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
-- [Introduction to Pointcut Expressions in Spring](https://www.baeldung.com/spring-aop-pointcut-tutorial)
-- [Introduction to Advice Types in Spring](https://www.baeldung.com/spring-aop-advice-tutorial)
 - [Integration Testing in Spring](https://www.baeldung.com/integration-testing-in-spring)
 - [A Quick Guide to Spring MVC Matrix Variables](https://www.baeldung.com/spring-mvc-matrix-variables)
-- [Intro to WebSockets with Spring](https://www.baeldung.com/websockets-spring)
 - [File Upload with Spring MVC](https://www.baeldung.com/spring-file-upload)
 - [Introduction to HtmlUnit](https://www.baeldung.com/htmlunit)
 - [Upload and Display Excel Files with Spring MVC](https://www.baeldung.com/spring-mvc-excel-files)
 - [web.xml vs Initializer with Spring](https://www.baeldung.com/spring-xml-vs-java-config)
 - [Spring MVC @PathVariable with a dot (.) gets truncated](https://www.baeldung.com/spring-mvc-pathvariable-dot)
-- [A Quick Example of Spring Websockets’ @SendToUser Annotation](https://www.baeldung.com/spring-websockets-sendtouser)
 - [Working with Date Parameters in Spring](https://www.baeldung.com/spring-date-parameters)
 - [A Java Web Application Without a web.xml](https://www.baeldung.com/java-web-app-without-web-xml)
 - [The HttpMediaTypeNotAcceptableException in Spring MVC](https://www.baeldung.com/spring-httpmediatypenotacceptable)
diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml
index dd197bbeb5..079a664a5d 100644
--- a/spring-mvc-java/pom.xml
+++ b/spring-mvc-java/pom.xml
@@ -48,19 +48,6 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
-
-        <!-- AOP -->
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>${aspectjrt.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-            <version>${aspectjweaver.version}</version>
-        </dependency>
-
         <!-- common -->
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
@@ -120,18 +107,6 @@
             <artifactId>hibernate-validator</artifactId>
             <version>${hibernate-validator.version}</version>
         </dependency>
-
-        <!-- Web socket to user example -->
-
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>javax.el</artifactId>
@@ -285,11 +260,8 @@
         <javax.el.version>3.0.1-b09</javax.el.version>
         <javax.version>4.0.1</javax.version>
         <javax-servlet-api.version>2.3.3</javax-servlet-api.version>
-        <aspectjrt.version>1.9.1</aspectjrt.version>
-        <aspectjweaver.version>1.9.1</aspectjweaver.version>
         <htmlunit.version>2.32</htmlunit.version>
         <json-path.version>2.4.0</json-path.version>
-        <gson.version>2.8.5</gson.version>
         <start-class>com.baeldung.SpringMVCApplication</start-class>
     </properties>
 
diff --git a/spring-mvc-java/src/test/java/com/baeldung/SpringContextTest.java b/spring-mvc-java/src/test/java/com/baeldung/SpringContextTest.java
deleted file mode 100644
index 8943ecb548..0000000000
--- a/spring-mvc-java/src/test/java/com/baeldung/SpringContextTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.baeldung;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import com.baeldung.config.TestConfig;
-
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {TestConfig.class})
-public class SpringContextTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-        
-    }
-}
diff --git a/spring-websockets/README.md b/spring-websockets/README.md
new file mode 100644
index 0000000000..26e1c6db7c
--- /dev/null
+++ b/spring-websockets/README.md
@@ -0,0 +1,7 @@
+## Spring WebSockets
+
+This module contains articles about Spring WebSockets.
+
+### Relevant articles
+- [Intro to WebSockets with Spring](https://www.baeldung.com/websockets-spring)
+- [A Quick Example of Spring Websockets’ @SendToUser Annotation](https://www.baeldung.com/spring-websockets-sendtouser)
diff --git a/spring-websockets/pom.xml b/spring-websockets/pom.xml
new file mode 100644
index 0000000000..ddfd512476
--- /dev/null
+++ b/spring-websockets/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>
+    <artifactId>spring-websockets</artifactId>
+    <name>spring-websockets</name>
+    <packaging>war</packaging>
+
+    <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-websocket</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>spring-websockets</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+</project>
diff --git a/spring-websockets/src/main/java/com/baeldung/SpringBootApp.java b/spring-websockets/src/main/java/com/baeldung/SpringBootApp.java
new file mode 100644
index 0000000000..ea2a461dfc
--- /dev/null
+++ b/spring-websockets/src/main/java/com/baeldung/SpringBootApp.java
@@ -0,0 +1,12 @@
+package com.baeldung;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+@SpringBootApplication
+public class SpringBootApp extends SpringBootServletInitializer {
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootApp.class, args);
+    }
+}
\ No newline at end of file
diff --git a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebSocketSendToUserConfig.java b/spring-websockets/src/main/java/com/baeldung/sendtouser/WebSocketSendToUserConfig.java
similarity index 98%
rename from spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebSocketSendToUserConfig.java
rename to spring-websockets/src/main/java/com/baeldung/sendtouser/WebSocketSendToUserConfig.java
index dbd52e20ba..76837d27f5 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebSocketSendToUserConfig.java
+++ b/spring-websockets/src/main/java/com/baeldung/sendtouser/WebSocketSendToUserConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.web.config;
+package com.baeldung.sendtouser;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.server.ServerHttpRequest;
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/WebsocketSendToUserController.java b/spring-websockets/src/main/java/com/baeldung/sendtouser/WebsocketSendToUserController.java
similarity index 96%
rename from spring-mvc-java/src/main/java/com/baeldung/web/controller/WebsocketSendToUserController.java
rename to spring-websockets/src/main/java/com/baeldung/sendtouser/WebsocketSendToUserController.java
index 4b55bcc00f..12475ad055 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/web/controller/WebsocketSendToUserController.java
+++ b/spring-websockets/src/main/java/com/baeldung/sendtouser/WebsocketSendToUserController.java
@@ -1,15 +1,14 @@
-package com.baeldung.web.controller;
-
-import java.security.Principal;
-import java.util.Map;
+package com.baeldung.sendtouser;
 
+import com.google.gson.Gson;
 import org.springframework.messaging.handler.annotation.MessageExceptionHandler;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.messaging.simp.annotation.SendToUser;
 import org.springframework.stereotype.Controller;
 
-import com.google.gson.Gson;
+import java.security.Principal;
+import java.util.Map;
 
 @Controller
 public class WebsocketSendToUserController {
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/ChatController.java b/spring-websockets/src/main/java/com/baeldung/websockets/ChatController.java
similarity index 83%
rename from spring-mvc-java/src/main/java/com/baeldung/web/controller/ChatController.java
rename to spring-websockets/src/main/java/com/baeldung/websockets/ChatController.java
index f4bed1950b..4ac78c2730 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/web/controller/ChatController.java
+++ b/spring-websockets/src/main/java/com/baeldung/websockets/ChatController.java
@@ -1,7 +1,5 @@
-package com.baeldung.web.controller;
+package com.baeldung.websockets;
 
-import com.baeldung.model.Message;
-import com.baeldung.model.OutputMessage;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.stereotype.Controller;
diff --git a/spring-mvc-java/src/main/java/com/baeldung/model/Message.java b/spring-websockets/src/main/java/com/baeldung/websockets/Message.java
similarity index 85%
rename from spring-mvc-java/src/main/java/com/baeldung/model/Message.java
rename to spring-websockets/src/main/java/com/baeldung/websockets/Message.java
index 76d53e132a..dd147a7bf5 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/model/Message.java
+++ b/spring-websockets/src/main/java/com/baeldung/websockets/Message.java
@@ -1,4 +1,4 @@
-package com.baeldung.model;
+package com.baeldung.websockets;
 
 public class Message {
 
diff --git a/spring-mvc-java/src/main/java/com/baeldung/model/OutputMessage.java b/spring-websockets/src/main/java/com/baeldung/websockets/OutputMessage.java
similarity index 93%
rename from spring-mvc-java/src/main/java/com/baeldung/model/OutputMessage.java
rename to spring-websockets/src/main/java/com/baeldung/websockets/OutputMessage.java
index 9aad564b1e..33d1f42743 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/model/OutputMessage.java
+++ b/spring-websockets/src/main/java/com/baeldung/websockets/OutputMessage.java
@@ -1,4 +1,4 @@
-package com.baeldung.model;
+package com.baeldung.websockets;
 
 public class OutputMessage {
 
diff --git a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebSocketConfig.java b/spring-websockets/src/main/java/com/baeldung/websockets/WebSocketConfig.java
similarity index 95%
rename from spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebSocketConfig.java
rename to spring-websockets/src/main/java/com/baeldung/websockets/WebSocketConfig.java
index 0793658e90..7b53dbc3f3 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebSocketConfig.java
+++ b/spring-websockets/src/main/java/com/baeldung/websockets/WebSocketConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.web.config;
+package com.baeldung.websockets;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.simp.config.MessageBrokerRegistry;
diff --git a/spring-mvc-java/src/main/webapp/resources/chat.html b/spring-websockets/src/main/webapp/resources/chat.html
similarity index 96%
rename from spring-mvc-java/src/main/webapp/resources/chat.html
rename to spring-websockets/src/main/webapp/resources/chat.html
index 92a54534fd..17c8494dd8 100644
--- a/spring-mvc-java/src/main/webapp/resources/chat.html
+++ b/spring-websockets/src/main/webapp/resources/chat.html
@@ -1,88 +1,88 @@
-<html>
-	<head>
-	    <title>Chat WebSocket</title>
-	    
-	    <script src="./js/sockjs-0.3.4.js"></script>
-	    <script src="./js/stomp.js"></script>
-	    
-	    <script type="text/javascript">
-	    
-	        var stompClient = null;
-	        
-	        function setConnected(connected) {
-	        	
-	            document.getElementById('connect').disabled = connected;
-	            document.getElementById('disconnect').disabled = !connected;
-	            document.getElementById('conversationDiv').style.visibility = connected ? 'visible' : 'hidden';
-	            document.getElementById('response').innerHTML = '';
-	        }
-	        
-	        function connect() {
-	        	
-	            var socket = new SockJS('/spring-mvc-java/chat');
-	            stompClient = Stomp.over(socket);  
-	            
-	            stompClient.connect({}, function(frame) {
-	                
-	            	setConnected(true);
-	                console.log('Connected: ' + frame);
-	                stompClient.subscribe('/topic/messages', function(messageOutput) {
-	                	
-	                    showMessageOutput(JSON.parse(messageOutput.body));
-	                });
-	            });
-	        }
-	        
-	        function disconnect() {
-	        	
-	            if(stompClient != null) {
-	                stompClient.disconnect();
-	            }
-	            
-	            setConnected(false);
-	            console.log("Disconnected");
-	        }
-	        
-	        function sendMessage() {
-	        	
-	        	var from = document.getElementById('from').value;
-	            var text = document.getElementById('text').value;
-	            stompClient.send("/app/chat", {}, JSON.stringify({'from':from, 'text':text}));
-	        }
-	        
-	        function showMessageOutput(messageOutput) {
-	        	
-	            var response = document.getElementById('response');
-	            var p = document.createElement('p');
-	            p.style.wordWrap = 'break-word';
-	            p.appendChild(document.createTextNode(messageOutput.from + ": " + messageOutput.text + " (" + messageOutput.time + ")"));
-	            response.appendChild(p);
-	        }
-	        
-	    </script>
-	    
-	</head>
-	
-	<body onload="disconnect()">
-
-		<div>
-		
-		
-			<div>
-				<input type="text" id="from" placeholder="Choose a nickname"/>
-			</div>
-			<br />
-		    <div>
-		        <button id="connect" onclick="connect();">Connect</button>
-		        <button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
-		    </div>
-		    <br />
-		    <div id="conversationDiv">
-		        <input type="text" id="text" placeholder="Write a message..."/>
-		        <button id="sendMessage" onclick="sendMessage();">Send</button>
-		        <p id="response"></p>
-		    </div>
-		</div>
-
-	</body>
+<html>
+	<head>
+	    <title>Chat WebSocket</title>
+	    
+	    <script src="./js/sockjs-0.3.4.js"></script>
+	    <script src="./js/stomp.js"></script>
+	    
+	    <script type="text/javascript">
+	    
+	        var stompClient = null;
+	        
+	        function setConnected(connected) {
+	        	
+	            document.getElementById('connect').disabled = connected;
+	            document.getElementById('disconnect').disabled = !connected;
+	            document.getElementById('conversationDiv').style.visibility = connected ? 'visible' : 'hidden';
+	            document.getElementById('response').innerHTML = '';
+	        }
+	        
+	        function connect() {
+	        	
+	            var socket = new SockJS('/spring-mvc-java/chat');
+	            stompClient = Stomp.over(socket);  
+	            
+	            stompClient.connect({}, function(frame) {
+	                
+	            	setConnected(true);
+	                console.log('Connected: ' + frame);
+	                stompClient.subscribe('/topic/messages', function(messageOutput) {
+	                	
+	                    showMessageOutput(JSON.parse(messageOutput.body));
+	                });
+	            });
+	        }
+	        
+	        function disconnect() {
+	        	
+	            if(stompClient != null) {
+	                stompClient.disconnect();
+	            }
+	            
+	            setConnected(false);
+	            console.log("Disconnected");
+	        }
+	        
+	        function sendMessage() {
+	        	
+	        	var from = document.getElementById('from').value;
+	            var text = document.getElementById('text').value;
+	            stompClient.send("/app/chat", {}, JSON.stringify({'from':from, 'text':text}));
+	        }
+	        
+	        function showMessageOutput(messageOutput) {
+	        	
+	            var response = document.getElementById('response');
+	            var p = document.createElement('p');
+	            p.style.wordWrap = 'break-word';
+	            p.appendChild(document.createTextNode(messageOutput.from + ": " + messageOutput.text + " (" + messageOutput.time + ")"));
+	            response.appendChild(p);
+	        }
+	        
+	    </script>
+	    
+	</head>
+	
+	<body onload="disconnect()">
+
+		<div>
+		
+		
+			<div>
+				<input type="text" id="from" placeholder="Choose a nickname"/>
+			</div>
+			<br />
+		    <div>
+		        <button id="connect" onclick="connect();">Connect</button>
+		        <button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
+		    </div>
+		    <br />
+		    <div id="conversationDiv">
+		        <input type="text" id="text" placeholder="Write a message..."/>
+		        <button id="sendMessage" onclick="sendMessage();">Send</button>
+		        <p id="response"></p>
+		    </div>
+		</div>
+
+	</body>
 </html>
\ No newline at end of file
diff --git a/spring-mvc-java/src/main/webapp/resources/js/sockjs-0.3.4.js b/spring-websockets/src/main/webapp/resources/js/sockjs-0.3.4.js
similarity index 100%
rename from spring-mvc-java/src/main/webapp/resources/js/sockjs-0.3.4.js
rename to spring-websockets/src/main/webapp/resources/js/sockjs-0.3.4.js
diff --git a/spring-mvc-java/src/main/webapp/resources/js/stomp.js b/spring-websockets/src/main/webapp/resources/js/stomp.js
similarity index 100%
rename from spring-mvc-java/src/main/webapp/resources/js/stomp.js
rename to spring-websockets/src/main/webapp/resources/js/stomp.js
diff --git a/spring-mvc-java/src/main/webapp/resources/js/webSocketSendToUserApp.js b/spring-websockets/src/main/webapp/resources/js/webSocketSendToUserApp.js
similarity index 100%
rename from spring-mvc-java/src/main/webapp/resources/js/webSocketSendToUserApp.js
rename to spring-websockets/src/main/webapp/resources/js/webSocketSendToUserApp.js

From 5e2b3271d15a290ba96f4b2c210c460b9246f3f7 Mon Sep 17 00:00:00 2001
From: mguarnaccia <michele.guarnaccia@gmail.com>
Date: Fri, 27 Dec 2019 18:20:10 +0100
Subject: [PATCH 098/106] BAEL-3486 (#8424)

* Hexagonal architecture: a quick and practical example

* BAEL-3486


commit

* Formatting issue solved
---
 .../baeldung/algorithms/greedy/Follower.java  | 20 +++++++
 .../algorithms/greedy/FollowersPath.java      | 44 ++++++++++++++
 .../algorithms/greedy/GreedyAlgorithm.java    | 47 +++++++++++++++
 .../algorithms/greedy/NonGreedyAlgorithm.java | 44 ++++++++++++++
 .../algorithms/greedy/SocialConnector.java    | 36 ++++++++++++
 .../algorithms/greedy/SocialUser.java         | 38 ++++++++++++
 .../greedy/GreedyAlgorithmUnitTest.java       | 58 +++++++++++++++++++
 7 files changed, 287 insertions(+)
 create mode 100644 algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/Follower.java
 create mode 100644 algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java
 create mode 100644 algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java
 create mode 100644 algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java
 create mode 100644 algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java
 create mode 100644 algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java
 create mode 100644 algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java

diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/Follower.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/Follower.java
new file mode 100644
index 0000000000..e142f10eb4
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/Follower.java
@@ -0,0 +1,20 @@
+package com.baeldung.algorithms.greedy;
+
+import lombok.Getter;
+
+public class Follower {
+
+    @Getter String username;
+    @Getter long count;
+    
+    public Follower(String username, long count) {
+        super();
+        this.username = username;
+        this.count = count;
+    }
+    
+    @Override
+    public String toString() {
+        return "User: " + username + ", Followers: " + count + "\n\r" ; 
+    }
+}
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java
new file mode 100644
index 0000000000..2319c14af8
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java
@@ -0,0 +1,44 @@
+package com.baeldung.algorithms.greedy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FollowersPath {
+
+    private List<Follower> accounts;
+    private long count;
+    
+    public FollowersPath() {
+        super();
+        this.accounts = new ArrayList<>();
+    }
+    
+    public List<Follower> getAccounts() {
+        return accounts;
+    }
+    public long getCount() {
+        return count;
+    }
+    
+    public void addFollower(String username, long count) {
+        accounts.add(new Follower(username, count));
+    }
+    
+    public void addCount(long count) {
+        this.count += count;
+    }
+    
+    @Override
+    public String toString() {
+        String details = "";
+        for(Follower a : accounts) {
+            details+=a.toString() + ", ";
+        }
+        
+        return "Total: " + count + ", \n\r" +
+                " Details: { " + "\n\r" + 
+                details + "\n\r" + 
+                " }";
+    }
+    
+}
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java
new file mode 100644
index 0000000000..d32ffb01b9
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java
@@ -0,0 +1,47 @@
+package com.baeldung.algorithms.greedy;
+
+import java.util.List;
+
+public class GreedyAlgorithm {
+
+    int currentLevel = 0;
+    final int maxLevel = 3; 
+    SocialConnector sc;
+    FollowersPath fp;
+    
+    public GreedyAlgorithm(SocialConnector sc) {
+        super();
+        this.sc = sc;
+        this.fp = new FollowersPath();
+    }
+    
+    public long findMostFollowersPath(String account) throws Exception {        
+        long max = 0;
+        SocialUser toFollow = null;
+        
+        List<SocialUser> followers = sc.getFollowers(account);
+        for (SocialUser el : followers) {
+            long followersCount = el.getFollowersCount();
+            if (followersCount > max) {
+                toFollow = el;
+                max = followersCount;
+            }
+        }
+        
+        if (currentLevel < maxLevel - 1) {
+            currentLevel++;
+            max += findMostFollowersPath(toFollow.getUsername());
+            //fp.addFollower(toFollow.getUsername(), max);
+            //fp.addCount(max);
+            return max;
+        } else {
+            //fp.addFollower(toFollow.getUsername(), max);
+            //fp.addCount(max);
+            return max;
+        }            
+    }
+    
+    public FollowersPath getFollowers() {
+        return fp;
+    }
+}
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java
new file mode 100644
index 0000000000..cb3d69a18e
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java
@@ -0,0 +1,44 @@
+package com.baeldung.algorithms.greedy;
+
+import java.util.List;
+
+public class NonGreedyAlgorithm {
+
+    int currentLevel = 0;
+    final int maxLevel = 3; 
+    SocialConnector tc;
+    
+    public NonGreedyAlgorithm(SocialConnector tc, int level) {
+        super();
+        this.tc = tc;
+        this.currentLevel = level;
+    }
+    
+    
+    public long findMostFollowersPath(String account) throws Exception {        
+        List<SocialUser> followers = tc.getFollowers(account);
+        long total = currentLevel > 0 ? followers.size() : 0;
+
+        if (currentLevel < maxLevel ) {
+            currentLevel++;
+
+            long[] count = new long[followers.size()];
+            int i = 0;
+            for (SocialUser el : followers) {
+                NonGreedyAlgorithm sub = new NonGreedyAlgorithm(tc, currentLevel);
+                count[i] = sub.findMostFollowersPath(el.getUsername());
+                i++;
+            }
+            
+            long max = 0;
+            for (; i > 0; i--) {
+                if (count[i-1] > max )
+                    max = count[i-1];
+            }
+            
+            return total + max;
+        }
+        
+        return total;
+    }
+}
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java
new file mode 100644
index 0000000000..b8bbbdcfff
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java
@@ -0,0 +1,36 @@
+package com.baeldung.algorithms.greedy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public class SocialConnector {
+    private boolean isCounterEnabled = true;
+    private int counter = 4;
+    @Getter @Setter List<SocialUser> users;
+    
+    public SocialConnector() {
+        users = new ArrayList<>();
+    }
+    
+    public boolean switchCounter() {
+        this.isCounterEnabled = !this.isCounterEnabled;
+        return this.isCounterEnabled;
+    }
+    
+    public List<SocialUser> getFollowers(String account) throws Exception {
+        if (counter < 0)
+            throw new Exception ("API limit reached");
+        else {
+            if(this.isCounterEnabled) counter--;
+            for(SocialUser user : users) {
+                if (user.getUsername().equals(account)) {
+                    return user.getFollowers();
+                }
+            }
+        }
+        return new ArrayList<>();
+    }
+}
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java
new file mode 100644
index 0000000000..bc8679da79
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java
@@ -0,0 +1,38 @@
+package com.baeldung.algorithms.greedy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.Getter;
+
+public class SocialUser {
+
+    @Getter private String username;
+    @Getter private List<SocialUser> followers;
+
+    public SocialUser(String username) {
+        super();
+        this.username = username;
+        this.followers = new ArrayList<>();
+    }
+    
+    public SocialUser(String username, List<SocialUser> followers) {
+        super();
+        this.username = username;
+        this.followers = followers;
+    }
+    
+    public long getFollowersCount() {
+        return followers.size();
+    }
+    
+    public void addFollowers(List<SocialUser> followers) {
+        this.followers.addAll(followers);
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        return ((SocialUser) obj).getUsername().equals(username);
+    }
+    
+}
diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java
new file mode 100644
index 0000000000..173e3f8de5
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java
@@ -0,0 +1,58 @@
+package com.baeldung.algorithms.greedy;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class GreedyAlgorithmUnitTest {
+
+    private SocialConnector prepareNetwork() {
+        SocialConnector sc = new SocialConnector();
+        SocialUser root = new SocialUser("root");
+        SocialUser child1 = new SocialUser("child1");
+        SocialUser child2 = new SocialUser("child2");
+        SocialUser child3 = new SocialUser("child3");
+        SocialUser child21 = new SocialUser("child21");
+        SocialUser child211 = new SocialUser("child211");
+        SocialUser child2111 = new SocialUser("child2111");
+        SocialUser child31 = new SocialUser("child31");
+        SocialUser child311 = new SocialUser("child311");
+        SocialUser child3111 = new SocialUser("child3111");
+        child211.addFollowers(Arrays.asList(new SocialUser[]{child2111}));
+        child311.addFollowers(Arrays.asList(new SocialUser[]{child3111}));
+        child21.addFollowers(Arrays.asList(new SocialUser[]{child211}));
+        child31.addFollowers(Arrays.asList(new SocialUser[]{child311, 
+          new SocialUser("child312"), new SocialUser("child313"), new SocialUser("child314")}));
+        child1.addFollowers(Arrays.asList(new SocialUser[]{new SocialUser("child11"), new SocialUser("child12")}));
+        child2.addFollowers(Arrays.asList(new SocialUser[]{child21, new SocialUser("child22"), new SocialUser("child23")}));
+        child3.addFollowers(Arrays.asList(new SocialUser[]{child31}));
+        root.addFollowers(Arrays.asList(new SocialUser[]{child1, child2, child3}));
+        sc.setUsers(Arrays.asList(new SocialUser[]{root, child1, child2, child3, child21, child31, child311, child211}));
+        return sc;
+    }
+
+    @Test
+    public void greedyAlgorithmTest() throws Exception {
+        GreedyAlgorithm ga = new GreedyAlgorithm(prepareNetwork());
+        assertEquals(ga.findMostFollowersPath("root"), 5);
+    }
+
+    @Test
+    public void nongreedyAlgorithmTest() throws Exception {
+        NonGreedyAlgorithm nga = new NonGreedyAlgorithm(prepareNetwork(), 0);
+        Assertions.assertThrows(Exception.class, () -> {
+            nga.findMostFollowersPath("root");
+          });
+    }
+
+    @Test
+    public void nongreedyAlgorithmUnboundedTest() throws Exception {
+        SocialConnector sc = prepareNetwork();
+        sc.switchCounter();
+        NonGreedyAlgorithm nga = new NonGreedyAlgorithm(sc, 0);
+        assertEquals(nga.findMostFollowersPath("root"), 6);
+    }
+}
\ No newline at end of file

From 8fab22b6e72b2a90ddb30f875a596128002df4bc Mon Sep 17 00:00:00 2001
From: macroscopic64 <46401144+macroscopic64@users.noreply.github.com>
Date: Fri, 27 Dec 2019 23:34:59 +0530
Subject: [PATCH 099/106] [BAEL-3485] - Java Range lookup problem (#8392)

* [BAEL-3485] - Java Range lookup problem

* [BAEL-3485] - Java Range lookup problem

* [BAEL-3485] - Java Range lookup problem
---
 .../baeldung/algorithms/quadtree/Point.java   |  24 ++++
 .../algorithms/quadtree/QuadTree.java         | 109 ++++++++++++++++++
 .../baeldung/algorithms/quadtree/Region.java  |  85 ++++++++++++++
 .../quadtree/QuadTreeSearchUnitTest.java      |  60 ++++++++++
 4 files changed, 278 insertions(+)
 create mode 100644 algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Point.java
 create mode 100644 algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java
 create mode 100644 algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Region.java
 create mode 100644 algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java

diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Point.java b/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Point.java
new file mode 100644
index 0000000000..f61ee87f7d
--- /dev/null
+++ b/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Point.java
@@ -0,0 +1,24 @@
+package com.baeldung.algorithms.quadtree;
+
+public class Point {
+    private float x;
+    private float y;
+
+    public Point(float x, float y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public float getX() {
+        return x;
+    }
+
+    public float getY() {
+        return y;
+    }
+
+    @Override
+    public String toString() {
+        return "[" + x + " , " + y + "]";
+    }
+}
diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java b/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java
new file mode 100644
index 0000000000..bb3cf029b1
--- /dev/null
+++ b/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java
@@ -0,0 +1,109 @@
+package com.baeldung.algorithms.quadtree;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class QuadTree {
+    private static final int MAX_POINTS = 3;
+    private Region area;
+    private List<Point> points = new ArrayList<>();
+    private List<QuadTree> quadTrees = new ArrayList<>();
+    private StringBuilder searchTraversePath;
+
+    public QuadTree(Region area) {
+        this.area = area;
+    }
+
+    public boolean addPoint(Point point) {
+        if (this.area.containsPoint(point)) {
+            if (this.points.size() < MAX_POINTS) {
+                this.points.add(point);
+                return true;
+            } else {
+                if (this.quadTrees.size() == 0) {
+                    createQuadrants();
+                }
+                return addPointToOneQuadrant(point);
+            }
+        }
+        return false;
+    }
+
+    private boolean addPointToOneQuadrant(Point point) {
+        boolean isPointAdded;
+        for (int i = 0; i < 4; i++) {
+            isPointAdded = this.quadTrees.get(i)
+                .addPoint(point);
+            if (isPointAdded)
+                return true;
+        }
+        return false;
+    }
+
+    private void createQuadrants() {
+        Region region;
+        for (int i = 0; i < 4; i++) {
+            region = this.area.getQuadrant(i);
+            quadTrees.add(new QuadTree(region));
+        }
+    }
+
+    public List<Point> search(Region searchRegion, List<Point> matches, String depthIndicator) {
+        searchTraversePath = new StringBuilder();
+        if (matches == null) {
+            matches = new ArrayList<Point>();
+            searchTraversePath.append(depthIndicator)
+                .append("Search Boundary =")
+                .append(searchRegion)
+                .append("\n");
+        }
+        if (!this.area.doesOverlap(searchRegion)) {
+            return matches;
+        } else {
+            for (Point point : points) {
+                if (searchRegion.containsPoint(point)) {
+                    searchTraversePath.append(depthIndicator)
+                    .append("Found match " + point)
+                    .append("\n");
+                    matches.add(point);
+                }
+            }
+            if (this.quadTrees.size() > 0) {
+                for (int i = 0; i < 4; i++) {
+                    searchTraversePath.append(depthIndicator)
+                        .append("Q")
+                        .append(i)
+                        .append("-->")
+                        .append(quadTrees.get(i).area)
+                        .append("\n");
+                    quadTrees.get(i)
+                        .search(searchRegion, matches, depthIndicator + "\t");
+                    this.searchTraversePath.append(quadTrees.get(i)
+                        .printSearchTraversePath());
+                }
+            }
+        }
+        return matches;
+    }
+
+    public String printTree(String depthIndicator) {
+        String str = "";
+        if (depthIndicator == "") {
+            str += "Root-->" + area.toString() + "\n";
+        }
+
+        for (Point point : points) {
+            str += depthIndicator + point.toString() + "\n";
+        }
+        for (int i = 0; i < quadTrees.size(); i++) {
+            str += depthIndicator + "Q" + String.valueOf(i) + "-->" + quadTrees.get(i).area.toString() + "\n";
+            str += quadTrees.get(i)
+                .printTree(depthIndicator + "\t");
+        }
+        return str;
+    }
+
+    public String printSearchTraversePath() {
+        return searchTraversePath.toString();
+    }
+}
diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Region.java b/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Region.java
new file mode 100644
index 0000000000..600711c4ae
--- /dev/null
+++ b/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Region.java
@@ -0,0 +1,85 @@
+package com.baeldung.algorithms.quadtree;
+
+public class Region {
+    private float x1;
+    private float y1;
+    private float x2;
+    private float y2;
+
+    public Region(float x1, float y1, float x2, float y2) {
+        if (x1 >= x2 || y1 >= y2)
+            throw new IllegalArgumentException("(x1,y1) should be lesser than (x2,y2)");
+        this.x1 = x1;
+        this.y1 = y1;
+        this.x2 = x2;
+        this.y2 = y2;
+    }
+
+    public Region getQuadrant(int quadrantIndex) {
+        float quadrantWidth = (this.x2 - this.x1) / 2;
+        float quadrantHeight = (this.y2 - this.y1) / 2;
+
+        // 0=SW, 1=NW, 2=NE, 3=SE
+        switch (quadrantIndex) {
+        case 0:
+            return new Region(x1, y1, x1 + quadrantWidth, y1 + quadrantHeight);
+        case 1:
+            return new Region(x1, y1 + quadrantHeight, x1 + quadrantWidth, y2);
+        case 2:
+            return new Region(x1 + quadrantWidth, y1 + quadrantHeight, x2, y2);
+        case 3:
+            return new Region(x1 + quadrantWidth, y1, x2, y1 + quadrantHeight);
+        }
+        return null;
+    }
+
+    public boolean containsPoint(Point point) {
+        // Consider left and top side to be inclusive for points on border
+        return point.getX() >= this.x1 
+            && point.getX() < this.x2 
+            && point.getY() >= this.y1 
+            && point.getY() < this.y2;
+    }
+
+    public boolean doesOverlap(Region testRegion) {
+        // Is test region completely to left of my region?
+        if (testRegion.getX2() < this.getX1()) {
+            return false;
+        }
+        // Is test region completely to right of my region?
+        if (testRegion.getX1() > this.getX2()) {
+            return false;
+        }
+        // Is test region completely above my region?
+        if (testRegion.getY1() > this.getY2()) {
+            return false;
+        }
+        // Is test region completely below my region?
+        if (testRegion.getY2() < this.getY1()) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "[Region (x1=" + x1 + ", y1=" + y1 + "), (x2=" + x2 + ", y2=" + y2 + ")]";
+    }
+
+    public float getX1() {
+        return x1;
+    }
+
+    public float getY1() {
+        return y1;
+    }
+
+    public float getX2() {
+        return x2;
+    }
+
+    public float getY2() {
+        return y2;
+    }
+
+}
diff --git a/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java b/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java
new file mode 100644
index 0000000000..0b58ae9f14
--- /dev/null
+++ b/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java
@@ -0,0 +1,60 @@
+package com.baeldung.algorithms.quadtree;
+
+import org.junit.Assert;
+
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class QuadTreeSearchUnitTest {
+    
+    private static final Logger LOGGER = LoggerFactory.getLogger(QuadTreeSearchUnitTest.class);
+
+    private static QuadTree quadTree;
+
+    @BeforeClass
+    public static void setUp() {
+        Region area = new Region(0, 0, 400, 400);
+        quadTree = new QuadTree(area);
+
+        float[][] points = new float[][] { { 21, 25 }, { 55, 53 }, { 70, 318 }, { 98, 302 }, 
+            { 49, 229 }, { 135, 229 }, { 224, 292 }, { 206, 321 }, { 197, 258 }, { 245, 238 } };
+
+        for (int i = 0; i < points.length; i++) {
+            Point point = new Point(points[i][0], points[i][1]);
+            quadTree.addPoint(point);
+        }
+        LOGGER.info("\n" + quadTree.printTree(""));
+        LOGGER.info("==============================================");
+    }
+
+    @Test
+    public void givenQuadTree_whenSearchingForRange_thenReturn1MatchingItem() {
+        Region searchArea = new Region(200, 200, 250, 250);
+        List<Point> result = quadTree.search(searchArea, null, "");
+        LOGGER.info(result.toString());
+        LOGGER.info(quadTree.printSearchTraversePath());
+       
+        Assert.assertEquals(1, result.size());
+        Assert.assertArrayEquals(new float[] { 245, 238 }, 
+            new float[]{result.get(0).getX(), result.get(0).getY() }, 0);
+    }
+    
+    @Test
+    public void givenQuadTree_whenSearchingForRange_thenReturn2MatchingItems() {
+        Region searchArea = new Region(0, 0, 100, 100);
+        List<Point> result = quadTree.search(searchArea, null, "");
+        LOGGER.info(result.toString());
+        LOGGER.info(quadTree.printSearchTraversePath());
+        
+        Assert.assertEquals(2, result.size());
+        Assert.assertArrayEquals(new float[] { 21, 25 }, 
+            new float[]{result.get(0).getX(), result.get(0).getY() }, 0);
+        Assert.assertArrayEquals(new float[] { 55, 53 }, 
+            new float[]{result.get(1).getX(), result.get(1).getY() }, 0);
+        
+    }
+}

From 4618f0d773fbf915f896383ffd5b8d0cd3b0e761 Mon Sep 17 00:00:00 2001
From: Carlos Cavero <carlos.cavero@atos.net>
Date: Fri, 27 Dec 2019 23:08:50 +0100
Subject: [PATCH 100/106] Bael 3618 array strings body Swagger API mvc-2
 (#8421)

* Add springfox, devtools and apache commons dependencies

* Add the Swagger yaml file to the main project

* Add the general README and Swagger yaml description

* Implement the functionalities and add the Swagger annotations

* Adjust indentation and reformatting

* Change formatting of pom from 6 to 4
---
 spring-boot-mvc-2/README.md                   |  1 +
 spring-boot-mvc-2/pom.xml                     | 77 ++++++++++++++++++-
 .../SpringBootSwaggerApplication.java         | 13 ++++
 .../swagger2boot/config/Swagger2Config.java   | 34 ++++++++
 .../controller/FooController.java             | 35 +++++++++
 .../com/baeldung/swagger2boot/model/Foo.java  | 44 +++++++++++
 .../main/resources/swagger-description.yml    | 33 ++++++++
 7 files changed, 233 insertions(+), 4 deletions(-)
 create mode 100644 spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/SpringBootSwaggerApplication.java
 create mode 100644 spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/config/Swagger2Config.java
 create mode 100644 spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/controller/FooController.java
 create mode 100644 spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/model/Foo.java
 create mode 100644 spring-boot-mvc-2/src/main/resources/swagger-description.yml

diff --git a/spring-boot-mvc-2/README.md b/spring-boot-mvc-2/README.md
index 0ff0f1f156..81a969bf87 100644
--- a/spring-boot-mvc-2/README.md
+++ b/spring-boot-mvc-2/README.md
@@ -5,4 +5,5 @@ This module contains articles about Spring Web MVC in Spring Boot projects.
 ### Relevant Articles:
 
 - [Functional Controllers in Spring MVC](https://www.baeldung.com/spring-mvc-functional-controllers)
+- [Specify an array of strings as body parameter in Swagger API](https://www.baeldung.com/array-of-strings-as-body-parameter-in-swagger-api)
 - More articles: [[prev -->]](/spring-boot-mvc)
diff --git a/spring-boot-mvc-2/pom.xml b/spring-boot-mvc-2/pom.xml
index fcc0fc8b82..0f5a4bcd77 100644
--- a/spring-boot-mvc-2/pom.xml
+++ b/spring-boot-mvc-2/pom.xml
@@ -1,7 +1,7 @@
 <?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>
     <artifactId>spring-boot-mvc-2</artifactId>
     <name>spring-boot-mvc-2</name>
@@ -12,7 +12,7 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.2.0.BUILD-SNAPSHOT</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath /> <!-- lookup parent from repository -->
     </parent>
 
     <dependencies>
@@ -20,6 +20,36 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Swagger dependencies for REST documentation -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${spring.fox.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${spring.fox.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-spring-webmvc</artifactId>
+            <version>${spring.fox.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -28,11 +58,50 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>com.baeldung.springbootmvc.SpringBootMvcFnApplication</mainClass>
+                    <mainClass>${start-class}</mainClass>
                     <layout>JAR</layout>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <properties>
+        <spring.fox.version>3.0.0-SNAPSHOT</spring.fox.version>
+        <start-class>com.baeldung.swagger2boot.SpringBootSwaggerApplication</start-class>
+        <!-- <start-class>com.baeldung.springbootmvc.SpringBootMvcFnApplication</start-class> -->
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/SpringBootSwaggerApplication.java b/spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/SpringBootSwaggerApplication.java
new file mode 100644
index 0000000000..0f68f75d16
--- /dev/null
+++ b/spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/SpringBootSwaggerApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.swagger2boot;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringBootSwaggerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootSwaggerApplication.class, args);
+    }
+
+}
diff --git a/spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/config/Swagger2Config.java b/spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/config/Swagger2Config.java
new file mode 100644
index 0000000000..a0048eb505
--- /dev/null
+++ b/spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/config/Swagger2Config.java
@@ -0,0 +1,34 @@
+package com.baeldung.swagger2boot.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
+
+@Configuration
+@EnableSwagger2WebMvc
+public class Swagger2Config {
+    @Bean
+    public Docket api() {
+        return new Docket(DocumentationType.SWAGGER_2).select()
+            .apis(RequestHandlerSelectors.basePackage("com.baeldung.swagger2boot.controller"))
+            .paths(PathSelectors.regex("/.*"))
+            .build()
+            .apiInfo(apiEndPointsInfo());
+    }
+
+    private ApiInfo apiEndPointsInfo() {
+        return new ApiInfoBuilder().title("Swagger Array")
+            .description("This is a sample Swagger description for an Array server")
+            .license("Apache 2.0")
+            .licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html")
+            .version("1.0.0")
+            .build();
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/controller/FooController.java b/spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/controller/FooController.java
new file mode 100644
index 0000000000..ac6d99c40c
--- /dev/null
+++ b/spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/controller/FooController.java
@@ -0,0 +1,35 @@
+package com.baeldung.swagger2boot.controller;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomNumeric;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import com.baeldung.swagger2boot.model.Foo;
+
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+
+@Controller
+public class FooController {
+
+    public FooController() {
+        super();
+    }
+
+    // API - write
+    @RequestMapping(method = RequestMethod.POST, value = "/foos")
+    @ResponseStatus(HttpStatus.CREATED)
+    @ResponseBody
+    @ApiImplicitParams({ @ApiImplicitParam(name = "foo", value = "List of strings", paramType = "body", dataType = "Foo") })
+    public Foo create(@RequestBody final Foo foo) {
+        foo.setId(Long.parseLong(randomNumeric(2)));
+        return foo;
+    }
+
+}
diff --git a/spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/model/Foo.java b/spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/model/Foo.java
new file mode 100644
index 0000000000..e48c2016c0
--- /dev/null
+++ b/spring-boot-mvc-2/src/main/java/com/baeldung/swagger2boot/model/Foo.java
@@ -0,0 +1,44 @@
+package com.baeldung.swagger2boot.model;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel
+public class Foo {
+    private long id;
+
+    @ApiModelProperty(name = "name", dataType = "List", example = "[\"str1\", \"str2\", \"str3\"]")
+    private List<String> name;
+
+    public Foo() {
+        super();
+    }
+
+    public Foo(final long id, final List<String> name) {
+        super();
+
+        this.id = id;
+        this.name = name;
+    }
+
+    //
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final long id) {
+        this.id = id;
+    }
+
+    public List<String> getName() {
+        return name;
+    }
+
+    public void setName(final List<String> name) {
+        this.name = name;
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-mvc-2/src/main/resources/swagger-description.yml b/spring-boot-mvc-2/src/main/resources/swagger-description.yml
new file mode 100644
index 0000000000..b40ddc80f0
--- /dev/null
+++ b/spring-boot-mvc-2/src/main/resources/swagger-description.yml
@@ -0,0 +1,33 @@
+swagger: "2.0"
+info:
+  description: "This is a sample Swagger description for an Array server"
+  version: "1.0.0"
+  title: "Swagger Array"
+  license:
+    name: "Apache 2.0"
+    url: "http://www.apache.org/licenses/LICENSE-2.0.html"
+basePath: "/localhost:8080/"
+tags:
+- name: "foo-controller"
+  description: "Foo controller"
+
+paths:
+  /foos:
+    post:
+      tags:
+      - "foo-controller"
+      summary: "create"
+      description: ""
+      parameters:
+        - in: body
+          description: ""
+          required: true
+          name: name
+          schema:
+            type: array
+            items:
+              type: string
+            example: ["str1", "str2", "str3"]
+      responses:
+        default:
+          description: OK 
\ No newline at end of file

From 00f167851424fcefd495991e8b92310d0845c2e4 Mon Sep 17 00:00:00 2001
From: KevinGilmore <kpg102@gmail.com>
Date: Sat, 28 Dec 2019 07:49:04 -0600
Subject: [PATCH 101/106] BAEL-3485 update README (#8444)

* BAEL-3336 BAEL-3058 add links

* BAEL-3319: add link

* BAEL-3284: add link

* BAEL-3198: add link to article

* BAEL-3479: add link to article

* BAEL-3485: add article link
---
 algorithms-searching/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/algorithms-searching/README.md b/algorithms-searching/README.md
index d86c3e3de8..9b85995235 100644
--- a/algorithms-searching/README.md
+++ b/algorithms-searching/README.md
@@ -9,3 +9,4 @@ This module contains articles about searching algorithms.
 - [Breadth-First Search Algorithm in Java](https://www.baeldung.com/java-breadth-first-search)
 - [String Search Algorithms for Large Texts](https://www.baeldung.com/java-full-text-search-algorithms)
 - [Monte Carlo Tree Search for Tic-Tac-Toe Game](https://www.baeldung.com/java-monte-carlo-tree-search)
+- [Range Search Algorithm in Java](https://www.baeldung.com/java-range-search)

From 03889c24e99dfa5614743d1821aa811efb512a24 Mon Sep 17 00:00:00 2001
From: Shubhra <shubhi.srvstv@gmail.com>
Date: Sat, 28 Dec 2019 21:42:52 +0530
Subject: [PATCH 102/106] BAEL-3500 Incorporating Review comment

---
 logging-modules/logback/pom.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/logging-modules/logback/pom.xml b/logging-modules/logback/pom.xml
index ddf2df1972..ee430949df 100644
--- a/logging-modules/logback/pom.xml
+++ b/logging-modules/logback/pom.xml
@@ -53,12 +53,12 @@
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
-            <version>1.4.7</version>
+            <version>${javax.mail.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.activation</groupId>
             <artifactId>activation</artifactId>
-            <version>1.1.1</version>
+            <version>${javax.activation.version}</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
@@ -67,6 +67,8 @@
         <logback.version>1.2.3</logback.version>
         <logback.contrib.version>0.1.5</logback.contrib.version>
         <docx4j.version>3.3.5</docx4j.version>
+        <javax.mail.version>1.4.7</javax.mail.version>
+        <javax.activation.version>1.1.1</javax.activation.version>
     </properties>
 
 </project>

From 17dc359d5beb4c83ff34218c76afbdc0884421fd Mon Sep 17 00:00:00 2001
From: Graham Cox <graham@grahamcox.co.uk>
Date: Sat, 28 Dec 2019 19:20:11 +0000
Subject: [PATCH 103/106] Examples for Branch Prediction article (#8426)

---
 .../branchprediction/CombiningUnitTest.java   | 57 ++++++++++++
 .../baeldung/branchprediction/IfUnitTest.java | 92 +++++++++++++++++++
 .../branchprediction/SortingUnitTest.java     | 60 ++++++++++++
 3 files changed, 209 insertions(+)
 create mode 100644 core-java-modules/core-java-perf/src/test/java/com/baeldung/branchprediction/CombiningUnitTest.java
 create mode 100644 core-java-modules/core-java-perf/src/test/java/com/baeldung/branchprediction/IfUnitTest.java
 create mode 100644 core-java-modules/core-java-perf/src/test/java/com/baeldung/branchprediction/SortingUnitTest.java

diff --git a/core-java-modules/core-java-perf/src/test/java/com/baeldung/branchprediction/CombiningUnitTest.java b/core-java-modules/core-java-perf/src/test/java/com/baeldung/branchprediction/CombiningUnitTest.java
new file mode 100644
index 0000000000..c98eef5ed1
--- /dev/null
+++ b/core-java-modules/core-java-perf/src/test/java/com/baeldung/branchprediction/CombiningUnitTest.java
@@ -0,0 +1,57 @@
+package com.baeldung.branchprediction;
+
+import java.util.stream.LongStream;
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CombiningUnitTest {
+    private static final Logger LOG = LoggerFactory.getLogger(CombiningUnitTest.class);
+
+    public static final int TOP = 10000000;
+    public static final double FRACTION = 0.1;
+
+    @Test
+    public void combined() {
+        long[] first = LongStream.range(0, TOP)
+            .map(n -> Math.random() < FRACTION ? 0 : n)
+            .toArray();
+        long[] second = LongStream.range(0, TOP)
+            .map(n -> Math.random() < FRACTION ? 0 : n)
+            .toArray();
+
+        long count = 0;
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < TOP; i++) {
+            if (first[i] * second[i] != 0) {
+                ++count;
+            }
+        }
+        long end = System.currentTimeMillis();
+
+        LOG.info("Counted {}/{} numbers using combined mode in {}ms", count, TOP, end - start);
+
+    }
+
+    @Test
+    public void separate() {
+        long[] first = LongStream.range(0, TOP)
+            .map(n -> Math.random() < FRACTION ? 0 : n)
+            .toArray();
+        long[] second = LongStream.range(0, TOP)
+            .map(n -> Math.random() < FRACTION ? 0 : n)
+            .toArray();
+
+        long count = 0;
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < TOP; i++) {
+            if (first[i] != 0 && second[i] != 0) {
+                ++count;
+            }
+        }
+        long end = System.currentTimeMillis();
+
+        LOG.info("Counted {}/{} numbers using separate mode in {}ms", count, TOP, end - start);
+    }
+}
diff --git a/core-java-modules/core-java-perf/src/test/java/com/baeldung/branchprediction/IfUnitTest.java b/core-java-modules/core-java-perf/src/test/java/com/baeldung/branchprediction/IfUnitTest.java
new file mode 100644
index 0000000000..6f80624502
--- /dev/null
+++ b/core-java-modules/core-java-perf/src/test/java/com/baeldung/branchprediction/IfUnitTest.java
@@ -0,0 +1,92 @@
+package com.baeldung.branchprediction;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class IfUnitTest {
+    private static final Logger LOG = LoggerFactory.getLogger(IfUnitTest.class);
+
+    public static final int TOP = 10000000;
+
+    @Test
+    public void majorBranchSorted() {
+        test(TOP, 0.9, false);
+    }
+
+    @Test
+    public void minorBranchSorted() {
+        test(TOP, 0.1, false);
+    }
+
+    @Test
+    public void equalBranchSorted() {
+        test(TOP, 0.5, false);
+    }
+
+    @Test
+    public void allBranchSorted() {
+        test(TOP, 1, false);
+    }
+
+    @Test
+    public void noneBranchSorted() {
+        test(TOP, 0, false);
+    }
+
+    @Test
+    public void majorBranchShuffled() {
+        test(TOP, 0.9, true);
+    }
+
+    @Test
+    public void minorBranchShuffled() {
+        test(TOP, 0.1, true);
+    }
+
+    @Test
+    public void equalBranchShuffled() {
+        test(TOP, 0.5, true);
+    }
+
+    @Test
+    public void allBranchShuffled() {
+        test(TOP, 1, true);
+    }
+
+    @Test
+    public void noneBranchShuffled() {
+        test(TOP, 0, true);
+    }
+
+    private void test(long top, double cutoffPercentage, boolean shuffle) {
+        List<Long> numbers = LongStream.range(0, top)
+            .boxed()
+            .collect(Collectors.toList());
+        if (shuffle) {
+            Collections.shuffle(numbers);
+        }
+
+        long cutoff = (long)(top * cutoffPercentage);
+        long low = 0;
+        long high = 0;
+
+        long start = System.currentTimeMillis();
+        for (Long number : numbers) {
+            if (number < cutoff) {
+                ++low;
+            } else {
+                ++high;
+            }
+        }
+        long end = System.currentTimeMillis();
+
+        LOG.info("Counted {}/{} {} numbers in {}ms", low, high, shuffle ? "shuffled" : "sorted", end - start);
+
+    }
+}
diff --git a/core-java-modules/core-java-perf/src/test/java/com/baeldung/branchprediction/SortingUnitTest.java b/core-java-modules/core-java-perf/src/test/java/com/baeldung/branchprediction/SortingUnitTest.java
new file mode 100644
index 0000000000..6af40bd57a
--- /dev/null
+++ b/core-java-modules/core-java-perf/src/test/java/com/baeldung/branchprediction/SortingUnitTest.java
@@ -0,0 +1,60 @@
+package com.baeldung.branchprediction;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SortingUnitTest {
+    private static final Logger LOG = LoggerFactory.getLogger(SortingUnitTest.class);
+    public static final int BIG = 10000000;
+    public static final int SMALL = 100000;
+
+    @Test
+    public void sortedBig() {
+        test(BIG, false);
+    }
+
+    @Test
+    public void shuffledBig() {
+        test(BIG, true);
+    }
+
+    @Test
+    public void sortedSmall() {
+        test(SMALL, false);
+    }
+
+    @Test
+    public void shuffledSmall() {
+        test(SMALL, true);
+    }
+
+    private void test(long top, boolean shuffle) {
+        List<Long> numbers = LongStream.range(0, top)
+            .boxed()
+            .collect(Collectors.toList());
+
+        if (shuffle) {
+            Collections.shuffle(numbers);
+        }
+
+        long cutoff = top / 2;
+        long count = 0;
+
+        long start = System.currentTimeMillis();
+        for (Long number : numbers) {
+            if (number < cutoff) {
+                ++count;
+            }
+        }
+        long end = System.currentTimeMillis();
+
+        LOG.info("Counted {}/{} {} numbers in {}ms",
+            count, top, shuffle ? "shuffled" : "sorted", end - start);
+    }
+}

From 954d0404c398163d729775402e82472018aa1488 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sat, 28 Dec 2019 21:53:28 +0200
Subject: [PATCH 104/106] Delete README.md

---
 core-java-lambdas/README.md | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 core-java-lambdas/README.md

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

From 7061e8c012c0e39e44e0796afa579742c3caa01c Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sat, 28 Dec 2019 21:58:50 +0200
Subject: [PATCH 105/106] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 7ea23f0d63..cc0c68d22f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1423,7 +1423,7 @@
                 <module>spring-security-modules/spring-security-mvc-login</module>
                 <module>spring-security-modules/spring-security-mvc-persisted-remember-me</module>
                 <module>spring-security-modules/spring-security-mvc-socket</module>
-                <module>spring-security-modules/spring-security-openid</module>
+                <module>spring-security-modules/spring-security-oidc</module>
                 <!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
                 <module>spring-security-modules/spring-security-rest</module>
                 <module>spring-security-modules/spring-security-rest-basic-auth</module>

From df1944164b99aa9e31d2a39ec6a6ab3779a1a06a Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Sat, 28 Dec 2019 23:13:39 +0100
Subject: [PATCH 106/106] BAEL-3674: Remove two more unit tests

---
 .../test/java/com/baeldung/datetime/DateUtilsUnitTest.java  | 6 ------
 .../java/com/baeldung/datetime/sql/DateUtilsUnitTest.java   | 5 -----
 2 files changed, 11 deletions(-)

diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/DateUtilsUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/DateUtilsUnitTest.java
index 8711455265..9bc2a17f28 100644
--- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/DateUtilsUnitTest.java
+++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/DateUtilsUnitTest.java
@@ -9,12 +9,6 @@ import static org.junit.Assert.assertEquals;
 
 public class DateUtilsUnitTest {
 
-    @Test
-    public void givenTimeMillis_thenDateIsReturned() {
-        Date now = DateUtils.getNow();
-        assertEquals(DateUtils.getDate(now.getTime()), now);
-    }
-
     @Test
     public void givenDateAndPattern_thenDateIsCorrectlyReturned() throws ParseException {
         long milliseconds = new Date(2020 - 1900, 0, 1).getTime();
diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/DateUtilsUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/DateUtilsUnitTest.java
index 945086c86f..9ccaa9a845 100644
--- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/DateUtilsUnitTest.java
+++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/DateUtilsUnitTest.java
@@ -9,11 +9,6 @@ import org.junit.Test;
 
 public class DateUtilsUnitTest {
 
-    @Test
-    public void givenCurrentDate_thenTodayIsReturned() {
-        assertEquals(DateUtils.getNow().toLocalDate(), LocalDate.now());
-    }
-
     @Test(expected = IllegalArgumentException.class)
     public void givenDateAsString_whenPatternIsNotRespected_thenExceptionIsThrown() {
         DateUtils.getDate("2020 01 01");