[JAVA-28956] Upgrade spring-data-jpa-repo module to Spring Boot 3 (#15665)

This commit is contained in:
Bipin kumar 2024-01-23 04:16:19 +05:30 committed by GitHub
parent 790334d094
commit 3aa6d757c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
21 changed files with 110 additions and 76 deletions

View File

@ -8,9 +8,9 @@
<parent> <parent>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<artifactId>parent-boot-2</artifactId> <artifactId>parent-boot-3</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-2</relativePath> <relativePath>../../parent-boot-3</relativePath>
</parent> </parent>
<dependencies> <dependencies>
@ -47,6 +47,31 @@
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>${guava.version}</version> <version>${guava.version}</version>
</dependency> </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0</version>
</dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<id>repackage</id>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>

View File

@ -1,12 +1,12 @@
package com.baeldung.boot.daos.impl; package com.baeldung.boot.daos.impl;
import javax.persistence.EntityManager;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baeldung.boot.daos.CustomItemRepository; import com.baeldung.boot.daos.CustomItemRepository;
import com.baeldung.boot.domain.Item; import com.baeldung.boot.domain.Item;
import jakarta.persistence.EntityManager;
@Repository @Repository
public class CustomItemRepositoryImpl implements CustomItemRepository { public class CustomItemRepositoryImpl implements CustomItemRepository {

View File

@ -1,6 +1,5 @@
package com.baeldung.boot.daos.impl; package com.baeldung.boot.daos.impl;
import javax.persistence.EntityManager;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@ -8,6 +7,8 @@ import org.springframework.stereotype.Repository;
import com.baeldung.boot.daos.CustomItemTypeRepository; import com.baeldung.boot.daos.CustomItemTypeRepository;
import com.baeldung.boot.domain.ItemType; import com.baeldung.boot.domain.ItemType;
import jakarta.persistence.EntityManager;
@Repository @Repository
public class CustomItemTypeRepositoryImpl implements CustomItemTypeRepository { public class CustomItemTypeRepositoryImpl implements CustomItemTypeRepository {

View File

@ -3,18 +3,19 @@ package com.baeldung.boot.daos.impl;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import javax.transaction.Transactional;
import org.springframework.data.jpa.repository.support.JpaEntityInformation; import org.springframework.data.jpa.repository.support.JpaEntityInformation;
import org.springframework.data.jpa.repository.support.SimpleJpaRepository; import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
import com.baeldung.boot.daos.ExtendedRepository; import com.baeldung.boot.daos.ExtendedRepository;
import jakarta.persistence.EntityManager;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Root;
import jakarta.transaction.Transactional;
public class ExtendedRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRepository<T, ID> implements ExtendedRepository<T, ID> { public class ExtendedRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRepository<T, ID> implements ExtendedRepository<T, ID> {
private EntityManager entityManager; private EntityManager entityManager;

View File

@ -2,9 +2,9 @@ package com.baeldung.boot.domain;
import java.math.BigDecimal; import java.math.BigDecimal;
import javax.persistence.Entity; import jakarta.persistence.Entity;
import javax.persistence.Id; import jakarta.persistence.Id;
import javax.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
@Entity @Entity
public class Item { public class Item {

View File

@ -3,11 +3,11 @@ package com.baeldung.boot.domain;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.persistence.CascadeType; import jakarta.persistence.CascadeType;
import javax.persistence.Entity; import jakarta.persistence.Entity;
import javax.persistence.Id; import jakarta.persistence.Id;
import javax.persistence.JoinColumn; import jakarta.persistence.JoinColumn;
import javax.persistence.OneToMany; import jakarta.persistence.OneToMany;
@Entity @Entity
public class ItemType { public class ItemType {

View File

@ -1,6 +1,6 @@
package com.baeldung.boot.domain; package com.baeldung.boot.domain;
import javax.persistence.Embeddable; import jakarta.persistence.Embeddable;
@Embeddable @Embeddable
public class KVTag { public class KVTag {

View File

@ -3,11 +3,11 @@ package com.baeldung.boot.domain;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.persistence.CascadeType; import jakarta.persistence.CascadeType;
import javax.persistence.Entity; import jakarta.persistence.Entity;
import javax.persistence.Id; import jakarta.persistence.Id;
import javax.persistence.JoinColumn; import jakarta.persistence.JoinColumn;
import javax.persistence.OneToMany; import jakarta.persistence.OneToMany;
@Entity @Entity
public class Location { public class Location {

View File

@ -1,11 +1,12 @@
package com.baeldung.boot.domain; package com.baeldung.boot.domain;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import java.math.BigDecimal; import java.math.BigDecimal;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
@Entity @Entity
public class MerchandiseEntity { public class MerchandiseEntity {
@Id @Id

View File

@ -1,6 +1,6 @@
package com.baeldung.boot.domain; package com.baeldung.boot.domain;
import javax.persistence.Embeddable; import jakarta.persistence.Embeddable;
@Embeddable @Embeddable
public class SkillTag { public class SkillTag {

View File

@ -3,12 +3,12 @@ package com.baeldung.boot.domain;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.persistence.CascadeType; import jakarta.persistence.CascadeType;
import javax.persistence.Entity; import jakarta.persistence.Entity;
import javax.persistence.Id; import jakarta.persistence.Id;
import javax.persistence.JoinColumn; import jakarta.persistence.JoinColumn;
import javax.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
import javax.persistence.OneToMany; import jakarta.persistence.OneToMany;
@Entity @Entity
public class Store { public class Store {

View File

@ -1,11 +1,12 @@
package com.baeldung.boot.domain; package com.baeldung.boot.domain;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.Id;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
@Entity @Entity
public class Student { public class Student {

View File

@ -1,11 +1,12 @@
package com.baeldung.derivedquery.entity; package com.baeldung.derivedquery.entity;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Table(name = "users") @Table(name = "users")
@Entity @Entity
public class User { public class User {

View File

@ -2,11 +2,11 @@ package com.baeldung.jpa.domain;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Column; import jakarta.persistence.Column;
import javax.persistence.Entity; import jakarta.persistence.Entity;
import javax.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
import javax.persistence.GenerationType; import jakarta.persistence.GenerationType;
import javax.persistence.Id; import jakarta.persistence.Id;
@Entity @Entity
public class Foo implements Serializable { public class Foo implements Serializable {

View File

@ -1,8 +1,8 @@
package com.baeldung.jpa.domain; package com.baeldung.jpa.domain;
import javax.persistence.Entity; import jakarta.persistence.Entity;
import javax.persistence.Id; import jakarta.persistence.Id;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@Entity @Entity

View File

@ -1,12 +1,13 @@
package com.baeldung.jpa.domain; package com.baeldung.jpa.domain;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import java.util.Objects; import java.util.Objects;
import jakarta.persistence.Basic;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
@Entity @Entity
public class Passenger { public class Passenger {

View File

@ -1,14 +1,16 @@
package com.baeldung.jpa.domain; package com.baeldung.jpa.domain;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
@Entity @Entity
public class Song { public class Song {
@Id private long id; @Id
private long id;
private String name; private String name;
@Column(name = "length_in_seconds") @Column(name = "length_in_seconds")
private int lengthInSeconds; private int lengthInSeconds;

View File

@ -1,9 +1,9 @@
package com.baeldung.spring.data.persistence.like.model; package com.baeldung.spring.data.persistence.like.model;
import javax.persistence.Entity; import jakarta.persistence.Entity;
import javax.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
import javax.persistence.GenerationType; import jakarta.persistence.GenerationType;
import javax.persistence.Id; import jakarta.persistence.Id;
@Entity @Entity
public class Movie { public class Movie {

View File

@ -1,13 +1,13 @@
package com.baeldung.storedprocedure.entity; package com.baeldung.storedprocedure.entity;
import javax.persistence.Column; import jakarta.persistence.Column;
import javax.persistence.Entity; import jakarta.persistence.Entity;
import javax.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
import javax.persistence.GenerationType; import jakarta.persistence.GenerationType;
import javax.persistence.Id; import jakarta.persistence.Id;
import javax.persistence.NamedStoredProcedureQuery; import jakarta.persistence.NamedStoredProcedureQuery;
import javax.persistence.StoredProcedureParameter; import jakarta.persistence.ParameterMode;
import javax.persistence.ParameterMode; import jakarta.persistence.StoredProcedureParameter;
@Entity @Entity
@NamedStoredProcedureQuery(name = "Car.getTotalCardsbyModelEntity", procedureName = "GET_TOTAL_CARS_BY_MODEL", parameters = { @NamedStoredProcedureQuery(name = "Car.getTotalCardsbyModelEntity", procedureName = "GET_TOTAL_CARS_BY_MODEL", parameters = {

View File

@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.List; import java.util.List;
import javax.annotation.Resource;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -16,6 +15,8 @@ import org.springframework.test.context.junit4.SpringRunner;
import com.baeldung.boot.BootApplication; import com.baeldung.boot.BootApplication;
import com.baeldung.boot.domain.Student; import com.baeldung.boot.domain.Student;
import jakarta.annotation.Resource;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@ContextConfiguration(classes = { BootApplication.class}) @ContextConfiguration(classes = { BootApplication.class})
@DirtiesContext @DirtiesContext

View File

@ -6,10 +6,6 @@ import static org.hamcrest.core.IsNot.not;
import java.util.List; import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.transaction.Transactional;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -21,6 +17,10 @@ import org.springframework.test.context.junit4.SpringRunner;
import com.baeldung.jpa.domain.Passenger; import com.baeldung.jpa.domain.Passenger;
import com.baeldung.jpa.repository.PassengerRepository; import com.baeldung.jpa.repository.PassengerRepository;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
import jakarta.transaction.Transactional;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@ContextConfiguration(classes = { JpaApplication.class}) @ContextConfiguration(classes = { JpaApplication.class})
@DirtiesContext @DirtiesContext