JAVA-34111 Revert the changes done in spring-data-jpa-simple module (#16493)

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)

persistence-modules/spring-data-jpa-repo-2/pom.xml

@@ -58,10 +58,6 @@
             <version>${querydsl.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.hibernate.orm</groupId>
-            <artifactId>hibernate-ant</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

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)

persistence-modules/spring-data-jpa-repo-3/pom.xml

@@ -32,11 +32,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
     </dependencies>
     <properties>
         <start-class>com.baeldung.spring.data.jpa.naturalid.Application</start-class>

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)

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

@@ -1,7 +0,0 @@
-package com.baeldung.simple.service;
-
-import com.baeldung.simple.entity.Foo;
-
-public interface IFooService {
-    Foo create(Foo foo);
-}

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)
+- [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)

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

@@ -43,11 +43,21 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
             <version>${jakarta.xml.bind.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-ant</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>

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) {

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);

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;

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;
 

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;
 

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<Book, Long> {

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<Book, Long>, ListCrudRepository<Book, Long> {

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<Foo, Long> {
 

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<User, Integer>, UserRepositoryCustom {
 

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 {
 

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;

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 {

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);
+}

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<Book> books = bookListRepository.findBooksByAuthor("John Doe");
-        Assertions.assertEquals(3, books.size());
+        assertEquals(3, books.size());
     }
 }

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<Book> 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());
     }
 }

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})

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)