From 24ef45fcc5abe04a2699e93114369b9ba5db7ef3 Mon Sep 17 00:00:00 2001 From: fejera Date: Tue, 5 Nov 2019 11:06:30 +0100 Subject: [PATCH] fixed broken tests in persistence-modules/spring-data-jpa-3 --- .../com/baeldung/model/{User.java => BasicUser.java} | 2 +- .../java/com/baeldung/repository/UserRepository.java | 10 +++++----- .../java/com/baeldung/service/SimpleUserService.java | 4 ++-- .../main/java/com/baeldung/service/UserService.java | 4 ++-- .../main/java/com/baeldung/web/DetailedUserDto.java | 4 ++-- .../baeldung/osiv/UserControllerIntegrationTest.java | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) rename persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/model/{User.java => BasicUser.java} (96%) diff --git a/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/model/User.java b/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/model/BasicUser.java similarity index 96% rename from persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/model/User.java rename to persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/model/BasicUser.java index 94d0c023f2..2dc9c18cf6 100644 --- a/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/model/User.java +++ b/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/model/BasicUser.java @@ -5,7 +5,7 @@ import java.util.Set; @Entity @Table(name = "users") -public class User { +public class BasicUser { @Id @GeneratedValue diff --git a/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/repository/UserRepository.java b/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/repository/UserRepository.java index bb3ce781f6..c656055751 100644 --- a/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/repository/UserRepository.java +++ b/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 { +public interface UserRepository extends JpaRepository { @EntityGraph(attributePaths = "permissions") - Optional findDetailedByUsername(String username); + Optional findDetailedByUsername(String username); - Optional findSummaryByUsername(String username); + Optional findSummaryByUsername(String username); - Optional findByUsername(String username); + Optional findByUsername(String username); } diff --git a/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/service/SimpleUserService.java b/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/service/SimpleUserService.java index 6782254f61..4bd1dc5e41 100644 --- a/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/service/SimpleUserService.java +++ b/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 class SimpleUserService implements UserService { @Override @Transactional(readOnly = true) - public Optional findOne(String username) { + public Optional findOne(String username) { return userRepository.findDetailedByUsername(username); } } diff --git a/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/service/UserService.java b/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/service/UserService.java index 11b3dc82ce..34a07199b2 100644 --- a/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/service/UserService.java +++ b/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 findOne(String username); + Optional findOne(String username); } diff --git a/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/web/DetailedUserDto.java b/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/web/DetailedUserDto.java index 0d8fe02b91..95a4f6eb07 100644 --- a/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/web/DetailedUserDto.java +++ b/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 class DetailedUserDto { 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()); diff --git a/persistence-modules/spring-data-jpa-3/src/test/java/com/baeldung/osiv/UserControllerIntegrationTest.java b/persistence-modules/spring-data-jpa-3/src/test/java/com/baeldung/osiv/UserControllerIntegrationTest.java index ba94fc111b..19fdf118ae 100644 --- a/persistence-modules/spring-data-jpa-3/src/test/java/com/baeldung/osiv/UserControllerIntegrationTest.java +++ b/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")));