fixed broken tests in persistence-modules/spring-data-jpa-3

Author: fanatixan

persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/model/User.java renamed to persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/model/BasicUser.java

@@ -5,7 +5,7 @@
 
 @Entity
 @Table(name = "users")
-public class User {
+public class BasicUser {
 
     @Id
     @GeneratedValue

persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/repository/UserRepository.java

@@ -1,17 +1,17 @@
 package com.baeldung.repository;
 
-import com.baeldung.model.User;
+import com.baeldung.model.BasicUser;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
 
-public interface UserRepository extends JpaRepository<User, Long> {
+public interface UserRepository extends JpaRepository<BasicUser, Long> {
 
     @EntityGraph(attributePaths = "permissions")
-    Optional<User> findDetailedByUsername(String username);
+    Optional<BasicUser> findDetailedByUsername(String username);
 
-    Optional<User> findSummaryByUsername(String username);
+    Optional<BasicUser> findSummaryByUsername(String username);
 
-    Optional<User> findByUsername(String username);
+    Optional<BasicUser> findByUsername(String username);
 }

persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/service/SimpleUserService.java

@@ -1,6 +1,6 @@
 package com.baeldung.service;
 
-import com.baeldung.model.User;
+import com.baeldung.model.BasicUser;
 import com.baeldung.repository.UserRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +18,7 @@ public SimpleUserService(UserRepository userRepository) {
 
     @Override
     @Transactional(readOnly = true)
-    public Optional<User> findOne(String username) {
+    public Optional<BasicUser> findOne(String username) {
         return userRepository.findDetailedByUsername(username);
     }
 }

persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/service/UserService.java

@@ -1,9 +1,9 @@
 package com.baeldung.service;
 
-import com.baeldung.model.User;
+import com.baeldung.model.BasicUser;
 
 import java.util.Optional;
 
 public interface UserService {
-    Optional<User> findOne(String username);
+    Optional<BasicUser> findOne(String username);
 }

persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/web/DetailedUserDto.java

@@ -1,6 +1,6 @@
 package com.baeldung.web;
 
-import com.baeldung.model.User;
+import com.baeldung.model.BasicUser;
 
 import java.util.Set;
 
@@ -34,7 +34,7 @@ public void setPermissions(Set<String> permissions) {
         this.permissions = permissions;
     }
 
-    public static DetailedUserDto fromEntity(User user) {
+    public static DetailedUserDto fromEntity(BasicUser user) {
         DetailedUserDto detailed = new DetailedUserDto();
         detailed.setId(user.getId());
         detailed.setUsername(user.getUsername());

persistence-modules/spring-data-jpa-3/src/test/java/com/baeldung/osiv/UserControllerIntegrationTest.java

@@ -1,6 +1,6 @@
 package com.baeldung.osiv;
 
-import com.baeldung.model.User;
+import com.baeldung.model.BasicUser;
 import com.baeldung.repository.UserRepository;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -32,7 +32,7 @@ class UserControllerIntegrationTest {
 
     @BeforeEach
     void setUp() {
-        User user = new User();
+        BasicUser user = new BasicUser();
         user.setUsername("root");
         user.setPermissions(new HashSet<>(Arrays.asList("PERM_READ", "PERM_WRITE")));