[BAEL-9538] - Move persistence-related modules into the persistence folder

persistence-modules/core-java-persistence/pom.xml

@@ -1,71 +1,71 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung.core-java-persistence</groupId>
-    <artifactId>core-java-persistence</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>core-java-persistence</name>
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
-    </parent>
-    <dependencies>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj-core.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-dbcp2</artifactId>
-            <version>${commons-dbcp2.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <version>${HikariCP.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.mchange</groupId>
-            <artifactId>c3p0</artifactId>
-            <version>${c3p0.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${springframework.spring-web.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <version>${springframework.boot.spring-boot-starter.version}</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <finalName>core-java-persistence</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>    
-    <properties>
-        <assertj-core.version>3.10.0</assertj-core.version>
-        <h2database.version>1.4.197</h2database.version>
-        <commons-dbcp2.version>2.4.0</commons-dbcp2.version>
-        <HikariCP.version>3.2.0</HikariCP.version>
-        <c3p0.version>0.9.5.2</c3p0.version>
-        <springframework.boot.spring-boot-starter.version>1.5.8.RELEASE</springframework.boot.spring-boot-starter.version>
-        <springframework.spring-web.version>4.3.4.RELEASE</springframework.spring-web.version>
-    </properties>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.core-java-persistence</groupId>
+    <artifactId>core-java-persistence</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>core-java-persistence</name>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2database.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
+            <version>${commons-dbcp2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>${HikariCP.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mchange</groupId>
+            <artifactId>c3p0</artifactId>
+            <version>${c3p0.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${springframework.spring-web.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>${springframework.boot.spring-boot-starter.version}</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <finalName>core-java-persistence</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>    
+    <properties>
+        <assertj-core.version>3.10.0</assertj-core.version>
+        <h2database.version>1.4.197</h2database.version>
+        <commons-dbcp2.version>2.4.0</commons-dbcp2.version>
+        <HikariCP.version>3.2.0</HikariCP.version>
+        <c3p0.version>0.9.5.2</c3p0.version>
+        <springframework.boot.spring-boot-starter.version>1.5.8.RELEASE</springframework.boot.spring-boot-starter.version>
+        <springframework.spring-web.version>4.3.4.RELEASE</springframework.spring-web.version>
+    </properties>
 </project>

persistence-modules/core-java-persistence/src/test/java/com/baeldung/connectionpool/BasicConnectionPoolUnitTest.java

@@ -1,67 +1,67 @@
-package com.baeldung.connectionpool;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class BasicConnectionPoolUnitTest {
-    
-    private static ConnectionPool connectionPool;
-
-    @BeforeClass
-    public static void setUpBasicConnectionPoolInstance() throws SQLException {
-        connectionPool = BasicConnectionPool.create("jdbc:h2:mem:test", "user", "password");
-    }
-    
-    @Test
-    public void givenBasicConnectionPoolInstance_whenCalledgetConnection_thenCorrect() throws Exception {
-        assertTrue(connectionPool.getConnection().isValid(1));
-    }
-    
-    @Test
-    public void givenBasicConnectionPoolInstance_whenCalledreleaseConnection_thenCorrect() throws Exception {
-        Connection connection = connectionPool.getConnection();
-        assertThat(connectionPool.releaseConnection(connection)).isTrue();
-    }
-    
-    @Test
-    public void givenBasicConnectionPoolInstance_whenCalledgetUrl_thenCorrect() {
-        assertThat(connectionPool.getUrl()).isEqualTo("jdbc:h2:mem:test");
-    }
-    
-    @Test
-    public void givenBasicConnectionPoolInstance_whenCalledgetUser_thenCorrect() {
-        assertThat(connectionPool.getUser()).isEqualTo("user");
-    }
-    
-    @Test
-    public void givenBasicConnectionPoolInstance_whenCalledgetPassword_thenCorrect() {
-        assertThat(connectionPool.getPassword()).isEqualTo("password");
-    }
-
-    @Test(expected = RuntimeException.class)
-    public void givenBasicConnectionPoolInstance_whenAskedForMoreThanMax_thenError() throws Exception {
-        // this test needs to be independent so it doesn't share the same connection pool as other tests
-        ConnectionPool cp = BasicConnectionPool.create("jdbc:h2:mem:test", "user", "password");
-        final int MAX_POOL_SIZE = 20;
-        for (int i = 0; i < MAX_POOL_SIZE + 1; i++) {
-            cp.getConnection();
-        }
-        fail();
-    }
-
-    @Test
-    public void givenBasicConnectionPoolInstance_whenSutdown_thenEmpty() throws Exception {
-        ConnectionPool cp = BasicConnectionPool.create("jdbc:h2:mem:test", "user", "password");
-        assertThat(((BasicConnectionPool)cp).getSize()).isEqualTo(10);
-
-        ((BasicConnectionPool) cp).shutdown();
-        assertThat(((BasicConnectionPool)cp).getSize()).isEqualTo(0);
-    }
-}
+package com.baeldung.connectionpool;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class BasicConnectionPoolUnitTest {
+    
+    private static ConnectionPool connectionPool;
+
+    @BeforeClass
+    public static void setUpBasicConnectionPoolInstance() throws SQLException {
+        connectionPool = BasicConnectionPool.create("jdbc:h2:mem:test", "user", "password");
+    }
+    
+    @Test
+    public void givenBasicConnectionPoolInstance_whenCalledgetConnection_thenCorrect() throws Exception {
+        assertTrue(connectionPool.getConnection().isValid(1));
+    }
+    
+    @Test
+    public void givenBasicConnectionPoolInstance_whenCalledreleaseConnection_thenCorrect() throws Exception {
+        Connection connection = connectionPool.getConnection();
+        assertThat(connectionPool.releaseConnection(connection)).isTrue();
+    }
+    
+    @Test
+    public void givenBasicConnectionPoolInstance_whenCalledgetUrl_thenCorrect() {
+        assertThat(connectionPool.getUrl()).isEqualTo("jdbc:h2:mem:test");
+    }
+    
+    @Test
+    public void givenBasicConnectionPoolInstance_whenCalledgetUser_thenCorrect() {
+        assertThat(connectionPool.getUser()).isEqualTo("user");
+    }
+    
+    @Test
+    public void givenBasicConnectionPoolInstance_whenCalledgetPassword_thenCorrect() {
+        assertThat(connectionPool.getPassword()).isEqualTo("password");
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void givenBasicConnectionPoolInstance_whenAskedForMoreThanMax_thenError() throws Exception {
+        // this test needs to be independent so it doesn't share the same connection pool as other tests
+        ConnectionPool cp = BasicConnectionPool.create("jdbc:h2:mem:test", "user", "password");
+        final int MAX_POOL_SIZE = 20;
+        for (int i = 0; i < MAX_POOL_SIZE + 1; i++) {
+            cp.getConnection();
+        }
+        fail();
+    }
+
+    @Test
+    public void givenBasicConnectionPoolInstance_whenSutdown_thenEmpty() throws Exception {
+        ConnectionPool cp = BasicConnectionPool.create("jdbc:h2:mem:test", "user", "password");
+        assertThat(((BasicConnectionPool)cp).getSize()).isEqualTo(10);
+
+        ((BasicConnectionPool) cp).shutdown();
+        assertThat(((BasicConnectionPool)cp).getSize()).isEqualTo(0);
+    }
+}

persistence-modules/core-java-persistence/src/test/java/com/baeldung/connectionpool/C3poDataSourceUnitTest.java

@@ -1,13 +1,13 @@
-package com.baeldung.connectionpool;
-
-import java.sql.SQLException;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
-public class C3poDataSourceUnitTest {
-    
-    @Test
-    public void givenC3poDataSourceClass_whenCalledgetConnection_thenCorrect() throws SQLException {
-        assertTrue(C3poDataSource.getConnection().isValid(1));
-    }   
+package com.baeldung.connectionpool;
+
+import java.sql.SQLException;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public class C3poDataSourceUnitTest {
+    
+    @Test
+    public void givenC3poDataSourceClass_whenCalledgetConnection_thenCorrect() throws SQLException {
+        assertTrue(C3poDataSource.getConnection().isValid(1));
+    }   
 }

persistence-modules/core-java-persistence/src/test/java/com/baeldung/connectionpool/DBCPDataSourceUnitTest.java

@@ -1,13 +1,13 @@
-package com.baeldung.connectionpool;
-
-import java.sql.SQLException;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
-public class DBCPDataSourceUnitTest {
-    
-    @Test
-    public void givenDBCPDataSourceClass_whenCalledgetConnection_thenCorrect() throws SQLException {
-        assertTrue(DBCPDataSource.getConnection().isValid(1));
-    }   
+package com.baeldung.connectionpool;
+
+import java.sql.SQLException;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public class DBCPDataSourceUnitTest {
+    
+    @Test
+    public void givenDBCPDataSourceClass_whenCalledgetConnection_thenCorrect() throws SQLException {
+        assertTrue(DBCPDataSource.getConnection().isValid(1));
+    }   
 }

persistence-modules/core-java-persistence/src/test/java/com/baeldung/connectionpool/HikariCPDataSourceUnitTest.java

@@ -1,13 +1,13 @@
-package com.baeldung.connectionpool;
-
-import java.sql.SQLException;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
-public class HikariCPDataSourceUnitTest {
-    
-    @Test
-    public void givenHikariDataSourceClass_whenCalledgetConnection_thenCorrect() throws SQLException {
-        assertTrue(HikariCPDataSource.getConnection().isValid(1));
-    }   
+package com.baeldung.connectionpool;
+
+import java.sql.SQLException;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public class HikariCPDataSourceUnitTest {
+    
+    @Test
+    public void givenHikariDataSourceClass_whenCalledgetConnection_thenCorrect() throws SQLException {
+        assertTrue(HikariCPDataSource.getConnection().isValid(1));
+    }   
 }

persistence-modules/deltaspike/pom.xml

@@ -14,6 +14,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
     </parent>
 
     <dependencies>