diff --git a/persistence-modules/spring-data-jpa-repo-2/README.md b/persistence-modules/spring-data-jpa-repo-2/README.md index 7ce69dbc4c..d377104c02 100644 --- a/persistence-modules/spring-data-jpa-repo-2/README.md +++ b/persistence-modules/spring-data-jpa-repo-2/README.md @@ -8,5 +8,5 @@ - [Differences Between Spring Data JPA findFirst() and findTop()](https://www.baeldung.com/spring-data-jpa-findfirst-vs-findtop) - [Difference Between findBy and findAllBy in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-find-by-vs-find-all-by) - [Calling Stored Procedures from Spring Data JPA Repositories](https://www.baeldung.com/spring-data-jpa-stored-procedures) -- [Generate Database Schema with Spring Data JPA](https://www.baeldung.com/spring-data-jpa-generate-db-schema) + - More articles: [[<-- prev]](../spring-data-jpa-repo) diff --git a/persistence-modules/spring-data-jpa-repo-2/pom.xml b/persistence-modules/spring-data-jpa-repo-2/pom.xml index d48ecebb98..12519088b5 100644 --- a/persistence-modules/spring-data-jpa-repo-2/pom.xml +++ b/persistence-modules/spring-data-jpa-repo-2/pom.xml @@ -58,10 +58,6 @@ ${querydsl.version} provided - - org.hibernate.orm - hibernate-ant - diff --git a/persistence-modules/spring-data-jpa-repo-3/README.md b/persistence-modules/spring-data-jpa-repo-3/README.md index 4d793d9fee..dbd7b67e2c 100644 --- a/persistence-modules/spring-data-jpa-repo-3/README.md +++ b/persistence-modules/spring-data-jpa-repo-3/README.md @@ -9,5 +9,4 @@ This module contains articles about Spring Data JPA. - [Difference Between findBy and findOneBy in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-findby-vs-findoneby) - [How to Get Last Record in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-last-record) - [Refresh and Fetch an Entity After Save in JPA](https://www.baeldung.com/spring-data-jpa-refresh-fetch-entity-after-save) -- [Pagination and Sorting using Spring Data JPA](https://www.baeldung.com/spring-data-jpa-pagination-sorting) - More articles: [[<-- prev]](../spring-data-jpa-repo-2) diff --git a/persistence-modules/spring-data-jpa-repo-3/pom.xml b/persistence-modules/spring-data-jpa-repo-3/pom.xml index ee4a1ce29c..5c57606d31 100644 --- a/persistence-modules/spring-data-jpa-repo-3/pom.xml +++ b/persistence-modules/spring-data-jpa-repo-3/pom.xml @@ -32,11 +32,6 @@ spring-boot-starter-test test - - com.google.guava - guava - ${guava.version} - com.baeldung.spring.data.jpa.naturalid.Application diff --git a/persistence-modules/spring-data-jpa-repo/README.md b/persistence-modules/spring-data-jpa-repo/README.md index c6c82c5846..ffbd57d7f6 100644 --- a/persistence-modules/spring-data-jpa-repo/README.md +++ b/persistence-modules/spring-data-jpa-repo/README.md @@ -3,7 +3,6 @@ This module contains articles about repositories in Spring Data JPA ### Relevant Articles: -- [Introduction to Spring Data JPA](https://www.baeldung.com/the-persistence-layer-with-spring-data-jpa) - [Case Insensitive Queries with Spring Data Repository](https://www.baeldung.com/spring-data-case-insensitive-queries) - [Spring Data – CrudRepository save() Method](https://www.baeldung.com/spring-data-crud-repository-save) - [Spring Data JPA – Adding a Method in All Repositories](https://www.baeldung.com/spring-data-jpa-method-in-all-repositories) diff --git a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/service/IFooService.java b/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/service/IFooService.java deleted file mode 100644 index 867b0770a0..0000000000 --- a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/service/IFooService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.baeldung.simple.service; - -import com.baeldung.simple.entity.Foo; - -public interface IFooService { - Foo create(Foo foo); -} \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-simple/README.md b/persistence-modules/spring-data-jpa-simple/README.md index 4b09ffac28..4d96acb0f4 100644 --- a/persistence-modules/spring-data-jpa-simple/README.md +++ b/persistence-modules/spring-data-jpa-simple/README.md @@ -8,10 +8,13 @@ This module contains articles about Spring Data JPA that are also part of an Ebo Since this is a module tied to an e-book, it should **not** be moved or used to store the code for any further article. ### Relevant Articles +- [Introduction to Spring Data JPA](https://www.baeldung.com/the-persistence-layer-with-spring-data-jpa) - [Customizing the Result of JPA Queries with Aggregation Functions](https://www.baeldung.com/jpa-queries-custom-result-with-aggregation-functions) - [CrudRepository, JpaRepository, and PagingAndSortingRepository in Spring Data](https://www.baeldung.com/spring-data-repositories) - [New CRUD Repository Interfaces in Spring Data 3](https://www.baeldung.com/spring-data-3-crud-repository-interfaces) - [Derived Query Methods in Spring Data JPA Repositories](https://www.baeldung.com/spring-data-derived-queries) - [Spring Data JPA @Query](https://www.baeldung.com/spring-data-jpa-query) - [Spring Data JPA Projections](https://www.baeldung.com/spring-data-jpa-projections) -- [Spring Data JPA @Modifying Annotation](https://www.baeldung.com/spring-data-jpa-modifying-annotation) \ No newline at end of file +- [Spring Data JPA @Modifying Annotation](https://www.baeldung.com/spring-data-jpa-modifying-annotation) +- [Generate Database Schema with Spring Data JPA](https://www.baeldung.com/spring-data-jpa-generate-db-schema) +- [Pagination and Sorting using Spring Data JPA](https://www.baeldung.com/spring-data-jpa-pagination-sorting) \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-simple/pom.xml b/persistence-modules/spring-data-jpa-simple/pom.xml index 300815bca8..dc59b1fd22 100644 --- a/persistence-modules/spring-data-jpa-simple/pom.xml +++ b/persistence-modules/spring-data-jpa-simple/pom.xml @@ -43,11 +43,21 @@ org.springframework spring-oxm + + com.google.guava + guava + ${guava.version} + jakarta.xml.bind jakarta.xml.bind-api ${jakarta.xml.bind.version} + + org.hibernate.orm + hibernate-ant + ${hibernate.version} + diff --git a/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/jpa/paginationsorting/PaginationSortingApplication.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/paginationsorting/PaginationSortingApplication.java similarity index 100% rename from persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/jpa/paginationsorting/PaginationSortingApplication.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/paginationsorting/PaginationSortingApplication.java diff --git a/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/jpa/paginationsorting/config/PersistenceProductConfiguration.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/paginationsorting/config/PersistenceProductConfiguration.java similarity index 100% rename from persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/jpa/paginationsorting/config/PersistenceProductConfiguration.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/paginationsorting/config/PersistenceProductConfiguration.java diff --git a/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/jpa/paginationsorting/model/Product.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/paginationsorting/model/Product.java similarity index 100% rename from persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/jpa/paginationsorting/model/Product.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/paginationsorting/model/Product.java diff --git a/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/jpa/paginationsorting/repository/ProductRepository.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/paginationsorting/repository/ProductRepository.java similarity index 100% rename from persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/jpa/paginationsorting/repository/ProductRepository.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/paginationsorting/repository/ProductRepository.java diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/jpa/schemageneration/AccountApplication.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/schemageneration/AccountApplication.java similarity index 100% rename from persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/jpa/schemageneration/AccountApplication.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/schemageneration/AccountApplication.java diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/jpa/schemageneration/HibernateUtil.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/schemageneration/HibernateUtil.java similarity index 100% rename from persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/jpa/schemageneration/HibernateUtil.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/schemageneration/HibernateUtil.java diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/jpa/schemageneration/model/Account.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/schemageneration/model/Account.java similarity index 100% rename from persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/jpa/schemageneration/model/Account.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/schemageneration/model/Account.java diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/jpa/schemageneration/model/AccountSetting.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/schemageneration/model/AccountSetting.java similarity index 100% rename from persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/jpa/schemageneration/model/AccountSetting.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/schemageneration/model/AccountSetting.java diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/jpa/schemageneration/repository/AccountRepository.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/schemageneration/repository/AccountRepository.java similarity index 100% rename from persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/jpa/schemageneration/repository/AccountRepository.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/schemageneration/repository/AccountRepository.java diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/jpa/schemageneration/repository/AccountSettingRepository.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/schemageneration/repository/AccountSettingRepository.java similarity index 100% rename from persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/jpa/schemageneration/repository/AccountSettingRepository.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/schemageneration/repository/AccountSettingRepository.java diff --git a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/JpaApplication.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/JpaApplication.java similarity index 79% rename from persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/JpaApplication.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/JpaApplication.java index ec7ac3ed1e..39efef714d 100644 --- a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/JpaApplication.java +++ b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/JpaApplication.java @@ -1,11 +1,11 @@ -package com.baeldung.simple; +package com.baeldung.jpa.simple; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; @SpringBootApplication -@EnableJpaRepositories("com.baeldung.simple.repository") +@EnableJpaRepositories("com.baeldung.jpa.simple.repository") public class JpaApplication { public static void main(String[] args) { diff --git a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/config/PersistenceConfig.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/config/PersistenceConfig.java similarity index 96% rename from persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/config/PersistenceConfig.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/config/PersistenceConfig.java index 44aea6a620..b142933240 100644 --- a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/config/PersistenceConfig.java +++ b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/config/PersistenceConfig.java @@ -1,4 +1,4 @@ -package com.baeldung.simple.config; +package com.baeldung.jpa.simple.config; import java.util.Properties; @@ -32,7 +32,7 @@ public class PersistenceConfig { public LocalContainerEntityManagerFactoryBean entityManagerFactory() { final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); em.setDataSource(dataSource()); - em.setPackagesToScan("com.baeldung.simple.entity"); + em.setPackagesToScan("com.baeldung.jpa.simple.model"); final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); em.setJpaVendorAdapter(vendorAdapter); diff --git a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/entity/Book.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/model/Book.java similarity index 96% rename from persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/entity/Book.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/model/Book.java index 1de1df9985..30e9003b2f 100644 --- a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/entity/Book.java +++ b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/model/Book.java @@ -1,4 +1,4 @@ -package com.baeldung.simple.entity; +package com.baeldung.jpa.simple.model; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/entity/Foo.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/model/Foo.java similarity index 97% rename from persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/entity/Foo.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/model/Foo.java index 3652e3633a..5cabacf389 100644 --- a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/entity/Foo.java +++ b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/model/Foo.java @@ -1,4 +1,4 @@ -package com.baeldung.simple.entity; +package com.baeldung.jpa.simple.model; import java.io.Serializable; diff --git a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/entity/User.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/model/User.java similarity index 97% rename from persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/entity/User.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/model/User.java index b902609d27..f9a2db8437 100644 --- a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/entity/User.java +++ b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/model/User.java @@ -1,4 +1,4 @@ -package com.baeldung.simple.entity; +package com.baeldung.jpa.simple.model; import java.time.ZonedDateTime; diff --git a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/BookListRepository.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/BookListRepository.java similarity index 76% rename from persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/BookListRepository.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/BookListRepository.java index 33816a0ff1..e7a781defd 100644 --- a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/BookListRepository.java +++ b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/BookListRepository.java @@ -1,11 +1,11 @@ -package com.baeldung.simple.repository; +package com.baeldung.jpa.simple.repository; import java.util.List; import org.springframework.data.repository.ListCrudRepository; import org.springframework.stereotype.Repository; -import com.baeldung.simple.entity.Book; +import com.baeldung.jpa.simple.model.Book; @Repository public interface BookListRepository extends ListCrudRepository { diff --git a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/BookPagingAndSortingRepository.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/BookPagingAndSortingRepository.java similarity index 84% rename from persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/BookPagingAndSortingRepository.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/BookPagingAndSortingRepository.java index b4e13d9384..b802406c1b 100644 --- a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/BookPagingAndSortingRepository.java +++ b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/BookPagingAndSortingRepository.java @@ -1,4 +1,4 @@ -package com.baeldung.simple.repository; +package com.baeldung.jpa.simple.repository; import java.util.List; @@ -7,7 +7,7 @@ import org.springframework.data.repository.ListCrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.stereotype.Repository; -import com.baeldung.simple.entity.Book; +import com.baeldung.jpa.simple.model.Book; @Repository public interface BookPagingAndSortingRepository extends PagingAndSortingRepository, ListCrudRepository { diff --git a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/IFooDAO.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/IFooDAO.java similarity index 82% rename from persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/IFooDAO.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/IFooDAO.java index f879385b62..20123c73cd 100644 --- a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/IFooDAO.java +++ b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/IFooDAO.java @@ -1,10 +1,10 @@ -package com.baeldung.simple.repository; +package com.baeldung.jpa.simple.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import com.baeldung.simple.entity.Foo; +import com.baeldung.jpa.simple.model.Foo; public interface IFooDAO extends JpaRepository { diff --git a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/UserRepository.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/UserRepository.java similarity index 94% rename from persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/UserRepository.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/UserRepository.java index 930051b168..368a0bcb5b 100644 --- a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/UserRepository.java +++ b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/UserRepository.java @@ -1,4 +1,4 @@ -package com.baeldung.simple.repository; +package com.baeldung.jpa.simple.repository; import java.time.ZonedDateTime; import java.util.Collection; @@ -6,7 +6,7 @@ import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import com.baeldung.simple.entity.User; +import com.baeldung.jpa.simple.model.User; public interface UserRepository extends JpaRepository, UserRepositoryCustom { diff --git a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/UserRepositoryCustom.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/UserRepositoryCustom.java similarity index 77% rename from persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/UserRepositoryCustom.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/UserRepositoryCustom.java index 4254ab535d..e4e1a3e73b 100644 --- a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/UserRepositoryCustom.java +++ b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/UserRepositoryCustom.java @@ -1,11 +1,11 @@ -package com.baeldung.simple.repository; +package com.baeldung.jpa.simple.repository; import java.util.Collection; import java.util.List; import java.util.Set; import java.util.function.Predicate; -import com.baeldung.simple.entity.User; +import com.baeldung.jpa.simple.model.User; public interface UserRepositoryCustom { diff --git a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/UserRepositoryCustomImpl.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/UserRepositoryCustomImpl.java similarity index 95% rename from persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/UserRepositoryCustomImpl.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/UserRepositoryCustomImpl.java index a97a67dc2c..b702735b97 100644 --- a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/repository/UserRepositoryCustomImpl.java +++ b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/repository/UserRepositoryCustomImpl.java @@ -1,4 +1,4 @@ -package com.baeldung.simple.repository; +package com.baeldung.jpa.simple.repository; import java.util.ArrayList; import java.util.Collection; @@ -7,7 +7,7 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.baeldung.simple.entity.User; +import com.baeldung.jpa.simple.model.User; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; diff --git a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/service/FooService.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/service/FooService.java similarity index 68% rename from persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/service/FooService.java rename to persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/service/FooService.java index aa9f48aec2..93d405c689 100644 --- a/persistence-modules/spring-data-jpa-repo/src/main/java/com/baeldung/simple/service/FooService.java +++ b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/service/FooService.java @@ -1,10 +1,10 @@ -package com.baeldung.simple.service; +package com.baeldung.jpa.simple.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baeldung.simple.entity.Foo; -import com.baeldung.simple.repository.IFooDAO; +import com.baeldung.jpa.simple.model.Foo; +import com.baeldung.jpa.simple.repository.IFooDAO; @Service public class FooService implements IFooService { diff --git a/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/service/IFooService.java b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/service/IFooService.java new file mode 100644 index 0000000000..f2950b81fb --- /dev/null +++ b/persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/service/IFooService.java @@ -0,0 +1,7 @@ +package com.baeldung.jpa.simple.service; + +import com.baeldung.jpa.simple.model.Foo; + +public interface IFooService { + Foo create(Foo foo); +} \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-repo-3/src/main/resources/pagination-sorting-db.properties b/persistence-modules/spring-data-jpa-simple/src/main/resources/pagination-sorting-db.properties similarity index 100% rename from persistence-modules/spring-data-jpa-repo-3/src/main/resources/pagination-sorting-db.properties rename to persistence-modules/spring-data-jpa-simple/src/main/resources/pagination-sorting-db.properties diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/resources/schema-generation.properties b/persistence-modules/spring-data-jpa-simple/src/main/resources/schema-generation.properties similarity index 100% rename from persistence-modules/spring-data-jpa-repo-2/src/main/resources/schema-generation.properties rename to persistence-modules/spring-data-jpa-simple/src/main/resources/schema-generation.properties diff --git a/persistence-modules/spring-data-jpa-repo-3/src/test/java/com/baeldung/jpa/paginationsorting/ProductRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/paginationsorting/ProductRepositoryIntegrationTest.java similarity index 100% rename from persistence-modules/spring-data-jpa-repo-3/src/test/java/com/baeldung/jpa/paginationsorting/ProductRepositoryIntegrationTest.java rename to persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/paginationsorting/ProductRepositoryIntegrationTest.java diff --git a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/simple/BookListRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/simple/BookListRepositoryIntegrationTest.java similarity index 77% rename from persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/simple/BookListRepositoryIntegrationTest.java rename to persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/simple/BookListRepositoryIntegrationTest.java index abb4604588..f393e305bc 100644 --- a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/simple/BookListRepositoryIntegrationTest.java +++ b/persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/simple/BookListRepositoryIntegrationTest.java @@ -1,15 +1,16 @@ -package com.baeldung.simple; +package com.baeldung.jpa.simple; + +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.List; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import com.baeldung.simple.entity.Book; -import com.baeldung.simple.repository.BookListRepository; +import com.baeldung.jpa.simple.model.Book; +import com.baeldung.jpa.simple.repository.BookListRepository; @SpringBootTest(classes = JpaApplication.class) class BookListRepositoryIntegrationTest { @@ -25,6 +26,6 @@ class BookListRepositoryIntegrationTest { bookListRepository.saveAll(Arrays.asList(book1, book2, book3)); List books = bookListRepository.findBooksByAuthor("John Doe"); - Assertions.assertEquals(3, books.size()); + assertEquals(3, books.size()); } } \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/simple/BookPagingAndSortingRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/simple/BookPagingAndSortingRepositoryIntegrationTest.java similarity index 75% rename from persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/simple/BookPagingAndSortingRepositoryIntegrationTest.java rename to persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/simple/BookPagingAndSortingRepositoryIntegrationTest.java index dbf183c7a9..390308b5ba 100644 --- a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/simple/BookPagingAndSortingRepositoryIntegrationTest.java +++ b/persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/simple/BookPagingAndSortingRepositoryIntegrationTest.java @@ -1,9 +1,11 @@ -package com.baeldung.simple; +package com.baeldung.jpa.simple; + +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.List; -import org.junit.jupiter.api.Assertions; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -11,8 +13,8 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import com.baeldung.simple.entity.Book; -import com.baeldung.simple.repository.BookPagingAndSortingRepository; +import com.baeldung.jpa.simple.model.Book; +import com.baeldung.jpa.simple.repository.BookPagingAndSortingRepository; @SpringBootTest class BookPagingAndSortingRepositoryIntegrationTest { @@ -29,8 +31,8 @@ class BookPagingAndSortingRepositoryIntegrationTest { Pageable pageable = PageRequest.of(0, 2, Sort.by("title").descending()); List books = bookPagingAndSortingRepository.findBooksByAuthor("John Miller", pageable); - Assertions.assertEquals(2, books.size()); - Assertions.assertEquals(book3.getId(), books.get(0).getId()); - Assertions.assertEquals(book2.getId(), books.get(1).getId()); + assertEquals(2, books.size()); + assertEquals(book3.getId(), books.get(0).getId()); + assertEquals(book2.getId(), books.get(1).getId()); } } \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/simple/FooServiceIntegrationTest.java b/persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/simple/FooServiceIntegrationTest.java similarity index 86% rename from persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/simple/FooServiceIntegrationTest.java rename to persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/simple/FooServiceIntegrationTest.java index 412827462d..d4a4c2a2f7 100644 --- a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/simple/FooServiceIntegrationTest.java +++ b/persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/simple/FooServiceIntegrationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.simple; +package com.baeldung.jpa.simple; import javax.sql.DataSource; @@ -10,8 +10,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.baeldung.simple.entity.Foo; -import com.baeldung.simple.service.IFooService; +import com.baeldung.jpa.simple.model.Foo; +import com.baeldung.jpa.simple.service.IFooService; @RunWith(SpringRunner.class) @ContextConfiguration(classes = { JpaApplication.class}) diff --git a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/simple/UserRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/simple/UserRepositoryIntegrationTest.java similarity index 97% rename from persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/simple/UserRepositoryIntegrationTest.java rename to persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/simple/UserRepositoryIntegrationTest.java index fb29d9494d..c690d601e2 100644 --- a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/simple/UserRepositoryIntegrationTest.java +++ b/persistence-modules/spring-data-jpa-simple/src/test/java/com/baeldung/jpa/simple/UserRepositoryIntegrationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.simple; +package com.baeldung.jpa.simple; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -14,8 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit.jupiter.SpringExtension; -import com.baeldung.simple.entity.User; -import com.baeldung.simple.repository.UserRepository; +import com.baeldung.jpa.simple.model.User; +import com.baeldung.jpa.simple.repository.UserRepository; @ExtendWith(SpringExtension.class) @SpringBootTest(classes = JpaApplication.class)