From b933c21023b6d39db62125423bab293f943765ac Mon Sep 17 00:00:00 2001
From: alemoles <alemolerio@gmail.com>
Date: Wed, 23 Mar 2022 01:41:59 -0400
Subject: [PATCH 1/3] BAEL-5429 - How to Fix Java Compiler Error: Illegal
 Character (#9)

---
 core-java-modules/core-java/pom.xml           | 10 +++
 .../IllegalCharacterUnitTest.java             | 79 +++++++++++++++++++
 .../core-java/src/test/resources/bom-file.txt |  1 +
 3 files changed, 90 insertions(+)
 create mode 100644 core-java-modules/core-java/src/test/java/com/baeldung/illegalcharacter/IllegalCharacterUnitTest.java
 create mode 100644 core-java-modules/core-java/src/test/resources/bom-file.txt

diff --git a/core-java-modules/core-java/pom.xml b/core-java-modules/core-java/pom.xml
index bb19b525d0..786ee91192 100644
--- a/core-java-modules/core-java/pom.xml
+++ b/core-java-modules/core-java/pom.xml
@@ -59,6 +59,16 @@
             <artifactId>spring-core</artifactId>
             <version>${spring.core.version}</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.gdata</groupId>
+            <artifactId>core</artifactId>
+            <version>1.47.1</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/illegalcharacter/IllegalCharacterUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/illegalcharacter/IllegalCharacterUnitTest.java
new file mode 100644
index 0000000000..4a08daa271
--- /dev/null
+++ b/core-java-modules/core-java/src/test/java/com/baeldung/illegalcharacter/IllegalCharacterUnitTest.java
@@ -0,0 +1,79 @@
+package com.baeldung.illegalcharacter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Objects;
+
+import org.apache.commons.io.ByteOrderMark;
+import org.apache.commons.io.input.BOMInputStream;
+import org.junit.Test;
+
+import com.google.gdata.util.io.base.UnicodeReader;
+
+public class IllegalCharacterUnitTest {
+
+    final String RESOURCE_FILE_NAME = "bom-file.txt";
+    final InputStream ioStream = this.getClass()
+        .getClassLoader()
+        .getResourceAsStream(RESOURCE_FILE_NAME);
+    final String expected = "Hello world with BOM.";
+
+    @Test
+    public void whenInputFileHasBOM_thenUseInputStream() throws IOException {
+        String line;
+        String actual = "";
+
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(ioStream))) {
+            while ((line = br.readLine()) != null) {
+                actual += line;
+            }
+        }
+
+        assertNotEquals(expected, actual);
+    }
+
+    @Test
+    public void whenInputFileHasBOM_thenUseInputStreamWithReplace() throws IOException {
+        String line;
+        String actual = "";
+
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(Objects.requireNonNull(ioStream)))) {
+            while ((line = br.readLine()) != null) {
+                actual += line.replace("\uFEFF", "");
+            }
+        }
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void whenInputFileHasBOM_thenUseBOMInputStream() throws IOException {
+        String line;
+        String actual = "";
+
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(new BOMInputStream(ioStream, false, ByteOrderMark.UTF_8, ByteOrderMark.UTF_16BE, ByteOrderMark.UTF_16LE, ByteOrderMark.UTF_32BE, ByteOrderMark.UTF_32LE)))) {
+            while ((line = br.readLine()) != null) {
+                actual += line;
+            }
+        }
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void whenInputFileHasBOM_thenUseGoogleGdata() throws IOException {
+        char[] actual = new char[21];
+
+        try (Reader r = new UnicodeReader(ioStream, null)) {
+            r.read(actual);
+        }
+
+        assertEquals(expected, String.valueOf(actual));
+    }
+}
diff --git a/core-java-modules/core-java/src/test/resources/bom-file.txt b/core-java-modules/core-java/src/test/resources/bom-file.txt
new file mode 100644
index 0000000000..b2037fded6
--- /dev/null
+++ b/core-java-modules/core-java/src/test/resources/bom-file.txt
@@ -0,0 +1 @@
+Hello world with BOM.
\ No newline at end of file

