Merge branch 'master' of https://github.com/eugenp/tutorials

core-java-modules/core-java-collections-array-list/README.md

@@ -0,0 +1,10 @@
+=========
+
+## Core Java Collections Array List Cookbooks and Examples
+
+### Relevant Articles: 
+- [Immutable ArrayList in Java](http://www.baeldung.com/java-immutable-list)
+- [Guide to the Java ArrayList](http://www.baeldung.com/java-arraylist)
+- [Add Multiple Items to an Java ArrayList](http://www.baeldung.com/java-add-items-array-list)
+- [ClassCastException: Arrays$ArrayList cannot be cast to ArrayList](https://www.baeldung.com/java-classcastexception-arrays-arraylist)
+- [Multi Dimensional ArrayList in Java](https://www.baeldung.com/java-multi-dimensional-arraylist)

core-java-modules/core-java-collections-array-list/pom.xml

@@ -0,0 +1,46 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-collections-array-list</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-collections-array-list</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>${commons-collections4.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <commons-collections4.version>4.1</commons-collections4.version>
+        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <assertj.version>3.11.1</assertj.version>
+    </properties>
+</project>

core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/java/list/Flower.java

@@ -0,0 +1,28 @@
+package com.baeldung.java.list;
+
+public class Flower {
+
+    private String name;
+    private int petals;
+
+    public Flower(String name, int petals) {
+        this.name = name;
+        this.petals = petals;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getPetals() {
+        return petals;
+    }
+
+    public void setPetals(int petals) {
+        this.petals = petals;
+    }
+}

core-java-modules/core-java-collections-array-list/src/main/resources/logback.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>

core-java-modules/core-java-collections-list-2/README.md

@@ -0,0 +1,17 @@
+=========
+
+## Core Java Collections List Cookbooks and Examples
+
+### Relevant Articles: 
+- [Check If Two Lists are Equal in Java](http://www.baeldung.com/java-test-a-list-for-ordinality-and-equality)
+- [Java 8 Streams: Find Items From One List Based On Values From Another List](https://www.baeldung.com/java-streams-find-list-items)
+- [A Guide to the Java LinkedList](http://www.baeldung.com/java-linkedlist)
+- [Java List UnsupportedOperationException](http://www.baeldung.com/java-list-unsupported-operation-exception)
+- [Java List Initialization in One Line](https://www.baeldung.com/java-init-list-one-line)
+- [Ways to Iterate Over a List in Java](https://www.baeldung.com/java-iterate-list)
+- [Flattening Nested Collections in Java](http://www.baeldung.com/java-flatten-nested-collections)
+- [Intersection of Two Lists in Java](https://www.baeldung.com/java-lists-intersection)
+- [Determine If All Elements Are the Same in a Java List](https://www.baeldung.com/java-list-all-equal)
+- [List of Primitive Integer Values in Java](https://www.baeldung.com/java-list-primitive-int)
+- [Performance Comparison of Primitive Lists in Java](https://www.baeldung.com/java-list-primitive-performance)
+- [Filtering a Java Collection by a List](https://www.baeldung.com/java-filter-collection-by-list)

core-java-modules/core-java-collections-list-2/pom.xml

@@ -0,0 +1,76 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-collections-list-2</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-collections-list-2</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>${commons-collections4.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sf.trove4j</groupId>
+            <artifactId>trove4j</artifactId>
+            <version>${trove4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>it.unimi.dsi</groupId>
+            <artifactId>fastutil</artifactId>
+            <version>${fastutil.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>colt</groupId>
+            <artifactId>colt</artifactId>
+            <version>${colt.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh-core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh-core.version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <commons-collections4.version>4.1</commons-collections4.version>
+        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <assertj.version>3.11.1</assertj.version>
+		<trove4j.version>3.0.2</trove4j.version>
+		<fastutil.version>8.1.0</fastutil.version>
+		<colt.version>1.2.0</colt.version>
+    </properties>
+</project>

core-java-modules/core-java-collections-list-2/src/main/resources/logback.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>

core-java-modules/core-java-collections-list/README.md

@@ -3,31 +3,14 @@
 ## Core Java Collections List Cookbooks and Examples
 
 ### Relevant Articles: 
-- [Immutable ArrayList in Java](http://www.baeldung.com/java-immutable-list)
-- [Guide to the Java ArrayList](http://www.baeldung.com/java-arraylist)
 - [Java – Get Random Item/Element From a List](http://www.baeldung.com/java-random-list-element)
 - [Removing all nulls from a List in Java](http://www.baeldung.com/java-remove-nulls-from-list)
 - [Removing all duplicates from a List in Java](http://www.baeldung.com/java-remove-duplicates-from-list)
 - [How to TDD a List Implementation in Java](http://www.baeldung.com/java-test-driven-list)
 - [Iterating Backward Through a List](http://www.baeldung.com/java-list-iterate-backwards)
-- [Add Multiple Items to an Java ArrayList](http://www.baeldung.com/java-add-items-array-list)
 - [Remove the First Element from a List](http://www.baeldung.com/java-remove-first-element-from-list)
 - [How to Find an Element in a List with Java](http://www.baeldung.com/find-list-element-java)
 - [Copy a List to Another List in Java](http://www.baeldung.com/java-copy-list-to-another)
 - [Finding Max/Min of a List or Collection](http://www.baeldung.com/java-collection-min-max)
 - [Collections.emptyList() vs. New List Instance](https://www.baeldung.com/java-collections-emptylist-new-list)
-- [Remove All Occurrences of a Specific Value from a List](https://www.baeldung.com/java-remove-value-from-list)
+- [Remove All Occurrences of a Specific Value from a List](https://www.baeldung.com/java-remove-value-from-list)
-- [Check If Two Lists are Equal in Java](http://www.baeldung.com/java-test-a-list-for-ordinality-and-equality)
-- [Java 8 Streams: Find Items From One List Based On Values From Another List](https://www.baeldung.com/java-streams-find-list-items)
-- [A Guide to the Java LinkedList](http://www.baeldung.com/java-linkedlist)
-- [Java List UnsupportedOperationException](http://www.baeldung.com/java-list-unsupported-operation-exception)
-- [Java List Initialization in One Line](https://www.baeldung.com/java-init-list-one-line)
-- [Ways to Iterate Over a List in Java](https://www.baeldung.com/java-iterate-list)
-- [ClassCastException: Arrays$ArrayList cannot be cast to ArrayList](https://www.baeldung.com/java-classcastexception-arrays-arraylist)
-- [Flattening Nested Collections in Java](http://www.baeldung.com/java-flatten-nested-collections)
-- [Intersection of Two Lists in Java](https://www.baeldung.com/java-lists-intersection)
-- [Multi Dimensional ArrayList in Java](https://www.baeldung.com/java-multi-dimensional-arraylist)
-- [Determine If All Elements Are the Same in a Java List](https://www.baeldung.com/java-list-all-equal)
-- [List of Primitive Integer Values in Java](https://www.baeldung.com/java-list-primitive-int)
-- [Performance Comparison of Primitive Lists in Java](https://www.baeldung.com/java-list-primitive-performance)
-- [Filtering a Java Collection by a List](https://www.baeldung.com/java-filter-collection-by-list)

core-java-modules/core-java-collections-list/pom.xml

@@ -36,42 +36,12 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
-
-        <dependency>
-            <groupId>net.sf.trove4j</groupId>
-            <artifactId>trove4j</artifactId>
-            <version>${trove4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>it.unimi.dsi</groupId>
-            <artifactId>fastutil</artifactId>
-            <version>${fastutil.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>colt</groupId>
-            <artifactId>colt</artifactId>
-            <version>${colt.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-            <version>${jmh-core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh-core.version}</version>
-        </dependency>
     </dependencies>
 
     <properties>
         <commons-collections4.version>4.1</commons-collections4.version>
         <commons-lang3.version>3.8.1</commons-lang3.version>
-        <avaitility.version>1.7.0</avaitility.version>
         <assertj.version>3.11.1</assertj.version>
 		<trove4j.version>3.0.2</trove4j.version>
-		<fastutil.version>8.1.0</fastutil.version>
-		<colt.version>1.2.0</colt.version>
     </properties>
 </project>

java-strings-2/README.MD

@@ -2,3 +2,4 @@
 
 - [Java Localization – Formatting Messages](https://www.baeldung.com/java-localization-messages-formatting)
 - [Check If a String Contains a Substring](https://www.baeldung.com/java-string-contains-substring)
+- [Removing Stopwords from a String in Java](https://www.baeldung.com/java-string-remove-stopwords)

jee-7/src/test/java/com/baeldung/singleton/CarServiceIntegrationTest.java

@@ -10,6 +10,10 @@ import java.util.Map;
 import java.util.UUID;
 
 import javax.ejb.EJB;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.CDI;
 import javax.inject.Inject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -47,68 +51,31 @@ public class CarServiceIntegrationTest {
 
     @EJB
     private CarServiceEjbSingleton carServiceEjbSingleton;
+    
+    @Test
+    public void givenASingleton_whenGetBeanIsCalledTwice_thenTheSameInstanceIsReturned() {       
+        CarServiceSingleton one = getBean(CarServiceSingleton.class);
+        CarServiceSingleton two = getBean(CarServiceSingleton.class);
+        assertTrue(one == two);
+    }
+    
+    @Test
+    public void givenAPojo_whenGetBeanIsCalledTwice_thenDifferentInstancesAreReturned() {       
+        CarServiceBean one = getBean(CarServiceBean.class);
+        CarServiceBean two = getBean(CarServiceBean.class);
+        assertTrue(one != two);
+    }
 
-    private static Map<String, UUID> idMap = new HashMap<>();
+    @SuppressWarnings("unchecked")
-
+    private <T> T getBean(Class<T> beanClass) {
-    @Before
+        BeanManager bm = CDI.current().getBeanManager();
-    public void setUp() {
+        Bean<T> bean = (Bean<T>) bm.getBeans(beanClass).iterator().next();
-        // populate idMap only on first run
+        CreationalContext<T> ctx = bm.createCreationalContext(bean);
-        if (idMap.isEmpty()) {
+        return (T) bm.getReference(bean, beanClass, ctx);
-            LOG.info("setUp::carServiceBean: {}", carServiceBean.getId());
-            idMap.put("carServiceBeanId", carServiceBean.getId());
-
-            LOG.info("setUp::carServiceSingleton: {}", carServiceSingleton.getId());
-            idMap.put("carServiceSingletonId", carServiceSingleton.getId());
-
-            LOG.info("setUp::carServiceEjbSingleton: {}", carServiceEjbSingleton.getId());
-            idMap.put("carServiceEjbSingletonId", carServiceEjbSingleton.getId());
-        }
     }
 
     @Test
-    public void givenRun1_whenGetId_thenSingletonIdEqual() {
+    public void givenCDI_whenConcurrentAccess_thenLockingIsNotProvided() {
-        int testRun = 1;
-
-        assertNotNull(carServiceBean);
-        assertNotNull(carServiceSingleton);
-        assertNotNull(carServiceEjbSingleton);
-
-        UUID carServiceBeanId = carServiceBean.getId();
-        assertEquals(idMap.get("carServiceBeanId"), carServiceBeanId);
-        LOG.info("Test run {}::carServiceBeanId: {}", testRun, carServiceBeanId);
-
-        UUID carServiceSingletonId = carServiceSingleton.getId();
-        assertEquals(idMap.get("carServiceSingletonId"), carServiceSingletonId);
-        LOG.info("Test run {}::carServiceSingletonId: {}", testRun, carServiceSingletonId);
-
-        UUID carServiceEjbSingletonId = carServiceEjbSingleton.getId();
-        assertEquals(idMap.get("carServiceEjbSingletonId"), carServiceEjbSingletonId);
-        LOG.info("Test run {}::carServiceEjbSingletonId: {}", testRun, carServiceEjbSingletonId);
-    }
-
-    @Test
-    public void givenRun2_whenGetId_thenSingletonIdEqual() {
-        int testRun = 2;
-
-        assertNotNull(carServiceBean);
-        assertNotNull(carServiceSingleton);
-        assertNotNull(carServiceEjbSingleton);
-
-        UUID carServiceBeanId = carServiceBean.getId();
-        assertNotEquals(idMap.get("carServiceBeanId"), carServiceBeanId);
-        LOG.info("Test run {}::carServiceBeanId: {}", testRun, carServiceBeanId);
-
-        UUID carServiceSingletonId = carServiceSingleton.getId();
-        assertEquals(idMap.get("carServiceSingletonId"), carServiceSingletonId);
-        LOG.info("Test run {}::carServiceSingletonId: {}", testRun, carServiceSingletonId);
-
-        UUID carServiceEjbSingletonId = carServiceEjbSingleton.getId();
-        assertEquals(idMap.get("carServiceEjbSingletonId"), carServiceEjbSingletonId);
-        LOG.info("Test run {}::carServiceEjbSingletonId: {}", testRun, carServiceEjbSingletonId);
-    }
-
-    @Test
-    public void givenRun3_whenSingleton_thenNoLocking() {
         for (int i = 0; i < 10; i++) {
             new Thread(new Runnable() {
                 @Override
@@ -124,7 +91,7 @@ public class CarServiceIntegrationTest {
     }
     
     @Test
-    public void givenRun4_whenEjb_thenLocking() {
+    public void givenEJB_whenConcurrentAccess_thenLockingIsProvided() {
         for (int i = 0; i < 10; i++) {
             new Thread(new Runnable() {
                 @Override

persistence-modules/spring-persistence-simple/README.md

@@ -11,6 +11,7 @@
 - [Transactions with Spring and JPA](https://www.baeldung.com/transaction-configuration-with-jpa-and-spring)
 - [Introduction to Spring Data JPA](http://www.baeldung.com/the-persistence-layer-with-spring-data-jpa)
 - [Spring Data JPA @Query](http://www.baeldung.com/spring-data-jpa-query)
+- [Spring JDBC](https://www.baeldung.com/spring-jdbc-jdbctemplate)
 
 
 ### Eclipse Config 

persistence-modules/spring-persistence-simple/pom.xml

@@ -18,12 +18,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-orm</artifactId>
             <version>${org.springframework.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/config/PersistenceConfig.java

@@ -1,11 +1,10 @@
-package org.baeldung.config;
+package com.baeldung.config;
 
 import java.util.Properties;
 
 import javax.sql.DataSource;
 
 import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
-import org.baeldung.persistence.dao.IFooDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -24,15 +23,16 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import com.baeldung.persistence.dao.impl.FooDao;
+import com.baeldung.hibernate.dao.FooDao;
+import com.baeldung.jpa.dao.IFooDao;
 import com.google.common.base.Preconditions;
 
 @Configuration
 @EnableTransactionManagement
-@EnableJpaRepositories(basePackages = { "com.baeldung.persistence" }, transactionManagerRef = "jpaTransactionManager")
+@EnableJpaRepositories(basePackages = { "com.baeldung.hibernate.dao" }, transactionManagerRef = "jpaTransactionManager")
 @EnableJpaAuditing
 @PropertySource({ "classpath:persistence-mysql.properties" })
-@ComponentScan({ "com.baeldung.persistence" })
+@ComponentScan({ "com.baeldung.persistence", "com.baeldung.hibernate.dao" })
 public class PersistenceConfig {
 
     @Autowired

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/config/PersistenceJPAConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package com.baeldung.config;
 
 import java.util.Properties;
 
@@ -25,8 +25,8 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-h2.properties" })
-@ComponentScan({ "org.baeldung.persistence" })
+@ComponentScan({ "com.baeldung.persistence","com.baeldung.jpa.dao" })
-@EnableJpaRepositories(basePackages = "org.baeldung.persistence.dao")
+@EnableJpaRepositories(basePackages = "com.baeldung.jpa.dao")
 public class PersistenceJPAConfig {
 
     @Autowired
@@ -42,7 +42,7 @@ public class PersistenceJPAConfig {
     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();
         em.setJpaVendorAdapter(vendorAdapter);

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/dao/FooDao.java

@@ -1,9 +1,9 @@
-package com.baeldung.persistence.dao.impl;
+package com.baeldung.hibernate.dao;
 
-import org.baeldung.persistence.dao.IFooDao;
+import com.baeldung.persistence.model.Foo;
-import org.baeldung.persistence.model.Foo;
 import org.springframework.stereotype.Repository;
 
+import com.baeldung.jpa.dao.IFooDao;
 import com.baeldung.persistence.dao.common.AbstractHibernateDao;
 
 @Repository

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/CustomSQLErrorCodeTranslator.java

@@ -1,4 +1,4 @@
-package org.baeldung.jdbc;
+package com.baeldung.jdbc;
 
 import java.sql.SQLException;
 
@@ -10,7 +10,7 @@ public class CustomSQLErrorCodeTranslator extends SQLErrorCodeSQLExceptionTransl
 
     @Override
     protected DataAccessException customTranslate(final String task, final String sql, final SQLException sqlException) {
-        if (sqlException.getErrorCode() == -104) {
+        if (sqlException.getErrorCode() == 23505) {
             return new DuplicateKeyException("Custome Exception translator - Integrity contraint voilation.", sqlException);
         }
         return null;

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/Employee.java

@@ -1,4 +1,4 @@
-package org.baeldung.jdbc;
+package com.baeldung.jdbc;
 
 public class Employee {
     private int id;

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/EmployeeDAO.java

@@ -1,4 +1,4 @@
-package org.baeldung.jdbc;
+package com.baeldung.jdbc;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/EmployeeRowMapper.java

@@ -1,4 +1,4 @@
-package org.baeldung.jdbc;
+package com.baeldung.jdbc;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/config/SpringJdbcConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.jdbc.config;
+package com.baeldung.jdbc.config;
 
 import javax.sql.DataSource;
 
@@ -10,12 +10,12 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
 @Configuration
-@ComponentScan("org.baeldung.jdbc")
+@ComponentScan("com.baeldung.jdbc")
 public class SpringJdbcConfig {
 
     @Bean
     public DataSource dataSource() {
-        return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL).addScript("classpath:jdbc/schema.sql").addScript("classpath:jdbc/test-data.sql").build();
+        return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2).addScript("classpath:jdbc/schema.sql").addScript("classpath:jdbc/test-data.sql").build();
     }
 
     // @Bean

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jpa/dao/AbstractJpaDAO.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.jpa.dao;
 
 import java.io.Serializable;
 import java.util.List;

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jpa/dao/FooDao.java

@@ -1,6 +1,6 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.jpa.dao;
 
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.model.Foo;
 import org.springframework.stereotype.Repository;
 
 @Repository

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jpa/dao/IFooDao.java

@@ -1,8 +1,8 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.jpa.dao;
 
 import java.util.List;
 
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.model.Foo;
 
 public interface IFooDao {
 

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/common/GenericJpaDao.java

@@ -2,11 +2,12 @@ package com.baeldung.persistence.dao.common;
 
 import java.io.Serializable;
 
-import org.baeldung.persistence.dao.AbstractJpaDAO;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Repository;
 
+import com.baeldung.jpa.dao.AbstractJpaDAO;
+
 @Repository
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
 public class GenericJpaDao<T extends Serializable> extends AbstractJpaDAO<T> implements IGenericDao<T> {

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/model/Bar.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import java.io.Serializable;
 import java.util.List;

persistence-modules/spring-persistence-simple/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;
 

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/service/FooService.java

@@ -1,9 +1,9 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
 import java.util.List;
 
-import org.baeldung.persistence.dao.IFooDao;
+import com.baeldung.jpa.dao.IFooDao;
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.model.Foo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/spring/data/persistence/config/PersistenceConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.persistence.config;
+package com.baeldung.spring.data.persistence.config;
 
 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.spring.data.persistence" })
+@ComponentScan({ "com.baeldung.spring.data.persistence" })
 // @ImportResource("classpath*:springDataPersistenceConfig.xml")
-@EnableJpaRepositories(basePackages = "org.baeldung.spring.data.persistence.dao")
+@EnableJpaRepositories(basePackages = "com.baeldung.spring.data.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.spring.data.persistence.model" });
+        em.setPackagesToScan(new String[] { "com.baeldung.spring.data.persistence.model" });
 
         final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         // vendorAdapter.set

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/spring/data/persistence/dao/IFooDao.java

@@ -1,6 +1,6 @@
-package org.baeldung.spring.data.persistence.dao;
+package com.baeldung.spring.data.persistence.dao;
 
-import org.baeldung.spring.data.persistence.model.Foo;
+import com.baeldung.spring.data.persistence.model.Foo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/spring/data/persistence/dao/user/UserRepository.java

@@ -1,11 +1,11 @@
-package org.baeldung.spring.data.persistence.dao.user;
+package com.baeldung.spring.data.persistence.dao.user;
 
 import java.time.LocalDate;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Stream;
 
-import org.baeldung.spring.data.persistence.model.User;
+import com.baeldung.spring.data.persistence.model.User;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/spring/data/persistence/dao/user/UserRepositoryCustom.java

@@ -1,11 +1,11 @@
-package org.baeldung.spring.data.persistence.dao.user;
+package com.baeldung.spring.data.persistence.dao.user;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Predicate;
 
-import org.baeldung.spring.data.persistence.model.User;
+import com.baeldung.spring.data.persistence.model.User;
 
 public interface UserRepositoryCustom {
     List<User> findUserByEmails(Set<String> emails);

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/spring/data/persistence/dao/user/UserRepositoryCustomImpl.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.persistence.dao.user;
+package com.baeldung.spring.data.persistence.dao.user;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -15,7 +15,7 @@ import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.baeldung.spring.data.persistence.model.User;
+import com.baeldung.spring.data.persistence.model.User;
 
 public class UserRepositoryCustomImpl implements UserRepositoryCustom {
 

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/spring/data/persistence/model/Foo.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.persistence.model;
+package com.baeldung.spring.data.persistence.model;
 
 import java.io.Serializable;
 

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/spring/data/persistence/model/Possession.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.persistence.model;
+package com.baeldung.spring.data.persistence.model;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/spring/data/persistence/model/User.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.persistence.model;
+package com.baeldung.spring.data.persistence.model;
 
 import javax.persistence.*;
 

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/spring/data/persistence/service/IFooService.java

@@ -1,6 +1,6 @@
-package org.baeldung.spring.data.persistence.service;
+package com.baeldung.spring.data.persistence.service;
 
-import org.baeldung.spring.data.persistence.model.Foo;
+import com.baeldung.spring.data.persistence.model.Foo;
 
 import com.baeldung.persistence.dao.common.IOperations;
 

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/spring/data/persistence/service/common/AbstractService.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.persistence.service.common;
+package com.baeldung.spring.data.persistence.service.common;
 
 import java.io.Serializable;
 import java.util.List;

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/spring/data/persistence/service/impl/FooService.java

@@ -1,10 +1,10 @@
-package org.baeldung.spring.data.persistence.service.impl;
+package com.baeldung.spring.data.persistence.service.impl;
 
 
-import org.baeldung.spring.data.persistence.model.Foo;
+import com.baeldung.spring.data.persistence.model.Foo;
-import org.baeldung.spring.data.persistence.dao.IFooDao;
+import com.baeldung.spring.data.persistence.dao.IFooDao;
-import org.baeldung.spring.data.persistence.service.IFooService;
+import com.baeldung.spring.data.persistence.service.IFooService;
-import org.baeldung.spring.data.persistence.service.common.AbstractService;
+import com.baeldung.spring.data.persistence.service.common.AbstractService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Service;

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/util/IDUtil.java

@@ -1,4 +1,4 @@
-package org.baeldung.util;
+package com.baeldung.util;
 
 import java.util.Random;
 

persistence-modules/spring-persistence-simple/src/main/resources/jdbc/schema.sql

@@ -0,0 +1,7 @@
+CREATE TABLE EMPLOYEE
+(
+	ID int  NOT NULL PRIMARY KEY,
+	FIRST_NAME varchar(255),
+	LAST_NAME varchar(255),
+	ADDRESS varchar(255),
+);

persistence-modules/spring-persistence-simple/src/main/resources/jdbc/springJdbc-config.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
+>
+
+    <bean id="employeeDao" class="com.baeldung.jdbc.EmployeeDAO">
+        <property name="dataSource" ref="dataSource"/>
+    </bean>
+
+    <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+        <property name="driverClassName" value="${jdbc.driverClassName}"/>
+        <property name="url" value="${jdbc.url}"/>
+        <property name="username" value="${jdbc.username}"/>
+        <property name="password" value="${jdbc.password}"/>
+    </bean>
+
+    <context:property-placeholder location="jdbc.properties"/>
+</beans>

persistence-modules/spring-persistence-simple/src/main/resources/jdbc/test-data.sql

@@ -0,0 +1,7 @@
+INSERT INTO EMPLOYEE VALUES (1, 'James', 'Gosling', 'Canada');
+
+INSERT INTO EMPLOYEE VALUES (2, 'Donald', 'Knuth', 'USA');
+
+INSERT INTO EMPLOYEE VALUES (3, 'Linus', 'Torvalds', 'Finland');
+
+INSERT INTO EMPLOYEE VALUES (4, 'Dennis', 'Ritchie', 'USA');

persistence-modules/spring-persistence-simple/src/main/resources/persistence.xml

@@ -11,7 +11,7 @@
 
     <bean id="myEmf" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <property name="dataSource" ref="dataSource"/>
-        <property name="packagesToScan" value="org.baeldung.persistence.model"/>
+        <property name="packagesToScan" value="com.baeldung.persistence.model"/>
         <property name="jpaVendorAdapter">
             <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"/>
             <!-- <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" /> <property name="generateDdl" value="${jpa.generateDdl}" /> <property name="databasePlatform" 

persistence-modules/spring-persistence-simple/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>

persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/jdbc/EmployeeDAOIntegrationTest.java

@@ -1,9 +1,9 @@
-package org.baeldung.jdbc;
+package com.baeldung.jdbc;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.baeldung.jdbc.config.SpringJdbcConfig;
+import com.baeldung.jdbc.config.SpringJdbcConfig;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.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.hasSize;
@@ -15,8 +15,8 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 
-import org.baeldung.config.PersistenceJPAConfig;
+import com.baeldung.config.PersistenceJPAConfig;
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.model.Foo;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java

@@ -1,9 +1,9 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
-import org.baeldung.config.PersistenceJPAConfig;
+import com.baeldung.config.PersistenceJPAConfig;
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.model.Foo;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/persistence/service/FooServiceSortingIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
 import java.util.List;
 
@@ -10,9 +10,9 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 
-import org.baeldung.config.PersistenceJPAConfig;
+import com.baeldung.config.PersistenceJPAConfig;
-import org.baeldung.persistence.model.Bar;
+import com.baeldung.persistence.model.Bar;
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.model.Foo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.annotation.DirtiesContext;

persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.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.junit.Assert.assertNull;
@@ -9,8 +9,8 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
-import org.baeldung.config.PersistenceJPAConfig;
+import com.baeldung.config.PersistenceJPAConfig;
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.model.Foo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/persistence/service/FooStoredProceduresLiveTest.java

@@ -1,12 +1,12 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.junit.Assert.assertEquals;
 
 import java.util.List;
 
-import org.baeldung.config.PersistenceConfig;
+import com.baeldung.config.PersistenceConfig;
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.model.Foo;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.exception.SQLGrammarException;

persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/spring/data/persistence/dao/user/UserRepositoryCommon.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.persistence.dao.user;
+package com.baeldung.spring.data.persistence.dao.user;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -18,8 +18,8 @@ import java.util.stream.Stream;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import org.baeldung.spring.data.persistence.config.PersistenceConfig;
+import com.baeldung.spring.data.persistence.config.PersistenceConfig;
-import org.baeldung.spring.data.persistence.model.User;
+import com.baeldung.spring.data.persistence.model.User;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;

persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/spring/data/persistence/dao/user/UserRepositoryIntegrationTest.java

@@ -1,11 +1,11 @@
-package org.baeldung.spring.data.persistence.dao.user;
+package com.baeldung.spring.data.persistence.dao.user;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.LocalDate;
 
-import org.baeldung.spring.data.persistence.config.PersistenceConfig;
+import com.baeldung.spring.data.persistence.config.PersistenceConfig;
-import org.baeldung.spring.data.persistence.model.User;
+import com.baeldung.spring.data.persistence.model.User;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.annotation.DirtiesContext;

persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/spring/data/persistence/service/AbstractServicePersistenceIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.persistence.service;
+package com.baeldung.spring.data.persistence.service;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.hamcrest.Matchers.hasItem;
@@ -11,8 +11,8 @@ import static org.junit.Assert.assertThat;
 import java.io.Serializable;
 import java.util.List;
 
-import org.baeldung.spring.data.persistence.model.Foo;
+import com.baeldung.spring.data.persistence.model.Foo;
-import org.baeldung.util.IDUtil;
+import com.baeldung.util.IDUtil;
 import org.hamcrest.Matchers;
 import org.junit.Ignore;
 import org.junit.Test;

persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/spring/data/persistence/service/FooServicePersistenceIntegrationTest.java

@@ -1,10 +1,10 @@
-package org.baeldung.spring.data.persistence.service;
+package com.baeldung.spring.data.persistence.service;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.junit.Assert.assertNotNull;
 
-import org.baeldung.spring.data.persistence.model.Foo;
+import com.baeldung.spring.data.persistence.model.Foo;
-import org.baeldung.spring.data.persistence.config.PersistenceConfig;
+import com.baeldung.spring.data.persistence.config.PersistenceConfig;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;

pom.xml

@@ -124,11 +124,6 @@
 					</excludes>
 				</configuration>
 				<dependencies>
-	                <dependency>
-	                    <groupId>org.junit.platform</groupId>
-	                    <artifactId>junit-platform-surefire-provider</artifactId>
-	                    <version>${junit-platform.version}</version>
-	                </dependency>
 	                <dependency>
 	                    <groupId>org.junit.jupiter</groupId>
 	                    <artifactId>junit-jupiter-engine</artifactId>
@@ -391,6 +386,8 @@
                 <module>core-java-modules/core-java-arrays</module>
                 <module>core-java-modules/core-java-collections</module>
                 <module>core-java-modules/core-java-collections-list</module>
+                <module>core-java-modules/core-java-collections-list-2</module>
+                <module>core-java-modules/core-java-collections-array-list</module>
                 <module>core-java-modules/core-java-collections-set</module>
                 <module>core-java-modules/core-java-concurrency-basic</module>
                 <module>core-java-modules/core-java-concurrency-collections</module>
@@ -1071,6 +1068,8 @@
                 <module>core-java-modules/core-java-arrays</module>
                 <module>core-java-modules/core-java-collections</module>
                 <module>core-java-modules/core-java-collections-list</module>
+                <module>core-java-modules/core-java-collections-list-2</module>
+                <module>core-java-modules/core-java-collections-array-list</module>
                 <module>core-java-modules/core-java-collections-set</module>
                 <module>core-java-modules/core-java-concurrency-basic</module>
                 <module>core-java-modules/core-java-concurrency-collections</module>
@@ -1527,7 +1526,7 @@
 		<logback.version>1.1.7</logback.version>
 
 		<!-- plugins -->
-		<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
 		<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
 		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
 		<java.version>1.8</java.version>
@@ -1549,8 +1548,8 @@
 		<jstl.version>1.2</jstl.version>
 		<jackson.version>2.9.8</jackson.version>
 		<commons-fileupload.version>1.3</commons-fileupload.version>
-		<junit-platform.version>1.2.0</junit-platform.version>
+		<junit-platform.version>1.4.2</junit-platform.version>
-		<junit-jupiter.version>5.2.0</junit-jupiter.version>
+		<junit-jupiter.version>5.4.2</junit-jupiter.version>
 		<directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
 		<maven-install-plugin.version>2.5.1</maven-install-plugin.version>
 		<custom-pmd.version>0.0.1</custom-pmd.version>

spring-all/README.md

@@ -33,5 +33,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Spring @Primary Annotation](http://www.baeldung.com/spring-primary)
 - [Spring Events](https://www.baeldung.com/spring-events)
 - [Spring Null-Safety Annotations](https://www.baeldung.com/spring-null-safety-annotations)
-- [Spring JDBC](https://www.baeldung.com/spring-jdbc-jdbctemplate)
 - [Using @Autowired in Abstract Classes](https://www.baeldung.com/spring-autowired-abstract-class)

spring-cloud/spring-cloud-contract/pom.xml

@@ -19,4 +19,45 @@
         <module>spring-cloud-contract-consumer</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-web</artifactId>
+                <version>${spring-boot.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-data-rest</artifactId>
+                <version>${spring-boot.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-contract-wiremock</artifactId>
+                <version>${spring-cloud.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-contract-stub-runner</artifactId>
+                <version>${spring-cloud.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-contract-verifier</artifactId>
+                <version>${spring-cloud.version}</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <spring-cloud.version>2.1.1.RELEASE</spring-cloud.version>
+        <spring-boot.version>2.1.4.RELEASE</spring-boot.version>
+    </properties>
 </project>

spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml

@@ -20,37 +20,27 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-contract-wiremock</artifactId>
-            <version>${spring-cloud.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-contract-stub-runner</artifactId>
-            <version>${spring-cloud.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-rest</artifactId>
-            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>com.baeldung.spring.cloud</groupId>
             <artifactId>spring-cloud-contract-producer</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-cloud.version>1.2.2.RELEASE</spring-cloud.version>
-        <spring-boot.version>1.5.9.RELEASE</spring-boot.version>
-    </properties>
 </project>

spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathControllerIntegrationTest.java

@@ -7,6 +7,7 @@ import org.springframework.boot.test.autoconfigure.json.AutoConfigureJsonTesters
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner;
+import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
@@ -19,7 +20,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK)
 @AutoConfigureMockMvc
 @AutoConfigureJsonTesters
-@AutoConfigureStubRunner(workOffline = true,
+@AutoConfigureStubRunner(stubsMode = StubRunnerProperties.StubsMode.LOCAL,
         ids = "com.baeldung.spring.cloud:spring-cloud-contract-producer:+:stubs:8090")
 public class BasicMathControllerIntegrationTest {
 

spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml

@@ -25,12 +25,10 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-rest</artifactId>
-            <version>${spring-boot.version}</version>
         </dependency>
     </dependencies>
     <build>
@@ -38,7 +36,7 @@
             <plugin>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-contract-maven-plugin</artifactId>
-                <version>1.2.2.RELEASE</version>
+                <version>2.1.1.RELEASE</version>
                 <extensions>true</extensions>
                 <configuration>
                     <baseClassForTests>com.baeldung.spring.cloud.springcloudcontractproducer.BaseTestClass
@@ -47,25 +45,4 @@
             </plugin>
         </plugins>
     </build>
-
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-cloud.version>Edgware.SR1</spring-cloud.version>
-        <spring-boot.version>1.5.9.RELEASE</spring-boot.version>
-    </properties>
-
 </project>

spring-security-rest-custom/pom.xml

@@ -8,10 +8,10 @@
     <packaging>war</packaging>
 
     <parent>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-1</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-security-rest-custom/src/main/java/org/baeldung/config/child/WebConfig.java

@@ -9,14 +9,14 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 @EnableWebMvc
 @ComponentScan("org.baeldung.web")
 // @ImportResource({ "classpath:prop.xml" })
 // @PropertySource("classpath:foo.properties")
-public class WebConfig extends WebMvcConfigurerAdapter {
+public class WebConfig implements WebMvcConfigurer {
 
     public WebConfig() {
         super();
@@ -26,7 +26,6 @@ public class WebConfig extends WebMvcConfigurerAdapter {
 
     @Override
     public void configureMessageConverters(final List<HttpMessageConverter<?>> converters) {
-        super.configureMessageConverters(converters);
         converters.add(new MappingJackson2HttpMessageConverter());
     }
 

testing-modules/junit-5/pom.xml

@@ -139,7 +139,7 @@
         <junit.vintage.version>5.4.2</junit.vintage.version>
         <log4j2.version>2.8.2</log4j2.version>
         <powermock.version>2.0.0-RC.1</powermock.version>
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <spring.version>5.0.1.RELEASE</spring.version>
     </properties>

testing-modules/junit-5/src/test/java/com/baeldung/MultipleExtensionsUnitTest.java

@@ -0,0 +1,28 @@
+package com.baeldung;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import com.baeldung.extensions.EmployeeDatabaseSetupExtension;
+
+public class MultipleExtensionsUnitTest {
+
+    @Order(1)
+    @RegisterExtension
+    static EmployeeDatabaseSetupExtension SECOND_DB =
+      new EmployeeDatabaseSetupExtension("jdbc:h2:mem:DbTwo;DB_CLOSE_DELAY=-1", "org.h2.Driver", "sa", "");
+
+    @Order(0)
+    @RegisterExtension
+    static EmployeeDatabaseSetupExtension FIRST_DB =
+      new EmployeeDatabaseSetupExtension("jdbc:h2:mem:DbOne;DB_CLOSE_DELAY=-1", "org.h2.Driver", "sa", "");
+
+    @RegisterExtension
+    static EmployeeDatabaseSetupExtension LAST_DB =
+      new EmployeeDatabaseSetupExtension("jdbc:h2:mem:DbLast;DB_CLOSE_DELAY=-1", "org.h2.Driver", "sa", "");
+
+    @Test
+    public void justDemonstratingTheIdea() {
+        // empty test
+    }
+}

testing-modules/junit-5/src/test/java/com/baeldung/ProgrammaticEmployeesUnitTest.java

@@ -0,0 +1,40 @@
+package com.baeldung;
+
+import java.sql.SQLException;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.baeldung.helpers.Employee;
+import com.baeldung.extensions.EmployeeDaoParameterResolver;
+import com.baeldung.extensions.EmployeeDatabaseSetupExtension;
+import com.baeldung.extensions.EnvironmentExtension;
+import com.baeldung.helpers.EmployeeJdbcDao;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@ExtendWith({ EnvironmentExtension.class, EmployeeDaoParameterResolver.class })
+public class ProgrammaticEmployeesUnitTest {
+
+    private EmployeeJdbcDao employeeDao;
+
+    @RegisterExtension static EmployeeDatabaseSetupExtension DB =
+      new EmployeeDatabaseSetupExtension("jdbc:h2:mem:AnotherDb;DB_CLOSE_DELAY=-1", "org.h2.Driver", "sa", "");
+
+    public ProgrammaticEmployeesUnitTest(EmployeeJdbcDao employeeDao) {
+        this.employeeDao = employeeDao;
+    }
+
+    @Test
+    public void whenAddEmployee_thenGetEmployee() throws SQLException {
+        Employee emp = new Employee(1, "john");
+        employeeDao.add(emp);
+        assertEquals(1, employeeDao.findAll().size());
+    }
+
+    @Test
+    public void whenGetEmployees_thenEmptyList() throws SQLException {
+        assertEquals(0, employeeDao.findAll().size());
+    }
+}

testing-modules/junit-5/src/test/java/com/baeldung/extensions/EmployeeDatabaseSetupExtension.java

@@ -15,10 +15,20 @@ import com.baeldung.helpers.JdbcConnectionUtil;
 
 public class EmployeeDatabaseSetupExtension implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback {
 
-    private Connection con = JdbcConnectionUtil.getConnection();
+    private Connection con;
-    private EmployeeJdbcDao employeeDao = new EmployeeJdbcDao(con);
+    private EmployeeJdbcDao employeeDao;
     private Savepoint savepoint;
 
+    public EmployeeDatabaseSetupExtension() {
+        con = JdbcConnectionUtil.getConnection();
+        employeeDao = new EmployeeJdbcDao(con);
+    }
+
+    public EmployeeDatabaseSetupExtension(String jdbcUrl, String driver, String username, String password) {
+        con = JdbcConnectionUtil.getConnection(jdbcUrl, driver, username, password);
+        employeeDao = new EmployeeJdbcDao(con);
+    }
+
     @Override
     public void afterAll(ExtensionContext context) throws SQLException {
         if (con != null) {

testing-modules/junit-5/src/test/java/com/baeldung/helpers/EmployeeJdbcDao.java

@@ -19,7 +19,7 @@ public class EmployeeJdbcDao {
     }
 
     public void createTable() throws SQLException {
-        String createQuery = "CREATE TABLE employees(id long primary key, firstName varchar(50))";
+        String createQuery = "CREATE TABLE IF NOT EXISTS employees(id long primary key, firstName varchar(50))";
         PreparedStatement pstmt = con.prepareStatement(createQuery);
 
         pstmt.execute();

testing-modules/junit-5/src/test/java/com/baeldung/helpers/JdbcConnectionUtil.java

@@ -11,22 +11,49 @@ public class JdbcConnectionUtil {
     private static Connection con;
 
     public static Connection getConnection() {
-        if (con == null) {
+        if (con == null || isClosed(con)) {
             try {
                 Properties props = new Properties();
                 props.load(JdbcConnectionUtil.class.getResourceAsStream("jdbc.properties"));
-                Class.forName(props.getProperty("jdbc.driver"));
+
-                con = DriverManager.getConnection(props.getProperty("jdbc.url"), props.getProperty("jdbc.user"), props.getProperty("jdbc.password"));
+                String jdbcUrl = props.getProperty("jdbc.url");
+                String driver = props.getProperty("jdbc.driver");
+                String username = props.getProperty("jdbc.user");
+                String password = props.getProperty("jdbc.password");
+                con = getConnection(jdbcUrl, driver, username, password);
                 return con;
             } catch (IOException exc) {
                 exc.printStackTrace();
+            }
+
+            return null;
+        }
+        return con;
+    }
+
+    public static Connection getConnection(String jdbcUrl, String driver, String username, String password) {
+        if (con == null || isClosed(con)) {
+            try {
+                Class.forName(driver);
+                con = DriverManager.getConnection(jdbcUrl, username, password);
+                return con;
             } catch (ClassNotFoundException exc) {
                 exc.printStackTrace();
             } catch (SQLException exc) {
                 exc.printStackTrace();
             }
+
             return null;
         }
+
         return con;
     }
+
+    private static boolean isClosed(Connection con) {
+        try {
+            return con.isClosed();
+        } catch (SQLException e) {
+            return true;
+        }
+    }
 }

testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/AssertionUnitTest.java

@@ -34,7 +34,7 @@ public class AssertionUnitTest {
                 "heading",
                 () -> assertEquals(4, 2 * 2, "4 is 2 times 2"),
                 () -> assertEquals("java", "JAVA".toLowerCase()),
-                () -> assertEquals(null, null, "null is equal to null")
+                () -> assertEquals((String) null, (String) null, "null is equal to null")
         );
     }
 }