diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java index 15e301069c0..fa611d9fdb2 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java @@ -454,7 +454,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana if (!definition.isReadOnly() && !txObject.isNewSession()) { // We need AUTO or COMMIT for a non-read-only transaction. FlushMode flushMode = session.getFlushMode(); - if (FlushMode.isManualFlushMode(session.getFlushMode())) { + if (session.getFlushMode().equals(FlushMode.MANUAL)) { session.setFlushMode(FlushMode.AUTO); txObject.getSessionHolder().setPreviousFlushMode(flushMode); } diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java index 7182c957a8c..cd96370a5a7 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java @@ -131,11 +131,13 @@ public class LocalSessionFactoryBuilder extends Configuration { * (may be {@code null}) * @param resourceLoader the ResourceLoader to load application classes from */ + @SuppressWarnings("deprecation") public LocalSessionFactoryBuilder(DataSource dataSource, ResourceLoader resourceLoader) { getProperties().put(Environment.CURRENT_SESSION_CONTEXT_CLASS, SpringSessionContext.class.getName()); if (dataSource != null) { getProperties().put(Environment.DATASOURCE, dataSource); } + // APP_CLASSLOADER is deprecated as of Hibernate 4.3 but we need to remain compatible with 4.0+ getProperties().put(AvailableSettings.APP_CLASSLOADER, resourceLoader.getClassLoader()); this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader); } diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java index 9f48f5f0102..e738e2762ae 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -90,7 +90,7 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere Session session = getCurrentSession(); // Read-write transaction -> flush the Hibernate Session. // Further check: only flush when not FlushMode.MANUAL. - if (!FlushMode.isManualFlushMode(session.getFlushMode())) { + if (!session.getFlushMode().equals(FlushMode.MANUAL)) { try { SessionFactoryUtils.logger.debug("Flushing Hibernate Session on transaction synchronization"); session.flush(); 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 49fa9eaaf6c..1f4ed58c432 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 @@ -68,13 +68,13 @@ import org.springframework.util.ReflectionUtils; /** * {@link org.springframework.orm.jpa.JpaDialect} implementation for - * Hibernate EntityManager. Developed against Hibernate 3.6 and 4.2. + * Hibernate EntityManager. Developed against Hibernate 3.6 and 4.2/4.3. * * @author Costin Leau * @author Juergen Hoeller * @since 2.0 */ -@SuppressWarnings("serial") +@SuppressWarnings({"serial", "deprecation"}) public class HibernateJpaDialect extends DefaultJpaDialect { private static Class optimisticLockExceptionClass; @@ -88,6 +88,7 @@ public class HibernateJpaDialect extends DefaultJpaDialect { optimisticLockExceptionClass = cl.loadClass("org.hibernate.dialect.lock.OptimisticEntityLockException"); } catch (ClassNotFoundException ex) { + // OptimisticLockException is deprecated on Hibernate 4.x; we're just using it on 3.x anyway optimisticLockExceptionClass = OptimisticLockException.class; } try { 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 04d36f274b1..fcd0861d2df 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -18,7 +18,6 @@ package org.springframework.orm.jpa.vendor; import java.util.HashMap; import java.util.Map; - import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.spi.PersistenceProvider; @@ -36,27 +35,64 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.ejb.HibernateEntityManager; import org.hibernate.ejb.HibernateEntityManagerFactory; import org.hibernate.ejb.HibernatePersistence; + import org.springframework.orm.jpa.JpaDialect; /** * {@link org.springframework.orm.jpa.JpaVendorAdapter} implementation for - * Hibernate EntityManager. Developed and tested against Hibernate 3.6 and 4.2. + * Hibernate EntityManager. Developed and tested against Hibernate 3.6 and 4.2/4.3. * *

Exposes Hibernate's persistence provider and EntityManager extension interface, * and supports {@link AbstractJpaVendorAdapter}'s common configuration settings. * + *

Note that the package location of Hibernate's JPA support changed from 4.2 to 4.3: + * from {@code org.hibernate.ejb.HibernateEntityManager(Factory)} to + * {@code org.hibernate.jpa.HibernateEntityManager(Factory)}. As of Spring 4.0, + * we're exposing the correct, non-deprecated variant depending on the Hibernate + * version encountered at runtime, in order to avoid deprecation log entries. + * * @author Juergen Hoeller * @author Rod Johnson * @since 2.0 - * @see org.hibernate.ejb.HibernatePersistence - * @see org.hibernate.ejb.HibernateEntityManager */ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter { - private final PersistenceProvider persistenceProvider = new HibernatePersistence(); + private final PersistenceProvider persistenceProvider; private final JpaDialect jpaDialect = new HibernateJpaDialect(); + private final Class entityManagerFactoryInterface; + + private final Class entityManagerInterface; + + + @SuppressWarnings({"deprecation", "unchecked"}) + public HibernateJpaVendorAdapter() { + PersistenceProvider providerToUse; + Class emfIfcToUse; + Class emIfcToUse; + try { + // Try Hibernate 4.3's org.hibernate.jpa package in order to avoid deprecation warnings + ClassLoader cl = HibernateJpaVendorAdapter.class.getClassLoader(); + Class hibernatePersistenceProviderClass = cl.loadClass("org.hibernate.jpa.HibernatePersistenceProvider"); + providerToUse = (PersistenceProvider) hibernatePersistenceProviderClass.newInstance(); + emfIfcToUse = (Class) cl.loadClass("org.hibernate.jpa.HibernateEntityManagerFactory"); + emIfcToUse = (Class) cl.loadClass("org.hibernate.jpa.HibernateEntityManager"); + } + catch (ClassNotFoundException ex) { + // Fall back to Hibernate 3.6-4.2 org.hibernate.ejb package + providerToUse = new HibernatePersistence(); + emfIfcToUse = HibernateEntityManagerFactory.class; + emIfcToUse = HibernateEntityManager.class; + } + catch (Exception ex) { + throw new IllegalStateException("Found HibernatePersistenceProvider but could not instantiate it", ex); + } + this.persistenceProvider = providerToUse; + this.entityManagerFactoryInterface = emfIfcToUse; + this.entityManagerInterface = emIfcToUse; + } + @Override public PersistenceProvider getPersistenceProvider() { @@ -101,15 +137,15 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter { protected Class determineDatabaseDialectClass(Database database) { switch (database) { case DB2: return DB2Dialect.class; - case DERBY: return DerbyDialect.class; + case DERBY: return DerbyDialect.class; // DerbyDialect deprecated in 4.x case H2: return H2Dialect.class; case HSQL: return HSQLDialect.class; case INFORMIX: return InformixDialect.class; case MYSQL: return MySQLDialect.class; case ORACLE: return Oracle9iDialect.class; - case POSTGRESQL: return PostgreSQLDialect.class; + case POSTGRESQL: return PostgreSQLDialect.class; // PostgreSQLDialect deprecated in 4.x case SQL_SERVER: return SQLServerDialect.class; - case SYBASE: return org.hibernate.dialect.SybaseDialect.class; + case SYBASE: return org.hibernate.dialect.SybaseDialect.class; // SybaseDialect deprecated in 3.6 but not 4.x default: return null; } } @@ -121,12 +157,12 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter { @Override public Class getEntityManagerFactoryInterface() { - return HibernateEntityManagerFactory.class; + return this.entityManagerFactoryInterface; } @Override public Class getEntityManagerInterface() { - return HibernateEntityManager.class; + return this.entityManagerInterface; } }