From 8735a58dd000e814b6af663102cb53b64fd2225b Mon Sep 17 00:00:00 2001
From: kwoyke <krzysztofwoyke@gmail.com>
Date: Tue, 26 Apr 2022 15:48:09 +0200
Subject: [PATCH 2/3] JAVA-10535: Create parent graphql module (#12112)

* JAVA-10535: Create parent graphql module

* JAVA-10535: Cleanup

* JAVA-10535: pom files cleanup

* JAVA-10535: Use parent-boot-2 as a parent module
---
 graphql/graphql-dgs/pom.xml                   | 34 +++++----------
 graphql/graphql-error-handling/pom.xml        | 43 ++++++-------------
 graphql/graphql-java/pom.xml                  | 33 +++-----------
 graphql/graphql-spqr/pom.xml                  | 26 ++---------
 .../java/com/baeldung/spqr/BookService.java   |  4 +-
 graphql/pom.xml                               | 26 +++++++++++
 pom.xml                                       |  6 +--
 7 files changed, 61 insertions(+), 111 deletions(-)
 create mode 100644 graphql/pom.xml

diff --git a/graphql/graphql-dgs/pom.xml b/graphql/graphql-dgs/pom.xml
index 6165ae839f..56e261f14d 100644
--- a/graphql/graphql-dgs/pom.xml
+++ b/graphql/graphql-dgs/pom.xml
@@ -3,16 +3,14 @@
     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.graphql-dgs</groupId>
     <artifactId>graphql-dgs</artifactId>
     <version>1.0</version>
     <name>graphql-dgs</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung.graphql</groupId>
+        <artifactId>graphql</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
     </parent>
 
     <dependencyManagement>
@@ -30,39 +28,22 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <version>2.6.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>2.6.2</version>
-            <scope>test</scope>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
             <groupId>com.netflix.graphql.dgs.codegen</groupId>
             <artifactId>graphql-dgs-codegen-client-core</artifactId>
-            <version>5.1.14</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.6.2</version>
+            <version>${graphql-dgs-codegen-client-core.version}</version>
         </dependency>
         <dependency>
             <groupId>com.netflix.graphql.dgs</groupId>
             <artifactId>graphql-dgs-spring-boot-starter</artifactId>
-            <version>4.9.15</version>
+            <version>${graphql-dgs-spring-boot-starter.version}</version>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.6.2</version>
-            </plugin>
             <plugin>
                 <groupId>io.github.deweyjose</groupId>
                 <artifactId>graphqlcodegen-maven-plugin</artifactId>
@@ -84,4 +65,9 @@
         </plugins>
     </build>
 
+    <properties>
+        <graphql-dgs-codegen-client-core.version>5.1.14</graphql-dgs-codegen-client-core.version>
+        <graphql-dgs-spring-boot-starter.version>4.9.15</graphql-dgs-spring-boot-starter.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/graphql/graphql-error-handling/pom.xml b/graphql/graphql-error-handling/pom.xml
index 0cd00df3b9..ea1cf96a0e 100644
--- a/graphql/graphql-error-handling/pom.xml
+++ b/graphql/graphql-error-handling/pom.xml
@@ -3,24 +3,17 @@
          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.graphql</groupId>
     <artifactId>graphql-error-handling</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
     <name>graphql-error-handling</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
+        <groupId>com.baeldung.graphql</groupId>
+        <artifactId>graphql</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <properties>
-        <java.version>1.8</java.version>
-        <lombok.version>1.18.18</lombok.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -35,13 +28,13 @@
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-spring-boot-starter</artifactId>
-            <version>5.0.2</version>
+            <version>${graphql-spring-boot-starter.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java-tools</artifactId>
-            <version>5.2.4</version>
+            <version>${graphql-java-tools.version}</version>
         </dependency>
 
         <dependency>
@@ -60,38 +53,28 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test</artifactId>
             <scope>test</scope>
-            <version>2.6.4</version>
         </dependency>
 
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-spring-boot-starter-test</artifactId>
             <scope>test</scope>
-            <version>5.0.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.22.0</version>
-            <scope>test</scope>
+            <version>${graphql-spring-boot-starter.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.skyscreamer</groupId>
             <artifactId>jsonassert</artifactId>
-            <version>1.5.0</version>
+            <version>${jsonassert.version}</version>
             <scope>test</scope>
         </dependency>
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+    <properties>
+        <graphql-spring-boot-starter.version>5.0.2</graphql-spring-boot-starter.version>
+        <graphql-java-tools.version>5.2.4</graphql-java-tools.version>
+        <jsonassert.version>1.5.0</jsonassert.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/graphql/graphql-java/pom.xml b/graphql/graphql-java/pom.xml
index 068cb04ea8..5e5bc8f648 100644
--- a/graphql/graphql-java/pom.xml
+++ b/graphql/graphql-java/pom.xml
@@ -3,16 +3,14 @@
     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.graphql</groupId>
     <artifactId>graphql-java</artifactId>
     <version>1.0</version>
     <name>graphql-java</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung.graphql</groupId>
+        <artifactId>graphql</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <repositories>
@@ -44,12 +42,12 @@
         <dependency>
             <groupId>com.github.americanexpress.nodes</groupId>
             <artifactId>nodes</artifactId>
-            <version>0.5.0</version>
+            <version>${nodes.version}</version>
         </dependency>
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java</artifactId>
-            <version>11.0</version>
+            <version>${graphql-java.version}</version>
         </dependency>
         <dependency>
             <groupId>com.graphql-java</groupId>
@@ -77,16 +75,6 @@
             <artifactId>jackson-core</artifactId>
             <version>${jackson.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.ratpack</groupId>
-            <artifactId>ratpack-core</artifactId>
-            <version>${ratpack-core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.americanexpress.nodes</groupId>
-            <artifactId>nodes</artifactId>
-            <version>${nodes.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -117,20 +105,10 @@
             <version>${graphql-java-extended-scalars.version}</version>
         </dependency>
 
-
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
@@ -169,6 +147,7 @@
     </build>
 
     <properties>
+        <graphql-java.version>11.0</graphql-java.version>
         <graphql-java-tools.version>5.2.4</graphql-java-tools.version>
         <graphql-java-servlet.version>6.1.3</graphql-java-servlet.version>
         <graphql-java-annotations.version>3.0.3</graphql-java-annotations.version>
@@ -182,8 +161,6 @@
 
         <jetty-maven-plugin.version>10.0.7</jetty-maven-plugin.version>
 
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <graphql.java.generator.version>1.18</graphql.java.generator.version>
         <graphql-java-extended-scalars.version>2022-04-06T00-10-27-a70541e</graphql-java-extended-scalars.version>
     </properties>
diff --git a/graphql/graphql-spqr/pom.xml b/graphql/graphql-spqr/pom.xml
index c825be9b79..ad040c1557 100644
--- a/graphql/graphql-spqr/pom.xml
+++ b/graphql/graphql-spqr/pom.xml
@@ -2,30 +2,21 @@
 <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.graphql</groupId>
     <artifactId>graphql-spqr</artifactId>
     <version>1.0</version>
-    <name>graphql-java</name>
+    <name>graphql-spqr</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung.graphql</groupId>
+        <artifactId>graphql</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
     </parent>
 
     <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</artifactId>
-            <version>${spring-boot-version}</version>
         </dependency>
         <dependency>
             <groupId>io.leangen.graphql</groupId>
@@ -34,18 +25,7 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.6.2</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
-        <spring-boot-version>2.6.2</spring-boot-version>
         <graphql-spqr-spring-boot-starter-version>0.0.6</graphql-spqr-spring-boot-starter-version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/graphql/graphql-spqr/src/main/java/com/baeldung/spqr/BookService.java b/graphql/graphql-spqr/src/main/java/com/baeldung/spqr/BookService.java
index 7c9b129491..2e9c6d8367 100644
--- a/graphql/graphql-spqr/src/main/java/com/baeldung/spqr/BookService.java
+++ b/graphql/graphql-spqr/src/main/java/com/baeldung/spqr/BookService.java
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @Service
 @GraphQLApi
@@ -27,8 +28,7 @@ public class BookService implements IBookService {
 
     @GraphQLQuery(name = "getAllBooks", description = "Get all books")
     public List<Book> getAllBooks() {
-        return books.stream()
-            .toList();
+        return books.stream().collect(Collectors.toList());
     }
 
     @GraphQLMutation(name = "addBook")
diff --git a/graphql/pom.xml b/graphql/pom.xml
new file mode 100644
index 0000000000..aec097752a
--- /dev/null
+++ b/graphql/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.graphql</groupId>
+    <artifactId>graphql</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <name>graphql</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <modules>
+        <module>graphql-dgs</module>
+        <module>graphql-error-handling</module>
+        <module>graphql-java</module>
+        <module>graphql-spqr</module>
+    </modules>
+
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 25aeebef9d..10948514d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -415,8 +415,7 @@
                 <!-- <module>gradle-5</module> --> <!-- Not a maven project -->
                 <!-- <module>gradle-6</module> --> <!-- Not a maven project -->
                 <!-- <module>grails</module> --> <!-- Not a maven project -->
-                <module>graphql/graphql-java</module>
-                <module>graphql/graphql-dgs</module>
+                <module>graphql</module>
                 <module>grpc</module>
                 <module>gson</module>
                 <module>guava-modules</module>
@@ -896,8 +895,7 @@
                 <!-- <module>gradle-5</module> --> <!-- Not a maven project -->
                 <!-- <module>gradle-6</module> --> <!-- Not a maven project -->
                 <!-- <module>grails</module> --> <!-- Not a maven project -->
-                <module>graphql/graphql-java</module>
-                <module>graphql/graphql-dgs</module>
+                <module>graphql</module>
                 <module>grpc</module>
                 <module>gson</module>
                 <module>guava-modules</module>

From 4553469318fff667885fbfaab4a549c47d6f5545 Mon Sep 17 00:00:00 2001
From: anuragkumawat <anuragkumawat7@gmail.com>
Date: Tue, 26 Apr 2022 19:28:06 +0530
Subject: [PATCH 3/3]  JAVA-11535 Move spring-data related modules to
 persistence-modules (#12126)

---
 persistence-modules/pom.xml                                 | 3 +++
 .../spring-data-rest-2}/README.md                           | 0
 .../spring-data-rest-2}/pom.xml                             | 2 +-
 .../java/com/baeldung/books/SpringDataRestApplication.java  | 0
 .../src/main/java/com/baeldung/books/config/DbConfig.java   | 0
 .../src/main/java/com/baeldung/books/config/RestConfig.java | 0
 .../com/baeldung/books/config/ValidatorEventRegister.java   | 0
 .../handlers/RestResponseEntityExceptionHandler.java        | 0
 .../main/java/com/baeldung/books/models/WebsiteUser.java    | 0
 .../com/baeldung/books/repositories/UserRepository.java     | 0
 .../com/baeldung/books/validators/WebsiteUserValidator.java | 0
 .../src/main/java/com/baeldung/halbrowser/App.java          | 0
 .../main/java/com/baeldung/halbrowser/config/DBLoader.java  | 0
 .../java/com/baeldung/halbrowser/config/RestConfig.java     | 0
 .../java/com/baeldung/halbrowser/data/BookRepository.java   | 0
 .../src/main/java/com/baeldung/halbrowser/model/Book.java   | 0
 .../springdatawebsupport/application/Application.java       | 0
 .../application/controllers/UserController.java             | 0
 .../springdatawebsupport/application/entities/User.java     | 0
 .../application/repositories/UserRepository.java            | 0
 .../src/main/resources/application.properties               | 0
 .../spring-data-rest-2}/src/main/resources/logback.xml      | 0
 .../src/main/resources/persistence-h2.properties            | 0
 .../src/test/java/com/baeldung/SpringContextTest.java       | 0
 .../validator/SpringDataRestValidatorIntegrationTest.java   | 0
 .../application/test/UserControllerIntegrationTest.java     | 0
 .../spring-data-rest-querydsl}/README.md                    | 0
 .../spring-data-rest-querydsl}/pom.xml                      | 2 +-
 .../src/main/java/com/baeldung/Application.java             | 0
 .../main/java/com/baeldung/controller/QueryController.java  | 0
 .../baeldung/controller/repository/AddressRepository.java   | 0
 .../com/baeldung/controller/repository/UserRepository.java  | 0
 .../src/main/java/com/baeldung/entity/Address.java          | 0
 .../src/main/java/com/baeldung/entity/User.java             | 0
 .../src/main/resources/application.yml                      | 0
 .../src/main/resources/logback.xml                          | 0
 .../src/test/java/com/baeldung/SpringContextTest.java       | 0
 .../baeldung/springdatarestquerydsl/IntegrationTest.java    | 0
 .../springdatarestquerydsl/QuerydslIntegrationTest.java     | 0
 .../src/test/resources/application.yml                      | 0
 .../spring-data-rest}/README.md                             | 0
 .../spring-data-rest}/pom.xml                               | 2 +-
 .../java/com/baeldung/books/SpringDataRestApplication.java  | 0
 .../src/main/java/com/baeldung/books/config/DbConfig.java   | 0
 .../src/main/java/com/baeldung/books/config/MvcConfig.java  | 0
 .../src/main/java/com/baeldung/books/config/RestConfig.java | 0
 .../main/java/com/baeldung/books/dialect/SQLiteDialect.java | 0
 .../baeldung/books/dialect/SQLiteIdentityColumnSupport.java | 0
 .../java/com/baeldung/books/events/AuthorEventHandler.java  | 0
 .../java/com/baeldung/books/events/BookEventHandler.java    | 0
 .../src/main/java/com/baeldung/books/models/Address.java    | 0
 .../src/main/java/com/baeldung/books/models/Author.java     | 0
 .../src/main/java/com/baeldung/books/models/Book.java       | 0
 .../src/main/java/com/baeldung/books/models/Library.java    | 0
 .../src/main/java/com/baeldung/books/models/Subject.java    | 0
 .../java/com/baeldung/books/projections/CustomBook.java     | 0
 .../com/baeldung/books/repositories/AddressRepository.java  | 0
 .../com/baeldung/books/repositories/AuthorRepository.java   | 0
 .../com/baeldung/books/repositories/BookRepository.java     | 0
 .../com/baeldung/books/repositories/LibraryRepository.java  | 0
 .../com/baeldung/books/repositories/SubjectRepository.java  | 0
 .../src/main/resources/application.properties               | 0
 .../spring-data-rest}/src/main/resources/logback.xml        | 0
 .../src/main/resources/persistence-derby.properties         | 0
 .../src/main/resources/persistence-h2.properties            | 0
 .../src/main/resources/persistence-hsqldb.properties        | 0
 .../src/main/resources/persistence-sqlite.properties        | 0
 .../spring-data-rest}/src/main/webapp/users.html            | 0
 .../spring-data-rest}/src/main/webapp/view/app.js           | 0
 .../src/test/java/com/baeldung/SpringContextTest.java       | 0
 .../baeldung/books/events/AuthorEventHandlerUnitTest.java   | 0
 .../com/baeldung/books/events/BookEventHandlerUnitTest.java | 0
 .../books/projections/SpringDataProjectionLiveTest.java     | 0
 pom.xml                                                     | 6 ------
 74 files changed, 6 insertions(+), 9 deletions(-)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/README.md (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/pom.xml (98%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/books/SpringDataRestApplication.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/books/config/DbConfig.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/books/config/RestConfig.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/books/config/ValidatorEventRegister.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/books/exception/handlers/RestResponseEntityExceptionHandler.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/books/models/WebsiteUser.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/books/repositories/UserRepository.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/books/validators/WebsiteUserValidator.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/halbrowser/App.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/halbrowser/config/DBLoader.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/halbrowser/config/RestConfig.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/halbrowser/data/BookRepository.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/halbrowser/model/Book.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/springdatawebsupport/application/Application.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/springdatawebsupport/application/controllers/UserController.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/springdatawebsupport/application/entities/User.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/java/com/baeldung/springdatawebsupport/application/repositories/UserRepository.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/resources/application.properties (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/resources/logback.xml (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/main/resources/persistence-h2.properties (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/test/java/com/baeldung/SpringContextTest.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/test/java/com/baeldung/books/validator/SpringDataRestValidatorIntegrationTest.java (100%)
 rename {spring-data-rest-2 => persistence-modules/spring-data-rest-2}/src/test/java/com/baeldung/springdatawebsupport/application/test/UserControllerIntegrationTest.java (100%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/README.md (100%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/pom.xml (98%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/src/main/java/com/baeldung/Application.java (100%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/src/main/java/com/baeldung/controller/QueryController.java (100%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/src/main/java/com/baeldung/controller/repository/AddressRepository.java (100%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/src/main/java/com/baeldung/controller/repository/UserRepository.java (100%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/src/main/java/com/baeldung/entity/Address.java (100%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/src/main/java/com/baeldung/entity/User.java (100%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/src/main/resources/application.yml (100%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/src/main/resources/logback.xml (100%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/src/test/java/com/baeldung/SpringContextTest.java (100%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/src/test/java/com/baeldung/springdatarestquerydsl/IntegrationTest.java (100%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/src/test/java/com/baeldung/springdatarestquerydsl/QuerydslIntegrationTest.java (100%)
 rename {spring-data-rest-querydsl => persistence-modules/spring-data-rest-querydsl}/src/test/resources/application.yml (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/README.md (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/pom.xml (98%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/SpringDataRestApplication.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/config/DbConfig.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/config/MvcConfig.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/config/RestConfig.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/events/AuthorEventHandler.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/events/BookEventHandler.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/models/Address.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/models/Author.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/models/Book.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/models/Library.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/models/Subject.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/projections/CustomBook.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/repositories/AddressRepository.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/repositories/AuthorRepository.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/repositories/BookRepository.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/repositories/LibraryRepository.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/java/com/baeldung/books/repositories/SubjectRepository.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/resources/application.properties (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/resources/logback.xml (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/resources/persistence-derby.properties (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/resources/persistence-h2.properties (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/resources/persistence-hsqldb.properties (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/resources/persistence-sqlite.properties (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/webapp/users.html (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/main/webapp/view/app.js (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/test/java/com/baeldung/SpringContextTest.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/test/java/com/baeldung/books/events/AuthorEventHandlerUnitTest.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/test/java/com/baeldung/books/events/BookEventHandlerUnitTest.java (100%)
 rename {spring-data-rest => persistence-modules/spring-data-rest}/src/test/java/com/baeldung/books/projections/SpringDataProjectionLiveTest.java (100%)

diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index f8e3cb05e8..132a8b6b20 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -88,6 +88,9 @@
         <module>spring-data-mongodb-reactive</module>
         <module>spring-data-neo4j</module>
         <module>spring-data-redis</module>
+        <module>spring-data-rest</module>
+        <module>spring-data-rest-2</module>
+        <module>spring-data-rest-querydsl</module>
         <module>spring-data-solr</module>
         <module>spring-hibernate-3</module>
         <module>spring-hibernate-5</module> <!-- long running -->
diff --git a/spring-data-rest-2/README.md b/persistence-modules/spring-data-rest-2/README.md
similarity index 100%
rename from spring-data-rest-2/README.md
rename to persistence-modules/spring-data-rest-2/README.md
diff --git a/spring-data-rest-2/pom.xml b/persistence-modules/spring-data-rest-2/pom.xml
similarity index 98%
rename from spring-data-rest-2/pom.xml
rename to persistence-modules/spring-data-rest-2/pom.xml
index cf3265c46d..fa328854a2 100644
--- a/spring-data-rest-2/pom.xml
+++ b/persistence-modules/spring-data-rest-2/pom.xml
@@ -13,7 +13,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/SpringDataRestApplication.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/SpringDataRestApplication.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/SpringDataRestApplication.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/SpringDataRestApplication.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/config/DbConfig.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/config/DbConfig.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/config/DbConfig.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/config/DbConfig.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/config/RestConfig.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/config/RestConfig.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/config/RestConfig.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/config/RestConfig.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/config/ValidatorEventRegister.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/config/ValidatorEventRegister.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/config/ValidatorEventRegister.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/config/ValidatorEventRegister.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/exception/handlers/RestResponseEntityExceptionHandler.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/exception/handlers/RestResponseEntityExceptionHandler.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/exception/handlers/RestResponseEntityExceptionHandler.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/exception/handlers/RestResponseEntityExceptionHandler.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/models/WebsiteUser.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/models/WebsiteUser.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/models/WebsiteUser.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/models/WebsiteUser.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/repositories/UserRepository.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/repositories/UserRepository.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/repositories/UserRepository.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/repositories/UserRepository.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/books/validators/WebsiteUserValidator.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/validators/WebsiteUserValidator.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/books/validators/WebsiteUserValidator.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/books/validators/WebsiteUserValidator.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/App.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/App.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/halbrowser/App.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/App.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/DBLoader.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/DBLoader.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/DBLoader.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/DBLoader.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/RestConfig.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/RestConfig.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/RestConfig.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/config/RestConfig.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/data/BookRepository.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/data/BookRepository.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/halbrowser/data/BookRepository.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/data/BookRepository.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/model/Book.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/model/Book.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/halbrowser/model/Book.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/halbrowser/model/Book.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/Application.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/Application.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/Application.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/Application.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/controllers/UserController.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/controllers/UserController.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/controllers/UserController.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/controllers/UserController.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/entities/User.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/entities/User.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/entities/User.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/entities/User.java
diff --git a/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/repositories/UserRepository.java b/persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/repositories/UserRepository.java
similarity index 100%
rename from spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/repositories/UserRepository.java
rename to persistence-modules/spring-data-rest-2/src/main/java/com/baeldung/springdatawebsupport/application/repositories/UserRepository.java
diff --git a/spring-data-rest-2/src/main/resources/application.properties b/persistence-modules/spring-data-rest-2/src/main/resources/application.properties
similarity index 100%
rename from spring-data-rest-2/src/main/resources/application.properties
rename to persistence-modules/spring-data-rest-2/src/main/resources/application.properties
diff --git a/spring-data-rest-2/src/main/resources/logback.xml b/persistence-modules/spring-data-rest-2/src/main/resources/logback.xml
similarity index 100%
rename from spring-data-rest-2/src/main/resources/logback.xml
rename to persistence-modules/spring-data-rest-2/src/main/resources/logback.xml
diff --git a/spring-data-rest-2/src/main/resources/persistence-h2.properties b/persistence-modules/spring-data-rest-2/src/main/resources/persistence-h2.properties
similarity index 100%
rename from spring-data-rest-2/src/main/resources/persistence-h2.properties
rename to persistence-modules/spring-data-rest-2/src/main/resources/persistence-h2.properties
diff --git a/spring-data-rest-2/src/test/java/com/baeldung/SpringContextTest.java b/persistence-modules/spring-data-rest-2/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-data-rest-2/src/test/java/com/baeldung/SpringContextTest.java
rename to persistence-modules/spring-data-rest-2/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-data-rest-2/src/test/java/com/baeldung/books/validator/SpringDataRestValidatorIntegrationTest.java b/persistence-modules/spring-data-rest-2/src/test/java/com/baeldung/books/validator/SpringDataRestValidatorIntegrationTest.java
similarity index 100%
rename from spring-data-rest-2/src/test/java/com/baeldung/books/validator/SpringDataRestValidatorIntegrationTest.java
rename to persistence-modules/spring-data-rest-2/src/test/java/com/baeldung/books/validator/SpringDataRestValidatorIntegrationTest.java
diff --git a/spring-data-rest-2/src/test/java/com/baeldung/springdatawebsupport/application/test/UserControllerIntegrationTest.java b/persistence-modules/spring-data-rest-2/src/test/java/com/baeldung/springdatawebsupport/application/test/UserControllerIntegrationTest.java
similarity index 100%
rename from spring-data-rest-2/src/test/java/com/baeldung/springdatawebsupport/application/test/UserControllerIntegrationTest.java
rename to persistence-modules/spring-data-rest-2/src/test/java/com/baeldung/springdatawebsupport/application/test/UserControllerIntegrationTest.java
diff --git a/spring-data-rest-querydsl/README.md b/persistence-modules/spring-data-rest-querydsl/README.md
similarity index 100%
rename from spring-data-rest-querydsl/README.md
rename to persistence-modules/spring-data-rest-querydsl/README.md
diff --git a/spring-data-rest-querydsl/pom.xml b/persistence-modules/spring-data-rest-querydsl/pom.xml
similarity index 98%
rename from spring-data-rest-querydsl/pom.xml
rename to persistence-modules/spring-data-rest-querydsl/pom.xml
index 0b1cdd8928..dc1cf64006 100644
--- a/spring-data-rest-querydsl/pom.xml
+++ b/persistence-modules/spring-data-rest-querydsl/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-data-rest-querydsl/src/main/java/com/baeldung/Application.java b/persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/Application.java
similarity index 100%
rename from spring-data-rest-querydsl/src/main/java/com/baeldung/Application.java
rename to persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/Application.java
diff --git a/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/QueryController.java b/persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/QueryController.java
similarity index 100%
rename from spring-data-rest-querydsl/src/main/java/com/baeldung/controller/QueryController.java
rename to persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/QueryController.java
diff --git a/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/AddressRepository.java b/persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/AddressRepository.java
similarity index 100%
rename from spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/AddressRepository.java
rename to persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/AddressRepository.java
diff --git a/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/UserRepository.java b/persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/UserRepository.java
similarity index 100%
rename from spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/UserRepository.java
rename to persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/controller/repository/UserRepository.java
diff --git a/spring-data-rest-querydsl/src/main/java/com/baeldung/entity/Address.java b/persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/entity/Address.java
similarity index 100%
rename from spring-data-rest-querydsl/src/main/java/com/baeldung/entity/Address.java
rename to persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/entity/Address.java
diff --git a/spring-data-rest-querydsl/src/main/java/com/baeldung/entity/User.java b/persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/entity/User.java
similarity index 100%
rename from spring-data-rest-querydsl/src/main/java/com/baeldung/entity/User.java
rename to persistence-modules/spring-data-rest-querydsl/src/main/java/com/baeldung/entity/User.java
diff --git a/spring-data-rest-querydsl/src/main/resources/application.yml b/persistence-modules/spring-data-rest-querydsl/src/main/resources/application.yml
similarity index 100%
rename from spring-data-rest-querydsl/src/main/resources/application.yml
rename to persistence-modules/spring-data-rest-querydsl/src/main/resources/application.yml
diff --git a/spring-data-rest-querydsl/src/main/resources/logback.xml b/persistence-modules/spring-data-rest-querydsl/src/main/resources/logback.xml
similarity index 100%
rename from spring-data-rest-querydsl/src/main/resources/logback.xml
rename to persistence-modules/spring-data-rest-querydsl/src/main/resources/logback.xml
diff --git a/spring-data-rest-querydsl/src/test/java/com/baeldung/SpringContextTest.java b/persistence-modules/spring-data-rest-querydsl/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-data-rest-querydsl/src/test/java/com/baeldung/SpringContextTest.java
rename to persistence-modules/spring-data-rest-querydsl/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/IntegrationTest.java b/persistence-modules/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/IntegrationTest.java
similarity index 100%
rename from spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/IntegrationTest.java
rename to persistence-modules/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/IntegrationTest.java
diff --git a/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/QuerydslIntegrationTest.java b/persistence-modules/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/QuerydslIntegrationTest.java
similarity index 100%
rename from spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/QuerydslIntegrationTest.java
rename to persistence-modules/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/QuerydslIntegrationTest.java
diff --git a/spring-data-rest-querydsl/src/test/resources/application.yml b/persistence-modules/spring-data-rest-querydsl/src/test/resources/application.yml
similarity index 100%
rename from spring-data-rest-querydsl/src/test/resources/application.yml
rename to persistence-modules/spring-data-rest-querydsl/src/test/resources/application.yml
diff --git a/spring-data-rest/README.md b/persistence-modules/spring-data-rest/README.md
similarity index 100%
rename from spring-data-rest/README.md
rename to persistence-modules/spring-data-rest/README.md
diff --git a/spring-data-rest/pom.xml b/persistence-modules/spring-data-rest/pom.xml
similarity index 98%
rename from spring-data-rest/pom.xml
rename to persistence-modules/spring-data-rest/pom.xml
index e223c0488e..f5601cb7ce 100644
--- a/spring-data-rest/pom.xml
+++ b/persistence-modules/spring-data-rest/pom.xml
@@ -13,7 +13,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/SpringDataRestApplication.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/SpringDataRestApplication.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/SpringDataRestApplication.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/SpringDataRestApplication.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/config/DbConfig.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/config/DbConfig.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/config/DbConfig.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/config/DbConfig.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/config/MvcConfig.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/config/MvcConfig.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/config/MvcConfig.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/config/MvcConfig.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/events/AuthorEventHandler.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/events/AuthorEventHandler.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/events/AuthorEventHandler.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/events/AuthorEventHandler.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/events/BookEventHandler.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/events/BookEventHandler.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/events/BookEventHandler.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/events/BookEventHandler.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/models/Address.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Address.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/models/Address.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Address.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/models/Author.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Author.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/models/Author.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Author.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/models/Book.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Book.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/models/Book.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Book.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/models/Library.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Library.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/models/Library.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Library.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/projections/CustomBook.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/projections/CustomBook.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/projections/CustomBook.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/projections/CustomBook.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/repositories/AddressRepository.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/AddressRepository.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/repositories/AddressRepository.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/AddressRepository.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/repositories/AuthorRepository.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/AuthorRepository.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/repositories/AuthorRepository.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/AuthorRepository.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/repositories/BookRepository.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/BookRepository.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/repositories/BookRepository.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/BookRepository.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/repositories/LibraryRepository.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/LibraryRepository.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/repositories/LibraryRepository.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/LibraryRepository.java
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/repositories/SubjectRepository.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/SubjectRepository.java
similarity index 100%
rename from spring-data-rest/src/main/java/com/baeldung/books/repositories/SubjectRepository.java
rename to persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/repositories/SubjectRepository.java
diff --git a/spring-data-rest/src/main/resources/application.properties b/persistence-modules/spring-data-rest/src/main/resources/application.properties
similarity index 100%
rename from spring-data-rest/src/main/resources/application.properties
rename to persistence-modules/spring-data-rest/src/main/resources/application.properties
diff --git a/spring-data-rest/src/main/resources/logback.xml b/persistence-modules/spring-data-rest/src/main/resources/logback.xml
similarity index 100%
rename from spring-data-rest/src/main/resources/logback.xml
rename to persistence-modules/spring-data-rest/src/main/resources/logback.xml
diff --git a/spring-data-rest/src/main/resources/persistence-derby.properties b/persistence-modules/spring-data-rest/src/main/resources/persistence-derby.properties
similarity index 100%
rename from spring-data-rest/src/main/resources/persistence-derby.properties
rename to persistence-modules/spring-data-rest/src/main/resources/persistence-derby.properties
diff --git a/spring-data-rest/src/main/resources/persistence-h2.properties b/persistence-modules/spring-data-rest/src/main/resources/persistence-h2.properties
similarity index 100%
rename from spring-data-rest/src/main/resources/persistence-h2.properties
rename to persistence-modules/spring-data-rest/src/main/resources/persistence-h2.properties
diff --git a/spring-data-rest/src/main/resources/persistence-hsqldb.properties b/persistence-modules/spring-data-rest/src/main/resources/persistence-hsqldb.properties
similarity index 100%
rename from spring-data-rest/src/main/resources/persistence-hsqldb.properties
rename to persistence-modules/spring-data-rest/src/main/resources/persistence-hsqldb.properties
diff --git a/spring-data-rest/src/main/resources/persistence-sqlite.properties b/persistence-modules/spring-data-rest/src/main/resources/persistence-sqlite.properties
similarity index 100%
rename from spring-data-rest/src/main/resources/persistence-sqlite.properties
rename to persistence-modules/spring-data-rest/src/main/resources/persistence-sqlite.properties
diff --git a/spring-data-rest/src/main/webapp/users.html b/persistence-modules/spring-data-rest/src/main/webapp/users.html
similarity index 100%
rename from spring-data-rest/src/main/webapp/users.html
rename to persistence-modules/spring-data-rest/src/main/webapp/users.html
diff --git a/spring-data-rest/src/main/webapp/view/app.js b/persistence-modules/spring-data-rest/src/main/webapp/view/app.js
similarity index 100%
rename from spring-data-rest/src/main/webapp/view/app.js
rename to persistence-modules/spring-data-rest/src/main/webapp/view/app.js
diff --git a/spring-data-rest/src/test/java/com/baeldung/SpringContextTest.java b/persistence-modules/spring-data-rest/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-data-rest/src/test/java/com/baeldung/SpringContextTest.java
rename to persistence-modules/spring-data-rest/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-data-rest/src/test/java/com/baeldung/books/events/AuthorEventHandlerUnitTest.java b/persistence-modules/spring-data-rest/src/test/java/com/baeldung/books/events/AuthorEventHandlerUnitTest.java
similarity index 100%
rename from spring-data-rest/src/test/java/com/baeldung/books/events/AuthorEventHandlerUnitTest.java
rename to persistence-modules/spring-data-rest/src/test/java/com/baeldung/books/events/AuthorEventHandlerUnitTest.java
diff --git a/spring-data-rest/src/test/java/com/baeldung/books/events/BookEventHandlerUnitTest.java b/persistence-modules/spring-data-rest/src/test/java/com/baeldung/books/events/BookEventHandlerUnitTest.java
similarity index 100%
rename from spring-data-rest/src/test/java/com/baeldung/books/events/BookEventHandlerUnitTest.java
rename to persistence-modules/spring-data-rest/src/test/java/com/baeldung/books/events/BookEventHandlerUnitTest.java
diff --git a/spring-data-rest/src/test/java/com/baeldung/books/projections/SpringDataProjectionLiveTest.java b/persistence-modules/spring-data-rest/src/test/java/com/baeldung/books/projections/SpringDataProjectionLiveTest.java
similarity index 100%
rename from spring-data-rest/src/test/java/com/baeldung/books/projections/SpringDataProjectionLiveTest.java
rename to persistence-modules/spring-data-rest/src/test/java/com/baeldung/books/projections/SpringDataProjectionLiveTest.java
diff --git a/pom.xml b/pom.xml
index 10948514d9..802f8ea43c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -643,9 +643,6 @@
                 <module>spring-core-5</module>
                 <module>spring-cucumber</module>
 
-                <module>spring-data-rest</module>
-                <module>spring-data-rest-2</module>
-                <module>spring-data-rest-querydsl</module>
                 <module>spring-di</module>
                 <module>spring-di-2</module>
                 <module>spring-di-3</module>
@@ -1117,9 +1114,6 @@
                 <module>spring-core-5</module>
                 <module>spring-cucumber</module>
 
-                <module>spring-data-rest</module>
-                <module>spring-data-rest-2</module>
-                <module>spring-data-rest-querydsl</module>
                 <module>spring-di</module>
                 <module>spring-di-2</module>
                 <module>spring-di-3</module>