JAVA-20168 Migrating spring-jpa (#14257)

* JAVA-20168 Migrating spring-jpa

* JAVA-20168 Migrate spring-jpa-2

* JAVA-20168 Remove unneeded annotation

---------

Co-authored-by: timis1 <noreplay@yahoo.com>

persistence-modules/spring-jpa/src/main/java/com/baeldung/annotations/Person.java

@@ -2,11 +2,11 @@ package com.baeldung.annotations;
 
 import java.util.Date;
 
-import javax.persistence.Entity;
-import javax.persistence.NamedStoredProcedureQueries;
-import javax.persistence.NamedStoredProcedureQuery;
-import javax.persistence.ParameterMode;
-import javax.persistence.StoredProcedureParameter;
+import jakarta.persistence.Entity;
+import jakarta.persistence.NamedStoredProcedureQueries;
+import jakarta.persistence.NamedStoredProcedureQuery;
+import jakarta.persistence.ParameterMode;
+import jakarta.persistence.StoredProcedureParameter;
 
 import com.baeldung.persistence.multiple.model.user.User;
 import org.springframework.data.annotation.CreatedBy;
@@ -16,13 +16,13 @@ import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.Transient;
 
 @Entity
-@NamedStoredProcedureQueries({ 
+@NamedStoredProcedureQueries({
     @NamedStoredProcedureQuery(
         name = "count_by_name", 
         procedureName = "person.count_by_name", 
         parameters = { 
                 @StoredProcedureParameter(
-                    mode = ParameterMode.IN, 
+                    mode = ParameterMode.IN,
                     name = "name", 
                     type = String.class),
                 @StoredProcedureParameter(

persistence-modules/spring-jpa/src/main/java/com/baeldung/annotations/PersonRepository.java

@@ -1,6 +1,6 @@
 package com.baeldung.annotations;
 
-import javax.persistence.LockModeType;
+import jakarta.persistence.LockModeType;
 
 import org.springframework.data.jpa.repository.Lock;
 import org.springframework.data.jpa.repository.Modifying;

persistence-modules/spring-jpa/src/main/java/com/baeldung/config/PersistenceJPAConfig.java

@@ -2,7 +2,7 @@ package com.baeldung.config;
 
 import java.util.Properties;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;

persistence-modules/spring-jpa/src/main/java/com/baeldung/config/SpringWebConfig.java

@@ -4,14 +4,13 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 import org.springframework.web.servlet.view.JstlView;
 
 @EnableWebMvc
 @Configuration
 @ComponentScan({ "com.baeldung.web" })
-public class SpringWebConfig extends WebMvcConfigurerAdapter {
+public class SpringWebConfig {
 
     @Bean
     public InternalResourceViewResolver viewResolver() {

persistence-modules/spring-jpa/src/main/java/com/baeldung/config/StudentJpaConfig.java

@@ -2,7 +2,7 @@ package com.baeldung.config;
 
 import java.util.Properties;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;

persistence-modules/spring-jpa/src/main/java/com/baeldung/inmemory/persistence/model/KVTag.java

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

persistence-modules/spring-jpa/src/main/java/com/baeldung/inmemory/persistence/model/LocationTag.java

@@ -1,6 +1,6 @@
 package com.baeldung.inmemory.persistence.model;
 
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 
 @Embeddable
 public class LocationTag {

persistence-modules/spring-jpa/src/main/java/com/baeldung/inmemory/persistence/model/ManyStudent.java

@@ -1,6 +1,6 @@
 package com.baeldung.inmemory.persistence.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.HashSet;
 import java.util.Set;
 

persistence-modules/spring-jpa/src/main/java/com/baeldung/inmemory/persistence/model/ManyTag.java

@@ -1,6 +1,6 @@
 package com.baeldung.inmemory.persistence.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.HashSet;
 import java.util.Set;
 

persistence-modules/spring-jpa/src/main/java/com/baeldung/inmemory/persistence/model/SkillTag.java

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

persistence-modules/spring-jpa/src/main/java/com/baeldung/inmemory/persistence/model/Student.java

@@ -2,9 +2,9 @@ package com.baeldung.inmemory.persistence.model;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class Student {

persistence-modules/spring-jpa/src/main/java/com/baeldung/persistence/dao/AbstractJpaDAO.java

@@ -3,8 +3,8 @@ package com.baeldung.persistence.dao;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 public abstract class AbstractJpaDAO<T extends Serializable> {
 

persistence-modules/spring-jpa/src/main/java/com/baeldung/persistence/model/Bar.java

@@ -3,15 +3,15 @@ package com.baeldung.persistence.model;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
 
 @Entity
 public class Bar implements Serializable {

persistence-modules/spring-jpa/src/main/java/com/baeldung/persistence/model/Foo.java

@@ -2,7 +2,7 @@ package com.baeldung.persistence.model;
 
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 
 @Entity

persistence-modules/spring-jpa/src/main/java/com/baeldung/persistence/multiple/model/user/Possession.java

@@ -1,6 +1,6 @@
 package com.baeldung.persistence.multiple.model.user;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table(schema = "spring_jpa_user")

persistence-modules/spring-jpa/src/main/java/com/baeldung/persistence/multiple/model/user/User.java

@@ -1,6 +1,6 @@
 package com.baeldung.persistence.multiple.model.user;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 
 @Entity

persistence-modules/spring-jpa/src/main/java/com/baeldung/sqlfiles/Country.java

@@ -1,11 +1,11 @@
 package com.baeldung.sqlfiles;
 
-import static javax.persistence.GenerationType.IDENTITY;
+import static jakarta.persistence.GenerationType.IDENTITY;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 
 @Entity
 public class Country {

persistence-modules/spring-jpa/src/main/resources/persistence-mysql.properties

@@ -5,7 +5,7 @@ jdbc.user=tutorialuser
 jdbc.pass=tutorialmy5ql
 
 # hibernate.X
-hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
 hibernate.show_sql=false
 hibernate.hbm2ddl.auto=create-drop
 hibernate.cache.use_second_level_cache=false

persistence-modules/spring-jpa/src/main/resources/persistence-student.properties

@@ -3,7 +3,7 @@ jdbc.url=jdbc:mysql://localhost:3306/myDb
 jdbc.user=tutorialuser
 jdbc.pass=tutorialpass
 
-hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
 hibernate.show_sql=false
 hibernate.hbm2ddl.auto=create-drop
 

persistence-modules/spring-jpa/src/test/java/META-INF/persistence.xml

@@ -6,11 +6,11 @@
         <class>com.baeldung.persistence.model.Foo</class>
         <class>com.baeldung.persistence.model.Bar</class>
         <properties>
-            <property name="javax.persistence.jdbc.user" value="root"/>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/HIBERTEST"/>
-            <property name="javax.persistence.ddl-generation" value="drop-and-create-tables"/>
-            <property name="javax.persistence.logging.level" value="INFO"/>
+            <property name="jakarta.persistence.jdbc.user" value="root"/>
+            <property name="jakarta.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/HIBERTEST"/>
+            <property name="jakarta.persistence.ddl-generation" value="drop-and-create-tables"/>
+            <property name="jakarta.persistence.logging.level" value="INFO"/>
             <property name="hibernate.show_sql" value="false"/>
             <property name="hibernate.cache.use_second_level_cache" value="false"/>
             <property name="hibernate.cache.use_query_cache" value="false"/>

persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/repository/AdvancedTaggingIntegrationTest.java

@@ -17,7 +17,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/repository/InMemoryDBIntegrationTest.java

@@ -11,7 +11,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import java.util.Arrays;
 import java.util.List;

persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java

@@ -7,13 +7,13 @@ import static org.junit.Assert.assertThat;
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 
 import com.baeldung.config.PersistenceJPAConfig;
 import com.baeldung.persistence.model.Foo;

persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooServiceSortingIntegrationTest.java

@@ -2,13 +2,13 @@ package com.baeldung.persistence.service;
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 
 import com.baeldung.config.PersistenceJPAConfig;
 import com.baeldung.persistence.model.Bar;

persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java

@@ -5,9 +5,9 @@ import static org.junit.Assert.assertNull;
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
 
 import com.baeldung.config.PersistenceJPAConfig;
 import com.baeldung.persistence.model.Foo;