Merge branch 'eugenp:master' into master

core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/readinputcharbychar/ReadInputCharByCharUnitTest.java

@@ -51,9 +51,10 @@ public class ReadInputCharByCharUnitTest {
         System.setIn(inputStream);
 
         try (Scanner scanner = new Scanner(System.in)) {
-            char[] result = scanner.next().toCharArray();
-
-            assertArrayEquals("TestInput".toCharArray(), result);
+            if (scanner.hasNext()) {
+                char[] result = scanner.next().toCharArray();
+                assertArrayEquals("TestInput".toCharArray(), result);
+            }
         }
     }
 }

core-java-modules/core-java-lang-operators-2/src/main/java/com/baeldung/infixpostfix/InfixToPostFixExpressionConversion.java

@@ -0,0 +1,67 @@
+package com.baeldung.infixpostfix;
+
+import java.util.Stack;
+
+public class InfixToPostFixExpressionConversion {
+
+    private int getPrecedenceScore(char ch) {
+        switch (ch) {
+        case '^':
+            return 3;
+
+        case '*':
+        case '/':
+            return 2;
+
+        case '+':
+        case '-':
+            return 1;
+        }
+        return -1;
+    }
+
+    private boolean isOperand(char ch) {
+        return (ch >= 'a' && ch <= 'z') || (ch >= '0' && ch <= '9');
+    }
+
+    private char associativity(char ch) {
+        if (ch == '^')
+            return 'R';
+        return 'L';
+    }
+
+    public String infixToPostfix(String infix) {
+        StringBuilder result = new StringBuilder();
+        Stack<Character> stack = new Stack<>();
+
+        for (int i = 0; i < infix.length(); i++) {
+            char ch = infix.charAt(i);
+
+            if (isOperand(ch)) {
+                result.append(ch);
+            } else if (ch == '(') {
+                stack.push(ch);
+            } else if (ch == ')') {
+                while (!stack.isEmpty() && stack.peek() != '(') {
+                    result.append(stack.pop());
+                }
+                stack.pop();
+            } else {
+                while (!stack.isEmpty() && (operatorPrecedenceCondition(infix, i, stack))) {
+                    result.append(stack.pop());
+                }
+                stack.push(ch);
+            }
+        }
+
+        while (!stack.isEmpty()) {
+            result.append(stack.pop());
+        }
+
+        return result.toString();
+    }
+
+    private boolean operatorPrecedenceCondition(String infix, int i, Stack<Character> stack) {
+        return getPrecedenceScore(infix.charAt(i)) < getPrecedenceScore(stack.peek()) || getPrecedenceScore(infix.charAt(i)) == getPrecedenceScore(stack.peek()) && associativity(infix.charAt(i)) == 'L';
+    }
+}

core-java-modules/core-java-lang-operators-2/src/test/java/com/baeldung/infixpostfix/InfixToPostfixExpressionUnitTest.java

@@ -0,0 +1,37 @@
+package com.baeldung.infixpostfix;
+
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+
+public class InfixToPostfixExpressionUnitTest {
+
+    @Test
+    public void givenSimpleOp_whenNoParenthesis_thenProduceValidPostfix() {
+        String infix = "a+b*c-d";
+        String postfix = "abc*+d-";
+
+        InfixToPostFixExpressionConversion obj = new InfixToPostFixExpressionConversion();
+
+        Assertions.assertEquals(postfix, obj.infixToPostfix(infix));
+    }
+
+    @Test
+    public void givenSimpleOp_whenWithParenthesis_thenProduceValidPostfix() {
+        String infix = "(a+b)*(c-d)";
+        String postfix = "ab+cd-*";
+
+        InfixToPostFixExpressionConversion obj = new InfixToPostFixExpressionConversion();
+
+        Assertions.assertEquals(postfix, obj.infixToPostfix(infix));
+    }
+
+    @Test
+    public void givenComplexOp_whenInputIsInfix_thenProduceValidPostfix() {
+        String infix = "a^b*(c^d-e)^(f+g*h)-i";
+        String postfix = "ab^cd^e-fgh*+^*i-";
+
+        InfixToPostFixExpressionConversion obj = new InfixToPostFixExpressionConversion();
+
+        Assertions.assertEquals(postfix, obj.infixToPostfix(infix));
+    }
+}

core-java-modules/core-java-optional/pom.xml

@@ -15,7 +15,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.core.version}</version>
         </dependency>
@@ -53,7 +53,7 @@
     </dependencies>
 
     <properties>
