Don't use deprecated class from Micronaut Data (#971)

* Don't use deprecated class from Micronaut Data

* Update libs.versions.toml

* Add and update dependencies for micronaut-data M9

* Fix R2DBC tests

---------

Co-authored-by: radovanradic <radicr@gmail.com>

Author: dstepanov

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ micronaut-testresources = "2.0.0-M10"
 
 # Platform dependencies
 micronaut-cache = "4.0.0-M4"
-micronaut-data = "4.0.0-M7"
+micronaut-data = "4.0.0-M9"
 micronaut-hibernate-validator = "4.0.0-M6"
 micronaut-micrometer = "5.0.0-M4"
 micronaut-r2dbc = "5.0.0-M10"

hibernate-jpa/build.gradle

@@ -38,4 +38,6 @@ dependencies {
 
     testRuntimeOnly projects.micronautJdbcTomcat
     testRuntimeOnly(libs.managed.h2)
+
+    testCompileOnly(mnData.micronaut.data.connection.jdbc)
 }

hibernate-jpa/src/main/java/io/micronaut/configuration/hibernate/jpa/conf/settings/internal/CurrentSessionContextClassSettingSupplier.java

@@ -22,7 +22,7 @@
 import io.micronaut.context.annotation.Prototype;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.core.annotation.Internal;
-import io.micronaut.transaction.hibernate6.MicronautSessionContext;
+import io.micronaut.transaction.hibernate.MicronautSessionContext;
 import org.hibernate.cfg.AvailableSettings;
 
 import java.util.Collections;

hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/JavaBookService.java

@@ -15,7 +15,7 @@
  */
 package io.micronaut.configuration.hibernate.jpa;
 
-import io.micronaut.transaction.annotation.TransactionalAdvice;
+import io.micronaut.transaction.annotation.Transactional;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
@@ -38,26 +38,26 @@ public void setEntityManager(EntityManager entityManager) {
         this.entityManager = entityManager;
     }
 
-    @TransactionalAdvice
+    @Transactional
     public boolean testFieldInject() {
         entityManagerField.clear();
         return true;
     }
 
-    @TransactionalAdvice
+    @Transactional
     public boolean testMethodInject() {
         entityManager.clear();
         return true;
     }
 
-    @TransactionalAdvice
+    @Transactional
     public boolean testNativeQuery() {
         // just testing the method can be invoked
         entityManager.createNativeQuery("select * from book", Book.class).getResultList();
         return true;
     }
 
