To specify the query region to be used for queries cached * by this template, set the "queryCacheRegion" property. * @see #setQueryCacheRegion - * @see org.hibernate.Query#setCacheable + * @see Query#setCacheable * @see Criteria#setCacheable */ public void setCacheQueries(boolean cacheQueries) { @@ -271,7 +254,7 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean *
The cache region will not take effect unless queries created by this
* template are configured to be cached via the "cacheQueries" property.
* @see #setCacheQueries
- * @see org.hibernate.Query#setCacheRegion
+ * @see Query#setCacheRegion
* @see Criteria#setCacheRegion
*/
public void setQueryCacheRegion(@Nullable String queryCacheRegion) {
@@ -359,7 +342,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
* @return a result object returned by the action, or {@code null}
* @throws DataAccessException in case of Hibernate errors
*/
- @SuppressWarnings("deprecation")
@Nullable
protected Compatible with Hibernate 5.0/5.1 as well as 5.2/5.3/5.4, as of Spring 5.2.
- * Set up with Hibernate 5.2+, {@code LocalSessionFactoryBean} is an immediate alternative
+ * Compatible with Hibernate 5.2/5.3/5.4, as of Spring 5.3.
+ * This Hibernate-specific {@code LocalSessionFactoryBean} can be an immediate alternative
* to {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean} for common
* JPA purposes: In particular with Hibernate 5.3/5.4, the Hibernate {@code SessionFactory}
* will natively expose the JPA {@code EntityManagerFactory} interface as well, and
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
index 7d07b5c1177..f18bc07a6f5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
@@ -47,6 +47,7 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.core.InfrastructureProxy;
@@ -76,8 +77,8 @@ import org.springframework.util.ClassUtils;
* Typically combined with {@link HibernateTransactionManager} for declarative
* transactions against the {@code SessionFactory} and its JDBC {@code DataSource}.
*
- * Compatible with Hibernate 5.0/5.1 as well as 5.2/5.3/5.4, as of Spring 5.2.
- * Set up with Hibernate 5.2+, this builder is also a convenient way to set up
+ * Compatible with Hibernate 5.2/5.3/5.4, as of Spring 5.3.
+ * 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.
*
@@ -162,23 +163,8 @@ public class LocalSessionFactoryBuilder extends Configuration {
if (dataSource != null) {
getProperties().put(AvailableSettings.DATASOURCE, dataSource);
}
-
- // Hibernate 5.1/5.2: manually enforce connection release mode ON_CLOSE (the former default)
- try {
- // Try Hibernate 5.2
- AvailableSettings.class.getField("CONNECTION_HANDLING");
- getProperties().put("hibernate.connection.handling_mode", "DELAYED_ACQUISITION_AND_HOLD");
- }
- catch (NoSuchFieldException ex) {
- // Try Hibernate 5.1
- try {
- AvailableSettings.class.getField("ACQUIRE_CONNECTIONS");
- getProperties().put("hibernate.connection.release_mode", "ON_CLOSE");
- }
- catch (NoSuchFieldException ex2) {
- // on Hibernate 5.0.x or lower - no need to change the default there
- }
- }
+ getProperties().put(AvailableSettings.CONNECTION_HANDLING,
+ PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_HOLD);
getProperties().put(AvailableSettings.CLASSLOADERS, Collections.singleton(resourceLoader.getClassLoader()));
this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader);
@@ -225,22 +211,8 @@ public class LocalSessionFactoryBuilder extends Configuration {
"Unknown transaction manager type: " + jtaTransactionManager.getClass().getName());
}
- // Hibernate 5.1/5.2: manually enforce connection release mode AFTER_STATEMENT (the JTA default)
- try {
- // Try Hibernate 5.2
- AvailableSettings.class.getField("CONNECTION_HANDLING");
- getProperties().put("hibernate.connection.handling_mode", "DELAYED_ACQUISITION_AND_RELEASE_AFTER_STATEMENT");
- }
- catch (NoSuchFieldException ex) {
- // Try Hibernate 5.1
- try {
- AvailableSettings.class.getField("ACQUIRE_CONNECTIONS");
- getProperties().put("hibernate.connection.release_mode", "AFTER_STATEMENT");
- }
- catch (NoSuchFieldException ex2) {
- // on Hibernate 5.0.x or lower - no need to change the default there
- }
- }
+ getProperties().put(AvailableSettings.CONNECTION_HANDLING,
+ PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_STATEMENT);
return this;
}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
index 87ba5cc2a07..d3b61969aac 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
@@ -24,7 +24,6 @@ import javax.sql.DataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.FlushMode;
import org.hibernate.HibernateException;
import org.hibernate.JDBCException;
import org.hibernate.NonUniqueObjectException;
@@ -65,7 +64,6 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
import org.springframework.dao.PessimisticLockingFailureException;
import org.springframework.jdbc.datasource.DataSourceUtils;
import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
@@ -95,39 +93,6 @@ public abstract class SessionFactoryUtils {
static final Log logger = LogFactory.getLog(SessionFactoryUtils.class);
- private static Method getFlushMode;
-
- static {
- try {
- // Hibernate 5.2+ getHibernateFlushMode()
- getFlushMode = Session.class.getMethod("getHibernateFlushMode");
- }
- catch (NoSuchMethodException ex) {
- try {
- // Hibernate 5.0/5.1 getFlushMode() with FlushMode return type
- getFlushMode = Session.class.getMethod("getFlushMode");
- }
- catch (NoSuchMethodException ex2) {
- throw new IllegalStateException("No compatible Hibernate getFlushMode signature found", ex2);
- }
- }
- // Check that it is the Hibernate FlushMode type, not JPA's...
- Assert.state(FlushMode.class == getFlushMode.getReturnType(), "Could not find Hibernate getFlushMode method");
- }
-
-
- /**
- * Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.
- * @param session the Hibernate Session to get the flush mode from
- * @return the FlushMode (never {@code null})
- * @since 4.3
- */
- static FlushMode getFlushMode(Session session) {
- FlushMode flushMode = (FlushMode) ReflectionUtils.invokeMethod(getFlushMode, session);
- Assert.state(flushMode != null, "No FlushMode from Session");
- return flushMode;
- }
-
/**
* Trigger a flush on the given Hibernate Session, converting regular
* {@link HibernateException} instances as well as Hibernate 5.2's
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionHolder.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionHolder.java
index 6353ed33a0b..261035a45da 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionHolder.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionHolder.java
@@ -16,8 +16,6 @@
package org.springframework.orm.hibernate5;
-import javax.persistence.EntityManager;
-
import org.hibernate.FlushMode;
import org.hibernate.Session;
import org.hibernate.Transaction;
@@ -40,8 +38,6 @@ import org.springframework.orm.jpa.EntityManagerHolder;
*/
public class SessionHolder extends EntityManagerHolder {
- private final Session session;
-
@Nullable
private Transaction transaction;
@@ -49,16 +45,13 @@ public class SessionHolder extends EntityManagerHolder {
private FlushMode previousFlushMode;
- @SuppressWarnings("cast")
public SessionHolder(Session session) {
- // Check below is always true against Hibernate >= 5.2 but not against 5.0/5.1 at runtime
- super(session instanceof EntityManager ? session : null);
- this.session = session;
+ super(session);
}
public Session getSession() {
- return this.session;
+ return (Session) getEntityManager();
}
public void setTransaction(@Nullable Transaction transaction) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionContext.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionContext.java
index b8bc7fa2e2a..1704b04957c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionContext.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -97,7 +97,7 @@ public class SpringSessionContext implements CurrentSessionContext {
sessionHolder.setSynchronizedWithTransaction(true);
// Switch to FlushMode.AUTO, as we have to assume a thread-bound Session
// with FlushMode.MANUAL, which needs to allow flushing within the transaction.
- FlushMode flushMode = SessionFactoryUtils.getFlushMode(session);
+ FlushMode flushMode = session.getHibernateFlushMode();
if (flushMode.equals(FlushMode.MANUAL) &&
!TransactionSynchronizationManager.isCurrentTransactionReadOnly()) {
session.setFlushMode(FlushMode.AUTO);
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionSynchronization.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionSynchronization.java
index e7014c38427..374110f39c9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionSynchronization.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionSynchronization.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -91,7 +91,7 @@ public class SpringSessionSynchronization implements TransactionSynchronization,
Session session = getCurrentSession();
// Read-write transaction -> flush the Hibernate Session.
// Further check: only flush when not FlushMode.MANUAL.
- if (!FlushMode.MANUAL.equals(SessionFactoryUtils.getFlushMode(session))) {
+ if (!FlushMode.MANUAL.equals(session.getHibernateFlushMode())) {
SessionFactoryUtils.flush(getCurrentSession(), true);
}
}
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 c57cb7865fd..9de9c87dec3 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
@@ -25,25 +25,28 @@ import javax.persistence.spi.PersistenceProvider;
import javax.persistence.spi.PersistenceUnitInfo;
import javax.persistence.spi.PersistenceUnitTransactionType;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.dialect.DB2Dialect;
import org.hibernate.dialect.DerbyTenSevenDialect;
import org.hibernate.dialect.H2Dialect;
import org.hibernate.dialect.HANAColumnStoreDialect;
import org.hibernate.dialect.HSQLDialect;
-import org.hibernate.dialect.InformixDialect;
-import org.hibernate.dialect.MySQL5Dialect;
+import org.hibernate.dialect.Informix10Dialect;
+import org.hibernate.dialect.MySQL57Dialect;
import org.hibernate.dialect.Oracle12cDialect;
import org.hibernate.dialect.PostgreSQL95Dialect;
import org.hibernate.dialect.SQLServer2012Dialect;
import org.hibernate.dialect.SybaseDialect;
+import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
import org.springframework.lang.Nullable;
/**
* {@link org.springframework.orm.jpa.JpaVendorAdapter} implementation for Hibernate
- * EntityManager. Developed and tested against Hibernate 5.0, 5.1, 5.2, 5.3, 5.4;
- * backwards-compatible with Hibernate 4.3 at runtime on a best-effort basis.
+ * EntityManager. Developed and tested against Hibernate 5.3 and 5.4;
+ * backwards-compatible with Hibernate 5.2 at runtime on a best-effort basis.
*
* Exposes Hibernate's persistence provider and EntityManager extension interface,
* and adapts {@link AbstractJpaVendorAdapter}'s common configuration settings.
@@ -77,11 +80,10 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter {
private final Class entityManagerInterface;
- @SuppressWarnings("deprecation")
public HibernateJpaVendorAdapter() {
this.persistenceProvider = new SpringHibernateJpaPersistenceProvider();
- this.entityManagerFactoryInterface = org.hibernate.jpa.HibernateEntityManagerFactory.class;
- this.entityManagerInterface = org.hibernate.jpa.HibernateEntityManager.class;
+ this.entityManagerFactoryInterface = SessionFactory.class;
+ this.entityManagerInterface = Session.class;
}
@@ -100,7 +102,7 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter {
* NOTE: For a persistence unit with transaction type JTA e.g. on WebLogic,
* the connection release mode will never be altered from its provider default,
* i.e. not be forced to {@code DELAYED_ACQUISITION_AND_HOLD} by this flag.
- * Alternatively, set Hibernate 5.2's "hibernate.connection.handling_mode"
+ * Alternatively, set Hibernate's "hibernate.connection.handling_mode"
* property to "DELAYED_ACQUISITION_AND_RELEASE_AFTER_TRANSACTION" or even
* "DELAYED_ACQUISITION_AND_RELEASE_AFTER_STATEMENT" in such a scenario.
* @since 4.3.1
@@ -155,22 +157,8 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter {
}
if (connectionReleaseOnClose) {
- // Hibernate 5.1+: manually enforce connection release mode ON_CLOSE (the former default)
- try {
- // Try Hibernate 5.2+
- AvailableSettings.class.getField("CONNECTION_HANDLING");
- jpaProperties.put("hibernate.connection.handling_mode", "DELAYED_ACQUISITION_AND_HOLD");
- }
- catch (NoSuchFieldException ex) {
- // Try Hibernate 5.1
- try {
- AvailableSettings.class.getField("ACQUIRE_CONNECTIONS");
- jpaProperties.put("hibernate.connection.release_mode", "ON_CLOSE");
- }
- catch (NoSuchFieldException ex2) {
- // on Hibernate 5.0.x or lower - no need to change the default there
- }
- }
+ jpaProperties.put(AvailableSettings.CONNECTION_HANDLING,
+ PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_HOLD);
}
return jpaProperties;
@@ -189,8 +177,8 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter {
case H2: return H2Dialect.class;
case HANA: return HANAColumnStoreDialect.class;
case HSQL: return HSQLDialect.class;
- case INFORMIX: return InformixDialect.class;
- case MYSQL: return MySQL5Dialect.class;
+ case INFORMIX: return Informix10Dialect.class;
+ case MYSQL: return MySQL57Dialect.class;
case ORACLE: return Oracle12cDialect.class;
case POSTGRESQL: return PostgreSQL95Dialect.class;
case SQL_SERVER: return SQLServer2012Dialect.class;