-        <hibernate.core.version>5.4.0.Final</hibernate.core.version>
+        <hibernate.core.version>6.4.2.Final</hibernate.core.version>
         <json-path.version>5.3.2</json-path.version>
     </properties>
 

core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/HandleOptionalTypeExample.java

@@ -5,7 +5,7 @@ import java.util.Map;
 import java.util.Optional;
 
 public class HandleOptionalTypeExample {
-    static Map<String, User> usersByName = new HashMap();
+    static Map<String, User> usersByName = new HashMap<>();
     static {
         User user1 = new User();
         user1.setUserId(1l);

core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample.java

@@ -2,9 +2,9 @@ package com.baeldung.optionalreturntype;
 
 import java.util.Optional;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 public class PersistOptionalTypeExample {
     static String persistenceUnit = "com.baeldung.optionalreturntype";

core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample2.java

@@ -1,8 +1,8 @@
 package com.baeldung.optionalreturntype;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 public class PersistOptionalTypeExample2 {
     static String persistenceUnit = "com.baeldung.optionalreturntype";

core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistUserExample.java

@@ -1,8 +1,8 @@
 package com.baeldung.optionalreturntype;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 public class PersistUserExample {
     static String persistenceUnit = "com.baeldung.optionalreturntype";

core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/User.java

@@ -2,8 +2,8 @@ package com.baeldung.optionalreturntype;
 
 import java.io.Serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class User implements Serializable {

core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptional.java

@@ -3,9 +3,9 @@ package com.baeldung.optionalreturntype;
 import java.io.Serializable;
 import java.util.Optional;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class UserOptional implements Serializable {

core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptionalField.java

@@ -3,8 +3,8 @@ package com.baeldung.optionalreturntype;
 import java.io.Serializable;
 import java.util.Optional;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class UserOptionalField implements Serializable {

persistence-modules/hibernate-annotations/pom.xml

@@ -28,7 +28,7 @@
             <version>${org.springframework.data.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate-core.version}</version>
         </dependency>
@@ -48,12 +48,12 @@
             <version>${commons-lang3.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-testing</artifactId>
             <version>${hibernate-core.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-spatial</artifactId>
             <version>${hibernate-core.version}</version>
         </dependency>
@@ -87,7 +87,7 @@
         <!-- Spring -->
         <org.springframework.version>6.0.6</org.springframework.version>
         <org.springframework.data.version>3.0.3</org.springframework.data.version>
-        <hibernate-core.version>6.1.7.Final</hibernate-core.version>
+        <hibernate-core.version>6.4.2.Final</hibernate-core.version>
         <maven.deploy.skip>true</maven.deploy.skip>
         <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
         <hypersistance-utils-hibernate-60.version>3.3.1</hypersistance-utils-hibernate-60.version>

persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java

@@ -1,7 +1,12 @@
 package com.baeldung.hibernate.customtypes;
 
+import org.hibernate.dialect.Dialect;
+import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation;
+import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan;
+import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
+import org.hibernate.type.spi.TypeConfiguration;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -48,4 +53,9 @@ public class LocalDateStringJavaDescriptor extends AbstractArrayTypeDescriptor<L
 
         throw unknownWrap(value.getClass());
     }
+
+    @Override
+    public BasicType<?> resolveType(TypeConfiguration typeConfiguration, Dialect dialect, BasicType basicType, ColumnTypeInformation columnTypeInformation, JdbcTypeIndicators jdbcTypeIndicators) {
+        return null;
+    }
 }

persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/softdelete/model/SoftDeletePerson.java

@@ -0,0 +1,59 @@
+package com.baeldung.hibernate.softdelete.model;
+
+import java.util.List;
+
+import org.hibernate.annotations.SoftDelete;
+import org.hibernate.annotations.SoftDeleteType;
+import org.hibernate.type.YesNoConverter;
+
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedNativeQueries;
+import jakarta.persistence.NamedNativeQuery;
+
+@Entity
+@NamedNativeQueries({
+    @NamedNativeQuery(name = "getDeletedPerson", query = "SELECT id, name FROM SoftDeletePerson sdp where sdp.deleted = true", resultClass = SoftDeletePerson.class) })
+@SoftDelete
+public class SoftDeletePerson {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private Long id;
+
+    private String name;
+
+    @ElementCollection(fetch = FetchType.EAGER)
+    @CollectionTable(name = "Emails", joinColumns = @JoinColumn(name = "id"))
+    @Column(name = "emailId")
+    @SoftDelete(strategy = SoftDeleteType.ACTIVE, converter = YesNoConverter.class)
+    private List<String> emailIds;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<String> getEmailIds() {
+        return emailIds;
+    }
+
+    public void setEmailIds(List<String> emailIds) {
+        this.emailIds = emailIds;
+    }
+
+    @Override
+    public String toString() {
+        return "SoftDeletePerson{" + "id=" + id + ", name='" + name + '\'' + ", emailIds=" + emailIds + '}';
+    }
+}

persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/softdelete/SoftDeletePersonIntegrationTest.java

@@ -0,0 +1,110 @@
+package com.baeldung.hibernate.softdelete;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.h2.Driver;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.service.ServiceRegistry;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import com.baeldung.hibernate.softdelete.model.SoftDeletePerson;
+
+public class SoftDeletePersonIntegrationTest {
+
+    private static SessionFactory sessionFactory;
+
+    private static Session session;
+
+    SoftDeletePerson person1 = new SoftDeletePerson();
+    SoftDeletePerson person2 = new SoftDeletePerson();
+
+    @BeforeAll
+    public static void beforeTests() {
+        Configuration configuration = new Configuration().addAnnotatedClass(SoftDeletePerson.class)
+            .setProperty("hibernate.dialect", H2Dialect.class.getName())
+            .setProperty("hibernate.connection.driver_class", Driver.class.getName())
+            .setProperty("hibernate.connection.url", "jdbc:h2:mem:test")
+            .setProperty("hibernate.connection.username", "sa")
+            .setProperty("hibernate.connection.password", "")
+            .setProperty("hibernate.hbm2ddl.auto", "update")
+            .setProperty("hibernate.show_sql", "true");
+
+        ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties())
+            .build();
+
+        sessionFactory = configuration.buildSessionFactory(serviceRegistry);
+    }
+
+    @BeforeEach
+    public void setup() {
+        session = sessionFactory.openSession();
+        session.beginTransaction();
+        SoftDeletePerson person1 = new SoftDeletePerson();
+        person1.setName("Person1");
+        List<String> emailIds = new ArrayList<>();
+        emailIds.add("[email protected]");
+        emailIds.add("[email protected]");
+        person1.setEmailIds(emailIds);
+        SoftDeletePerson person2 = new SoftDeletePerson();
+        person2.setName("Person2");
+        List<String> emailIdsPerson2 = new ArrayList<>();
+        emailIdsPerson2.add("[email protected]");
+        emailIdsPerson2.add("[email protected]");
+        person2.setEmailIds(emailIdsPerson2);
+        session.save(person1);
+        session.save(person2);
+        session.getTransaction()
+            .commit();
+
+        assertNotNull(person1.getName());
+        assertNotNull(person2.getName());
+        System.out.println(person1);
+        System.out.println(person2);
+    }
+
+    @Test
+    void whenDeletingUsingSoftDelete_ThenEntityAndCollectionAreDeleted() {
+        session.beginTransaction();
+        person1 = session.createQuery("from SoftDeletePerson where name='Person1'", SoftDeletePerson.class)
+            .getSingleResult();
+        person2 = session.createQuery("from SoftDeletePerson where name='Person2'", SoftDeletePerson.class)
+            .getSingleResult();
+
+        assertNotNull(person1);
+        assertNotNull(person2);
+
+        session.delete(person2);
+        List<String> emailIds = person1.getEmailIds();
+        emailIds.remove(0);
+        person1.setEmailIds(emailIds);
+        session.save(person1);
+        session.getTransaction()
+            .commit();
+        List<SoftDeletePerson> activeRows = session.createQuery("from SoftDeletePerson")
+            .list();
+        List<SoftDeletePerson> deletedRows = session.createNamedQuery("getDeletedPerson", SoftDeletePerson.class)
+            .getResultList();
+        session.close();
+
+        assertNotNull(person1.getName());
+        System.out.println("-------------Active Rows-----------");
+        activeRows.forEach(row -> System.out.println(row));
+        System.out.println("-------------Deleted Rows-----------");
+        deletedRows.forEach(row -> System.out.println(row));
+    }
+
+    @AfterAll
+    static void afterTests() {
+        sessionFactory.close();
+    }
+}

persistence-modules/querydsl/pom.xml

@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.version}</version>
+            <version>${hibernate-core.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -131,6 +131,7 @@
         <commons-pool.version>1.6</commons-pool.version>
         <commons-dbcp.version>1.4</commons-dbcp.version>
         <apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
+        <hibernate-core.version>6.4.2.Final</hibernate-core.version>
     </properties>
 
 </project>

persistence-modules/querydsl/src/test/java/com/baeldung/dao/PersonDaoIntegrationTest.java

@@ -11,7 +11,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 @ContextConfiguration("/test-context.xml")
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -64,7 +64,7 @@ public class PersonDaoIntegrationTest {
         personDao.save(new Person("Kent", "Zivago", 30));
 
         final int maxAge = personDao.findMaxAge();
-        Assert.assertTrue(maxAge == 35);
+        Assert.assertEquals(35, maxAge);
     }
 
     @Test
@@ -74,7 +74,7 @@ public class PersonDaoIntegrationTest {
         personDao.save(new Person("Kent", "Zivago", 30));
 
         final Map<String, Integer> maxAge = personDao.findMaxAgeByName();
-        Assert.assertTrue(maxAge.size() == 2);
+        Assert.assertEquals(2, maxAge.size());
         Assert.assertSame(35, maxAge.get("Ralph"));
         Assert.assertSame(30, maxAge.get("Kent"));
     }

persistence-modules/querydsl/src/test/java/com/baeldung/querydsl/intro/QueryDSLIntegrationTest.java

@@ -122,10 +122,10 @@ public class QueryDSLIntegrationTest {
                 .fetch();
 
         assertEquals("Hello World!", userTitleCounts.get(0).get(blogPost.title));
-        assertEquals(new Long(2), userTitleCounts.get(0).get(count));
+        assertEquals(Long.valueOf(2), userTitleCounts.get(0).get(count));
 
         assertEquals("My Second Post", userTitleCounts.get(1).get(blogPost.title));
-        assertEquals(new Long(1), userTitleCounts.get(1).get(count));
+        assertEquals(Long.valueOf(1), userTitleCounts.get(1).get(count));
 
     }
 

persistence-modules/read-only-transactions/pom.xml

@@ -43,7 +43,7 @@
             <version>${mysql.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
@@ -69,9 +69,9 @@
     <properties>
         <mysql.version>8.2.0</mysql.version>
         <hikari.version>4.0.3</hikari.version>
-        <hibernate.version>5.6.1.Final</hibernate.version>
-        <spring-boot.version>2.6.1</spring-boot.version>
-        <spring-test.version>5.3.13</spring-test.version>
+        <hibernate.version>6.4.2.Final</hibernate.version>
+        <spring-boot.version>3.2.2</spring-boot.version>
+        <spring-test.version>6.0.16</spring-test.version>
         <junit-jupiter.version>5.8.2</junit-jupiter.version>
         <h2.version>2.1.214</h2.version>
     </properties>

persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Book.java

@@ -1,10 +1,10 @@
 package com.baeldung.readonlytransactions.h2;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "book")

persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/BookService.java

@@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 
 @Service
 public class BookService {

persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Config.java

@@ -11,7 +11,7 @@ import com.zaxxer.hikari.HikariDataSource;
 
 import java.util.Properties;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 @Configuration

persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/TransactionConfig.java

@@ -7,7 +7,7 @@ import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 
 @Configuration
 @EnableTransactionManagement

persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoJPA.java

@@ -7,9 +7,9 @@ import com.baeldung.readonlytransactions.mysql.entities.Book;
 import java.util.SplittableRandom;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 public class MyRepoJPA extends BaseRepo {
 

persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/entities/Book.java

@@ -1,10 +1,10 @@
 package com.baeldung.readonlytransactions.mysql.entities;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "book")

persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/Config.java

@@ -18,7 +18,7 @@ import com.zaxxer.hikari.HikariDataSource;
 
 import java.util.Properties;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 @Configuration

persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/entities/BookEntity.java

@@ -1,10 +1,10 @@
 package com.baeldung.readonlytransactions.mysql.spring.entities;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "book")

persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/repositories/BookRepository.java

@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query;
 import com.baeldung.readonlytransactions.mysql.spring.ReaderDS;
 import com.baeldung.readonlytransactions.mysql.spring.entities.BookEntity;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 public interface BookRepository extends JpaRepository<BookEntity, Long> {
 

persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/JPATransactionIntegrationTest.java

@@ -21,8 +21,8 @@ import com.baeldung.readonlytransactions.mysql.spring.ReadOnlyInterception;
 
 import java.util.UUID;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(loader = AnnotationConfigContextLoader.class, initializers = JPATransactionIntegrationTest.TestConfig.class, classes = { ReadOnlyInterception.class })

persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/SpringTransactionReadOnlyIntegrationTest.java

@@ -21,8 +21,8 @@ import com.baeldung.readonlytransactions.h2.BookService;
 
 import java.util.UUID;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(loader = AnnotationConfigContextLoader.class, initializers = SpringTransactionReadOnlyIntegrationTest.TestConfig.class, classes = { BookService.class })