JAVA-20166 Migrating spring-date-eclipselink (#13959)

* JAVA-20166 Migrating spring-date-eclipselink

* JAVA-20166 Fix failed tests address already bind

* JAVA-20166 Migrating spring-date-couchbase-2

* JAVA-20166 Replace with optional instead of returning null

---------

Co-authored-by: timis1 <noreplay@yahoo.com>
This commit is contained in:
timis1
2023-05-19 09:53:28 +03:00
committed by GitHub
parent d9182f160c
commit 09e421c3cd
40 changed files with 266 additions and 220 deletions
@@ -21,8 +21,8 @@ import java.util.Map;
@Configuration
public class JpaConfiguration extends JpaBaseConfiguration {
protected JpaConfiguration(DataSource dataSource, JpaProperties properties, ObjectProvider<JtaTransactionManager> jtaTransactionManager, ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers) {
super(dataSource, properties, jtaTransactionManager, transactionManagerCustomizers);
protected JpaConfiguration(DataSource dataSource, JpaProperties properties, ObjectProvider<JtaTransactionManager> jtaTransactionManager) {
super(dataSource, properties, jtaTransactionManager);
}
@Override
@@ -1,9 +1,9 @@
package com.baeldung.eclipselink.springdata.model;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
/**
* Created by adam.
@@ -1,6 +1,6 @@
package com.baeldung.eclipselink.springdata.pessimisticlocking;
import javax.persistence.Embeddable;
import jakarta.persistence.Embeddable;
@Embeddable
public class Address {
@@ -1,9 +1,9 @@
package com.baeldung.eclipselink.springdata.pessimisticlocking;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.JoinTable;
import javax.persistence.ManyToOne;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.JoinTable;
import jakarta.persistence.ManyToOne;
@Entity
public class Course {
@@ -1,9 +1,9 @@
package com.baeldung.eclipselink.springdata.pessimisticlocking;
import javax.persistence.CollectionTable;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.Id;
import jakarta.persistence.CollectionTable;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import java.util.List;
@Entity
@@ -1,6 +1,6 @@
package com.baeldung.eclipselink.springdata.pessimisticlocking;
import javax.persistence.Entity;
import jakarta.persistence.Entity;
import java.math.BigDecimal;
@Entity
@@ -1,9 +1,9 @@
package com.baeldung.eclipselink.springdata.pessimisticlocking;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Inheritance;
import jakarta.persistence.InheritanceType;
@Entity
@Inheritance(strategy = InheritanceType.JOINED)
@@ -1,8 +1,8 @@
package com.baeldung.eclipselink.springdata.pessimisticlocking;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.OneToMany;
import java.util.List;
@Entity
@@ -1,14 +1,12 @@
package com.baeldung.eclipselink.springdata.pessimisticlocking;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import javax.persistence.*;
import jakarta.persistence.*;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.HashMap;