diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/JsonbMessageConverter.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/JsonbMessageConverter.java index 171c316e741..14376696e52 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/converter/JsonbMessageConverter.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/converter/JsonbMessageConverter.java @@ -35,7 +35,8 @@ import org.springframework.util.Assert; * @since 5.3 * @see jakarta.json.bind.Jsonb * @see jakarta.json.bind.JsonbBuilder - * @see #setJsonb + * @see #JsonbMessageConverter(Jsonb) + * @see #JsonbMessageConverter(JsonbConfig) */ public class JsonbMessageConverter extends AbstractJsonMessageConverter { diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java index 499ba95a826..cbf413b2ba4 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java @@ -328,11 +328,11 @@ public abstract class EntityManagerFactoryUtils { } } else if (!TransactionSynchronizationManager.isSynchronizationActive()) { - // Indicate that we can't obtain a transactional EntityManager. + // Indicate that we can't obtain a transactional EntityAgent. return null; } - // Create a new EntityManager for use within the current transaction. + // Create a new EntityAgent for use within the current transaction. logger.debug("Opening JPA EntityAgent"); Object entityAgent = null; if (emHolder != null && emf instanceof EntityManagerFactoryInfo info && diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java index 0b806971b3f..533a870c713 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java @@ -61,9 +61,9 @@ import org.springframework.core.type.filter.TypeFilter; * {@link FactoryBean} that creates a Hibernate {@link SessionFactory}. This is the usual * way to set up a shared Hibernate SessionFactory in a Spring application context; the * SessionFactory can then be passed to data access objects via dependency injection. + * Compatible with Hibernate ORM 7.0-7.4 and 8.0. * - *

Compatible with Hibernate ORM 7.x, as of Spring Framework 7.0. - * This Hibernate-specific {@code LocalSessionFactoryBean} can be an immediate alternative + *

This Hibernate-specific {@code LocalSessionFactoryBean} can be an immediate alternative * to {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean} for * common JPA purposes: The Hibernate {@code SessionFactory} will natively expose the JPA * {@code EntityManagerFactory} interface as well, and Hibernate {@code BeanContainer} diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java index 135f48de803..651f3aa4fb9 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java @@ -74,14 +74,14 @@ import org.springframework.util.ClassUtils; * A Spring-provided extension of the standard Hibernate {@link Configuration} class, * adding {@link SpringSessionContext} as a default and providing convenient ways * to specify a JDBC {@link DataSource} and an application class loader. + * Compatible with Hibernate ORM 7.0-7.4 and 8.0. * *

This is designed for programmatic use, for example, in {@code @Bean} factory methods; * consider using {@link LocalSessionFactoryBean} for XML bean definition files. * Typically combined with {@link HibernateTransactionManager} for declarative * transactions against the {@code SessionFactory} and its JDBC {@code DataSource}. * - *

Compatible with Hibernate ORM 7.x, as of Spring Framework 7.0. - * This Hibernate-specific factory builder can also be a convenient way to set up + *

This Hibernate-specific factory builder can also be a convenient way to set up * a JPA {@code EntityManagerFactory} since the Hibernate {@code SessionFactory} * natively exposes the JPA {@code EntityManagerFactory} interface as well now. * diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java index 8838ee56d7e..2b054045171 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java @@ -47,7 +47,7 @@ import org.springframework.util.ReflectionUtils; /** * {@link org.springframework.orm.jpa.JpaDialect} implementation for Hibernate. - * Compatible with Hibernate ORM 7.x and 8.x. + * Compatible with Hibernate ORM 7.0-7.4 and 8.0. * * @author Juergen Hoeller * @author Costin Leau diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java index 26da37be04b..776bf603f6d 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java @@ -50,7 +50,7 @@ import org.springframework.transaction.jta.JtaTransactionManager; /** * {@link org.springframework.orm.jpa.JpaVendorAdapter} implementation for Hibernate. - * Compatible with Hibernate ORM 7.x and 8.x. + * Compatible with Hibernate ORM 7.0-7.4 and 8.0. * *

Exposes Hibernate's persistence provider and Hibernate's Session as extended * EntityManager interface, and adapts {@link AbstractJpaVendorAdapter}'s common