diff --git a/spring-jinq/pom.xml b/spring-jinq/pom.xml
index 14ac366e74..c1dee7fa9f 100644
--- a/spring-jinq/pom.xml
+++ b/spring-jinq/pom.xml
@@ -10,9 +10,9 @@
com.baeldung
- parent-boot-2
+ parent-boot-3
0.0.1-SNAPSHOT
- ../parent-boot-2
+ ../parent-boot-3
@@ -35,6 +35,11 @@
org.springframework
spring-orm
+
+ org.hibernate.orm
+ hibernate-core
+ ${hibernate-core.version}
+
org.springframework.boot
@@ -58,7 +63,8 @@
- 1.8.29
+ 2.0.1
+ 6.4.0.Final
\ No newline at end of file
diff --git a/spring-jinq/src/main/java/com/baeldung/spring/jinq/config/JinqProviderConfiguration.java b/spring-jinq/src/main/java/com/baeldung/spring/jinq/config/JinqProviderConfiguration.java
index 6d921045b7..01e16cf0f7 100644
--- a/spring-jinq/src/main/java/com/baeldung/spring/jinq/config/JinqProviderConfiguration.java
+++ b/spring-jinq/src/main/java/com/baeldung/spring/jinq/config/JinqProviderConfiguration.java
@@ -1,6 +1,6 @@
package com.baeldung.spring.jinq.config;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
import org.jinq.jpa.JinqJPAStreamProvider;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-jinq/src/main/java/com/baeldung/spring/jinq/entities/Car.java b/spring-jinq/src/main/java/com/baeldung/spring/jinq/entities/Car.java
index 263e6c7622..a0b9620629 100644
--- a/spring-jinq/src/main/java/com/baeldung/spring/jinq/entities/Car.java
+++ b/spring-jinq/src/main/java/com/baeldung/spring/jinq/entities/Car.java
@@ -1,19 +1,23 @@
package com.baeldung.spring.jinq.entities;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+
+
@Entity(name = "CAR")
public class Car {
+ @Id
private String model;
private String description;
private int year;
private String engine;
+ @ManyToOne
+ @JoinColumn(name = "name")
private Manufacturer manufacturer;
- @Id
public String getModel() {
return model;
}
@@ -46,8 +50,6 @@ public class Car {
this.engine = engine;
}
- @OneToOne
- @JoinColumn(name = "name")
public Manufacturer getManufacturer() {
return manufacturer;
}
diff --git a/spring-jinq/src/main/java/com/baeldung/spring/jinq/entities/Manufacturer.java b/spring-jinq/src/main/java/com/baeldung/spring/jinq/entities/Manufacturer.java
index f6e5fd23de..0021e45658 100644
--- a/spring-jinq/src/main/java/com/baeldung/spring/jinq/entities/Manufacturer.java
+++ b/spring-jinq/src/main/java/com/baeldung/spring/jinq/entities/Manufacturer.java
@@ -2,18 +2,19 @@ package com.baeldung.spring.jinq.entities;
import java.util.List;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
@Entity(name = "MANUFACTURER")
public class Manufacturer {
+ @Id
private String name;
private String city;
+ @OneToMany(mappedBy = "model")
private List cars;
- @Id
public String getName() {
return name;
}
@@ -30,7 +31,6 @@ public class Manufacturer {
this.city = city;
}
- @OneToMany(mappedBy = "model")
public List getCars() {
return cars;
}
@@ -38,5 +38,4 @@ public class Manufacturer {
public void setCars(List cars) {
this.cars = cars;
}
-
}
diff --git a/spring-jinq/src/main/java/com/baeldung/spring/jinq/repositories/BaseJinqRepositoryImpl.java b/spring-jinq/src/main/java/com/baeldung/spring/jinq/repositories/BaseJinqRepositoryImpl.java
index 42b81ecc59..e85231f537 100644
--- a/spring-jinq/src/main/java/com/baeldung/spring/jinq/repositories/BaseJinqRepositoryImpl.java
+++ b/spring-jinq/src/main/java/com/baeldung/spring/jinq/repositories/BaseJinqRepositoryImpl.java
@@ -1,7 +1,7 @@
package com.baeldung.spring.jinq.repositories;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
import org.jinq.jpa.JPAJinqStream;
import org.jinq.jpa.JinqJPAStreamProvider;
diff --git a/spring-jinq/src/test/java/com/baeldung/SpringContextTest.java b/spring-jinq/src/test/java/com/baeldung/SpringContextTest.java
index 1a486d1003..7c65a831c4 100644
--- a/spring-jinq/src/test/java/com/baeldung/SpringContextTest.java
+++ b/spring-jinq/src/test/java/com/baeldung/SpringContextTest.java
@@ -4,7 +4,6 @@ import com.baeldung.spring.jinq.JinqApplication;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
-import com.baeldung.spring.jinq.JinqApplication;
@SpringBootTest(classes = JinqApplication.class)
public class SpringContextTest {