diff --git a/persistence-modules/spring-data-jpa-5/README.md b/persistence-modules/spring-data-jpa-5/README.md
new file mode 100644
index 0000000000..dd4ac22e4a
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-5/README.md
@@ -0,0 +1,11 @@
+### Relevant Articles:
+- [Spring JPA @Embedded and @EmbeddedId](TBD)
+
+### Eclipse Config
+After importing the project into Eclipse, you may see the following error:
+"No persistence xml file found in project"
+
+This can be ignored:
+- Project -> Properties -> Java Persistance -> JPA -> Error/Warnings -> Select Ignore on "No persistence xml file found in project"
+Or:
+- Eclipse -> Preferences - Validation - disable the "Build" execution of the JPA Validator
diff --git a/persistence-modules/spring-data-jpa-5/pom.xml b/persistence-modules/spring-data-jpa-5/pom.xml
new file mode 100644
index 0000000000..7f2c724f98
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-5/pom.xml
@@ -0,0 +1,37 @@
+
+
+ 4.0.0
+ spring-data-jpa-5
+ spring-data-jpa-5
+
+
+ com.baeldung
+ parent-boot-2
+ 0.0.1-SNAPSHOT
+ ../../parent-boot-2
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-jdbc
+
+
+
+ com.h2database
+ h2
+
+
+
+
diff --git a/persistence-modules/spring-data-jpa-5/src/main/java/com/baeldung/composite/BookApplication.java b/persistence-modules/spring-data-jpa-5/src/main/java/com/baeldung/composite/BookApplication.java
new file mode 100644
index 0000000000..52f06058aa
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-5/src/main/java/com/baeldung/composite/BookApplication.java
@@ -0,0 +1,12 @@
+package com.baeldung.composite;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class BookApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(BookApplication.class);
+ }
+}
diff --git a/persistence-modules/spring-data-jpa-5/src/main/java/com/baeldung/composite/entity/Book.java b/persistence-modules/spring-data-jpa-5/src/main/java/com/baeldung/composite/entity/Book.java
new file mode 100644
index 0000000000..e4f1727654
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-5/src/main/java/com/baeldung/composite/entity/Book.java
@@ -0,0 +1,47 @@
+package com.baeldung.composite.entity;
+
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+
+@Entity
+public class Book {
+
+ @EmbeddedId
+ private BookId id;
+ private String genre;
+ private Integer price;
+
+ public Book() {
+ }
+
+ public Book(String author, String name, String genre, Integer price) {
+ BookId id = new BookId(author, name);
+ this.id = id;
+ this.genre = genre;
+ this.price = price;
+ }
+
+ public BookId getId() {
+ return id;
+ }
+
+ public void setId(BookId id) {
+ this.id = id;
+ }
+
+ public String getGenre() {
+ return genre;
+ }
+
+ public void setGenre(String genre) {
+ this.genre = genre;
+ }
+
+ public Integer getPrice() {
+ return price;
+ }
+
+ public void setPrice(Integer price) {
+ this.price = price;
+ }
+}
diff --git a/persistence-modules/spring-data-jpa-5/src/main/java/com/baeldung/composite/entity/BookId.java b/persistence-modules/spring-data-jpa-5/src/main/java/com/baeldung/composite/entity/BookId.java
new file mode 100644
index 0000000000..1524452412
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-5/src/main/java/com/baeldung/composite/entity/BookId.java
@@ -0,0 +1,51 @@
+package com.baeldung.composite.entity;
+
+import javax.persistence.Embeddable;
+import java.io.Serializable;
+import java.util.Objects;
+
+@Embeddable
+public class BookId implements Serializable {
+
+ private String author;
+ private String name;
+
+ public BookId() {
+ }
+
+ public BookId(String author, String name) {
+ this.author = author;
+ this.name = name;
+ }
+
+ public String getAuthor() {
+ return author;
+ }
+
+ public void setAuthor(String author) {
+ this.author = author;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
+ BookId bookId = (BookId) o;
+ return Objects.equals(author, bookId.author) && Objects.equals(name, bookId.name);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(author, name);
+ }
+}
diff --git a/persistence-modules/spring-data-jpa-5/src/main/java/com/baeldung/composite/repository/BookRepository.java b/persistence-modules/spring-data-jpa-5/src/main/java/com/baeldung/composite/repository/BookRepository.java
new file mode 100644
index 0000000000..d5993eaf79
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-5/src/main/java/com/baeldung/composite/repository/BookRepository.java
@@ -0,0 +1,18 @@
+package com.baeldung.composite.repository;
+
+import com.baeldung.composite.entity.Book;
+import com.baeldung.composite.entity.BookId;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface BookRepository extends JpaRepository {
+
+ List findByIdName(String name);
+
+ List findByIdAuthor(String author);
+
+ List findByGenre(String genre);
+}
diff --git a/persistence-modules/spring-data-jpa-5/src/main/resources/application.properties b/persistence-modules/spring-data-jpa-5/src/main/resources/application.properties
new file mode 100644
index 0000000000..dfc5e56e33
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-5/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+spring.jpa.show-sql=true
+
diff --git a/persistence-modules/spring-data-jpa-5/src/test/java/com/baeldung/composite/repository/BookRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-5/src/test/java/com/baeldung/composite/repository/BookRepositoryIntegrationTest.java
new file mode 100644
index 0000000000..9d25acbd96
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-5/src/test/java/com/baeldung/composite/repository/BookRepositoryIntegrationTest.java
@@ -0,0 +1,64 @@
+package com.baeldung.composite.repository;
+
+import com.baeldung.composite.BookApplication;
+import com.baeldung.composite.entity.Book;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = BookApplication.class)
+public class BookRepositoryIntegrationTest {
+
+ public static final String JAVA_101 = "Java101";
+ public static final String JANE = "Jane";
+ public static final String TECH = "Tech";
+ @Autowired
+ BookRepository repository;
+
+ @Before
+ public void setUp() {
+ Book book1 = new Book("John", JAVA_101, TECH, 20);
+ Book book2 = new Book(JANE, JAVA_101, "Arch", 25);
+ Book book3 = new Book(JANE, "Scala101", TECH, 23);
+
+ repository.saveAll(Arrays.asList(book1, book2, book3));
+ }
+
+ @After
+ public void tearDown() {
+ repository.deleteAll();
+ }
+
+ @Test
+ public void testFindByName() {
+ List books = repository.findByIdName(JAVA_101);
+
+ assertEquals(2, books.size());
+ }
+
+ @Test
+ public void testFindByAuthor() {
+ List books = repository.findByIdAuthor(JANE);
+
+ assertEquals(2, books.size());
+ }
+
+ @Test
+ public void testFindByGenre() {
+ List books = repository.findByGenre(TECH);
+
+ assertEquals(2, books.size());
+ }
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-5/src/test/resources/application-test.properties b/persistence-modules/spring-data-jpa-5/src/test/resources/application-test.properties
new file mode 100644
index 0000000000..207de2e8ec
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-5/src/test/resources/application-test.properties
@@ -0,0 +1 @@
+spring.jpa.hibernate.ddl-auto=update