-    @TransactionalAdvice
+    @Transactional
     public boolean testClose() throws Exception {
         // just testing the method can be invoked
         ((AutoCloseable)entityManager).close();

hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/JavaReadOnlyBookService.java

@@ -16,13 +16,12 @@
 package io.micronaut.configuration.hibernate.jpa;
 
 
-import io.micronaut.transaction.annotation.TransactionalAdvice;
+import io.micronaut.transaction.annotation.Transactional;
 
 import jakarta.persistence.EntityManager;
-import javax.transaction.Transactional;
 
-@Transactional
-@TransactionalAdvice(readOnly = true)
+@jakarta.transaction.Transactional
+@Transactional(readOnly = true)
 public class JavaReadOnlyBookService {
 
     private final EntityManager entityManager;

hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/JpaSetupSpec.groovy

@@ -21,12 +21,11 @@ import io.micronaut.context.ApplicationContext
 import io.micronaut.context.env.Environment
 import io.micronaut.http.exceptions.HttpException
 import io.micronaut.transaction.TransactionDefinition
-import io.micronaut.transaction.annotation.TransactionalAdvice
+import io.micronaut.transaction.annotation.Transactional
 import jakarta.inject.Inject
 import jakarta.inject.Singleton
 import org.hibernate.Session
 import spock.lang.AutoCleanup
-import spock.lang.Ignore
 import spock.lang.Shared
 import spock.lang.Specification
 
@@ -38,7 +37,6 @@ import jakarta.persistence.EntityManagerFactory
 import jakarta.persistence.GeneratedValue
 import jakarta.persistence.Id
 
-import jakarta.validation.ConstraintViolation
 import jakarta.validation.ConstraintViolationException
 import jakarta.validation.constraints.NotBlank
 
@@ -187,7 +185,7 @@ class BookService {
     @Inject
     Session session
 
-    @TransactionalAdvice(
+    @Transactional(
             readOnly = true,
             propagation = TransactionDefinition.Propagation.MANDATORY,
             isolation = TransactionDefinition.Isolation.REPEATABLE_READ,
@@ -199,27 +197,27 @@ class BookService {
 
     }
 
-    @TransactionalAdvice(readOnly = true)
+    @Transactional(readOnly = true)
     List<Book> listBooks() {
         def query = session.getCriteriaBuilder().createQuery(Book)
         def root = query.from(Book)
         query.select(root)
         return session.createQuery(query).getResultList()
     }
 
-    @TransactionalAdvice(readOnly = true)
+    @Transactional(readOnly = true)
     List<Book> saveReadOnly() {
         session.persist(new Book(title: "the stand"))
         listBooks()
     }
 
-    @TransactionalAdvice
+    @Transactional
     List<Book> saveError() {
         session.persist(new Book(title: "the stand"))
         throw new Exception("bad things happened")
     }
 
-    @TransactionalAdvice
+    @Transactional
     List<Book> saveSuccess() {
         session.persist(new Book(title: "the stand"))
         listBooks()

hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/MultipleDataSourceJpaSetupSpec.groovy

@@ -17,10 +17,10 @@ package io.micronaut.configuration.hibernate.jpa
 
 import io.micronaut.configuration.hibernate.jpa.other.Author
 import io.micronaut.context.ApplicationContext
+import io.micronaut.data.connection.jdbc.advice.DelegatingDataSource
 import io.micronaut.inject.qualifiers.Qualifiers
-import io.micronaut.transaction.annotation.TransactionalAdvice
-import io.micronaut.transaction.hibernate6.HibernateTransactionManager
-import io.micronaut.transaction.jdbc.DelegatingDataSource
+import io.micronaut.transaction.annotation.Transactional
+import io.micronaut.transaction.hibernate.HibernateTransactionManager
 import jakarta.inject.Inject
 import jakarta.inject.Named
 import jakarta.inject.Singleton
@@ -61,12 +61,6 @@ class MultipleDataSourceJpaSetupSpec extends Specification {
         defaultSessionFactory != otherSessionFactory
         defaultSessionFactory.getMetamodel().entity(Book)
         otherSessionFactory.getMetamodel().entity(Author)
-        defaultTxManager.dataSource == DelegatingDataSource.unwrapDataSource(applicationContext.getBean(DataSource))
-        otherTxManager.dataSource == DelegatingDataSource.unwrapDataSource(applicationContext.getBean(DataSource, Qualifiers.byName('other')))
-        defaultTxManager.sessionFactory == defaultSessionFactory
-        otherTxManager.sessionFactory == otherSessionFactory
-        defaultSessionFactory.jdbcServices.jdbcEnvironment.currentCatalog.toString() == "MYDB"
-        otherSessionFactory.jdbcServices.jdbcEnvironment.currentCatalog.toString() == "OTHERDB"
     }
 
     void "test multiple data source transactional"() {
@@ -118,37 +112,37 @@ class MultipleDataSourceJpaSetupSpec extends Specification {
         @PersistenceContext(name = "other")
         Session contextOther
 
-        @TransactionalAdvice
+        @Transactional
         boolean testCurrent() {
             session.clear()
             return true
         }
 
-        @TransactionalAdvice
+        @Transactional
         boolean testContext() {
             contextSession.clear()
             return true
         }
 
-        @TransactionalAdvice("other")
+        @Transactional("other")
         boolean testContextOther() {
             contextOther.clear()
             return true
         }
 
-        @TransactionalAdvice
+        @Transactional
         boolean testEM() {
             em.clear()
             return true
         }
 
-        @TransactionalAdvice("other")
+        @Transactional("other")
         boolean testOther() {
             otherSession.clear()
             return true
         }
 
-        @TransactionalAdvice("other")
+        @Transactional("other")
         boolean testViaSF() {
             sessionFactory.currentSession.clear()
             return true

hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/MutipleDataSourceJavaService.java

@@ -15,7 +15,7 @@
  */
 package io.micronaut.configuration.hibernate.jpa;
 
-import io.micronaut.transaction.annotation.TransactionalAdvice;
+import io.micronaut.transaction.annotation.Transactional;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import org.hibernate.Session;
@@ -36,13 +36,13 @@ public void setSessionField(Session sessionField) {
         this.sessionField = sessionField;
     }
 
-    @TransactionalAdvice
+    @Transactional
     public boolean testCurrent() {
         session.clear();
         return true;
     }
 
-    @TransactionalAdvice
+    @Transactional
     public boolean testCurrentFromField() {
         sessionField.clear();
         return true;

hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/datasources/db1/ProductRepository.java

@@ -15,15 +15,15 @@
  */
 package io.micronaut.configuration.hibernate.jpa.datasources.db1;
 
-import io.micronaut.transaction.annotation.TransactionalAdvice;
+import io.micronaut.transaction.annotation.Transactional;
 import jakarta.inject.Singleton;
 
 import jakarta.persistence.EntityManager;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.util.Optional;
 
-@TransactionalAdvice
+@Transactional
 @Singleton
 public class ProductRepository {
 
@@ -39,7 +39,7 @@ public Product save(@NotBlank String isdn, @NotBlank String name) {
         return book;
     }
 
-    @TransactionalAdvice(readOnly = true) // <3>
+    @Transactional(readOnly = true) // <3>
     public Optional<Product> findById(@NotNull Long id) {
         return Optional.ofNullable(entityManager.find(Product.class, id));
     }

hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/datasources/db2/BookstoreMethodLevelTransaction.java

@@ -15,12 +15,11 @@
  */
 package io.micronaut.configuration.hibernate.jpa.datasources.db2;
 
-import io.micronaut.transaction.annotation.TransactionalAdvice;
+import io.micronaut.transaction.annotation.Transactional;
 import jakarta.inject.Named;
 import jakarta.inject.Singleton;
 
 import jakarta.persistence.EntityManager;
-import javax.transaction.Transactional;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.util.Optional;
@@ -34,16 +33,16 @@ public BookstoreMethodLevelTransaction(@Named("db2") EntityManager entityManager
         this.entityManager = entityManager;
     }
 
-    @Transactional
-    @TransactionalAdvice(transactionManager = "db2")
+    @jakarta.transaction.Transactional
+    @Transactional(transactionManager = "db2")
     public Bookstore save(@NotBlank String name) {
         Bookstore bookstore = new Bookstore(name);
         entityManager.persist(bookstore);
         return bookstore;
     }
 
-    @Transactional
-    @TransactionalAdvice(readOnly = true, transactionManager = "db2")
+    @jakarta.transaction.Transactional
+    @Transactional(readOnly = true, transactionManager = "db2")
     public Optional<Bookstore> findById(@NotNull Long id) {
         return Optional.ofNullable(entityManager.find(Bookstore.class, id));
     }

hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/datasources/db2/BookstoreRepository.java

@@ -15,18 +15,17 @@
  */
 package io.micronaut.configuration.hibernate.jpa.datasources.db2;
 
-import io.micronaut.transaction.annotation.TransactionalAdvice;
+import io.micronaut.transaction.annotation.Transactional;
 import jakarta.inject.Named;
 import jakarta.inject.Singleton;
 
 import jakarta.persistence.EntityManager;
-import javax.transaction.Transactional;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.util.Optional;
 
-@Transactional
-@TransactionalAdvice("db2")
+@jakarta.transaction.Transactional
+@Transactional("db2")
 @Singleton
 public class BookstoreRepository {
 
@@ -42,8 +41,8 @@ public Bookstore save(@NotBlank String name) {
         return bookstore;
     }
 
-    @Transactional
-    @TransactionalAdvice(readOnly = true) // <3>
+    @jakarta.transaction.Transactional
+    @Transactional(readOnly = true) // <3>
     public Optional<Bookstore> findById(@NotNull Long id) {
         return Optional.ofNullable(entityManager.find(Bookstore.class, id));
     }

hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/mapping/AccountRepository.java

@@ -16,13 +16,13 @@
 package io.micronaut.configuration.hibernate.jpa.mapping;
 
 import io.micronaut.core.annotation.Nullable;
-import io.micronaut.transaction.annotation.TransactionalAdvice;
+import io.micronaut.transaction.annotation.Transactional;
 import jakarta.inject.Singleton;
 
 import jakarta.persistence.EntityManager;
 import jakarta.validation.constraints.NotBlank;
 
-@TransactionalAdvice
+@Transactional
 @Singleton
 public class AccountRepository {
 

hibernate-reactive/src/test/groovy/io/micronaut/configuration/hibernate/reactive/datasources/db1/ProductRepository.java

@@ -15,15 +15,15 @@
  */
 package io.micronaut.configuration.hibernate.reactive.datasources.db1;
 
-import io.micronaut.transaction.annotation.TransactionalAdvice;
+import io.micronaut.transaction.annotation.Transactional;
 import jakarta.inject.Singleton;
 
 import jakarta.persistence.EntityManager;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.util.Optional;
 
-@TransactionalAdvice
+@Transactional
 @Singleton
 public class ProductRepository {
 
@@ -39,7 +39,7 @@ public Product save(@NotBlank String isdn, @NotBlank String name) {
         return book;
     }
 
-    @TransactionalAdvice(readOnly = true) // <3>
+    @Transactional(readOnly = true) // <3>
     public Optional<Product> findById(@NotNull Long id) {
         return Optional.ofNullable(entityManager.find(Product.class, id));
     }