Move code to common module - Spring Data JPA (#15733)
* JAVA-30484: Move code to new module - Spring Data JPA * JAVA-30484: remove the duplicate code from the old modules.
This commit is contained in:
+2
-2
@@ -1,4 +1,4 @@
|
||||
package com.baeldung.spring.data.jpa.query;
|
||||
package com.baeldung;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
@@ -10,4 +10,4 @@ public class QueryApplication {
|
||||
SpringApplication.run(QueryApplication.class, args);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
-126
@@ -1,126 +0,0 @@
|
||||
package com.baeldung.spring.data.jpa.query;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
@Entity
|
||||
@Table(name = "users")
|
||||
public class User {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private int id;
|
||||
|
||||
private String name;
|
||||
|
||||
private LocalDate creationDate;
|
||||
|
||||
private LocalDate lastLoginDate;
|
||||
|
||||
private boolean active;
|
||||
|
||||
private int age;
|
||||
|
||||
@Column(unique = true, nullable = false)
|
||||
private String email;
|
||||
|
||||
private Integer status;
|
||||
|
||||
public User() {
|
||||
super();
|
||||
}
|
||||
|
||||
public User(String name, LocalDate creationDate, String email, Integer status) {
|
||||
this.name = name;
|
||||
this.creationDate = creationDate;
|
||||
this.email = email;
|
||||
this.status = status;
|
||||
this.active = true;
|
||||
}
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(final int id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(final String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(final String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
public Integer getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(Integer status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public int getAge() {
|
||||
return age;
|
||||
}
|
||||
|
||||
public void setAge(final int age) {
|
||||
this.age = age;
|
||||
}
|
||||
|
||||
public LocalDate getCreationDate() {
|
||||
return creationDate;
|
||||
}
|
||||
|
||||
public LocalDate getLastLoginDate() {
|
||||
return lastLoginDate;
|
||||
}
|
||||
|
||||
public void setLastLoginDate(LocalDate lastLoginDate) {
|
||||
this.lastLoginDate = lastLoginDate;
|
||||
}
|
||||
|
||||
public boolean isActive() {
|
||||
return active;
|
||||
}
|
||||
|
||||
public void setActive(boolean active) {
|
||||
this.active = active;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
final StringBuilder builder = new StringBuilder();
|
||||
builder.append("User [name=").append(name).append(", id=").append(id).append("]");
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
User user = (User) o;
|
||||
return id == user.id &&
|
||||
age == user.age &&
|
||||
Objects.equals(name, user.name) &&
|
||||
Objects.equals(creationDate, user.creationDate) &&
|
||||
Objects.equals(email, user.email) &&
|
||||
Objects.equals(status, user.status);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(id, name, creationDate, age, email, status);
|
||||
}
|
||||
}
|
||||
-62
@@ -1,62 +0,0 @@
|
||||
package com.baeldung.spring.data.jpa.query;
|
||||
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.domain.Sort;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Modifying;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
public interface UserRepository extends JpaRepository<User, Integer>, UserRepositoryCustom {
|
||||
@Query("SELECT u FROM User u WHERE u.status = 1")
|
||||
Collection<User> findAllActiveUsers();
|
||||
|
||||
@Query(value = "SELECT * FROM Users u WHERE u.status = 1", nativeQuery = true)
|
||||
Collection<User> findAllActiveUsersNative();
|
||||
|
||||
@Query(value = "SELECT u FROM User u")
|
||||
List<User> findAllUsers(Sort sort);
|
||||
|
||||
@Query(value = "SELECT u FROM User u ORDER BY id")
|
||||
Page<User> findAllUsersWithPagination(Pageable pageable);
|
||||
|
||||
@Query(value = "SELECT * FROM Users ORDER BY id", countQuery = "SELECT count(*) FROM Users", nativeQuery = true)
|
||||
Page<User> findAllUsersWithPaginationNative(Pageable pageable);
|
||||
|
||||
@Query("SELECT u FROM User u WHERE u.status = ?1")
|
||||
User findUserByStatus(Integer status);
|
||||
|
||||
@Query("SELECT u FROM User u WHERE u.status = ?1 and u.name = ?2")
|
||||
User findUserByStatusAndName(Integer status, String name);
|
||||
|
||||
@Query(value = "SELECT * FROM Users u WHERE u.status = ?1", nativeQuery = true)
|
||||
User findUserByStatusNative(Integer status);
|
||||
|
||||
@Query("SELECT u FROM User u WHERE u.status = :status and u.name = :name")
|
||||
User findUserByStatusAndNameNamedParams(@Param("status") Integer status, @Param("name") String name);
|
||||
|
||||
@Query("SELECT u FROM User u WHERE u.status = :status and u.name = :name")
|
||||
User findUserByUserStatusAndUserName(@Param("status") Integer userStatus, @Param("name") String userName);
|
||||
|
||||
@Query(value = "SELECT * FROM Users u WHERE u.status = :status AND u.name = :name", nativeQuery = true)
|
||||
User findUserByStatusAndNameNamedParamsNative(@Param("status") Integer status, @Param("name") String name);
|
||||
|
||||
@Query(value = "SELECT u FROM User u WHERE u.name IN :names")
|
||||
List<User> findUserByNameList(@Param("names") Collection<String> names);
|
||||
|
||||
@Modifying
|
||||
@Query("update User u set u.status = :status where u.name = :name")
|
||||
int updateUserSetStatusForName(@Param("status") Integer status, @Param("name") String name);
|
||||
|
||||
@Modifying
|
||||
@Query(value = "UPDATE Users u SET u.status = ? WHERE u.name = ?", nativeQuery = true)
|
||||
int updateUserSetStatusForNameNative(Integer status, String name);
|
||||
|
||||
@Query(value = "INSERT INTO Users (name, age, email, status, active) VALUES (:name, :age, :email, :status, :active)", nativeQuery = true)
|
||||
@Modifying
|
||||
void insertUser(@Param("name") String name, @Param("age") Integer age, @Param("email") String email, @Param("status") Integer status, @Param("active") boolean active);
|
||||
}
|
||||
-14
@@ -1,14 +0,0 @@
|
||||
package com.baeldung.spring.data.jpa.query;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
public interface UserRepositoryCustom {
|
||||
|
||||
List<User> findUserByEmails(Set<String> emails);
|
||||
|
||||
List<User> findAllUsersByPredicates(Collection<Predicate<User>> predicates);
|
||||
|
||||
}
|
||||
-48
@@ -1,48 +0,0 @@
|
||||
package com.baeldung.spring.data.jpa.query;
|
||||
|
||||
import jakarta.persistence.EntityManager;
|
||||
import jakarta.persistence.PersistenceContext;
|
||||
import jakarta.persistence.criteria.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public class UserRepositoryCustomImpl implements UserRepositoryCustom {
|
||||
@PersistenceContext
|
||||
private EntityManager entityManager;
|
||||
|
||||
@Override
|
||||
public List<User> findUserByEmails(Set<String> emails) {
|
||||
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
|
||||
CriteriaQuery<User> query = cb.createQuery(User.class);
|
||||
Root<User> user = query.from(User.class);
|
||||
|
||||
Path<String> emailPath = user.get("email");
|
||||
|
||||
List<Predicate> predicates = new ArrayList<>();
|
||||
for (String email : emails) {
|
||||
|
||||
predicates.add(cb.like(emailPath, email));
|
||||
|
||||
}
|
||||
query.select(user)
|
||||
.where(cb.or(predicates.toArray(new Predicate[predicates.size()])));
|
||||
|
||||
return entityManager.createQuery(query)
|
||||
.getResultList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<User> findAllUsersByPredicates(Collection<java.util.function.Predicate<User>> predicates) {
|
||||
List<User> allUsers = entityManager.createQuery("select u from User u", User.class).getResultList();
|
||||
Stream<User> allUsersStream = allUsers.stream();
|
||||
for (java.util.function.Predicate<User> predicate : predicates) {
|
||||
allUsersStream = allUsersStream.filter(predicate);
|
||||
}
|
||||
|
||||
return allUsersStream.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
-162
@@ -1,162 +0,0 @@
|
||||
package com.baeldung.spring.data.jpa.query;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.data.domain.Sort;
|
||||
import org.springframework.data.jpa.domain.JpaSort;
|
||||
import org.springframework.data.mapping.PropertyReferenceException;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
|
||||
@RunWith(SpringRunner.class)
|
||||
@DataJpaTest(properties = "spring.sql.init.data-locations=classpath:insert_users.sql", showSql = false)
|
||||
public class UserRepositoryIntegrationTest {
|
||||
|
||||
@Autowired
|
||||
private UserRepository userRepository;
|
||||
|
||||
@Test
|
||||
public void whenFindAllActiveUsersThenAllActiveFound() {
|
||||
Collection<User> allActiveUsers = userRepository.findAllActiveUsers();
|
||||
assertThat(allActiveUsers).hasSize(2);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindAllActiveUsersNativeThenAllActiveFound() {
|
||||
Collection<User> allActiveUsers = userRepository.findAllActiveUsersNative();
|
||||
assertThat(allActiveUsers).hasSize(2);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindAllSortedByNameThenAllSorted() {
|
||||
List<User> allUsersSortedByName = userRepository.findAll(Sort.by(Sort.Direction.ASC, "name"));
|
||||
assertThat(allUsersSortedByName)
|
||||
.extracting("name")
|
||||
.containsSequence("Bob", "Cindy", "John");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindAllSortedByNameLengthThenException() {
|
||||
assertThatThrownBy(() -> userRepository.findAll(Sort.by("LENGTH(name)")))
|
||||
.isInstanceOf(PropertyReferenceException.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindAllUsersSortedByNameThenAllSorted() {
|
||||
List<User> allUsersSortedByName = userRepository.findAllUsers(Sort.by(Sort.Direction.ASC, "name"));
|
||||
assertThat(allUsersSortedByName)
|
||||
.extracting("name")
|
||||
.containsSequence("Bob", "Cindy", "John");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindAllUsersSortedByNameLengthThenAllSorted() {
|
||||
List<User> allUsersSortedByName = userRepository.findAllUsers(JpaSort.unsafe("LENGTH(name)"));
|
||||
assertThat(allUsersSortedByName)
|
||||
.extracting("name")
|
||||
.containsSequence("Bob", "John", "Cindy");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindAllUsersWithPaginationThenPaginated() {
|
||||
Page<User> page = userRepository.findAllUsersWithPagination(PageRequest.of(0, 1));
|
||||
assertThat(page.stream().map(User::getId))
|
||||
.hasSize(1)
|
||||
.containsOnly(1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindAllUsersWithPaginationNativeThenPaginated() {
|
||||
Page<User> page = userRepository.findAllUsersWithPaginationNative(PageRequest.of(1, 1));
|
||||
assertThat(page.stream().map(User::getId))
|
||||
.hasSize(1)
|
||||
.containsOnly(2);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindUserByStatusThenFound() {
|
||||
User user = userRepository.findUserByStatus(0);
|
||||
assertThat(user.getStatus()).isZero();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindUserByStatusAndNameThenFound() {
|
||||
User user = userRepository.findUserByStatusAndName(1, "John");
|
||||
assertThat(user.getStatus()).isOne();
|
||||
assertThat(user.getName()).isEqualTo("John");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindUserByStatusNativeThenFound() {
|
||||
User user = userRepository.findUserByStatusNative(0);
|
||||
assertThat(user.getStatus()).isZero();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindUserByStatusAndNameNamedParamsThenFound() {
|
||||
User user = userRepository.findUserByStatusAndNameNamedParams(1, "John");
|
||||
assertThat(user.getStatus()).isOne();
|
||||
assertThat(user.getName()).isEqualTo("John");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindUserByUserStatusAndUserNameThenFound() {
|
||||
User user = userRepository.findUserByUserStatusAndUserName(1, "John");
|
||||
assertThat(user.getStatus()).isOne();
|
||||
assertThat(user.getName()).isEqualTo("John");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindUserByStatusAndNameNamedParamsNativeThenFound() {
|
||||
User user = userRepository.findUserByStatusAndNameNamedParamsNative(1, "Bob");
|
||||
assertThat(user.getStatus()).isOne();
|
||||
assertThat(user.getName()).isEqualTo("Bob");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenFindUserByNameListThenAllFound() {
|
||||
List<User> users = userRepository.findUserByNameList(Arrays.asList("Bob", "Cindy"));
|
||||
assertThat(users)
|
||||
.extracting("name")
|
||||
.containsOnly("Bob", "Cindy");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenUpdateUserSetStatusForNameThenUpdated() {
|
||||
int updated = userRepository.updateUserSetStatusForName(0, "John");
|
||||
assertThat(updated).isOne();
|
||||
|
||||
User john = userRepository.findUserByStatusAndName(0, "John");
|
||||
assertThat(john).isNotNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenUpdateUserSetStatusForNameNativeThenUpdated() {
|
||||
int updated = userRepository.updateUserSetStatusForNameNative(0, "John");
|
||||
assertThat(updated).isOne();
|
||||
|
||||
User john = userRepository.findUserByStatusAndName(0, "John");
|
||||
assertThat(john).isNotNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenInsertUserThenInserted() {
|
||||
User beforeInsert = userRepository.findUserByStatusAndName(0, "Mandy");
|
||||
assertThat(beforeInsert).isNull();
|
||||
|
||||
userRepository.insertUser("Mandy", 20, "mandy@email.com", 0, true);
|
||||
|
||||
User afterInsert = userRepository.findUserByStatusAndName(0, "Mandy");
|
||||
assertThat(afterInsert).isNotNull();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user