getAllClassMetadata() throws HibernateException {
- return getImpl().getAllClassMetadata();
- }
-
- public Map getAllCollectionMetadata() throws HibernateException {
- return getImpl().getAllCollectionMetadata();
- }
-
- public void close() throws HibernateException {
- }
-
- public boolean isClosed() {
- return false;
- }
-
- public Cache getCache() {
- return getImpl().getCache();
- }
-
- public void evict(Class persistentClass, Serializable id)
- throws HibernateException {
- getImpl().evict(persistentClass, id);
- }
-
- public void evict(Class persistentClass) throws HibernateException {
- getImpl().evict(persistentClass);
- }
-
- public void evictEntity(String entityName, Serializable id)
- throws HibernateException {
- getImpl().evictEntity(entityName, id);
- }
-
- public void evictEntity(String entityName) throws HibernateException {
- getImpl().evictEntity(entityName);
- }
-
- public void evictCollection(String roleName, Serializable id)
- throws HibernateException {
- getImpl().evictCollection(roleName, id);
- }
-
- public void evictCollection(String roleName) throws HibernateException {
- getImpl().evictCollection(roleName);
- }
-
- public void evictQueries() throws HibernateException {
- getImpl().evictQueries();
- }
-
- public void evictQueries(String cacheRegion) throws HibernateException {
- getImpl().evictQueries(cacheRegion);
- }
-
- public Statistics getStatistics() {
- return getImpl().getStatistics();
- }
-
- @Override
- public StatelessSessionBuilder withStatelessOptions() {
- return getImpl().withStatelessOptions();
- }
-
- public StatelessSession openStatelessSession() {
- return getImpl().openStatelessSession();
- }
-
- public StatelessSession openStatelessSession(Connection conn) {
- return getImpl().openStatelessSession(conn);
- }
-
- public Set getDefinedFilterNames() {
- return getImpl().getDefinedFilterNames();
- }
-
- public FilterDefinition getFilterDefinition(String filterName) throws HibernateException {
- return getImpl().getFilterDefinition( filterName );
- }
-
- public boolean containsFetchProfileDefinition(String name) {
- return getImpl().containsFetchProfileDefinition( name );
- }
-
- public TypeHelper getTypeHelper() {
- return getImpl().getTypeHelper();
- }
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsService.java b/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsService.java
deleted file mode 100644
index 2895997b41..0000000000
--- a/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsService.java
+++ /dev/null
@@ -1,367 +0,0 @@
-package org.hibernate.jmx;
-
-import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-import javax.naming.Reference;
-
-import org.jboss.logging.Logger;
-
-import org.hibernate.SessionFactory;
-import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.internal.SessionFactoryRegistry;
-import org.hibernate.stat.CollectionStatistics;
-import org.hibernate.stat.EntityStatistics;
-import org.hibernate.stat.NaturalIdCacheStatistics;
-import org.hibernate.stat.QueryStatistics;
-import org.hibernate.stat.SecondLevelCacheStatistics;
-import org.hibernate.stat.Statistics;
-import org.hibernate.stat.internal.ConcurrentStatisticsImpl;
-
-/**
- * JMX service for Hibernate statistics
- * //build the ObjectName you want
- * Hashtable tb = new Hashtable();
- * tb.put("type", "statistics");
- * tb.put("sessionFactory", "myFinancialApp");
- * ObjectName on = new ObjectName("hibernate", tb);
- * StatisticsService stats = new StatisticsService();
- * stats.setSessionFactory(sessionFactory);
- * server.registerMBean(stats, on);
- *
- * And call the MBean the way you want
- * //build the ObjectName you want
- * Hashtable tb = new Hashtable();
- * tb.put("type", "statistics");
- * tb.put("sessionFactory", "myFinancialApp");
- * ObjectName on = new ObjectName("hibernate", tb);
- * StatisticsService stats = new StatisticsService();
- * server.registerMBean(stats, on);
- *
- * And call the MBean by providing the SessionFactoryJNDIName first.
- * Then the session factory will be retrieved from JNDI and the statistics
- * loaded.
- *
- * @author Emmanuel Bernard
- * @deprecated See HHH-6190 for details
- */
-@Deprecated
-public class StatisticsService implements StatisticsServiceMBean {
-
- private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, StatisticsService.class.getName() );
- //TODO: We probably should have a StatisticsNotPublishedException, to make it clean
-
- SessionFactory sf;
- String sfJNDIName;
- Statistics stats = new ConcurrentStatisticsImpl();
-
- /**
- * @see StatisticsServiceMBean#setSessionFactoryJNDIName(java.lang.String)
- */
- public void setSessionFactoryJNDIName(String sfJNDIName) {
- this.sfJNDIName = sfJNDIName;
- try {
- final SessionFactory sessionFactory;
- final Object jndiValue = new InitialContext().lookup( sfJNDIName );
- if ( jndiValue instanceof Reference ) {
- final String uuid = (String) ( (Reference) jndiValue ).get( 0 ).getContent();
- sessionFactory = SessionFactoryRegistry.INSTANCE.getSessionFactory( uuid );
- }
- else {
- sessionFactory = (SessionFactory) jndiValue;
- }
- setSessionFactory( sessionFactory );
- }
- catch (NameNotFoundException e) {
- LOG.noSessionFactoryWithJndiName( sfJNDIName, e );
- setSessionFactory(null);
- }
- catch (NamingException e) {
- LOG.unableToAccessSessionFactory( sfJNDIName, e );
- setSessionFactory(null);
- }
- catch (ClassCastException e) {
- LOG.jndiNameDoesNotHandleSessionFactoryReference( sfJNDIName, e );
- setSessionFactory(null);
- }
- }
-
- /**
- * Useful to init this MBean wo a JNDI session factory name
- *
- * @param sf session factory to register
- */
- public void setSessionFactory(SessionFactory sf) {
- this.sf = sf;
- if (sf == null) {
- stats = new ConcurrentStatisticsImpl();
- }
- else {
- stats = sf.getStatistics();
- }
-
- }
- /**
- * @see StatisticsServiceMBean#clear()
- */
- public void clear() {
- stats.clear();
- }
- /**
- * @see StatisticsServiceMBean#getEntityStatistics(java.lang.String)
- */
- public EntityStatistics getEntityStatistics(String entityName) {
- return stats.getEntityStatistics(entityName);
- }
- /**
- * @see StatisticsServiceMBean#getCollectionStatistics(java.lang.String)
- */
- public CollectionStatistics getCollectionStatistics(String role) {
- return stats.getCollectionStatistics(role);
- }
- /**
- * @see StatisticsServiceMBean#getSecondLevelCacheStatistics(java.lang.String)
- */
- public SecondLevelCacheStatistics getSecondLevelCacheStatistics(String regionName) {
- return stats.getSecondLevelCacheStatistics(regionName);
- }
- /**
- * @see StatisticsServiceMBean#getQueryStatistics(java.lang.String)
- */
- public QueryStatistics getQueryStatistics(String hql) {
- return stats.getQueryStatistics(hql);
- }
- /**
- * @see StatisticsServiceMBean#getEntityDeleteCount()
- */
- public long getEntityDeleteCount() {
- return stats.getEntityDeleteCount();
- }
- /**
- * @see StatisticsServiceMBean#getEntityInsertCount()
- */
- public long getEntityInsertCount() {
- return stats.getEntityInsertCount();
- }
- /**
- * @see StatisticsServiceMBean#getEntityLoadCount()
- */
- public long getEntityLoadCount() {
- return stats.getEntityLoadCount();
- }
- /**
- * @see StatisticsServiceMBean#getEntityFetchCount()
- */
- public long getEntityFetchCount() {
- return stats.getEntityFetchCount();
- }
- /**
- * @see StatisticsServiceMBean#getEntityUpdateCount()
- */
- public long getEntityUpdateCount() {
- return stats.getEntityUpdateCount();
- }
- /**
- * @see StatisticsServiceMBean#getQueryExecutionCount()
- */
- public long getQueryExecutionCount() {
- return stats.getQueryExecutionCount();
- }
- public long getQueryCacheHitCount() {
- return stats.getQueryCacheHitCount();
- }
- public long getQueryExecutionMaxTime() {
- return stats.getQueryExecutionMaxTime();
- }
- public long getQueryCacheMissCount() {
- return stats.getQueryCacheMissCount();
- }
- public long getQueryCachePutCount() {
- return stats.getQueryCachePutCount();
- }
-
- public long getUpdateTimestampsCacheHitCount() {
- return stats.getUpdateTimestampsCacheHitCount();
- }
-
- public long getUpdateTimestampsCacheMissCount() {
- return stats.getUpdateTimestampsCacheMissCount();
- }
-
- public long getUpdateTimestampsCachePutCount() {
- return stats.getUpdateTimestampsCachePutCount();
- }
-
- /**
- * @see StatisticsServiceMBean#getFlushCount()
- */
- public long getFlushCount() {
- return stats.getFlushCount();
- }
- /**
- * @see StatisticsServiceMBean#getConnectCount()
- */
- public long getConnectCount() {
- return stats.getConnectCount();
- }
- /**
- * @see StatisticsServiceMBean#getSecondLevelCacheHitCount()
- */
- public long getSecondLevelCacheHitCount() {
- return stats.getSecondLevelCacheHitCount();
- }
- /**
- * @see StatisticsServiceMBean#getSecondLevelCacheMissCount()
- */
- public long getSecondLevelCacheMissCount() {
- return stats.getSecondLevelCacheMissCount();
- }
- /**
- * @see StatisticsServiceMBean#getSecondLevelCachePutCount()
- */
- public long getSecondLevelCachePutCount() {
- return stats.getSecondLevelCachePutCount();
- }
-
- public NaturalIdCacheStatistics getNaturalIdCacheStatistics(String regionName) {
- return stats.getNaturalIdCacheStatistics( regionName );
- }
-
- public long getNaturalIdCacheHitCount() {
- return stats.getNaturalIdCacheHitCount();
- }
-
- public long getNaturalIdCacheMissCount() {
- return stats.getNaturalIdCacheMissCount();
- }
-
- public long getNaturalIdCachePutCount() {
- return stats.getNaturalIdCachePutCount();
- }
-
- @Override
- public long getNaturalIdQueryExecutionCount() {
- return stats.getNaturalIdQueryExecutionCount();
- }
-
- @Override
- public long getNaturalIdQueryExecutionMaxTime() {
- return stats.getNaturalIdQueryExecutionMaxTime();
- }
-
- @Override
- public String getNaturalIdQueryExecutionMaxTimeRegion() {
- return stats.getNaturalIdQueryExecutionMaxTimeRegion();
- }
-
- /**
- * @see StatisticsServiceMBean#getSessionCloseCount()
- */
- public long getSessionCloseCount() {
- return stats.getSessionCloseCount();
- }
- /**
- * @see StatisticsServiceMBean#getSessionOpenCount()
- */
- public long getSessionOpenCount() {
- return stats.getSessionOpenCount();
- }
- /**
- * @see StatisticsServiceMBean#getCollectionLoadCount()
- */
- public long getCollectionLoadCount() {
- return stats.getCollectionLoadCount();
- }
- /**
- * @see StatisticsServiceMBean#getCollectionFetchCount()
- */
- public long getCollectionFetchCount() {
- return stats.getCollectionFetchCount();
- }
- /**
- * @see StatisticsServiceMBean#getCollectionUpdateCount()
- */
- public long getCollectionUpdateCount() {
- return stats.getCollectionUpdateCount();
- }
- /**
- * @see StatisticsServiceMBean#getCollectionRemoveCount()
- */
- public long getCollectionRemoveCount() {
- return stats.getCollectionRemoveCount();
- }
- /**
- * @see StatisticsServiceMBean#getCollectionRecreateCount()
- */
- public long getCollectionRecreateCount() {
- return stats.getCollectionRecreateCount();
- }
- /**
- * @see StatisticsServiceMBean#getStartTime()
- */
- public long getStartTime() {
- return stats.getStartTime();
- }
-
- /**
- * @see StatisticsServiceMBean#isStatisticsEnabled()
- */
- public boolean isStatisticsEnabled() {
- return stats.isStatisticsEnabled();
- }
-
- /**
- * @see StatisticsServiceMBean#setStatisticsEnabled(boolean)
- */
- public void setStatisticsEnabled(boolean enable) {
- stats.setStatisticsEnabled(enable);
- }
-
- public void logSummary() {
- stats.logSummary();
- }
-
- public String[] getCollectionRoleNames() {
- return stats.getCollectionRoleNames();
- }
-
- public String[] getEntityNames() {
- return stats.getEntityNames();
- }
-
- public String[] getQueries() {
- return stats.getQueries();
- }
-
- public String[] getSecondLevelCacheRegionNames() {
- return stats.getSecondLevelCacheRegionNames();
- }
-
- public long getSuccessfulTransactionCount() {
- return stats.getSuccessfulTransactionCount();
- }
- public long getTransactionCount() {
- return stats.getTransactionCount();
- }
-
- public long getCloseStatementCount() {
- return stats.getCloseStatementCount();
- }
- public long getPrepareStatementCount() {
- return stats.getPrepareStatementCount();
- }
-
- public long getOptimisticFailureCount() {
- return stats.getOptimisticFailureCount();
- }
-
- public String getQueryExecutionMaxTimeQueryString() {
- return stats.getQueryExecutionMaxTimeQueryString();
- }
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsServiceMBean.java b/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsServiceMBean.java
deleted file mode 100644
index 63d5514722..0000000000
--- a/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsServiceMBean.java
+++ /dev/null
@@ -1,20 +0,0 @@
-//$Id: StatisticsServiceMBean.java 4332 2004-08-15 12:55:28Z oneovthafew $
-package org.hibernate.jmx;
-import org.hibernate.stat.Statistics;
-
-/**
- * MBean exposing Session Factory statistics
- *
- * @see org.hibernate.stat.Statistics
- * @author Emmanuel Bernard
- * @deprecated See HHH-6190 for details
- */
-@Deprecated
-public interface StatisticsServiceMBean extends Statistics {
- /**
- * Publish the statistics of a session factory bound to
- * the default JNDI context
- * @param sfJNDIName session factory jndi name
- */
- public abstract void setSessionFactoryJNDIName(String sfJNDIName);
-}
\ No newline at end of file
diff --git a/hibernate-core/src/main/java/org/hibernate/service/jmx/internal/DisabledJmxServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/jmx/internal/DisabledJmxServiceImpl.java
similarity index 94%
rename from hibernate-core/src/main/java/org/hibernate/service/jmx/internal/DisabledJmxServiceImpl.java
rename to hibernate-core/src/main/java/org/hibernate/jmx/internal/DisabledJmxServiceImpl.java
index d9a1efe228..943a9a6769 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/jmx/internal/DisabledJmxServiceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jmx/internal/DisabledJmxServiceImpl.java
@@ -21,10 +21,10 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.jmx.internal;
+package org.hibernate.jmx.internal;
import javax.management.ObjectName;
-import org.hibernate.service.jmx.spi.JmxService;
+import org.hibernate.jmx.spi.JmxService;
import org.hibernate.service.spi.Manageable;
/**
diff --git a/hibernate-core/src/main/java/org/hibernate/service/jmx/internal/JmxServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceImpl.java
similarity index 98%
rename from hibernate-core/src/main/java/org/hibernate/service/jmx/internal/JmxServiceImpl.java
rename to hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceImpl.java
index 4ba6ca1ba2..384f56e6ec 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/jmx/internal/JmxServiceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceImpl.java
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.jmx.internal;
+package org.hibernate.jmx.internal;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.Map;
@@ -38,7 +38,7 @@ import org.hibernate.cfg.Environment;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.Service;
-import org.hibernate.service.jmx.spi.JmxService;
+import org.hibernate.jmx.spi.JmxService;
import org.hibernate.service.spi.Manageable;
import org.hibernate.service.spi.Stoppable;
diff --git a/hibernate-core/src/main/java/org/hibernate/service/jmx/internal/JmxServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceInitiator.java
similarity index 88%
rename from hibernate-core/src/main/java/org/hibernate/service/jmx/internal/JmxServiceInitiator.java
rename to hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceInitiator.java
index 1d2cc97eb9..e3c7b51a45 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/jmx/internal/JmxServiceInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceInitiator.java
@@ -21,14 +21,14 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.jmx.internal;
+package org.hibernate.jmx.internal;
import java.util.Map;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.service.jmx.spi.JmxService;
-import org.hibernate.service.spi.BasicServiceInitiator;
+import org.hibernate.jmx.spi.JmxService;
+import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
@@ -36,7 +36,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
*
* @author Steve Ebersole
*/
-public class JmxServiceInitiator implements BasicServiceInitiator {
+public class JmxServiceInitiator implements StandardServiceInitiator {
public static final JmxServiceInitiator INSTANCE = new JmxServiceInitiator();
@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/jmx/package.html b/hibernate-core/src/main/java/org/hibernate/jmx/package.html
deleted file mode 100755
index 66827f9090..0000000000
--- a/hibernate-core/src/main/java/org/hibernate/jmx/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- This package exposes a Hibernate instance via JMX.
-
-
- HibernateService allows configuration and management
- of the Hibernate runtime. StatisticsService
- reports information that might be useful for performance
- tuning.
-
-
-
diff --git a/hibernate-core/src/main/java/org/hibernate/service/jmx/spi/JmxService.java b/hibernate-core/src/main/java/org/hibernate/jmx/spi/JmxService.java
similarity index 97%
rename from hibernate-core/src/main/java/org/hibernate/service/jmx/spi/JmxService.java
rename to hibernate-core/src/main/java/org/hibernate/jmx/spi/JmxService.java
index 629cf8faec..96a52d4730 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/jmx/spi/JmxService.java
+++ b/hibernate-core/src/main/java/org/hibernate/jmx/spi/JmxService.java
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.jmx.spi;
+package org.hibernate.jmx.spi;
import javax.management.ObjectName;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java
index 166a2a6f5d..1b009ce860 100755
--- a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java
@@ -155,7 +155,15 @@ public class CriteriaJoinWalker extends AbstractEntityJoinWalker {
if ( isDefaultFetchMode( fetchMode ) ) {
if ( persister != null ) {
if ( isJoinFetchEnabledByProfile( persister, path, propertyNumber ) ) {
- resolvedJoinType = getJoinType( nullable, currentDepth );
+ if ( isDuplicateAssociation( lhsTable, lhsColumns, associationType ) ) {
+ resolvedJoinType = JoinType.NONE;
+ }
+ else if ( isTooDeep(currentDepth) || ( associationType.isCollectionType() && isTooManyCollections() ) ) {
+ resolvedJoinType = JoinType.NONE;
+ }
+ else {
+ resolvedJoinType = getJoinType( nullable, currentDepth );
+ }
}
else {
resolvedJoinType = super.getJoinType(
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java b/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
index 0de1a5745f..5f20d9b273 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
@@ -55,7 +55,7 @@ import org.hibernate.metamodel.internal.source.annotations.xml.mocker.EntityMapp
import org.hibernate.metamodel.spi.source.MappingException;
import org.hibernate.metamodel.spi.source.MappingNotFoundException;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
/**
* Entry point into working with sources of metadata information ({@code hbm.xml}, annotations). Tell Hibernate
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/Binder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/Binder.java
index cd0e904028..72be827dc1 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/Binder.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/Binder.java
@@ -42,6 +42,7 @@ import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.NotYetImplementedException;
import org.hibernate.cfg.ObjectNameNormalizer;
import org.hibernate.engine.FetchTiming;
+import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.id.EntityIdentifierNature;
import org.hibernate.id.IdentifierGenerator;
import org.hibernate.id.IdentityGenerator;
@@ -144,7 +145,6 @@ import org.hibernate.metamodel.spi.source.UniqueConstraintSource;
import org.hibernate.metamodel.spi.source.VersionAttributeSource;
import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.service.config.spi.ConfigurationService;
import org.hibernate.tuple.component.ComponentMetamodel;
import org.hibernate.tuple.entity.EntityTuplizer;
import org.hibernate.type.ComponentType;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataBuilderImpl.java
index 35b1419607..8b6cbbc8cd 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataBuilderImpl.java
@@ -29,6 +29,7 @@ import org.jboss.jandex.IndexView;
import org.xml.sax.EntityResolver;
import org.hibernate.MultiTenancyStrategy;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.cache.spi.access.AccessType;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.EJB3DTDEntityResolver;
@@ -40,8 +41,7 @@ import org.hibernate.metamodel.MetadataSourceProcessingOrder;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.spi.MetadataSourcesContributor;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.config.spi.ConfigurationService;
+import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.service.config.spi.StandardConverters;
/**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataImpl.java
index db0e26f743..a801c00ec7 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataImpl.java
@@ -83,7 +83,7 @@ import org.hibernate.metamodel.spi.source.MappingDefaults;
import org.hibernate.metamodel.spi.source.MetaAttributeContext;
import org.hibernate.metamodel.spi.source.TypeDescriptorSource;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.type.TypeResolver;
/**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/SessionFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/SessionFactoryBuilderImpl.java
index 8b9b56dd25..9815c44822 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/SessionFactoryBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/SessionFactoryBuilderImpl.java
@@ -36,17 +36,16 @@ import org.hibernate.Interceptor;
import org.hibernate.ObjectNotFoundException;
import org.hibernate.SessionFactory;
import org.hibernate.SessionFactoryObserver;
+import org.hibernate.boot.registry.selector.spi.StrategySelector;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
+import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.internal.DefaultCustomEntityDirtinessStrategy;
import org.hibernate.internal.SessionFactoryImpl;
import org.hibernate.metamodel.SessionFactoryBuilder;
import org.hibernate.metamodel.spi.MetadataImplementor;
import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.classloading.spi.StrategyInstanceResolver;
-import org.hibernate.service.config.spi.ConfigurationService;
/**
* @author Gail Badner
@@ -111,14 +110,13 @@ public class SessionFactoryBuilderImpl implements SessionFactoryBuilder {
private EntityNotFoundDelegate entityNotFoundDelegate;
public SessionFactoryOptionsImpl(ServiceRegistry serviceRegistry) {
- final StrategyInstanceResolver strategyInstanceResolver
- = serviceRegistry.getService( ClassLoaderService.class ).getStrategyInstanceResolver();
-
final Map configurationSettings = serviceRegistry.getService( ConfigurationService.class ).getSettings();
- this.interceptor = strategyInstanceResolver.resolveDefaultableStrategyInstance(
- configurationSettings.get( AvailableSettings.INTERCEPTOR ),
+ final StrategySelector strategySelector = serviceRegistry.getService( StrategySelector.class );
+
+ this.interceptor = strategySelector.resolveDefaultableStrategy(
Interceptor.class,
+ configurationSettings.get( AvailableSettings.INTERCEPTOR ),
EmptyInterceptor.INSTANCE
);
@@ -129,15 +127,15 @@ public class SessionFactoryBuilderImpl implements SessionFactoryBuilder {
}
};
- this.customEntityDirtinessStrategy = strategyInstanceResolver.resolveDefaultableStrategyInstance(
- configurationSettings.get( AvailableSettings.CUSTOM_ENTITY_DIRTINESS_STRATEGY ),
+ this.customEntityDirtinessStrategy = strategySelector.resolveDefaultableStrategy(
CustomEntityDirtinessStrategy.class,
+ configurationSettings.get( AvailableSettings.CUSTOM_ENTITY_DIRTINESS_STRATEGY ),
DefaultCustomEntityDirtinessStrategy.INSTANCE
);
- this.currentTenantIdentifierResolver = strategyInstanceResolver.resolveStrategyInstance(
- configurationSettings.get( AvailableSettings.MULTI_TENANT_IDENTIFIER_RESOLVER ),
- CurrentTenantIdentifierResolver.class
+ this.currentTenantIdentifierResolver = strategySelector.resolveStrategy(
+ CurrentTenantIdentifierResolver.class,
+ configurationSettings.get( AvailableSettings.MULTI_TENANT_IDENTIFIER_RESOLVER )
);
}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/AnnotationBindingContextImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/AnnotationBindingContextImpl.java
index 1b160aa9cf..c5f64eca40 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/AnnotationBindingContextImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/AnnotationBindingContextImpl.java
@@ -42,7 +42,7 @@ import org.hibernate.metamodel.spi.domain.Type;
import org.hibernate.metamodel.spi.source.IdentifierGeneratorSource;
import org.hibernate.metamodel.spi.source.MappingDefaults;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
/**
* @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelper.java
index 7c4d6d0bba..74f87f78ad 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelper.java
@@ -45,7 +45,7 @@ import org.jboss.jandex.Type;
import org.hibernate.AssertionFailure;
import org.hibernate.HibernateException;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
/**
* Utility methods for working with the jandex annotation index.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/IndexBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/IndexBuilder.java
index cf1416c115..1869ed3fa5 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/IndexBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/IndexBuilder.java
@@ -43,7 +43,7 @@ import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.collections.CollectionHelper;
import org.hibernate.metamodel.internal.source.annotations.xml.filter.IndexedAnnotationFilter;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
/**
* @author Strong Liu
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/MockHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/MockHelper.java
index 4fc5e95e4b..5a21f8997c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/MockHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/MockHelper.java
@@ -46,7 +46,7 @@ import org.hibernate.internal.util.collections.CollectionHelper;
import org.hibernate.jaxb.spi.orm.JaxbCascadeType;
import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
/**
* @author Strong Liu
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/HibernateMappingProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/HibernateMappingProcessor.java
index 6b384f09da..085a443570 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/HibernateMappingProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/HibernateMappingProcessor.java
@@ -39,6 +39,8 @@ import org.jboss.logging.Logger;
import org.hibernate.CacheMode;
import org.hibernate.FlushMode;
import org.hibernate.LockMode;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
import org.hibernate.cfg.HbmBinder;
import org.hibernate.cfg.NotYetImplementedException;
import org.hibernate.engine.ResultSetMappingDefinition;
@@ -94,8 +96,6 @@ import org.hibernate.metamodel.spi.relational.BasicAuxiliaryDatabaseObjectImpl;
import org.hibernate.metamodel.spi.source.FilterDefinitionSource;
import org.hibernate.metamodel.spi.source.MappingException;
import org.hibernate.metamodel.spi.source.TypeDescriptorSource;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.classloading.spi.ClassLoadingException;
import org.hibernate.type.Type;
/**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/JavaType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/JavaType.java
index 9e9ac26b3f..b774becae7 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/JavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/JavaType.java
@@ -24,7 +24,7 @@
package org.hibernate.metamodel.spi.domain;
import org.hibernate.internal.util.ValueHolder;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
/**
* Models the naming of a Java type where we may not have access to that type's {@link Class} reference. Generally
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/Type.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/Type.java
index 9a90b28e84..066e1117c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/Type.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/Type.java
@@ -50,7 +50,7 @@ public interface Type {
*
* @return The {@link Class} reference
*
- * @throws org.hibernate.service.classloading.spi.ClassLoadingException Indicates the class reference
+ * @throws org.hibernate.boot.registry.classloading.spi.ClassLoadingException Indicates the class reference
* could not be determined. Generally this is the case in reverse-engineering scenarios where the specified
* domain model classes do not yet exist.
*/
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
index 642836295a..cdefbfa91b 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
@@ -364,7 +364,7 @@ public abstract class AbstractCollectionPersister
iter = collection.getElement().getColumnIterator();
while ( iter.hasNext() ) {
Selectable selectable = (Selectable) iter.next();
- elementColumnAliases[j] = selectable.getAlias( dialect );
+ elementColumnAliases[j] = selectable.getAlias( dialect, table );
if ( selectable.isFormula() ) {
Formula form = (Formula) selectable;
elementFormulaTemplates[j] = form.getTemplate( dialect, factory.getSqlFunctionRegistry() );
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterClassResolverInitiator.java b/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterClassResolverInitiator.java
index 0f5a9d71b7..95db7a0271 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterClassResolverInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterClassResolverInitiator.java
@@ -25,16 +25,16 @@ package org.hibernate.persister.internal;
import java.util.Map;
+import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.persister.spi.PersisterClassResolver;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.spi.BasicServiceInitiator;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.ServiceException;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
* @author Steve Ebersole
*/
-public class PersisterClassResolverInitiator implements BasicServiceInitiator {
+public class PersisterClassResolverInitiator implements StandardServiceInitiator {
public static final PersisterClassResolverInitiator INSTANCE = new PersisterClassResolverInitiator();
public static final String IMPL_NAME = "hibernate.persister.resolver";
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryInitiator.java b/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryInitiator.java
index 74227a9c60..2ad3ae3614 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryInitiator.java
@@ -25,16 +25,16 @@ package org.hibernate.persister.internal;
import java.util.Map;
+import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.persister.spi.PersisterFactory;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.spi.BasicServiceInitiator;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.ServiceException;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
* @author Steve Ebersole
*/
-public class PersisterFactoryInitiator implements BasicServiceInitiator {
+public class PersisterFactoryInitiator implements StandardServiceInitiator {
public static final PersisterFactoryInitiator INSTANCE = new PersisterFactoryInitiator();
public static final String IMPL_NAME = "hibernate.persister.factory";
diff --git a/hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistry.java b/hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistry.java
index 9b0a74e24a..623b54e35d 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistry.java
@@ -1,7 +1,7 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2011, Red Hat Inc. or third-party contributors as
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
@@ -24,10 +24,8 @@
package org.hibernate.service;
/**
- * Specialization of the {@link ServiceRegistry} contract mainly to make the
- * {@link ServiceRegistryBuilder#ServiceRegistryBuilder(BootstrapServiceRegistry)} signature type-safe
- *
- * @author Steve Ebersole
+ * @deprecated Use {@link org.hibernate.boot.registry.BootstrapServiceRegistry} instead
*/
-public interface BootstrapServiceRegistry extends ServiceRegistry {
+@Deprecated
+public interface BootstrapServiceRegistry extends org.hibernate.boot.registry.BootstrapServiceRegistry {
}
diff --git a/hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistryBuilder.java b/hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistryBuilder.java
index 165c9b436a..5d707232dd 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistryBuilder.java
@@ -1,7 +1,7 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2011, Red Hat Inc. or third-party contributors as
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
@@ -23,105 +23,51 @@
*/
package org.hibernate.service;
-import java.util.LinkedHashSet;
-
-import org.hibernate.integrator.internal.IntegratorServiceImpl;
import org.hibernate.integrator.spi.Integrator;
-import org.hibernate.service.classloading.internal.ClassLoaderServiceImpl;
-import org.hibernate.service.internal.BootstrapServiceRegistryImpl;
/**
- * Builder for bootstrap {@link ServiceRegistry} instances.
- *
- * @author Steve Ebersole
- *
- * @see BootstrapServiceRegistryImpl
- * @see ServiceRegistryBuilder#ServiceRegistryBuilder(BootstrapServiceRegistry)
+ * @deprecated Use {@link org.hibernate.boot.registry.BootstrapServiceRegistryBuilder} instead
*/
-public class BootstrapServiceRegistryBuilder {
- private final LinkedHashSet providedIntegrators = new LinkedHashSet();
- private ClassLoader applicationClassLoader;
- private ClassLoader resourcesClassLoader;
- private ClassLoader hibernateClassLoader;
- private ClassLoader environmentClassLoader;
-
- /**
- * Add an {@link Integrator} to be applied to the bootstrap registry.
- *
- * @param integrator The integrator to add.
- * @return {@code this}, for method chaining
- */
+@Deprecated
+public class BootstrapServiceRegistryBuilder extends org.hibernate.boot.registry.BootstrapServiceRegistryBuilder {
+ @Override
public BootstrapServiceRegistryBuilder with(Integrator integrator) {
- providedIntegrators.add( integrator );
+ super.with( integrator );
return this;
}
- /**
- * Applies the specified {@link ClassLoader} as the application class loader for the bootstrap registry
- *
- * @param classLoader The class loader to use
- * @return {@code this}, for method chaining
- */
- @SuppressWarnings( {"UnusedDeclaration"})
+ @Override
public BootstrapServiceRegistryBuilder withApplicationClassLoader(ClassLoader classLoader) {
- this.applicationClassLoader = classLoader;
+ super.withApplicationClassLoader( classLoader );
return this;
}
- /**
- * Applies the specified {@link ClassLoader} as the resource class loader for the bootstrap registry
- *
- * @param classLoader The class loader to use
- * @return {@code this}, for method chaining
- */
- @SuppressWarnings( {"UnusedDeclaration"})
+ @Override
public BootstrapServiceRegistryBuilder withResourceClassLoader(ClassLoader classLoader) {
- this.resourcesClassLoader = classLoader;
+ super.withResourceClassLoader( classLoader );
return this;
}
- /**
- * Applies the specified {@link ClassLoader} as the Hibernate class loader for the bootstrap registry
- *
- * @param classLoader The class loader to use
- * @return {@code this}, for method chaining
- */
- @SuppressWarnings( {"UnusedDeclaration"})
+ @Override
public BootstrapServiceRegistryBuilder withHibernateClassLoader(ClassLoader classLoader) {
- this.hibernateClassLoader = classLoader;
+ super.withHibernateClassLoader( classLoader );
return this;
}
- /**
- * Applies the specified {@link ClassLoader} as the environment (or system) class loader for the bootstrap registry
- *
- * @param classLoader The class loader to use
- * @return {@code this}, for method chaining
- */
- @SuppressWarnings( {"UnusedDeclaration"})
+ @Override
public BootstrapServiceRegistryBuilder withEnvironmentClassLoader(ClassLoader classLoader) {
- this.environmentClassLoader = classLoader;
+ super.withEnvironmentClassLoader( classLoader );
return this;
}
- /**
- * Build the bootstrap registry.
- *
- * @return The built bootstrap registry
- */
+ @Override
+ public BootstrapServiceRegistryBuilder withStrategySelector(Class strategy, String name, Class implementation) {
+ super.withStrategySelector( strategy, name, implementation );
+ return this;
+ }
+
+ @Override
public BootstrapServiceRegistry build() {
- final ClassLoaderServiceImpl classLoaderService = new ClassLoaderServiceImpl(
- applicationClassLoader,
- resourcesClassLoader,
- hibernateClassLoader,
- environmentClassLoader
- );
-
- final IntegratorServiceImpl integratorService = new IntegratorServiceImpl(
- providedIntegrators,
- classLoaderService
- );
-
- return new BootstrapServiceRegistryImpl( classLoaderService, integratorService );
+ return (BootstrapServiceRegistry) super.build();
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/service/ConfigLoader.java b/hibernate-core/src/main/java/org/hibernate/service/ConfigLoader.java
index 4fb6fa731c..598625506d 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/ConfigLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/ConfigLoader.java
@@ -29,13 +29,14 @@ import java.util.Properties;
import org.jboss.logging.Logger;
-import org.hibernate.internal.util.ValueHolder;
-import org.hibernate.internal.util.config.ConfigurationException;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
import org.hibernate.jaxb.internal.JaxbConfigurationProcessor;
import org.hibernate.jaxb.spi.Origin;
import org.hibernate.jaxb.spi.SourceType;
+import org.hibernate.internal.util.ValueHolder;
+import org.hibernate.internal.util.config.ConfigurationException;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.jaxb.spi.cfg.JaxbHibernateConfiguration;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
/**
* Loads {@code cfg.xml} files.
diff --git a/hibernate-core/src/main/java/org/hibernate/service/ServiceRegistry.java b/hibernate-core/src/main/java/org/hibernate/service/ServiceRegistry.java
index 910f301a8f..87fba8c9af 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/ServiceRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/ServiceRegistry.java
@@ -37,8 +37,8 @@ public interface ServiceRegistry {
public ServiceRegistry getParentServiceRegistry();
/**
- * Retrieve a service by role. If service is not found, but a {@link org.hibernate.service.spi.BasicServiceInitiator} is registered for
- * this service role, the service will be initialized and returned.
+ * Retrieve a service by role. If service is not found, but a {@link org.hibernate.service.spi.ServiceInitiator} is
+ * registered for this service role, the service will be initialized and returned.
*
* NOTE: We cannot return {@code >} here because the service might come from the parent...
*
diff --git a/hibernate-core/src/main/java/org/hibernate/service/ServiceRegistryBuilder.java b/hibernate-core/src/main/java/org/hibernate/service/ServiceRegistryBuilder.java
index 73157d1cc7..6d9c358aef 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/ServiceRegistryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/ServiceRegistryBuilder.java
@@ -1,7 +1,7 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2011, Red Hat Inc. or third-party contributors as
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
@@ -23,214 +23,67 @@
*/
package org.hibernate.service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.Properties;
-import org.hibernate.cfg.Environment;
-import org.hibernate.integrator.spi.Integrator;
-import org.hibernate.integrator.spi.IntegratorService;
-import org.hibernate.integrator.spi.ServiceContributingIntegrator;
-import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.jaxb.spi.cfg.JaxbHibernateConfiguration;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.internal.BootstrapServiceRegistryImpl;
-import org.hibernate.service.internal.ProvidedService;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
-import org.hibernate.service.spi.BasicServiceInitiator;
-import org.hibernate.service.spi.ServiceContributor;
+import org.hibernate.boot.registry.StandardServiceInitiator;
/**
- * Builder for standard {@link ServiceRegistry} instances.
- *
- * @author Steve Ebersole
- *
- * @see StandardServiceRegistryImpl
- * @see BootstrapServiceRegistryBuilder
+ * @deprecated Use {@link org.hibernate.boot.registry.StandardServiceRegistryBuilder} instead
*/
-public class ServiceRegistryBuilder {
- public static final String DEFAULT_CFG_RESOURCE_NAME = "hibernate.cfg.xml";
-
- private final Map settings;
- private final List initiators = standardInitiatorList();
- private final List providedServices = new ArrayList();
-
- private final BootstrapServiceRegistry bootstrapServiceRegistry;
- private final ConfigLoader configLoader;
-
- /**
- * Create a default builder
- */
+@Deprecated
+public class ServiceRegistryBuilder extends org.hibernate.boot.registry.StandardServiceRegistryBuilder {
public ServiceRegistryBuilder() {
- this( new BootstrapServiceRegistryImpl() );
+ super(); //To change body of overridden methods use File | Settings | File Templates.
}
- /**
- * Create a builder with the specified bootstrap services.
- *
- * @param bootstrapServiceRegistry Provided bootstrap registry to use.
- */
public ServiceRegistryBuilder(BootstrapServiceRegistry bootstrapServiceRegistry) {
- this.settings = Environment.getProperties();
- this.bootstrapServiceRegistry = bootstrapServiceRegistry;
- this.configLoader = new ConfigLoader( bootstrapServiceRegistry );
+ super( bootstrapServiceRegistry ); //To change body of overridden methods use File | Settings | File Templates.
}
- /**
- * Allows access to the underlying boot-strap registry.
- *
- * @return The boot-strap registry
- */
- public BootstrapServiceRegistry getBootstrapServiceRegistry() {
- return bootstrapServiceRegistry;
- }
-
- /**
- * Used from the {@link #initiators} variable initializer
- *
- * @return List of standard initiators
- */
- private static List standardInitiatorList() {
- final List initiators = new ArrayList();
- initiators.addAll( StandardServiceInitiators.LIST );
- return initiators;
- }
-
- /**
- * Read settings from a {@link Properties} file. Differs from {@link #configure()} and {@link #configure(String)}
- * in that here we read a {@link Properties} file while for {@link #configure} we read the XML variant.
- *
- * @param resourceName The name by which to perform a resource look up for the properties file.
- *
- * @return this, for method chaining
- *
- * @see #configure()
- * @see #configure(String)
- */
- @SuppressWarnings( {"unchecked"})
+ @Override
public ServiceRegistryBuilder loadProperties(String resourceName) {
- settings.putAll( configLoader.loadProperties( resourceName ) );
+ super.loadProperties( resourceName );
return this;
}
- /**
- * Read setting information from an XML file using the standard resource location
- *
- * @return this, for method chaining
- *
- * @see #DEFAULT_CFG_RESOURCE_NAME
- * @see #configure(String)
- * @see #loadProperties(String)
- */
+ @Override
public ServiceRegistryBuilder configure() {
- return configure( DEFAULT_CFG_RESOURCE_NAME );
+ super.configure();
+ return this;
}
- /**
- * Read setting information from an XML file using the named resource location
- *
- * @param resourceName The named resource
- *
- * @return this, for method chaining
- *
- * @see #loadProperties(String)
- */
- @SuppressWarnings( {"unchecked"})
+ @Override
public ServiceRegistryBuilder configure(String resourceName) {
- JaxbHibernateConfiguration configurationElement = configLoader.loadConfigXmlResource( resourceName );
- for ( JaxbHibernateConfiguration.JaxbSessionFactory.JaxbProperty xmlProperty : configurationElement.getSessionFactory().getProperty() ) {
- settings.put( xmlProperty.getName(), xmlProperty.getValue() );
- }
-
+ super.configure( resourceName );
return this;
}
- /**
- * Apply a setting value
- *
- * @param settingName The name of the setting
- * @param value The value to use.
- *
- * @return this, for method chaining
- */
- @SuppressWarnings( {"unchecked", "UnusedDeclaration"})
+ @Override
public ServiceRegistryBuilder applySetting(String settingName, Object value) {
- settings.put( settingName, value );
+ super.applySetting( settingName, value );
return this;
}
- /**
- * Apply a groups of setting values
- *
- * @param settings The incoming settings to apply
- *
- * @return this, for method chaining
- */
- @SuppressWarnings( {"unchecked", "UnusedDeclaration"})
+ @Override
public ServiceRegistryBuilder applySettings(Map settings) {
- this.settings.putAll( settings );
+ super.applySettings( settings );
return this;
}
- /**
- * Adds a service initiator.
- *
- * @param initiator The initiator to be added
- *
- * @return this, for method chaining
- */
- @SuppressWarnings( {"UnusedDeclaration"})
- public ServiceRegistryBuilder addInitiator(BasicServiceInitiator initiator) {
- initiators.add( initiator );
+ @Override
+ public ServiceRegistryBuilder addInitiator(StandardServiceInitiator initiator) {
+ super.addInitiator( initiator );
return this;
}
- /**
- * Adds a user-provided service
- *
- * @param serviceRole The role of the service being added
- * @param service The service implementation
- *
- * @return this, for method chaining
- */
- @SuppressWarnings( {"unchecked"})
- public ServiceRegistryBuilder addService(final Class serviceRole, final Service service) {
- providedServices.add( new ProvidedService( serviceRole, service ) );
+ @Override
+ public ServiceRegistryBuilder addService(Class serviceRole, Service service) {
+ super.addService( serviceRole, service );
return this;
}
- /**
- * Build the service registry accounting for all settings and service initiators and services.
- *
- * @return The built service registry
- */
+ @Override
public ServiceRegistry buildServiceRegistry() {
- Map settingsCopy = new HashMap();
- settingsCopy.putAll( settings );
- Environment.verifyProperties( settingsCopy );
- ConfigurationHelper.resolvePlaceHolders( settingsCopy );
-
- for ( Integrator integrator : bootstrapServiceRegistry.getService( IntegratorService.class ).getIntegrators() ) {
- if ( ServiceContributingIntegrator.class.isInstance( integrator ) ) {
- ServiceContributingIntegrator.class.cast( integrator ).prepareServices( this );
- }
- }
-
- for ( ServiceContributor contributor : bootstrapServiceRegistry.getService( ClassLoaderService.class ).loadJavaServices(ServiceContributor.class) ) {
- contributor.contribute( this );
- }
-
- return new StandardServiceRegistryImpl( bootstrapServiceRegistry, initiators, providedServices, settingsCopy );
- }
-
- /**
- * Destroy a service registry. Applications should only destroy registries they have explicitly created.
- *
- * @param serviceRegistry The registry to be closed.
- */
- public static void destroy(ServiceRegistry serviceRegistry) {
- ( (StandardServiceRegistryImpl) serviceRegistry ).destroy();
+ return super.buildServiceRegistry();
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java b/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
index ad5e3bf4c1..1c945077b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
@@ -27,25 +27,25 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.engine.jdbc.batch.internal.BatchBuilderInitiator;
import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
import org.hibernate.engine.transaction.internal.TransactionFactoryInitiator;
import org.hibernate.id.factory.internal.MutableIdentifierGeneratorFactoryInitiator;
import org.hibernate.persister.internal.PersisterClassResolverInitiator;
import org.hibernate.persister.internal.PersisterFactoryInitiator;
-import org.hibernate.service.config.internal.ConfigurationServiceInitiator;
+import org.hibernate.engine.config.internal.ConfigurationServiceInitiator;
import org.hibernate.service.internal.SessionFactoryServiceRegistryFactoryInitiator;
-import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator;
-import org.hibernate.service.jdbc.connections.internal.MultiTenantConnectionProviderInitiator;
-import org.hibernate.service.jdbc.cursor.internal.RefCursorSupportInitiator;
-import org.hibernate.service.jdbc.dialect.internal.DialectFactoryInitiator;
-import org.hibernate.service.jdbc.dialect.internal.DialectResolverInitiator;
+import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator;
+import org.hibernate.engine.jdbc.connections.internal.MultiTenantConnectionProviderInitiator;
+import org.hibernate.engine.jdbc.cursor.internal.RefCursorSupportInitiator;
+import org.hibernate.engine.jdbc.dialect.internal.DialectFactoryInitiator;
+import org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator;
+import org.hibernate.jmx.internal.JmxServiceInitiator;
+import org.hibernate.engine.jndi.internal.JndiServiceInitiator;
+import org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformInitiator;
import org.hibernate.service.jdbc.env.internal.JdbcEnvironmentInitiator;
-import org.hibernate.service.jmx.internal.JmxServiceInitiator;
-import org.hibernate.service.jndi.internal.JndiServiceInitiator;
-import org.hibernate.service.jta.platform.internal.JtaPlatformInitiator;
import org.hibernate.service.schema.internal.SchemaManagementToolInitiator;
-import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractorInitiator;
/**
@@ -54,10 +54,10 @@ import org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractorInitiator;
* @author Steve Ebersole
*/
public class StandardServiceInitiators {
- public static List LIST = buildStandardServiceInitiatorList();
+ public static List LIST = buildStandardServiceInitiatorList();
- private static List buildStandardServiceInitiatorList() {
- final List serviceInitiators = new ArrayList();
+ private static List buildStandardServiceInitiatorList() {
+ final List serviceInitiators = new ArrayList();
serviceInitiators.add( ConfigurationServiceInitiator.INSTANCE );
serviceInitiators.add( ImportSqlCommandExtractorInitiator.INSTANCE );
diff --git a/hibernate-core/src/main/java/org/hibernate/service/classloading/internal/StrategyInstanceResolverImpl.java b/hibernate-core/src/main/java/org/hibernate/service/classloading/internal/StrategyInstanceResolverImpl.java
deleted file mode 100644
index 3afdbf7183..0000000000
--- a/hibernate-core/src/main/java/org/hibernate/service/classloading/internal/StrategyInstanceResolverImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.service.classloading.internal;
-
-import org.hibernate.HibernateException;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.classloading.spi.StrategyInstanceResolver;
-
-/**
- * A helper to deal with the common idiom of loading a named strategy implementer.
- *
- * @author Steve Ebersole
- */
-public class StrategyInstanceResolverImpl implements StrategyInstanceResolver {
-
- // todo : maybe even allow passing in a "construction handler" to deal with non-no-arg cases
-
- private final ClassLoaderService classLoaderService;
-
- public StrategyInstanceResolverImpl(ClassLoaderService classLoaderService) {
- this.classLoaderService = classLoaderService;
- }
-
- @Override
- public T resolveStrategyInstance(Object strategyReference, Class type) {
- return resolveDefaultableStrategyInstance( strategyReference, type, null );
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public T resolveDefaultableStrategyInstance(Object strategyReference, Class type, T defaultValue) {
- if ( strategyReference == null ) {
- return defaultValue;
- }
-
- if ( type.isInstance( strategyReference ) ) {
- return type.cast( strategyReference );
- }
-
- final Class implementationClass;
- if ( Class.class.isInstance( strategyReference ) ) {
- implementationClass = (Class) strategyReference;
- }
- else {
- implementationClass = (Class) classLoaderService.classForName( strategyReference.toString() );
- }
-
- try {
- return implementationClass.newInstance();
- }
- catch (Exception e) {
- throw new HibernateException(
- String.format( "Could not instantiate named strategy class [%s]", implementationClass.getName() ),
- e
- );
- }
- }
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/service/classloading/spi/StrategyInstanceResolver.java b/hibernate-core/src/main/java/org/hibernate/service/classloading/spi/StrategyInstanceResolver.java
deleted file mode 100644
index 7c43796094..0000000000
--- a/hibernate-core/src/main/java/org/hibernate/service/classloading/spi/StrategyInstanceResolver.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.service.classloading.spi;
-
-/**
- * A helper to deal with the common idiom of loading a named strategy implementer.
- *
- * @author Steve Ebersole
- */
-public interface StrategyInstanceResolver {
- /**
- * Resolve strategy instances. See discussion on {@link #resolveDefaultableStrategyInstance}.
- * Only difference is that here, the implied default value is {@code null}.
- *
- * @param strategyReference The reference to the strategy for which we need to resolve an instance.
- * @param type The type (interface) of the strategy to be resolved.
- * @param The parameterized java type type.
- *
- * @return The strategy instance
- */
- public T resolveStrategyInstance(Object strategyReference, Class type);
-
- /**
- * Resolve strategy instances. The incoming reference might be:
- *
- * {@code null} - in which case defaultValue is returned.
- *
- *
- * An actual instance of the strategy type - it is returned, as is
- *
- *
- * A reference to the implementation {@link Class} - an instance is created by calling
- * {@link Class#newInstance()} (aka, the class's no-arg ctor).
- *
- *
- * The name of the implementation class - First the implementation's {@link Class} reference
- * is resolved, and then an instance is created by calling {@link Class#newInstance()}
- *
- *
- *
- * @param strategyReference The reference to the strategy for which we need to resolve an instance.
- * @param type The type (interface) of the strategy to be resolved.
- * @param defaultValue THe default value to use if strategyReference is null
- * @param The parameterized java type type.
- *
- * @return The strategy instance
- */
- public T resolveDefaultableStrategyInstance(Object strategyReference, Class type, T defaultValue);
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/service/config/spi/StandardConverters.java b/hibernate-core/src/main/java/org/hibernate/service/config/spi/StandardConverters.java
index d3dbea939a..664ca86366 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/config/spi/StandardConverters.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/config/spi/StandardConverters.java
@@ -23,7 +23,8 @@
*/
package org.hibernate.service.config.spi;
-import static org.hibernate.service.config.spi.ConfigurationService.Converter;
+
+import static org.hibernate.engine.config.spi.ConfigurationService.Converter;
/**
* Standard set of setting converters
@@ -31,7 +32,7 @@ import static org.hibernate.service.config.spi.ConfigurationService.Converter;
* @author Steve Ebersole
*/
public class StandardConverters {
- public static final Converter BOOLEAN = new Converter() {
+ public static final Converter BOOLEAN = new Converter() {
@Override
public Boolean convert(Object value) {
if ( value == null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
index dda22639b0..0b160a1636 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
@@ -32,11 +32,11 @@ import org.jboss.logging.Logger;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.collections.CollectionHelper;
-import org.hibernate.service.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
import org.hibernate.service.Service;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.UnknownServiceException;
-import org.hibernate.service.jmx.spi.JmxService;
+import org.hibernate.jmx.spi.JmxService;
import org.hibernate.service.spi.InjectService;
import org.hibernate.service.spi.Manageable;
import org.hibernate.service.spi.ServiceBinding;
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java
index 3e0236f443..8d1c00ebfa 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java
@@ -31,7 +31,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.service.spi.SessionFactoryServiceRegistryFactory;
/**
- * Acts as a {@link Service} in the {@link StandardServiceRegistryImpl} whose function is as a factory for
+ * Acts as a {@link Service} in the {@link org.hibernate.boot.registry.internal.StandardServiceRegistryImpl} whose function is as a factory for
* {@link SessionFactoryServiceRegistryImpl} implementations.
*
* @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryInitiator.java
index 5cabc73b87..e935561682 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryInitiator.java
@@ -25,14 +25,14 @@ package org.hibernate.service.internal;
import java.util.Map;
-import org.hibernate.service.spi.BasicServiceInitiator;
+import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.service.spi.SessionFactoryServiceRegistryFactory;
/**
* @author Steve Ebersole
*/
-public class SessionFactoryServiceRegistryFactoryInitiator implements BasicServiceInitiator {
+public class SessionFactoryServiceRegistryFactoryInitiator implements StandardServiceInitiator {
public static final SessionFactoryServiceRegistryFactoryInitiator INSTANCE = new SessionFactoryServiceRegistryFactoryInitiator();
@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/JdbcConnectionAccess.java b/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/JdbcConnectionAccess.java
index 7ea1c3fb85..1fa6f1f49a 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/JdbcConnectionAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/JdbcConnectionAccess.java
@@ -56,8 +56,8 @@ public interface JdbcConnectionAccess extends Serializable {
* Does the underlying provider of connections support aggressive releasing of connections (and re-acquisition
* of those connections later, if need be) in JTA environments?
*
- * @see org.hibernate.service.jdbc.connections.spi.ConnectionProvider#supportsAggressiveRelease()
- * @see org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider#supportsAggressiveRelease()
+ * @see org.hibernate.engine.jdbc.connections.spi.ConnectionProvider#supportsAggressiveRelease()
+ * @see org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider#supportsAggressiveRelease()
*/
public boolean supportsAggressiveRelease();
}
diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentImpl.java b/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentImpl.java
index 70eb25153c..8a1f721741 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentImpl.java
@@ -31,8 +31,11 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
+import org.hibernate.boot.registry.selector.spi.StrategySelector;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.config.spi.ConfigurationService;
+import org.hibernate.engine.jdbc.cursor.internal.StandardRefCursorSupport;
import org.hibernate.engine.jdbc.internal.TypeInfo;
import org.hibernate.engine.jdbc.internal.TypeInfoExtracter;
import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
@@ -41,10 +44,7 @@ import org.hibernate.exception.internal.SQLStateConversionDelegate;
import org.hibernate.exception.internal.StandardSQLExceptionConverter;
import org.hibernate.exception.spi.SQLExceptionConverter;
import org.hibernate.metamodel.spi.relational.Identifier;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.config.spi.ConfigurationService;
import org.hibernate.service.config.spi.StandardConverters;
-import org.hibernate.service.jdbc.cursor.internal.StandardRefCursorSupport;
import org.hibernate.service.jdbc.env.spi.ExtractedDatabaseMetaData;
import org.hibernate.service.jdbc.env.spi.IdentifierHelper;
import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
@@ -232,9 +232,11 @@ public class JdbcEnvironmentImpl implements JdbcEnvironment {
final Object setting = serviceRegistry.getService( ConfigurationService.class )
.getSettings()
.get( AvailableSettings.SCHEMA_NAME_RESOLVER );
- return serviceRegistry.getService( ClassLoaderService.class )
- .getStrategyInstanceResolver()
- .resolveDefaultableStrategyInstance( setting, SchemaNameResolver.class, TemporarySchemaNameResolver.INSTANCE );
+ return serviceRegistry.getService( StrategySelector.class ).resolveDefaultableStrategy(
+ SchemaNameResolver.class,
+ setting,
+ TemporarySchemaNameResolver.INSTANCE
+ );
}
private Set buildMergedReservedWords(Dialect dialect, DatabaseMetaData dbmd) throws SQLException {
diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentInitiator.java
index dc9277d4b6..b21854e686 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentInitiator.java
@@ -31,20 +31,20 @@ import java.util.Map;
import org.jboss.logging.Logger;
import org.hibernate.MultiTenancyStrategy;
+import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
+import org.hibernate.engine.jdbc.dialect.spi.DialectFactory;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.jdbc.connections.spi.JdbcConnectionAccess;
-import org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider;
-import org.hibernate.service.jdbc.dialect.spi.DialectFactory;
import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
* @author Steve Ebersole
*/
-public class JdbcEnvironmentInitiator implements BasicServiceInitiator {
+public class JdbcEnvironmentInitiator implements StandardServiceInitiator {
private static final CoreMessageLogger log = Logger.getMessageLogger(
CoreMessageLogger.class,
JdbcEnvironmentInitiator.class.getName()
diff --git a/hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JtaPlatformInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JtaPlatformInitiator.java
deleted file mode 100644
index 5c7fb6d5cc..0000000000
--- a/hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JtaPlatformInitiator.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.service.jta.platform.internal;
-
-import java.util.Map;
-
-import org.jboss.logging.Logger;
-
-import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.cfg.Environment;
-import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.internal.util.jndi.JndiHelper;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.config.spi.ConfigurationService;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
-import org.hibernate.service.jta.platform.spi.JtaPlatformException;
-import org.hibernate.service.spi.BasicServiceInitiator;
-import org.hibernate.service.spi.ServiceRegistryImplementor;
-import org.hibernate.transaction.TransactionManagerLookup;
-
-/**
- * Standard initiator for the standard {@link org.hibernate.service.jta.platform.spi.JtaPlatform}
- *
- * @author Steve Ebersole
- */
-public class JtaPlatformInitiator implements BasicServiceInitiator {
- public static final JtaPlatformInitiator INSTANCE = new JtaPlatformInitiator();
-
- private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, JtaPlatformInitiator.class.getName());
-
- @Override
- public Class getServiceInitiated() {
- return JtaPlatform.class;
- }
-
- @Override
- @SuppressWarnings( {"unchecked"})
- public JtaPlatform initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
- final Object platform = getConfiguredPlatform( configurationValues, registry );
- if ( platform == null ) {
- return new NoJtaPlatform();
- }
- return registry.getService( ConfigurationService.class )
- .cast( JtaPlatform.class, platform );
-
- }
-
- private Object getConfiguredPlatform(Map configVales, ServiceRegistryImplementor registry) {
- Object platform = configVales.get( AvailableSettings.JTA_PLATFORM );
- if ( platform == null ) {
- final String transactionManagerLookupImplName = (String) configVales.get( Environment.TRANSACTION_MANAGER_STRATEGY );
- if ( transactionManagerLookupImplName != null ) {
- LOG.deprecatedTransactionManagerStrategy(TransactionManagerLookup.class.getName(),
- Environment.TRANSACTION_MANAGER_STRATEGY,
- JtaPlatform.class.getName(),
- AvailableSettings.JTA_PLATFORM);
- platform = mapLegacyClasses( transactionManagerLookupImplName, configVales, registry );
- LOG.debugf("Mapped %s -> %s", transactionManagerLookupImplName, platform);
- }
- }
- return platform;
- }
-
- private JtaPlatform mapLegacyClasses(String tmlImplName, Map configVales, ServiceRegistryImplementor registry) {
- if ( tmlImplName == null ) {
- return null;
- }
-
- LOG.legacyTransactionManagerStrategy(JtaPlatform.class.getName(), AvailableSettings.JTA_PLATFORM);
-
- if ( "org.hibernate.transaction.BESTransactionManagerLookup".equals( tmlImplName ) ) {
- return new BorlandEnterpriseServerJtaPlatform();
- }
-
- if ( "org.hibernate.transaction.BTMTransactionManagerLookup".equals( tmlImplName ) ) {
- return new BitronixJtaPlatform();
- }
-
- if ( "org.hibernate.transaction.JBossTransactionManagerLookup".equals( tmlImplName ) ) {
- return new JBossAppServerJtaPlatform();
- }
-
- if ( "org.hibernate.transaction.JBossTSStandaloneTransactionManagerLookup".equals( tmlImplName ) ) {
- return new JBossStandAloneJtaPlatform();
- }
-
- if ( "org.hibernate.transaction.JOnASTransactionManagerLookup".equals( tmlImplName ) ) {
- return new JOnASJtaPlatform();
- }
-
- if ( "org.hibernate.transaction.JOTMTransactionManagerLookup".equals( tmlImplName ) ) {
- return new JOTMJtaPlatform();
- }
-
- if ( "org.hibernate.transaction.JRun4TransactionManagerLookup".equals( tmlImplName ) ) {
- return new JRun4JtaPlatform();
- }
-
- if ( "org.hibernate.transaction.OC4JTransactionManagerLookup".equals( tmlImplName ) ) {
- return new OC4JJtaPlatform();
- }
-
- if ( "org.hibernate.transaction.OrionTransactionManagerLookup".equals( tmlImplName ) ) {
- return new OrionJtaPlatform();
- }
-
- if ( "org.hibernate.transaction.ResinTransactionManagerLookup".equals( tmlImplName ) ) {
- return new ResinJtaPlatform();
- }
-
- if ( "org.hibernate.transaction.SunONETransactionManagerLookup".equals( tmlImplName ) ) {
- return new SunOneJtaPlatform();
- }
-
- if ( "org.hibernate.transaction.WeblogicTransactionManagerLookup".equals( tmlImplName ) ) {
- return new WeblogicJtaPlatform();
- }
-
- if ( "org.hibernate.transaction.WebSphereTransactionManagerLookup".equals( tmlImplName ) ) {
- return new WebSphereJtaPlatform();
- }
-
- if ( "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup".equals( tmlImplName ) ) {
- return new WebSphereExtendedJtaPlatform();
- }
-
- try {
- TransactionManagerLookup lookup = (TransactionManagerLookup) registry.getService( ClassLoaderService.class )
- .classForName( tmlImplName )
- .newInstance();
- return new TransactionManagerLookupBridge( lookup, JndiHelper.extractJndiProperties( configVales ) );
- }
- catch ( Exception e ) {
- throw new JtaPlatformException(
- "Unable to build " + TransactionManagerLookupBridge.class.getName() + " from specified " +
- TransactionManagerLookup.class.getName() + " implementation: " +
- tmlImplName
- );
- }
- }
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/TransactionManagerLookupBridge.java b/hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/TransactionManagerLookupBridge.java
deleted file mode 100644
index bd3889ce99..0000000000
--- a/hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/TransactionManagerLookupBridge.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2011, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.service.jta.platform.internal;
-
-import java.util.Properties;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-
-import org.hibernate.service.jndi.spi.JndiService;
-import org.hibernate.transaction.TransactionManagerLookup;
-
-/**
- * @author Steve Ebersole
- */
-public class TransactionManagerLookupBridge extends AbstractJtaPlatform {
- private final TransactionManagerLookup lookup;
- private final Properties jndiProperties;
-
- public TransactionManagerLookupBridge(TransactionManagerLookup lookup, Properties jndiProperties) {
- this.lookup = lookup;
- this.jndiProperties = jndiProperties;
- }
-
- @Override
- protected TransactionManager locateTransactionManager() {
- return lookup.getTransactionManager( jndiProperties );
- }
-
- @Override
- protected UserTransaction locateUserTransaction() {
- return (UserTransaction) serviceRegistry().getService( JndiService.class ).locate( lookup.getUserTransactionName() );
- }
-
- @Override
- public Object getTransactionIdentifier(Transaction transaction) {
- return lookup.getTransactionIdentifier( transaction );
- }
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaManagementToolInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaManagementToolInitiator.java
index 26a0ac5586..45cbbb0abb 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaManagementToolInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaManagementToolInitiator.java
@@ -25,23 +25,21 @@ package org.hibernate.service.schema.internal;
import java.util.Map;
+import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.boot.registry.selector.spi.StrategySelector;
import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.schema.spi.SchemaManagementTool;
-import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
* @author Steve Ebersole
*/
-public class SchemaManagementToolInitiator implements BasicServiceInitiator {
+public class SchemaManagementToolInitiator implements StandardServiceInitiator {
public static final SchemaManagementToolInitiator INSTANCE = new SchemaManagementToolInitiator();
public SchemaManagementTool initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
final Object setting = configurationValues.get( AvailableSettings.SCHEMA_MANAGEMENT_TOOL );
- SchemaManagementTool tool = registry.getService( ClassLoaderService.class )
- .getStrategyInstanceResolver()
- .resolveStrategyInstance( setting, SchemaManagementTool.class );
+ SchemaManagementTool tool = registry.getService( StrategySelector.class ).resolveStrategy( SchemaManagementTool.class, setting );
if ( tool == null ) {
tool = new HibernateSchemaManagementTool();
}
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java
index 52baa87f13..38c6391dc3 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java
@@ -30,9 +30,9 @@ import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.internal.CoreMessageLogger;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.metamodel.spi.MetadataImplementor;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.config.spi.ConfigurationService;
import org.hibernate.service.config.spi.StandardConverters;
import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.service.spi.SessionFactoryServiceInitiator;
@@ -107,8 +107,10 @@ public class StatisticsInitiator implements SessionFactoryServiceInitiator {
+public class ImportSqlCommandExtractorInitiator implements StandardServiceInitiator {
public static final ImportSqlCommandExtractorInitiator INSTANCE = new ImportSqlCommandExtractorInitiator();
public static final ImportSqlCommandExtractor DEFAULT_EXTRACTOR = new SingleLineSqlCommandExtractor();
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java
index 00391b6b16..411866f517 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java
@@ -28,12 +28,12 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.Properties;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
/**
* A {@link ConnectionHelper} implementation based on an internally
@@ -62,7 +62,7 @@ class ManagedProviderConnectionHelper implements ConnectionHelper {
private static StandardServiceRegistryImpl createServiceRegistry(Properties properties) {
Environment.verifyProperties( properties );
ConfigurationHelper.resolvePlaceHolders( properties );
- return (StandardServiceRegistryImpl) new ServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
+ return (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
}
public Connection getConnection() throws SQLException {
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
index d824cac3fb..2bc448ad5b 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
@@ -43,6 +43,7 @@ import java.util.Properties;
import org.jboss.logging.Logger;
import org.hibernate.HibernateException;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
@@ -60,10 +61,9 @@ import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.metamodel.spi.MetadataImplementor;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.config.spi.ConfigurationService;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.config.spi.ConfigurationService;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.schema.spi.SchemaManagementTool;
/**
@@ -553,8 +553,7 @@ public class SchemaExport {
private static StandardServiceRegistryImpl createServiceRegistry(Properties properties) {
Environment.verifyProperties( properties );
ConfigurationHelper.resolvePlaceHolders( properties );
- return ( StandardServiceRegistryImpl ) new ServiceRegistryBuilder().applySettings( properties )
- .buildServiceRegistry();
+ return (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
}
public static void main(String[] args) {
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
index 713370850d..451fae85bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
@@ -37,6 +37,7 @@ import org.jboss.logging.Logger;
import org.hibernate.HibernateException;
import org.hibernate.JDBCException;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.cfg.NamingStrategy;
@@ -50,8 +51,7 @@ import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
/**
* A commandline tool to update a database schema. May also be called from inside an application.
@@ -110,7 +110,7 @@ public class SchemaUpdate {
private static StandardServiceRegistryImpl createServiceRegistry(Properties properties) {
Environment.verifyProperties( properties );
ConfigurationHelper.resolvePlaceHolders( properties );
- return (StandardServiceRegistryImpl) new ServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
+ return (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
}
public static void main(String[] args) {
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
index af64cfa563..8a748cffdc 100755
--- a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
@@ -31,6 +31,7 @@ import java.util.Properties;
import org.jboss.logging.Logger;
import org.hibernate.HibernateException;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.cfg.NamingStrategy;
@@ -40,8 +41,7 @@ import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
/**
* A commandline tool to update a database schema. May also be called from
@@ -79,7 +79,7 @@ public class SchemaValidator {
private static StandardServiceRegistryImpl createServiceRegistry(Properties properties) {
Environment.verifyProperties( properties );
ConfigurationHelper.resolvePlaceHolders( properties );
- return (StandardServiceRegistryImpl) new ServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
+ return (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
}
public static void main(String[] args) {
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java
index 8dd589ae43..b98f550629 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java
@@ -28,7 +28,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
/**
* A {@link ConnectionHelper} implementation based on a provided
diff --git a/hibernate-core/src/main/java/org/hibernate/transaction/TransactionManagerLookup.java b/hibernate-core/src/main/java/org/hibernate/transaction/TransactionManagerLookup.java
deleted file mode 100644
index 2656ae938f..0000000000
--- a/hibernate-core/src/main/java/org/hibernate/transaction/TransactionManagerLookup.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate.transaction;
-import java.util.Properties;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-import org.hibernate.HibernateException;
-
-/**
- * Contract for locating the JTA {@link TransactionManager} on given platform.
- *
- * NOTE: this contract has expanded over time, and basically is a platform
- * abstraction contract for JTA-related information.
- *
- * @author Gavin King
- */
-public interface TransactionManagerLookup {
-
- /**
- * Obtain the JTA {@link TransactionManager}.
- *
- * @param props The configuration properties.
- * @return The JTA {@link TransactionManager}.
- *
- * @throws HibernateException Indicates problem locating {@link TransactionManager}.
- */
- public TransactionManager getTransactionManager(Properties props) throws HibernateException;
-
- /**
- * Return the JNDI namespace of the JTA
- * {@link javax.transaction.UserTransaction} for this platform or null ;
- * optional operation.
- *
- * @return The JNDI namespace where we can locate the
- * {@link javax.transaction.UserTransaction} for this platform.
- */
- public String getUserTransactionName();
-
- /**
- * Determine an identifier for the given transaction appropriate for use in caching/lookup usages.
- *
- * Generally speaking the transaction itself will be returned here. This method was added specifically
- * for use in WebSphere and other unfriendly JEE containers (although WebSphere is still the only known
- * such brain-dead, sales-driven impl).
- *
- * @param transaction The transaction to be identified.
- * @return An appropropriate identifier
- */
- public Object getTransactionIdentifier(Transaction transaction);
-}
-
diff --git a/hibernate-core/src/main/java/org/hibernate/transaction/package.html b/hibernate-core/src/main/java/org/hibernate/transaction/package.html
deleted file mode 100755
index 895501cfc1..0000000000
--- a/hibernate-core/src/main/java/org/hibernate/transaction/package.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
- This package abstracts the underlying transaction mechanism
- (JTA or JDBC) and provides strategies for obtaining application
- server TransactionManager s.
-
-
-
diff --git a/hibernate-core/src/main/java/org/hibernate/type/EnumType.java b/hibernate-core/src/main/java/org/hibernate/type/EnumType.java
index bf5e984fa9..0cf1a17d5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/EnumType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/EnumType.java
@@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * Copyright (c) 2008, 2012, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
+ * distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
@@ -23,6 +23,8 @@
*/
package org.hibernate.type;
+import javax.persistence.Enumerated;
+import javax.persistence.MapKeyEnumerated;
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.sql.PreparedStatement;
@@ -30,165 +32,155 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
import java.util.Properties;
-import javax.persistence.Enumerated;
-import javax.persistence.MapKeyEnumerated;
import org.jboss.logging.Logger;
import org.hibernate.AssertionFailure;
import org.hibernate.HibernateException;
import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.ReflectHelper;
+import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.usertype.DynamicParameterizedType;
import org.hibernate.usertype.EnhancedUserType;
/**
- * Enum type mapper
- * Try and find the appropriate SQL type depending on column metadata
- *
- * TODO implements readobject/writeobject to recalculate the enumclasses
+ * Value type mapper for enumerations.
+ *
+ * Generally speaking, the proper configuration is picked up from the annotations associated with the mapped attribute.
+ *
+ * There are a few configuration parameters understood by this type mapper:
+ *
+ * enumClass - Names the enumeration class.
+ *
+ *
+ * useNamed - Should enum be mapped via name. Default is to map as ordinal. Used when
+ * annotations are not used (otherwise {@link javax.persistence.EnumType} is used).
+ *
+ *
+ * type - Identifies the JDBC type (via type code) to be used for the column.
+ *
+ *
*
* @author Emmanuel Bernard
* @author Hardy Ferentschik
+ * @author Steve Ebersole
*/
@SuppressWarnings("unchecked")
public class EnumType implements EnhancedUserType, DynamicParameterizedType, Serializable {
-
- private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, EnumType.class.getName());
+ private static final Logger LOG = Logger.getLogger( EnumType.class.getName() );
public static final String ENUM = "enumClass";
- public static final String SCHEMA = "schema";
- public static final String CATALOG = "catalog";
- public static final String TABLE = "table";
- public static final String COLUMN = "column";
+ public static final String NAMED = "useNamed";
public static final String TYPE = "type";
private Class enumClass;
- private transient Object[] enumValues;
- private int sqlType = Types.INTEGER; //before any guessing
+ private EnumValueMapper enumValueMapper;
+ private int sqlType = Types.INTEGER; // before any guessing
+ @Override
public int[] sqlTypes() {
return new int[] { sqlType };
}
+ @Override
public Class returnedClass() {
return enumClass;
}
+ @Override
public boolean equals(Object x, Object y) throws HibernateException {
return x == y;
}
+ @Override
public int hashCode(Object x) throws HibernateException {
return x == null ? 0 : x.hashCode();
}
-
- public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException {
- Object object = rs.getObject( names[0] );
- if ( rs.wasNull() ) {
- if ( LOG.isTraceEnabled() ) LOG.tracev( "Returning null as column {0}", names[0] );
- return null;
+ @Override
+ public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws SQLException {
+ if ( enumValueMapper == null ) {
+ guessTypeOfEnumValueMapper( rs.getMetaData().getColumnType( rs.findColumn( names[0] ) ) );
}
- if ( object instanceof Number ) {
- initEnumValues();
- int ordinal = ( ( Number ) object ).intValue();
- if (ordinal < 0 || ordinal >= enumValues.length) throw new IllegalArgumentException("Unknown ordinal value for enum "
- + enumClass + ": " + ordinal);
- if ( LOG.isTraceEnabled() ) LOG.tracev( "Returning '{0}' as column {1}", ordinal, names[0] );
- return enumValues[ordinal];
+ return enumValueMapper.getValue( rs, names );
+ }
+
+ private void guessTypeOfEnumValueMapper(int columnType) {
+ // fallback for cases where not enough parameter/parameterization information was passed in
+ if ( isOrdinal( columnType ) ) {
+ treatAsOrdinal();
}
else {
- String name = ( String ) object;
- if ( LOG.isTraceEnabled() ) LOG.tracev( "Returning '{0}' as column {1}", name, names[0] );
- try {
- return Enum.valueOf( enumClass, name );
- }
- catch ( IllegalArgumentException iae ) {
- throw new IllegalArgumentException( "Unknown name value for enum " + enumClass + ": " + name, iae );
- }
+ treatAsNamed();
}
}
+ @Override
public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException {
- if ( value == null ) {
- if ( LOG.isTraceEnabled() ) LOG.tracev( "Binding null to parameter: {0}", index );
- st.setNull( index, sqlType );
- }
- else {
- boolean isOrdinal = isOrdinal( sqlType );
- if ( isOrdinal ) {
- int ordinal = ( ( Enum ) value ).ordinal();
- if ( LOG.isTraceEnabled() ) LOG.tracev( "Binding '{0}' to parameter: '{1}", ordinal, index );
- st.setObject( index, Integer.valueOf( ordinal ), sqlType );
- }
- else {
- String enumString = ( ( Enum ) value ).name();
- if ( LOG.isTraceEnabled() ) LOG.tracev( "Binding '{0}' to parameter: {1}", enumString, index );
- st.setObject( index, enumString, sqlType );
- }
- }
- }
-
- private boolean isOrdinal(int paramType) {
- switch ( paramType ) {
- case Types.INTEGER:
- case Types.NUMERIC:
- case Types.SMALLINT:
- case Types.TINYINT:
- case Types.BIGINT:
- case Types.DECIMAL: //for Oracle Driver
- case Types.DOUBLE: //for Oracle Driver
- case Types.FLOAT: //for Oracle Driver
- return true;
- case Types.CHAR:
- case Types.LONGVARCHAR:
- case Types.VARCHAR:
- return false;
- default:
- throw new HibernateException( "Unable to persist an Enum in a column of SQL Type: " + paramType );
+ if ( enumValueMapper == null ) {
+ guessTypeOfEnumValueMapper( st.getParameterMetaData().getParameterType( index ) );
}
+ enumValueMapper.setValue( st, (Enum) value, index );
}
+ @Override
public Object deepCopy(Object value) throws HibernateException {
return value;
}
+ @Override
public boolean isMutable() {
return false;
}
+ @Override
public Serializable disassemble(Object value) throws HibernateException {
return ( Serializable ) value;
}
+ @Override
public Object assemble(Serializable cached, Object owner) throws HibernateException {
return cached;
}
+ @Override
public Object replace(Object original, Object target, Object owner) throws HibernateException {
return original;
}
+ @Override
public void setParameterValues(Properties parameters) {
- ParameterType reader = (ParameterType) parameters.get( PARAMETER_TYPE );
+ final ParameterType reader = (ParameterType) parameters.get( PARAMETER_TYPE );
+
+ // IMPL NOTE : be protective about not setting enumValueMapper (i.e. calling treatAsNamed/treatAsOrdinal)
+ // in cases where we do not have enough information. In such cases the `if` check in nullSafeGet/nullSafeSet
+ // will kick in to query against the JDBC metadata to make that determination.
if ( reader != null ) {
enumClass = reader.getReturnedClass().asSubclass( Enum.class );
- javax.persistence.EnumType enumType = getEnumType( reader );
- if ( enumType != null ) {
- if ( javax.persistence.EnumType.ORDINAL.equals( enumType ) ) {
- sqlType = Types.INTEGER;
- }
- else if ( javax.persistence.EnumType.STRING.equals( enumType ) ) {
- sqlType = Types.VARCHAR;
- }
- else {
- throw new AssertionFailure( "Unknown EnumType: " + enumType );
- }
+ final boolean isOrdinal;
+ final javax.persistence.EnumType enumType = getEnumType( reader );
+ if ( enumType == null ) {
+ isOrdinal = true;
}
+ else if ( javax.persistence.EnumType.ORDINAL.equals( enumType ) ) {
+ isOrdinal = true;
+ }
+ else if ( javax.persistence.EnumType.STRING.equals( enumType ) ) {
+ isOrdinal = false;
+ }
+ else {
+ throw new AssertionFailure( "Unknown EnumType: " + enumType );
+ }
+
+ if ( isOrdinal ) {
+ treatAsOrdinal();
+ }
+ else {
+ treatAsNamed();
+ }
+ sqlType = enumValueMapper.getSqlType();
}
else {
String enumClassName = (String) parameters.get( ENUM );
@@ -199,63 +191,34 @@ public class EnumType implements EnhancedUserType, DynamicParameterizedType, Ser
throw new HibernateException( "Enum class not found", exception );
}
- String type = (String) parameters.get( TYPE );
- if ( type != null ) {
- sqlType = Integer.decode( type );
+ final Object useNamedSetting = parameters.get( NAMED );
+ if ( useNamedSetting != null ) {
+ final boolean useNamed = ConfigurationHelper.getBoolean( NAMED, parameters );
+ if ( useNamed ) {
+ treatAsNamed();
+ }
+ else {
+ treatAsOrdinal();
+ }
+ sqlType = enumValueMapper.getSqlType();
}
}
+
+ final String type = (String) parameters.get( TYPE );
+ if ( type != null ) {
+ sqlType = Integer.decode( type );
+ }
}
- /**
- * Lazy init of {@link #enumValues}.
- */
- private void initEnumValues() {
- if ( enumValues == null ) {
- this.enumValues = enumClass.getEnumConstants();
- if ( enumValues == null ) {
- throw new NullPointerException( "Failed to init enumValues" );
- }
+ private void treatAsOrdinal() {
+ if ( enumValueMapper == null || ! OrdinalEnumValueMapper.class.isInstance( enumValueMapper ) ) {
+ enumValueMapper = new OrdinalEnumValueMapper();
}
}
- public String objectToSQLString(Object value) {
- boolean isOrdinal = isOrdinal( sqlType );
- if ( isOrdinal ) {
- int ordinal = ( ( Enum ) value ).ordinal();
- return Integer.toString( ordinal );
- }
- else {
- return '\'' + ( ( Enum ) value ).name() + '\'';
- }
- }
-
- public String toXMLString(Object value) {
- boolean isOrdinal = isOrdinal( sqlType );
- if ( isOrdinal ) {
- int ordinal = ( ( Enum ) value ).ordinal();
- return Integer.toString( ordinal );
- }
- else {
- return ( ( Enum ) value ).name();
- }
- }
-
- public Object fromXMLString(String xmlValue) {
- try {
- int ordinal = Integer.parseInt( xmlValue );
- initEnumValues();
- if ( ordinal < 0 || ordinal >= enumValues.length ) {
- throw new IllegalArgumentException( "Unknown ordinal value for enum " + enumClass + ": " + ordinal );
- }
- return enumValues[ordinal];
- }
- catch ( NumberFormatException e ) {
- try {
- return Enum.valueOf( enumClass, xmlValue );
- }
- catch ( IllegalArgumentException iae ) {
- throw new IllegalArgumentException( "Unknown name value for enum " + enumClass + ": " + xmlValue, iae );
- }
+ private void treatAsNamed() {
+ if ( enumValueMapper == null || ! NamedEnumValueMapper.class.isInstance( enumValueMapper ) ) {
+ enumValueMapper = new NamedEnumValueMapper();
}
}
@@ -284,4 +247,202 @@ public class EnumType implements EnhancedUserType, DynamicParameterizedType, Ser
}
return null;
}
+
+ @Override
+ public String objectToSQLString(Object value) {
+ return enumValueMapper.objectToSQLString( (Enum) value );
+ }
+
+ @Override
+ public String toXMLString(Object value) {
+ return enumValueMapper.toXMLString( (Enum) value );
+ }
+
+ @Override
+ public Object fromXMLString(String xmlValue) {
+ return enumValueMapper.fromXMLString( xmlValue );
+ }
+
+ private static interface EnumValueMapper {
+ public int getSqlType();
+ public Enum getValue(ResultSet rs, String[] names) throws SQLException;
+ public void setValue(PreparedStatement st, Enum value, int index) throws SQLException;
+
+ public String objectToSQLString(Enum value);
+ public String toXMLString(Enum value);
+ public Enum fromXMLString(String xml);
+ }
+
+ public abstract class EnumValueMapperSupport implements EnumValueMapper {
+ protected abstract Object extractJdbcValue(Enum value);
+
+ @Override
+ public void setValue(PreparedStatement st, Enum value, int index) throws SQLException {
+ final Object jdbcValue = value == null ? null : extractJdbcValue( value );
+
+ if ( jdbcValue == null ) {
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracev( "Binding null to parameter: {0}", index );
+ }
+ st.setNull( index, getSqlType() );
+ return;
+ }
+
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracev( "Binding '{0}' to parameter: '{1}", jdbcValue, index );
+ }
+ st.setObject( index, jdbcValue, EnumType.this.sqlType );
+ }
+ }
+
+ private class OrdinalEnumValueMapper extends EnumValueMapperSupport implements EnumValueMapper {
+ private transient Enum[] enumsByOrdinal;
+
+ @Override
+ public int getSqlType() {
+ return Types.INTEGER;
+ }
+
+ @Override
+ public Enum getValue(ResultSet rs, String[] names) throws SQLException {
+ final int ordinal = rs.getInt( names[0] );
+ if ( rs.wasNull() ) {
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracev( "Returning null as column {0}", names[0] );
+ }
+ return null;
+ }
+
+ final Enum enumValue = fromOrdinal( ordinal );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracev( "Returning '{0}' as column {1}", enumValue, names[0] );
+ }
+ return enumValue;
+ }
+
+ private Enum fromOrdinal(int ordinal) {
+ final Enum[] enumsByOrdinal = enumsByOrdinal();
+ if ( ordinal < 0 || ordinal >= enumsByOrdinal.length ) {
+ throw new IllegalArgumentException(
+ String.format(
+ "Unknown ordinal value [%s] for enum class [%s]",
+ ordinal,
+ enumClass.getName()
+ )
+ );
+ }
+ return enumsByOrdinal[ordinal];
+
+ }
+
+ private Enum[] enumsByOrdinal() {
+ if ( enumsByOrdinal == null ) {
+ enumsByOrdinal = enumClass.getEnumConstants();
+ if ( enumsByOrdinal == null ) {
+ throw new HibernateException( "Failed to init enum values" );
+ }
+ }
+ return enumsByOrdinal;
+ }
+
+ @Override
+ public String objectToSQLString(Enum value) {
+ return toXMLString( value );
+ }
+
+ @Override
+ public String toXMLString(Enum value) {
+ return Integer.toString( value.ordinal() );
+ }
+
+ @Override
+ public Enum fromXMLString(String xml) {
+ return fromOrdinal( Integer.parseInt( xml ) );
+ }
+
+ @Override
+ protected Object extractJdbcValue(Enum value) {
+ return value.ordinal();
+ }
+ }
+
+ private class NamedEnumValueMapper extends EnumValueMapperSupport implements EnumValueMapper {
+ @Override
+ public int getSqlType() {
+ return Types.VARCHAR;
+ }
+
+ @Override
+ public Enum getValue(ResultSet rs, String[] names) throws SQLException {
+ final String value = rs.getString( names[0] );
+
+ if ( rs.wasNull() ) {
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracev( "Returning null as column {0}", names[0] );
+ }
+ return null;
+ }
+
+ final Enum enumValue = fromName( value );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracev( "Returning '{0}' as column {1}", enumValue, names[0] );
+ }
+ return enumValue;
+ }
+
+ private Enum fromName(String name) {
+ try {
+ return Enum.valueOf( enumClass, name );
+ }
+ catch ( IllegalArgumentException iae ) {
+ throw new IllegalArgumentException(
+ String.format(
+ "Unknown name value [%s] for enum class [%s]",
+ name,
+ enumClass.getName()
+ )
+ );
+ }
+ }
+
+ @Override
+ public String objectToSQLString(Enum value) {
+ return '\'' + toXMLString( value ) + '\'';
+ }
+
+ @Override
+ public String toXMLString(Enum value) {
+ return value.name();
+ }
+
+ @Override
+ public Enum fromXMLString(String xml) {
+ return fromName( xml );
+ }
+
+ @Override
+ protected Object extractJdbcValue(Enum value) {
+ return value.name();
+ }
+ }
+
+ private boolean isOrdinal(int paramType) {
+ switch ( paramType ) {
+ case Types.INTEGER:
+ case Types.NUMERIC:
+ case Types.SMALLINT:
+ case Types.TINYINT:
+ case Types.BIGINT:
+ case Types.DECIMAL: //for Oracle Driver
+ case Types.DOUBLE: //for Oracle Driver
+ case Types.FLOAT: //for Oracle Driver
+ return true;
+ case Types.CHAR:
+ case Types.LONGVARCHAR:
+ case Types.VARCHAR:
+ return false;
+ default:
+ throw new HibernateException( "Unable to persist an Enum in a column of SQL Type: " + paramType );
+ }
+ }
}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/SerializableToBlobType.java b/hibernate-core/src/main/java/org/hibernate/type/SerializableToBlobType.java
index d11ea335a0..e7eb70ebe7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/SerializableToBlobType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/SerializableToBlobType.java
@@ -34,7 +34,6 @@ import java.util.Map;
import java.util.Properties;
import org.dom4j.Node;
-
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
import org.hibernate.MappingException;
@@ -43,14 +42,14 @@ import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.SessionImplementor;
import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.internal.util.SerializationHelper;
-import org.hibernate.usertype.ParameterizedType;
+import org.hibernate.usertype.DynamicParameterizedType;
/**
* @author Emmanuel Bernard
*/
-public class SerializableToBlobType extends AbstractLobType implements ParameterizedType {
+public class SerializableToBlobType extends AbstractLobType implements DynamicParameterizedType {
/**
- * class name of the serialisable class
+ * class name of the serialisable class
*/
public static final String CLASS_NAME = "classname";
private Class serializableClass;
@@ -138,17 +137,19 @@ public class SerializableToBlobType extends AbstractLobType implements Parameter
}
public void setParameterValues(Properties parameters) {
- if ( parameters != null ) {
+ ParameterType reader = (ParameterType) parameters.get( PARAMETER_TYPE );
+ if ( reader != null ) {
+ serializableClass = reader.getReturnedClass();
+ }
+ else {
String className = parameters.getProperty( CLASS_NAME );
if ( className == null ) {
- throw new MappingException(
- "No class name defined for type: " + SerializableToBlobType.class.getName()
- );
+ throw new MappingException( "No class name defined for type: " + SerializableToBlobType.class.getName() );
}
try {
serializableClass = ReflectHelper.classForName( className );
}
- catch (ClassNotFoundException e) {
+ catch ( ClassNotFoundException e ) {
throw new MappingException( "Unable to load class from " + CLASS_NAME + " parameter", e );
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/DynamicParameterizedType.java b/hibernate-core/src/main/java/org/hibernate/usertype/DynamicParameterizedType.java
index 6b072c3611..07043eda19 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/DynamicParameterizedType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/DynamicParameterizedType.java
@@ -1,10 +1,31 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
package org.hibernate.usertype;
import java.lang.annotation.Annotation;
/**
- * {@inheritDoc}
- *
* Types who implements this interface will have in the setParameterValues an
* instance of the class DynamicParameterizedType$ParameterType instead of
* the key PARAMETER_TYPE = "org.hibernate.type.ParameterType"
diff --git a/hibernate-core/src/test/java/org/hibernate/cfg/beanvalidation/ApplySchemaConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/cfg/beanvalidation/ApplySchemaConstraintTest.java
index f3dda7a149..ff1eed36b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/cfg/beanvalidation/ApplySchemaConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/cfg/beanvalidation/ApplySchemaConstraintTest.java
@@ -36,6 +36,10 @@ import javax.validation.constraints.NotNull;
import org.junit.Before;
import org.junit.Test;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.spi.MetadataImplementor;
import org.hibernate.metamodel.spi.binding.AttributeBinding;
@@ -45,11 +49,7 @@ import org.hibernate.metamodel.spi.binding.RelationalValueBinding;
import org.hibernate.metamodel.spi.relational.Column;
import org.hibernate.metamodel.spi.relational.Size;
import org.hibernate.metamodel.spi.relational.Value;
-import org.hibernate.service.BootstrapServiceRegistry;
-import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.validator.constraints.Length;
import static junit.framework.Assert.assertEquals;
@@ -160,7 +160,7 @@ public class ApplySchemaConstraintTest {
private StandardServiceRegistryImpl createServiceRegistry() {
final BootstrapServiceRegistryBuilder builder = new BootstrapServiceRegistryBuilder();
final BootstrapServiceRegistry bootstrapServiceRegistry = builder.build();
- ServiceRegistryBuilder registryBuilder = new ServiceRegistryBuilder( bootstrapServiceRegistry );
+ StandardServiceRegistryBuilder registryBuilder = new StandardServiceRegistryBuilder( bootstrapServiceRegistry );
return ( StandardServiceRegistryImpl ) registryBuilder.buildServiceRegistry();
}
diff --git a/hibernate-core/src/test/java/org/hibernate/connection/PropertiesTest.java b/hibernate-core/src/test/java/org/hibernate/connection/PropertiesTest.java
index c1a0e70f7f..1ae674536b 100644
--- a/hibernate-core/src/test/java/org/hibernate/connection/PropertiesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/connection/PropertiesTest.java
@@ -27,7 +27,7 @@ import java.util.Properties;
import org.junit.Assert;
import org.junit.Test;
-import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator;
+import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator;
import org.hibernate.testing.junit4.BaseUnitTestCase;
/**
diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/TestingDialects.java b/hibernate-core/src/test/java/org/hibernate/dialect/TestingDialects.java
index dd440c5deb..8c7bb01edf 100644
--- a/hibernate-core/src/test/java/org/hibernate/dialect/TestingDialects.java
+++ b/hibernate-core/src/test/java/org/hibernate/dialect/TestingDialects.java
@@ -26,8 +26,8 @@ import java.sql.DatabaseMetaData;
import java.sql.SQLException;
import org.hibernate.HibernateException;
-import org.hibernate.service.jdbc.dialect.internal.AbstractDialectResolver;
-import org.hibernate.service.jdbc.dialect.internal.BasicDialectResolver;
+import org.hibernate.engine.jdbc.dialect.internal.AbstractDialectResolver;
+import org.hibernate.engine.jdbc.dialect.internal.BasicDialectResolver;
/**
* @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java
index 4d763ff5a5..f166212290 100644
--- a/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java
@@ -29,10 +29,11 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.junit.Before;
-import org.junit.Test;
-
import org.hibernate.HibernateException;
+import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
+import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
+import org.hibernate.boot.registry.selector.internal.StrategySelectorBuilder;
+import org.hibernate.boot.registry.selector.spi.StrategySelectionException;
import org.hibernate.cfg.Environment;
import org.hibernate.dialect.DB2400Dialect;
import org.hibernate.dialect.DB2Dialect;
@@ -55,12 +56,14 @@ import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseAnywhereDialect;
import org.hibernate.dialect.TestingDialects;
-import org.hibernate.service.classloading.internal.ClassLoaderServiceImpl;
-import org.hibernate.service.classloading.spi.ClassLoadingException;
-import org.hibernate.service.jdbc.dialect.internal.DialectFactoryImpl;
-import org.hibernate.service.jdbc.dialect.internal.DialectResolverSet;
-import org.hibernate.service.jdbc.dialect.internal.StandardDialectResolver;
-import org.hibernate.service.jdbc.dialect.spi.DialectResolver;
+import org.hibernate.engine.jdbc.dialect.internal.DialectFactoryImpl;
+import org.hibernate.engine.jdbc.dialect.internal.DialectResolverSet;
+import org.hibernate.engine.jdbc.dialect.internal.StandardDialectResolver;
+import org.hibernate.engine.jdbc.dialect.spi.DialectResolver;
+
+import org.junit.Before;
+import org.junit.Test;
+
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static org.junit.Assert.assertEquals;
@@ -76,10 +79,23 @@ public class DialectFactoryTest extends BaseUnitTestCase {
@Before
public void setUp() {
dialectFactory = new DialectFactoryImpl();
- dialectFactory.setClassLoaderService( new ClassLoaderServiceImpl( getClass().getClassLoader() ) );
+ dialectFactory.setStrategySelector(
+ new StrategySelectorBuilder().buildSelector( new ClassLoaderServiceImpl( getClass().getClassLoader() ) )
+ );
dialectFactory.setDialectResolver( new StandardDialectResolver() );
}
+ @Test
+ public void testExplicitShortNameUse() {
+ final Map configValues = new HashMap();
+
+ configValues.put( Environment.DIALECT, "H2" );
+ assertEquals( H2Dialect.class, dialectFactory.buildDialect( configValues, null ).getClass() );
+
+ configValues.put( Environment.DIALECT, "Oracle10g" );
+ assertEquals( Oracle10gDialect.class, dialectFactory.buildDialect( configValues, null ).getClass() );
+ }
+
@Test
public void testExplicitlySuppliedDialectClassName() {
final Map configValues = new HashMap();
@@ -93,7 +109,7 @@ public class DialectFactoryTest extends BaseUnitTestCase {
fail();
}
catch ( HibernateException e ) {
- assertEquals( "unexpected exception type", ClassLoadingException.class, e.getCause().getClass() );
+ assertEquals( "unexpected exception type", StrategySelectionException.class, e.getClass() );
}
configValues.put( Environment.DIALECT, "java.lang.Object" );
diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectResolverTest.java b/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectResolverTest.java
index ae774dcb61..ba49a7e109 100644
--- a/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectResolverTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectResolverTest.java
@@ -30,9 +30,9 @@ import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.Mocks;
import org.hibernate.dialect.TestingDialects;
import org.hibernate.exception.JDBCConnectionException;
-import org.hibernate.service.jdbc.dialect.internal.BasicDialectResolver;
-import org.hibernate.service.jdbc.dialect.internal.DialectResolverSet;
-import org.hibernate.service.jdbc.dialect.spi.DialectResolver;
+import org.hibernate.engine.jdbc.dialect.internal.BasicDialectResolver;
+import org.hibernate.engine.jdbc.dialect.internal.DialectResolverSet;
+import org.hibernate.engine.jdbc.dialect.spi.DialectResolver;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static org.junit.Assert.assertEquals;
diff --git a/hibernate-core/src/test/java/org/hibernate/jmx/Entity.java b/hibernate-core/src/test/java/org/hibernate/jmx/Entity.java
deleted file mode 100644
index 035a2dddb7..0000000000
--- a/hibernate-core/src/test/java/org/hibernate/jmx/Entity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.hibernate.jmx;
-
-
-/**
- * {@inheritDoc}
- *
- * @author Steve Ebersole
- */
-public class Entity {
- private Long id;
- private String name;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/MetadataImplTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/MetadataImplTest.java
index ceb0620573..2d92c01057 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/MetadataImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/MetadataImplTest.java
@@ -29,13 +29,14 @@ import org.junit.Test;
import org.hibernate.HibernateException;
import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.metamodel.Metadata;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.SessionFactoryBuilder;
+import org.hibernate.metamodel.spi.binding.FetchProfile;
import org.hibernate.metamodel.internal.MetadataImpl;
import org.hibernate.metamodel.internal.SessionFactoryBuilderImpl;
-import org.hibernate.metamodel.spi.binding.FetchProfile;
-import org.hibernate.service.ServiceRegistryBuilder;
+
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static junit.framework.Assert.assertEquals;
@@ -50,29 +51,29 @@ public class MetadataImplTest extends BaseUnitTestCase {
@Test(expected = IllegalArgumentException.class)
public void testAddingNullClass() {
- MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
+ MetadataSources sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
sources.addClass( null );
sources.buildMetadata();
}
@Test(expected = IllegalArgumentException.class)
public void testAddingNullPackageName() {
- MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
+ MetadataSources sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
sources.addPackage( null );
sources.buildMetadata();
}
@Test(expected = HibernateException.class)
public void testAddingNonExistingPackageName() {
- MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
+ MetadataSources sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
sources.addPackage( "not.a.package" );
sources.buildMetadata();
}
@Test
public void testAddingPackageName() {
- MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
- sources.addPackage( MetadataImplTest.class.getPackage().getName() );
+ MetadataSources sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
+ sources.addPackage( "org.hibernate.metamodel.source.internal" );
MetadataImpl metadata = (MetadataImpl) sources.buildMetadata();
assertFetchProfile( metadata );
@@ -80,8 +81,8 @@ public class MetadataImplTest extends BaseUnitTestCase {
@Test
public void testAddingPackageNameWithTrailingDot() {
- MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
- sources.addPackage( MetadataImplTest.class.getPackage().getName() + "." );
+ MetadataSources sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
+ sources.addPackage( "org.hibernate.metamodel.source.internal." );
MetadataImpl metadata = (MetadataImpl) sources.buildMetadata();
assertFetchProfile( metadata );
@@ -89,7 +90,7 @@ public class MetadataImplTest extends BaseUnitTestCase {
@Test
public void testGettingSessionFactoryBuilder() {
- MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
+ MetadataSources sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
Metadata metadata = sources.buildMetadata();
SessionFactoryBuilder sessionFactoryBuilder = metadata.getSessionFactoryBuilder();
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/SessionFactoryBuilderImplTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/SessionFactoryBuilderImplTest.java
index cb5230ec7c..6676fbcde8 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/SessionFactoryBuilderImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/SessionFactoryBuilderImplTest.java
@@ -35,12 +35,13 @@ import org.hibernate.Interceptor;
import org.hibernate.ObjectNotFoundException;
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.SessionFactoryBuilder;
import org.hibernate.metamodel.internal.MetadataImpl;
import org.hibernate.metamodel.internal.SessionFactoryBuilderImpl;
import org.hibernate.proxy.EntityNotFoundDelegate;
-import org.hibernate.service.ServiceRegistryBuilder;
+
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.type.Type;
@@ -90,7 +91,7 @@ public class SessionFactoryBuilderImplTest extends BaseUnitTestCase {
}
private SessionFactoryBuilder getSessionFactoryBuilder() {
- MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
+ MetadataSources sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
sources.addAnnotatedClass( SimpleEntity.class );
MetadataImpl metadata = (MetadataImpl) sources.buildMetadata();
return metadata.getSessionFactoryBuilder();
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/IdentifierGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/IdentifierGeneratorTest.java
index 180d9b4f8c..24241bb453 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/IdentifierGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/IdentifierGeneratorTest.java
@@ -24,14 +24,20 @@
package org.hibernate.metamodel.internal.source.annotations.entity;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
-import org.junit.Test;
-
import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.dialect.H2Dialect;
import org.hibernate.id.Assigned;
import org.hibernate.id.IdentifierGenerator;
import org.hibernate.id.IdentityGenerator;
@@ -42,19 +48,16 @@ import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.spi.binding.EntityBinding;
import org.hibernate.metamodel.spi.binding.EntityIdentifier;
import org.hibernate.metamodel.spi.source.MappingException;
-import org.hibernate.service.ServiceRegistryBuilder;
+import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.junit4.BaseAnnotationBindingTestCase;
import org.hibernate.testing.junit4.Resources;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import org.junit.Test;
/**
* @author Hardy Ferentschik
*/
+@RequiresDialect(H2Dialect.class)
public class IdentifierGeneratorTest extends BaseAnnotationBindingTestCase {
@Entity
class NoGenerationEntity {
@@ -149,7 +152,7 @@ public class IdentifierGeneratorTest extends BaseAnnotationBindingTestCase {
@Test
public void testUndefinedGenerator() {
try {
- sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
+ sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
sources.addAnnotatedClass( NamedGeneratorEntity.class );
sources.buildMetadata();
fail();
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/MapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/MapsIdTest.java
index 53ee398a38..2dcd2fe572 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/MapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/MapsIdTest.java
@@ -33,11 +33,11 @@ import javax.persistence.OneToMany;
import org.junit.Test;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.spi.source.MappingException;
-import org.hibernate.service.ServiceRegistryBuilder;
+
import org.hibernate.testing.junit4.BaseAnnotationBindingTestCase;
-import org.hibernate.testing.junit4.Resources;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
@@ -72,10 +72,9 @@ public class MapsIdTest extends BaseAnnotationBindingTestCase {
}
@Test
- @Resources(annotatedClasses = { })
public void testMapsIsOnOneToManyThrowsException() {
try {
- sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
+ sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
sources.addAnnotatedClass( DependentId.class );
sources.addAnnotatedClass( Dependent.class );
sources.addAnnotatedClass( Employee.class );
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileBinderTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileBinderTest.java
index a6c98a618e..614a88f973 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileBinderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileBinderTest.java
@@ -34,13 +34,14 @@ import org.hibernate.MappingException;
import org.hibernate.annotations.FetchMode;
import org.hibernate.annotations.FetchProfile;
import org.hibernate.annotations.FetchProfiles;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.metamodel.MetadataSources;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.metamodel.internal.MetadataImpl;
import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContextImpl;
import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static junit.framework.Assert.fail;
@@ -58,7 +59,7 @@ public class FetchProfileBinderTest extends BaseUnitTestCase {
@Before
public void setUp() {
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder().buildServiceRegistry();
service = serviceRegistry.getService( ClassLoaderService.class );
meta = (MetadataImpl) new MetadataSources( serviceRegistry ).buildMetadata();
}
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/QueryBinderTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/QueryBinderTest.java
index da888279e1..a92dacfb91 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/QueryBinderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/QueryBinderTest.java
@@ -30,17 +30,18 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.NotYetImplementedException;
import org.hibernate.engine.query.spi.sql.NativeSQLQueryReturn;
import org.hibernate.engine.query.spi.sql.NativeSQLQueryRootReturn;
import org.hibernate.engine.spi.NamedSQLQueryDefinition;
import org.hibernate.metamodel.MetadataSources;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.metamodel.internal.MetadataImpl;
import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContextImpl;
import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static junit.framework.Assert.assertEquals;
@@ -51,14 +52,13 @@ import static junit.framework.Assert.assertTrue;
* @author Hardy Ferentschik
*/
public class QueryBinderTest extends BaseUnitTestCase {
-
private StandardServiceRegistryImpl serviceRegistry;
private ClassLoaderService service;
private MetadataImpl meta;
@Before
public void setUp() {
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder().buildServiceRegistry();
service = serviceRegistry.getService( ClassLoaderService.class );
meta = (MetadataImpl) new MetadataSources( serviceRegistry ).buildMetadata();
}
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/BaseAnnotationIndexTestCase.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/BaseAnnotationIndexTestCase.java
index 48b019dc9a..07b7477124 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/BaseAnnotationIndexTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/BaseAnnotationIndexTestCase.java
@@ -31,14 +31,15 @@ import org.junit.After;
import org.junit.Before;
import org.hibernate.metamodel.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.metamodel.internal.MetadataImpl;
import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContext;
import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContextImpl;
import org.hibernate.metamodel.internal.source.annotations.entity.EmbeddableHierarchy;
import org.hibernate.metamodel.spi.binding.SingularAttributeBinding;
import org.hibernate.metamodel.spi.source.EntityHierarchy;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
+
import org.hibernate.testing.junit4.BaseUnitTestCase;
/**
@@ -49,7 +50,7 @@ public abstract class BaseAnnotationIndexTestCase extends BaseUnitTestCase {
@Before
public void setUp() {
- MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
+ MetadataSources sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
meta = (MetadataImpl) sources.buildMetadata();
}
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelperTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelperTest.java
index e78fac1ef8..af5d368f70 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelperTest.java
@@ -43,9 +43,9 @@ import org.junit.Test;
import org.hibernate.AssertionFailure;
import org.hibernate.annotations.NamedNativeQuery;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static junit.framework.Assert.assertTrue;
@@ -64,7 +64,7 @@ public class JandexHelperTest extends BaseUnitTestCase {
@Before
public void setUp() {
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder().buildServiceRegistry();
classLoaderService = serviceRegistry.getService( ClassLoaderService.class );
}
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/OrmXmlParserTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/OrmXmlParserTests.java
index 414b2dea13..30398338aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/OrmXmlParserTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/OrmXmlParserTests.java
@@ -25,11 +25,11 @@ package org.hibernate.metamodel.internal.source.annotations.xml;
import org.junit.Test;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.internal.MetadataImpl;
import org.hibernate.metamodel.spi.binding.EntityBinding;
import org.hibernate.metamodel.spi.source.MappingException;
-import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static junit.framework.Assert.assertNotNull;
@@ -40,7 +40,7 @@ import static junit.framework.Assert.assertNotNull;
public class OrmXmlParserTests extends BaseUnitTestCase {
@Test
public void testSimpleOrmVersion2() {
- MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
+ MetadataSources sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
sources.addResource( "org/hibernate/metamodel/internal/source/annotations/xml/orm-father.xml" );
MetadataImpl metadata = (MetadataImpl) sources.buildMetadata();
@@ -50,7 +50,7 @@ public class OrmXmlParserTests extends BaseUnitTestCase {
@Test
public void testSimpleOrmVersion1() {
- MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
+ MetadataSources sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
sources.addResource( "org/hibernate/metamodel/internal/source/annotations/xml/orm-star.xml" );
MetadataImpl metadata = (MetadataImpl) sources.buildMetadata();
@@ -60,7 +60,7 @@ public class OrmXmlParserTests extends BaseUnitTestCase {
@Test(expected = MappingException.class)
public void testInvalidOrmXmlThrowsException() {
- MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
+ MetadataSources sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
sources.addResource( "org/hibernate/metamodel/internal/source/annotations/xml/orm-invalid.xml" );
sources.buildMetadata();
}
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/AbstractMockerTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/AbstractMockerTest.java
index 176e78b72b..162eafb5a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/AbstractMockerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/AbstractMockerTest.java
@@ -40,7 +40,7 @@ import org.hibernate.AnnotationException;
import org.hibernate.HibernateException;
import org.hibernate.jaxb.spi.orm.JaxbEntityMappings;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.testing.ServiceRegistryBuilder;
import static org.junit.Assert.assertEquals;
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/XmlHelper.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/XmlHelper.java
index 9b4daeec39..b94211570f 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/XmlHelper.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/XmlHelper.java
@@ -39,7 +39,7 @@ import org.xml.sax.SAXException;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.jaxb.spi.JaxbRoot;
import org.hibernate.jaxb.spi.Origin;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
/**
* @author Hardy Ferentschik
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractBasicBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractBasicBindingTests.java
index c89e424b64..ff88113f19 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractBasicBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractBasicBindingTests.java
@@ -32,6 +32,8 @@ import org.junit.Before;
import org.junit.Test;
import org.hibernate.FetchMode;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.engine.FetchTiming;
import org.hibernate.engine.spi.CascadeStyles;
import org.hibernate.metamodel.MetadataSources;
@@ -46,8 +48,6 @@ import org.hibernate.metamodel.spi.relational.ForeignKey;
import org.hibernate.metamodel.spi.relational.Identifier;
import org.hibernate.metamodel.spi.relational.JdbcDataType;
import org.hibernate.metamodel.spi.relational.Value;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.type.LongType;
import org.hibernate.type.StringType;
@@ -70,7 +70,7 @@ public abstract class AbstractBasicBindingTests extends BaseUnitTestCase {
@Before
public void setUp() {
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder().buildServiceRegistry();
}
@After
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractUnsavedValueTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractUnsavedValueTests.java
index 382c4a6636..a7d5beb68c 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractUnsavedValueTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractUnsavedValueTests.java
@@ -36,11 +36,11 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.internal.MetadataImpl;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static org.junit.Assert.assertEquals;
@@ -51,12 +51,11 @@ import static org.junit.Assert.assertEquals;
* @author Gail Badner
*/
public abstract class AbstractUnsavedValueTests extends BaseUnitTestCase {
-
private StandardServiceRegistryImpl serviceRegistry;
@Before
public void setUp() {
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder().buildServiceRegistry();
}
@After
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/JoinedSubclassBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/JoinedSubclassBindingTests.java
index 76adac9dd6..2ef89f1897 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/JoinedSubclassBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/JoinedSubclassBindingTests.java
@@ -32,10 +32,10 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.internal.MetadataImpl;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static org.junit.Assert.assertTrue;
@@ -48,7 +48,7 @@ public class JoinedSubclassBindingTests extends BaseUnitTestCase {
@Before
public void setUp() {
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder().buildServiceRegistry();
}
@After
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/SimpleValueBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/SimpleValueBindingTests.java
index becc4ffd0c..3999b9ad93 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/SimpleValueBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/SimpleValueBindingTests.java
@@ -31,6 +31,7 @@ import java.util.List;
import org.junit.Test;
import org.hibernate.EntityMode;
+import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
import org.hibernate.internal.util.ValueHolder;
import org.hibernate.mapping.PropertyGeneration;
import org.hibernate.metamodel.spi.domain.Entity;
@@ -41,7 +42,6 @@ import org.hibernate.metamodel.spi.relational.JdbcDataType;
import org.hibernate.metamodel.spi.relational.Schema;
import org.hibernate.metamodel.spi.relational.Size;
import org.hibernate.metamodel.spi.relational.Table;
-import org.hibernate.service.classloading.spi.ClassLoadingException;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static org.junit.Assert.assertSame;
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/UnidirectionalManyToManyBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/UnidirectionalManyToManyBindingTests.java
index bc0bf55727..fd0769de21 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/UnidirectionalManyToManyBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/UnidirectionalManyToManyBindingTests.java
@@ -27,13 +27,13 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.metamodel.MetadataSourceProcessingOrder;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.internal.MetadataImpl;
import org.hibernate.metamodel.spi.relational.Column;
import org.hibernate.metamodel.spi.relational.Identifier;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.FailureExpected;
import org.hibernate.testing.junit4.BaseUnitTestCase;
@@ -48,7 +48,7 @@ public class UnidirectionalManyToManyBindingTests extends BaseUnitTestCase {
@Before
public void setUp() {
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder().buildServiceRegistry();
}
@After
@@ -77,9 +77,12 @@ public class UnidirectionalManyToManyBindingTests extends BaseUnitTestCase {
final EntityBinding simpleEntityBinding = metadata.getEntityBinding( SimpleEntity.class.getName() );
assertNotNull( entityBinding );
- assertEquals( Identifier.toIdentifier( "SimpleEntity" ), simpleEntityBinding.getPrimaryTable().getLogicalName() );
+ assertEquals(
+ Identifier.toIdentifier( "SimpleEntity" ),
+ simpleEntityBinding.getPrimaryTable().getLogicalName()
+ );
assertEquals( 1, simpleEntityBinding.getPrimaryTable().getPrimaryKey().getColumnSpan() );
Column simpleEntityIdColumn = simpleEntityBinding.getPrimaryTable().getPrimaryKey().getColumns().get( 0 );
- assertEquals( Identifier.toIdentifier("id") , simpleEntityIdColumn.getColumnName() );
+ assertEquals( Identifier.toIdentifier( "id" ) , simpleEntityIdColumn.getColumnName() );
}
}
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/basiccollections/AbstractBasicCollectionBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/basiccollections/AbstractBasicCollectionBindingTests.java
index bd688265df..26978139d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/basiccollections/AbstractBasicCollectionBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/basiccollections/AbstractBasicCollectionBindingTests.java
@@ -31,6 +31,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.engine.FetchTiming;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.internal.MetadataImpl;
@@ -47,8 +49,6 @@ import org.hibernate.metamodel.spi.relational.ForeignKey;
import org.hibernate.metamodel.spi.relational.Identifier;
import org.hibernate.metamodel.spi.relational.TableSpecification;
import org.hibernate.metamodel.spi.relational.Value;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.type.BagType;
import org.hibernate.type.CollectionType;
@@ -70,7 +70,7 @@ public abstract class AbstractBasicCollectionBindingTests extends BaseUnitTestCa
@Before
public void setUp() {
- serviceRegistry = ( StandardServiceRegistryImpl ) new ServiceRegistryBuilder().buildServiceRegistry();
+ serviceRegistry = ( StandardServiceRegistryImpl ) new StandardServiceRegistryBuilder().buildServiceRegistry();
MetadataSources metadataSources = new MetadataSources( serviceRegistry );
addSources( metadataSources );
metadata = ( MetadataImpl ) metadataSources.getMetadataBuilder().buildMetadata();
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/onetomany/AbstractUnidirectionalOneToManyBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/onetomany/AbstractUnidirectionalOneToManyBindingTests.java
index 1e67575841..45951ae335 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/onetomany/AbstractUnidirectionalOneToManyBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/onetomany/AbstractUnidirectionalOneToManyBindingTests.java
@@ -33,6 +33,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.engine.FetchTiming;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.internal.MetadataImpl;
@@ -46,8 +48,6 @@ import org.hibernate.metamodel.spi.relational.Column;
import org.hibernate.metamodel.spi.relational.ForeignKey;
import org.hibernate.metamodel.spi.relational.Identifier;
import org.hibernate.metamodel.spi.relational.Value;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.type.BagType;
import org.hibernate.type.CollectionType;
@@ -71,7 +71,7 @@ public abstract class AbstractUnidirectionalOneToManyBindingTests extends BaseUn
@Before
public void setUp() {
- serviceRegistry = ( StandardServiceRegistryImpl ) new ServiceRegistryBuilder().buildServiceRegistry();
+ serviceRegistry = ( StandardServiceRegistryImpl ) new StandardServiceRegistryBuilder().buildServiceRegistry();
MetadataSources metadataSources = new MetadataSources( serviceRegistry );
addSources( metadataSources );
metadata = ( MetadataImpl ) metadataSources.getMetadataBuilder().buildMetadata();
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/relational/AbstractGeneratedIdColumnTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/relational/AbstractGeneratedIdColumnTests.java
index 048f207e1c..b95b79f348 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/relational/AbstractGeneratedIdColumnTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/relational/AbstractGeneratedIdColumnTests.java
@@ -32,13 +32,13 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.internal.MetadataImpl;
import org.hibernate.metamodel.spi.binding.EntityBinding;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static org.junit.Assert.assertEquals;
@@ -49,12 +49,11 @@ import static org.junit.Assert.assertEquals;
* @author Gail Badner
*/
public abstract class AbstractGeneratedIdColumnTests extends BaseUnitTestCase {
-
private StandardServiceRegistryImpl serviceRegistry;
@Before
public void setUp() {
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder().buildServiceRegistry();
}
@After
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/ordered/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/ordered/Person.java
index c33c929cff..9b74e4de73 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/ordered/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/ordered/Person.java
@@ -30,6 +30,7 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
import javax.persistence.OrderBy;
import org.hibernate.annotations.GenericGenerator;
@@ -73,6 +74,7 @@ public class Person {
@ElementCollection
@JoinColumn
+ @JoinTable(name = "T_NICKNAMES_A")
@OrderBy
public Set getNickNamesAscendingNaturalSort() {
return nickNamesAscendingNaturalSort;
@@ -84,6 +86,7 @@ public class Person {
@ElementCollection
@JoinColumn
+ @JoinTable(name = "T_NICKNAMES_D")
@OrderBy( "desc" )
public Set getNickNamesDescendingNaturalSort() {
return nickNamesDescendingNaturalSort;
@@ -97,6 +100,7 @@ public class Person {
@ElementCollection
@JoinColumn
@OrderBy
+ @JoinTable(name = "T_ADDRESS_A")
public Set getAddressesAscendingNaturalSort() {
return addressesAscendingNaturalSort;
}
@@ -108,6 +112,7 @@ public class Person {
@ElementCollection
@JoinColumn
@OrderBy( "desc" )
+ @JoinTable(name = "T_ADDRESS_D")
public Set getAddressesDescendingNaturalSort() {
return addressesDescendingNaturalSort;
}
@@ -119,6 +124,7 @@ public class Person {
@ElementCollection
@JoinColumn
@OrderBy( "city" )
+ @JoinTable(name = "T_ADD_CITY_A")
public Set getAddressesCityAscendingSort() {
return addressesCityAscendingSort;
}
@@ -130,6 +136,7 @@ public class Person {
@ElementCollection
@JoinColumn
@OrderBy( "city desc" )
+ @JoinTable(name = "T_ADD_CITY_D")
public Set getAddressesCityDescendingSort() {
return addressesCityDescendingSort;
}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java
new file mode 100644
index 0000000000..52b2266560
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java
@@ -0,0 +1,121 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.Item;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.junit.Test;
+
+public class CompositeKeyDeleteTest extends BaseCoreFunctionalTestCase {
+
+ public String[] getMappings() {
+ return new String[] { "annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml" };
+ }
+
+ public CompositeKeyDeleteTest() {
+ System.setProperty( "hibernate.enable_specj_proprietary_syntax", "true" );
+ }
+ /**
+ * This test checks to make sure the non null column is not updated with a
+ * null value when a CustomerInventory is removed.
+ */
+ @Test
+ public void testRemove() {
+ Session s = openSession();
+ Transaction tx = s.beginTransaction();
+
+ CustomerTwo c1 = new CustomerTwo(
+ "foo", "bar", "contact1", "100", new BigDecimal( 1000 ), new BigDecimal( 1000 ), new BigDecimal( 1000 )
+ );
+
+ s.persist( c1 );
+ s.flush();
+ s.clear();
+
+ Item boat = new Item();
+ boat.setId( "1" );
+ boat.setName( "cruiser" );
+ boat.setPrice( new BigDecimal( 500 ) );
+ boat.setDescription( "a boat" );
+ boat.setCategory( 42 );
+
+ s.persist( boat );
+
+
+ Item house = new Item();
+ house.setId( "2" );
+ house.setName( "blada" );
+ house.setPrice( new BigDecimal( 5000 ) );
+ house.setDescription( "a house" );
+ house.setCategory( 74 );
+
+ s.persist( house );
+ s.flush();
+ s.clear();
+
+ c1.addInventory( boat, 10, new BigDecimal( 5000 ) );
+
+ c1.addInventory( house, 100, new BigDecimal( 50000 ) );
+ s.merge( c1 );
+ Integer id = c1.getId();
+ tx.commit();
+ s.close();
+
+ s = openSession();
+ tx = s.beginTransaction();
+
+ CustomerTwo c12 = ( CustomerTwo) s.createQuery( "select c from CustomerTwo c" ).uniqueResult();
+ Assert.assertNotNull(c12);
+ List list = c12.getInventories();
+ Assert.assertNotNull(list);
+ Assert.assertEquals(2, list.size());
+ CustomerInventoryTwo ci = list.get(1);
+ list.remove(ci);
+ s.delete(ci);
+ s.flush();
+
+ tx.commit();//fail
+ s.close();
+
+ }
+
+ @Override
+ protected Class[] getAnnotatedClasses() {
+ return new Class[] {
+ CustomerTwo.class,
+ CustomerInventoryTwo.class,
+ CustomerInventoryTwoPK.class,
+ Item.class
+
+ };
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java
new file mode 100644
index 0000000000..ea34c711be
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java
@@ -0,0 +1,147 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Comparator;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Version;
+
+import org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.Item;
+
+@NamedQueries({ @NamedQuery(name = "CustomerInventoryTwo.selectAll", query = "select a from CustomerInventoryTwo a") })
+@SuppressWarnings("serial")
+@Entity
+@Table(name = "O_CUSTINVENTORY")
+@IdClass(CustomerInventoryTwoPK.class)
+public class CustomerInventoryTwo implements Serializable,
+ Comparator {
+
+ @Id
+ @TableGenerator(name = "inventory", table = "U_SEQUENCES", pkColumnName = "S_ID", valueColumnName = "S_NEXTNUM", pkColumnValue = "inventory", allocationSize = 1000)
+ @GeneratedValue(strategy = GenerationType.TABLE, generator = "inventory")
+ @Column(name = "CI_ID")
+ private Integer id;
+
+ @Id
+ @Column(name = "CI_CUSTOMERID", insertable = false, updatable = false)
+ private int custId;
+
+ @ManyToOne(cascade = CascadeType.MERGE)
+ @JoinColumn(name = "CI_CUSTOMERID", nullable = false)
+ private CustomerTwo customer;
+
+ @ManyToOne(cascade = CascadeType.MERGE)
+ @JoinColumn(name = "CI_ITEMID")
+ private Item vehicle;
+
+ @Column(name = "CI_VALUE")
+ private BigDecimal totalCost;
+
+ @Column(name = "CI_QUANTITY")
+ private int quantity;
+
+ @Version
+ @Column(name = "CI_VERSION")
+ private int version;
+
+ protected CustomerInventoryTwo() {
+ }
+
+ CustomerInventoryTwo(CustomerTwo customer, Item vehicle, int quantity,
+ BigDecimal totalValue) {
+ this.customer = customer;
+ this.vehicle = vehicle;
+ this.quantity = quantity;
+ this.totalCost = totalValue;
+ }
+
+ public Item getVehicle() {
+ return vehicle;
+ }
+
+ public BigDecimal getTotalCost() {
+ return totalCost;
+ }
+
+ public int getQuantity() {
+ return quantity;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public CustomerTwo getCustomer() {
+ return customer;
+ }
+
+ public int getCustId() {
+ return custId;
+ }
+
+ public int getVersion() {
+ return version;
+ }
+
+ public int compare(CustomerInventoryTwo cdb1, CustomerInventoryTwo cdb2) {
+ return cdb1.id.compareTo(cdb2.id);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (obj == null || !(obj instanceof CustomerInventoryTwo)) {
+ return false;
+ }
+ if (this.id == ((CustomerInventoryTwo) obj).id) {
+ return true;
+ }
+ if (this.id != null && ((CustomerInventoryTwo) obj).id == null) {
+ return false;
+ }
+ if (this.id == null && ((CustomerInventoryTwo) obj).id != null) {
+ return false;
+ }
+
+ return this.id.equals(((CustomerInventoryTwo) obj).id);
+ }
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java
new file mode 100644
index 0000000000..236290a979
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java
@@ -0,0 +1,67 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
+
+import java.io.Serializable;
+
+public class CustomerInventoryTwoPK implements Serializable {
+
+ private Integer id;
+ private int custId;
+
+ public CustomerInventoryTwoPK() {
+ }
+
+ public CustomerInventoryTwoPK(Integer id, int custId) {
+ this.id = id;
+ this.custId = custId;
+ }
+
+ public boolean equals(Object other) {
+ if ( other == this ) {
+ return true;
+ }
+ if ( other == null || getClass() != other.getClass() ) {
+ return false;
+ }
+ CustomerInventoryTwoPK cip = ( CustomerInventoryTwoPK ) other;
+ return ( custId == cip.custId && ( id == cip.id ||
+ ( id != null && id.equals( cip.id ) ) ) );
+ }
+
+ public int hashCode() {
+ return ( id == null ? 0 : id.hashCode() ) ^ custId;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public int getCustId() {
+ return custId;
+ }
+
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java
new file mode 100644
index 0000000000..d548959eea
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java
@@ -0,0 +1,248 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Version;
+
+import org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.Item;
+
+@SuppressWarnings("serial")
+@NamedQueries({
+ @NamedQuery(name = CustomerTwo.QUERY_ALL,
+ query = "select a from CustomerTwo a"),
+ @NamedQuery(name = CustomerTwo.QUERY_COUNT,
+ query = "select COUNT(a) from CustomerTwo a"),
+ @NamedQuery(name = CustomerTwo.QUERY_BY_CREDIT,
+ query = "SELECT c.id FROM CustomerTwo c WHERE c.creditLimit > :limit")
+})
+@Entity
+@Table(name = "O_CUSTOMER")
+public class CustomerTwo implements Serializable{
+ public static final String QUERY_ALL = "CustomerTwo.selectAll";
+ public static final String QUERY_COUNT = "CustomerTwo.count";
+ public static final String QUERY_BY_CREDIT = "CustomerTwo.selectByCreditLimit";
+
+ public static final String BAD_CREDIT = "BC";
+
+ @Id
+ @Column(name = "C_ID")
+ private int id;
+
+ @Column(name = "C_FIRST")
+ private String firstName;
+
+ @Column(name = "C_LAST")
+ private String lastName;
+
+ @Column(name = "C_CONTACT")
+ private String contact;
+
+ @Column(name = "C_CREDIT")
+ private String credit;
+
+ @Column(name = "C_CREDIT_LIMIT")
+ private BigDecimal creditLimit;
+
+ @Column(name = "C_SINCE")
+ @Temporal(TemporalType.DATE)
+ private Calendar since;
+
+ @Column(name = "C_BALANCE")
+ private BigDecimal balance;
+
+ @Column(name = "C_YTD_PAYMENT")
+ private BigDecimal ytdPayment;
+
+ @OneToMany(targetEntity = CustomerInventoryTwo.class,
+ mappedBy = "customer",
+ cascade = CascadeType.ALL,
+ fetch = FetchType.EAGER)
+ private List customerInventories;
+
+
+ @Version
+ @Column(name = "C_VERSION")
+ private int version;
+
+ protected CustomerTwo() {
+ }
+
+ public CustomerTwo(String first, String last,
+ String contact, String credit, BigDecimal creditLimit,
+ BigDecimal balance, BigDecimal YtdPayment) {
+
+ this.firstName = first;
+ this.lastName = last;
+ this.contact = contact;
+ this.since = Calendar.getInstance();
+ this.credit = credit;
+ this.creditLimit = creditLimit;
+ this.balance = balance;
+ this.ytdPayment = YtdPayment;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer customerId) {
+ this.id = customerId;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ public String getContact() {
+ return contact;
+ }
+
+ public void setContact(String contact) {
+ this.contact = contact;
+ }
+
+ public String getCredit() {
+ return credit;
+ }
+
+ public void setCredit(String credit) {
+ this.credit = credit;
+ }
+
+ public BigDecimal getCreditLimit() {
+ return creditLimit;
+ }
+
+ public void setCreditLimit(BigDecimal creditLimit) {
+ this.creditLimit = creditLimit;
+ }
+
+ public Calendar getSince() {
+ return since;
+ }
+
+ public void setSince(Calendar since) {
+ this.since = since;
+ }
+
+ public BigDecimal getBalance() {
+ return balance;
+ }
+
+ public void setBalance(BigDecimal balance) {
+ this.balance = balance;
+ }
+
+ public void changeBalance(BigDecimal change) {
+ setBalance( balance.add( change ).setScale( 2, BigDecimal.ROUND_DOWN ) );
+ }
+
+ public BigDecimal getYtdPayment() {
+ return ytdPayment;
+ }
+
+ public void setYtdPayment(BigDecimal ytdPayment) {
+ this.ytdPayment = ytdPayment;
+ }
+
+
+ public List getInventories() {
+ if ( this.customerInventories == null ) {
+ this.customerInventories = new ArrayList();
+ }
+ return this.customerInventories;
+ }
+
+ public CustomerInventoryTwo addInventory(Item item, int quantity,
+ BigDecimal totalValue) {
+
+ CustomerInventoryTwo inventory = new CustomerInventoryTwo(
+ this, item,
+ quantity, totalValue
+ );
+ getInventories().add( inventory );
+ return inventory;
+ }
+
+ public int getVersion() {
+ return version;
+ }
+
+ public boolean hasSufficientCredit(BigDecimal amount) {
+ return !BAD_CREDIT.equals( getCredit() )
+ && creditLimit != null
+ && creditLimit.compareTo( amount ) >= 0;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if ( this == o ) {
+ return true;
+ }
+ if ( o == null || getClass() != o.getClass() ) {
+ return false;
+ }
+ return id == ( ( CustomerTwo ) o ).id;
+ }
+
+ @Override
+ public int hashCode() {
+ return new Integer( id ).hashCode();
+ }
+
+ @Override
+ public String toString() {
+ return this.getFirstName() + " " + this.getLastName();
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/hbm_order.xml b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/hbm_order.xml
new file mode 100644
index 0000000000..511abfbb59
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/hbm_order.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml
new file mode 100644
index 0000000000..259e3cba10
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/EmbeddableIntegratorTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/EmbeddableIntegratorTest.java
index 86fb4e3987..a74643867b 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/EmbeddableIntegratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/EmbeddableIntegratorTest.java
@@ -26,23 +26,20 @@ package org.hibernate.test.annotations.embeddables;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
-import java.util.LinkedHashSet;
import java.util.List;
import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl;
import org.hibernate.cfg.Configuration;
+import org.hibernate.dialect.H2Dialect;
import org.hibernate.exception.GenericJDBCException;
-import org.hibernate.integrator.internal.IntegratorServiceImpl;
-import org.hibernate.integrator.spi.Integrator;
-import org.hibernate.integrator.spi.IntegratorService;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.classloading.internal.ClassLoaderServiceImpl;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.internal.BootstrapServiceRegistryImpl;
+import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static org.junit.Assert.assertEquals;
@@ -50,6 +47,7 @@ import static org.junit.Assert.assertEquals;
/**
* @author Chris Pheby
*/
+@RequiresDialect(H2Dialect.class)
public class EmbeddableIntegratorTest extends BaseUnitTestCase {
/**
@@ -58,7 +56,7 @@ public class EmbeddableIntegratorTest extends BaseUnitTestCase {
@Test(expected=GenericJDBCException.class)
public void testWithoutIntegrator() {
- ServiceRegistry reg = new ServiceRegistryBuilder(new BootstrapServiceRegistryImpl())
+ ServiceRegistry reg = new StandardServiceRegistryBuilder(new BootstrapServiceRegistryImpl())
.buildServiceRegistry();
SessionFactory sf = new Configuration()
@@ -82,15 +80,9 @@ public class EmbeddableIntegratorTest extends BaseUnitTestCase {
@Test
public void testWithIntegrator() {
-
- LinkedHashSet providedIntegrators = new LinkedHashSet();
- providedIntegrators.add(new InvestorIntegrator());
- ClassLoaderService classLoaderService = new ClassLoaderServiceImpl();
- IntegratorService integratorService = new IntegratorServiceImpl(providedIntegrators, classLoaderService);
-
- ServiceRegistry reg = new ServiceRegistryBuilder(new BootstrapServiceRegistryImpl(
- classLoaderService,
- integratorService)).buildServiceRegistry();
+ ServiceRegistry reg = new StandardServiceRegistryBuilder(
+ new BootstrapServiceRegistryBuilder().with( new InvestorIntegrator() ).build()
+ ).buildServiceRegistry();
SessionFactory sf = new Configuration()
.addAnnotatedClass( Investor.class )
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java
index 062f862f7d..e8a36f10ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java
@@ -23,7 +23,11 @@
*/
package org.hibernate.test.annotations.embeddables.nested;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
import java.sql.Types;
+import java.util.HashMap;
+import java.util.Map;
import org.junit.Test;
@@ -37,6 +41,7 @@ import org.hibernate.mapping.SimpleValue;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.type.CustomType;
+import static org.hibernate.testing.junit4.ExtraAssertions.assertJdbcTypeCode;
import static org.junit.Assert.assertEquals;
/**
@@ -57,6 +62,6 @@ public class NestedEmbeddableMetadataTest extends BaseUnitTestCase {
CustomType currencyType = (CustomType) currencyMetadata.getType();
int[] currencySqlTypes = currencyType.sqlTypes( mapping );
assertEquals( 1, currencySqlTypes.length );
- assertEquals( Types.VARCHAR, currencySqlTypes[0] );
+ assertJdbcTypeCode( Types.VARCHAR, currencySqlTypes[0] );
}
}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/secondarytable/User.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/secondarytable/User.java
index bbbd76dba3..02c68c5d48 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/secondarytable/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/secondarytable/User.java
@@ -11,13 +11,14 @@ import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.ParamDef;
import org.hibernate.annotations.SqlFragmentAlias;
+import org.hibernate.annotations.Type;
@Entity
-@Table(name="USER")
+@Table(name="T_USER")
@SecondaryTable(name="SECURITY_USER")
@FilterDef(name="ageFilter", parameters=@ParamDef(name="age", type="integer"))
@Filter(name="ageFilter", condition="{u}.AGE < :age AND {s}.LOCKED_OUT <> 1",
- aliases={@SqlFragmentAlias(alias="u", table="USER"), @SqlFragmentAlias(alias="s", table="SECURITY_USER")})
+ aliases={@SqlFragmentAlias(alias="u", table="T_USER"), @SqlFragmentAlias(alias="s", table="SECURITY_USER")})
public class User {
@Id
@@ -31,13 +32,14 @@ public class User {
@Column(name="AGE")
private int age;
- @Column(name="USERNAME", table="SECURITY_USER")
+ @Column(name="SECURITY_USERNAME", table="SECURITY_USER")
private String username;
- @Column(name="PASSWORD", table="SECURITY_USER")
+ @Column(name="SECURITY_PASSWORD", table="SECURITY_USER")
private String password;
@Column(name="LOCKED_OUT", table="SECURITY_USER")
+ @Type( type = "numeric_boolean")
private boolean lockedOut;
public int getId() {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/subclass/joined/Mammal.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/subclass/joined/Mammal.java
index 0db20e43d6..a77e8f3c6b 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/subclass/joined/Mammal.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/subclass/joined/Mammal.java
@@ -6,6 +6,7 @@ import javax.persistence.Table;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
+import org.hibernate.annotations.Type;
@Entity
@Table(name="ZOOLOGY_MAMMAL")
@@ -14,6 +15,7 @@ import org.hibernate.annotations.FilterDef;
public class Mammal extends Animal{
@Column(name="IS_PREGNANT")
+ @Type( type="numeric_boolean" )
private boolean isPregnant;
public boolean isPregnant() {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/subclass/singletable/Mammal.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/subclass/singletable/Mammal.java
index 47f0f72310..483bcc5e2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/subclass/singletable/Mammal.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/subclass/singletable/Mammal.java
@@ -6,6 +6,7 @@ import javax.persistence.Table;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
+import org.hibernate.annotations.Type;
@Entity
@Table(name="ZOOLOGY_MAMMAL")
@@ -14,6 +15,7 @@ import org.hibernate.annotations.FilterDef;
public class Mammal extends Animal{
@Column(name="IS_PREGNANT")
+ @Type( type="numeric_boolean" )
private boolean isPregnant;
public boolean isPregnant() {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/subclass/tableperclass/Mammal.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/subclass/tableperclass/Mammal.java
index 7e4af107fa..23e1b374af 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/subclass/tableperclass/Mammal.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/filter/subclass/tableperclass/Mammal.java
@@ -6,6 +6,7 @@ import javax.persistence.Table;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
+import org.hibernate.annotations.Type;
@Entity
@Table(name="ZOOLOGY_MAMMAL")
@@ -14,6 +15,7 @@ import org.hibernate.annotations.FilterDef;
public class Mammal extends Animal{
@Column(name="IS_PREGNANT")
+ @Type( type="numeric_boolean" )
private boolean isPregnant;
public boolean isPregnant() {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/HibernateSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/HibernateSequenceTest.java
index e53ab9efb2..641ccffb08 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/HibernateSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/HibernateSequenceTest.java
@@ -6,12 +6,15 @@ import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.H2Dialect;
import org.hibernate.id.IdentifierGenerator;
import org.hibernate.id.enhanced.SequenceStyleGenerator;
import org.hibernate.mapping.Table;
import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.test.annotations.id.sequences.entities.HibernateSequenceEntity;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
+import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -19,6 +22,7 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
* @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
*/
@TestForIssue(jiraKey = "HHH-6068")
+@RequiresDialect( value = H2Dialect.class)
public class HibernateSequenceTest extends BaseCoreFunctionalTestCase {
private static final String SCHEMA_NAME = "OTHER_SCHEMA";
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/EntitySerialize.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/EntitySerialize.java
new file mode 100644
index 0000000000..879e66766b
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/EntitySerialize.java
@@ -0,0 +1,44 @@
+package org.hibernate.test.annotations.lob;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+
+import org.hibernate.annotations.Type;
+import org.hibernate.annotations.TypeDef;
+import org.hibernate.annotations.TypeDefs;
+
+/**
+ * @author Janario Oliveira
+ */
+@Entity
+@TypeDefs({ @TypeDef(typeClass = ImplicitSerializableType.class, defaultForType = ImplicitSerializable.class) })
+public class EntitySerialize {
+ @Id
+ @GeneratedValue
+ long id;
+
+ @Lob
+ ExplicitSerializable explicitLob;
+
+ @Type(type = "org.hibernate.test.annotations.lob.ExplicitSerializableType")
+ ExplicitSerializable explicit;
+
+ ImplicitSerializable implicit;
+
+ @Type(type = "org.hibernate.test.annotations.lob.ExplicitSerializableType")
+ ImplicitSerializable explicitOverridingImplicit;
+
+ /**
+ * common in ExplicitSerializable and ImplicitSerializable to create same property in both
+ * This property will not persist it have a default value per type
+ *
+ * @author Janario Oliveira
+ */
+ public interface CommonSerializable {
+ String getDefaultValue();
+
+ void setDefaultValue(String defaultValue);
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ExplicitSerializable.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ExplicitSerializable.java
new file mode 100644
index 0000000000..75f15d48e3
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ExplicitSerializable.java
@@ -0,0 +1,23 @@
+package org.hibernate.test.annotations.lob;
+
+import java.io.Serializable;
+
+import org.hibernate.test.annotations.lob.EntitySerialize.CommonSerializable;
+
+/**
+ * @author Janario Oliveira
+ */
+public class ExplicitSerializable implements Serializable, CommonSerializable {
+ String defaultValue;
+ String value;
+
+ @Override
+ public String getDefaultValue() {
+ return defaultValue;
+ }
+
+ @Override
+ public void setDefaultValue(String defaultValue) {
+ this.defaultValue = defaultValue;
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ExplicitSerializableType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ExplicitSerializableType.java
new file mode 100644
index 0000000000..13effc1804
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ExplicitSerializableType.java
@@ -0,0 +1,30 @@
+package org.hibernate.test.annotations.lob;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.test.annotations.lob.EntitySerialize.CommonSerializable;
+import org.hibernate.type.SerializableToBlobType;
+
+/**
+ * @author Janario Oliveira
+ */
+public class ExplicitSerializableType extends SerializableToBlobType {
+ @Override
+ public Object get(ResultSet rs, String name) throws SQLException {
+ CommonSerializable deserialize = (CommonSerializable) super.get( rs, name );
+ deserialize.setDefaultValue( "EXPLICIT" );
+ return deserialize;
+ }
+
+ @Override
+ public void set(PreparedStatement st, Object value, int index, SessionImplementor session) throws SQLException {
+ if ( value != null ) {
+ ( (CommonSerializable) value ).setDefaultValue( null );
+ }
+ super.set( st, value, index, session );
+ }
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ImplicitSerializable.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ImplicitSerializable.java
new file mode 100644
index 0000000000..7f5a894048
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ImplicitSerializable.java
@@ -0,0 +1,23 @@
+package org.hibernate.test.annotations.lob;
+
+import java.io.Serializable;
+
+import org.hibernate.test.annotations.lob.EntitySerialize.CommonSerializable;
+
+/**
+ * @author Janario Oliveira
+ */
+public class ImplicitSerializable implements Serializable, CommonSerializable {
+ String defaultValue;
+ String value;
+
+ @Override
+ public String getDefaultValue() {
+ return defaultValue;
+ }
+
+ @Override
+ public void setDefaultValue(String defaultValue) {
+ this.defaultValue = defaultValue;
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ImplicitSerializableType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ImplicitSerializableType.java
new file mode 100644
index 0000000000..c88fb14dea
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ImplicitSerializableType.java
@@ -0,0 +1,31 @@
+package org.hibernate.test.annotations.lob;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.test.annotations.lob.EntitySerialize.CommonSerializable;
+import org.hibernate.type.SerializableToBlobType;
+
+/**
+ * @author Janario Oliveira
+ */
+public class ImplicitSerializableType extends SerializableToBlobType {
+
+ @Override
+ public Object get(ResultSet rs, String name) throws SQLException {
+ CommonSerializable deserialize = (CommonSerializable) super.get( rs, name );
+ deserialize.setDefaultValue( "IMPLICIT" );
+ return deserialize;
+ }
+
+ @Override
+ public void set(PreparedStatement st, Object value, int index, SessionImplementor session) throws SQLException {
+ if ( value != null ) {
+ ( (CommonSerializable) value ).setDefaultValue( null );
+ }
+ super.set( st, value, index, session );
+ }
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/SerializableToBlobTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/SerializableToBlobTypeTest.java
new file mode 100644
index 0000000000..6d82206a78
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/SerializableToBlobTypeTest.java
@@ -0,0 +1,89 @@
+package org.hibernate.test.annotations.lob;
+
+import static org.junit.Assert.assertEquals;
+
+import org.hibernate.Session;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.hibernate.type.SerializableToBlobType;
+import org.hibernate.type.Type;
+import org.junit.Test;
+
+/**
+ * Test type definition for SerializableToBlobType
+ *
+ * @author Janario Oliveira
+ */
+public class SerializableToBlobTypeTest extends BaseCoreFunctionalTestCase {
+ @Test
+ public void testTypeDefinition() {
+ Configuration cfg = configuration();
+ PersistentClass pc = cfg.getClassMapping( EntitySerialize.class.getName() );
+
+ // explicitLob of SerializableToBlobType
+ Type explicitLobType = pc.getProperty( "explicitLob" ).getType();
+ assertEquals( ExplicitSerializable.class, explicitLobType.getReturnedClass() );
+ assertEquals( SerializableToBlobType.class.getName(), explicitLobType.getName() );
+
+ // explicit of ExplicitSerializableType
+ Type explicitType = pc.getProperty( "explicit" ).getType();
+ assertEquals( ExplicitSerializable.class, explicitType.getReturnedClass() );
+ assertEquals( ExplicitSerializableType.class.getName(), explicitType.getName() );
+
+ // implicit of ImplicitSerializableType
+ Type implicitType = pc.getProperty( "implicit" ).getType();
+ assertEquals( ImplicitSerializable.class, implicitType.getReturnedClass() );
+ assertEquals( ImplicitSerializableType.class.getName(), implicitType.getName() );
+
+ // explicitOverridingImplicit ExplicitSerializableType overrides ImplicitSerializableType
+ Type overrideType = pc.getProperty( "explicitOverridingImplicit" ).getType();
+ assertEquals( ImplicitSerializable.class, overrideType.getReturnedClass() );
+ assertEquals( ExplicitSerializableType.class.getName(), overrideType.getName() );
+ }
+
+ @Test
+ public void testPersist() {
+ EntitySerialize entitySerialize = new EntitySerialize();
+
+ entitySerialize.explicitLob = new ExplicitSerializable();
+ entitySerialize.explicitLob.value = "explicitLob";
+ entitySerialize.explicitLob.defaultValue = "defaultExplicitLob";
+
+ entitySerialize.explicit = new ExplicitSerializable();
+ entitySerialize.explicit.value = "explicit";
+
+ entitySerialize.implicit = new ImplicitSerializable();
+ entitySerialize.implicit.value = "implicit";
+
+ entitySerialize.explicitOverridingImplicit = new ImplicitSerializable();
+ entitySerialize.explicitOverridingImplicit.value = "explicitOverridingImplicit";
+
+ Session session = openSession();
+ session.getTransaction().begin();
+ session.persist( entitySerialize );
+
+ session.getTransaction().commit();
+ session.close();
+
+ session = openSession();
+
+ EntitySerialize persistedSerialize = (EntitySerialize) session.get( EntitySerialize.class, entitySerialize.id );
+ assertEquals( "explicitLob", persistedSerialize.explicitLob.value );
+ assertEquals( "explicit", persistedSerialize.explicit.value );
+ assertEquals( "implicit", persistedSerialize.implicit.value );
+ assertEquals( "explicitOverridingImplicit", persistedSerialize.explicitOverridingImplicit.value );
+
+ assertEquals( "defaultExplicitLob", persistedSerialize.explicitLob.defaultValue );
+ assertEquals( "EXPLICIT", persistedSerialize.explicit.defaultValue );
+ assertEquals( "IMPLICIT", persistedSerialize.implicit.defaultValue );
+ assertEquals( "EXPLICIT", persistedSerialize.explicitOverridingImplicit.defaultValue );
+
+ session.close();
+ }
+
+ @Override
+ protected Class[] getAnnotatedClasses() {
+ return new Class[] { EntitySerialize.class };
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
index 29fc4a99ed..9fcda3079f 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
@@ -316,7 +316,55 @@ public class ManyToManyTest
tx.rollback();
s.close();
}
+
+ // HHH-4394
+ @Test
+ public void testOrderByContractor() throws Exception {
+ Session s;
+ Transaction tx;
+ s = openSession();
+ tx = s.beginTransaction();
+ // create some test entities
+ Employer employer = new Employer();
+ Contractor contractor1 = new Contractor();
+ contractor1.setName( "Emmanuel" );
+ contractor1.setHourlyRate(100.0f);
+ Contractor contractor2 = new Contractor();
+ contractor2.setName( "Hardy" );
+ contractor2.setHourlyRate(99.99f);
+ s.persist( contractor1 );
+ s.persist( contractor2 );
+
+ // add contractors to employer
+ List setOfContractors = new ArrayList();
+ setOfContractors.add( contractor1 );
+ setOfContractors.add( contractor2 );
+ employer.setContractors( setOfContractors );
+
+ // add employer to contractors
+ Collection employerListContractor1 = new ArrayList();
+ employerListContractor1.add( employer );
+ contractor1.setEmployers( employerListContractor1 );
+
+ Collection employerListContractor2 = new ArrayList();
+ employerListContractor2.add( employer );
+ contractor2.setEmployers( employerListContractor2 );
+
+ s.flush();
+ s.clear();
+
+ // assertions
+ employer = (Employer) s.get( Employer.class, employer.getId() );
+ assertNotNull( employer );
+ assertNotNull( employer.getContractors() );
+ assertEquals( 2, employer.getContractors().size() );
+ Contractor firstContractorFromDb = (Contractor) employer.getContractors().iterator().next();
+ assertEquals( contractor2.getName(), firstContractorFromDb.getName() );
+ tx.rollback();
+ s.close();
+ }
+
@Test
public void testRemoveInBetween() throws Exception {
Session s;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/InsertedDataTest.java b/hibernate-core/src/test/java/org/hibernate/test/cache/InsertedDataTest.java
index 32d64c5159..5e8693e999 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/cache/InsertedDataTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/cache/InsertedDataTest.java
@@ -28,9 +28,9 @@ import java.util.Map;
import org.junit.Test;
import org.hibernate.Session;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
-import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertEquals;
@@ -58,7 +58,7 @@ public class InsertedDataTest extends BaseCoreFunctionalTestCase {
}
@Override
- protected void prepareBasicRegistryBuilder(ServiceRegistryBuilder serviceRegistryBuilder) {
+ protected void prepareBasicRegistryBuilder(StandardServiceRegistryBuilder serviceRegistryBuilder) {
serviceRegistryBuilder.applySetting( Environment.CACHE_REGION_PREFIX, "" );
serviceRegistryBuilder.applySetting( Environment.GENERATE_STATISTICS, "true" );
}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/WrongCircularityDetectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/WrongCircularityDetectionTest.java
new file mode 100644
index 0000000000..6b66ce94f7
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/cfg/WrongCircularityDetectionTest.java
@@ -0,0 +1,74 @@
+package org.hibernate.test.cfg;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+
+import org.hibernate.cfg.Configuration;
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.junit.Test;
+
+/**
+ * This test illustrates the problem when two related (in terms of joins)
+ * classes have the same table name in different schemas.
+ *
+ * @author Didier Villevalois
+ */
+@TestForIssue(jiraKey = "HHH-7134")
+public class WrongCircularityDetectionTest extends BaseUnitTestCase {
+
+ @Test
+ public void testNoCircularityDetection() {
+ Configuration cfg = new Configuration();
+ cfg.addAnnotatedClass(Entity1.class);
+ cfg.addAnnotatedClass(Entity2.class);
+
+ cfg.buildMappings();
+
+ org.hibernate.mapping.Table entity1Table = cfg.getClassMapping(
+ Entity1.class.getName()).getTable();
+ org.hibernate.mapping.Table entity2Table = cfg.getClassMapping(
+ Entity2.class.getName()).getTable();
+
+ assertTrue(entity1Table.getName().equals(entity2Table.getName()));
+ assertFalse(entity1Table.getSchema().equals(entity2Table.getSchema()));
+ }
+
+ @Entity
+ @Inheritance(strategy = InheritanceType.JOINED)
+ @Table(schema = "schema1", name = "entity")
+ public static class Entity1 {
+ private String id;
+
+ @Id
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+ }
+
+ @Entity
+ @Table(schema = "schema2", name = "entity")
+ public static class Entity2 extends Entity1 {
+ private String value;
+
+ @Basic
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java
index 177df15ed2..706391588b 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java
@@ -24,10 +24,11 @@ import org.junit.Test;
import org.hibernate.MappingException;
import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
import org.hibernate.persister.spi.PersisterClassResolver;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
+
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static org.junit.Assert.assertEquals;
@@ -42,15 +43,15 @@ public class PersisterClassProviderTest extends BaseUnitTestCase {
Configuration cfg = new Configuration();
cfg.addAnnotatedClass( Gate.class );
- ServiceRegistry serviceRegistry = new ServiceRegistryBuilder()
+ ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
.applySettings( cfg.getProperties() )
.buildServiceRegistry();
//no exception as the GoofyPersisterClassProvider is not set
SessionFactory sessionFactory = cfg.buildSessionFactory( serviceRegistry );
sessionFactory.close();
- ServiceRegistryBuilder.destroy( serviceRegistry );
+ StandardServiceRegistryBuilder.destroy( serviceRegistry );
- serviceRegistry = new ServiceRegistryBuilder()
+ serviceRegistry = new StandardServiceRegistryBuilder()
.applySettings( cfg.getProperties() )
.addService( PersisterClassResolver.class, new GoofyPersisterClassProvider() )
.buildServiceRegistry();
@@ -69,13 +70,13 @@ public class PersisterClassProviderTest extends BaseUnitTestCase {
);
}
finally {
- ServiceRegistryBuilder.destroy( serviceRegistry );
+ StandardServiceRegistryBuilder.destroy( serviceRegistry );
}
cfg = new Configuration();
cfg.addAnnotatedClass( Portal.class );
cfg.addAnnotatedClass( Window.class );
- serviceRegistry = new ServiceRegistryBuilder()
+ serviceRegistry = new StandardServiceRegistryBuilder()
.applySettings( cfg.getProperties() )
.addService( PersisterClassResolver.class, new GoofyPersisterClassProvider() )
.buildServiceRegistry();
@@ -91,14 +92,14 @@ public class PersisterClassProviderTest extends BaseUnitTestCase {
( (GoofyException) e.getCause() ).getValue() );
}
finally {
- ServiceRegistryBuilder.destroy( serviceRegistry );
+ StandardServiceRegistryBuilder.destroy( serviceRegistry );
}
cfg = new Configuration();
cfg.addAnnotatedClass( Tree.class );
cfg.addAnnotatedClass( Palmtree.class );
- serviceRegistry = new ServiceRegistryBuilder()
+ serviceRegistry = new StandardServiceRegistryBuilder()
.applySettings( cfg.getProperties() )
.addService( PersisterClassResolver.class, new GoofyPersisterClassProvider() )
.buildServiceRegistry();
@@ -114,7 +115,7 @@ public class PersisterClassProviderTest extends BaseUnitTestCase {
( (GoofyException) e.getCause() ).getValue() );
}
finally {
- ServiceRegistryBuilder.destroy( serviceRegistry );
+ StandardServiceRegistryBuilder.destroy( serviceRegistry );
}
}
}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/map/hhh7557/EntityMapTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/map/hhh7557/EntityMapTest.java
new file mode 100644
index 0000000000..5dfa28a905
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/collection/map/hhh7557/EntityMapTest.java
@@ -0,0 +1,105 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.collection.map.hhh7557;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.hibernate.Session;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+
+/**
+ * @author Elizabeth Chatman
+ * @author Steve Ebersole
+ */
+public class EntityMapTest extends BaseCoreFunctionalTestCase {
+ @Override
+ protected Class[] getAnnotatedClasses() {
+ return new Class[] {MapValue.class, MapKey.class, MapHolder.class};
+ }
+
+ @Test
+ public void testInsertIntoMap() throws Exception {
+ {
+ // Session 1: Insert 3 values into the map
+ Session session = openSession();
+ session.beginTransaction();
+ MapHolder mapHolder = new MapHolder();
+ mapHolder.setMap( new HashMap() );
+ addMapEntry( session, mapHolder, "A", "1" );
+ addMapEntry( session, mapHolder, "B", "2" );
+ addMapEntry( session, mapHolder, "C", "3" );
+ session.save( mapHolder );
+ // Verify there are 3 entries in the map
+ Assert.assertEquals( 3, mapHolder.getMap().size() );
+ session.getTransaction().commit();
+ session.close();
+ }
+
+ {
+ // Session 2: Add a 4th value to the map
+ Session session = openSession();
+ session.beginTransaction();
+ MapHolder mapHolder = getMapHolder( session );
+ System.out.println( "Got MapHolder; checking map size -----" );
+ Assert.assertEquals( 3, mapHolder.getMap().size() );
+ System.out.println( "Got MapHolder; checked map size -----" );
+ addMapEntry( session, mapHolder, "D", "4" );
+ // Verify there are 4 entries in the map
+ Assert.assertEquals( 4, mapHolder.getMap().size() );
+ session.getTransaction().commit();
+ session.close();
+ }
+
+ {
+ // Session 3: Count the entries in the map
+ Session session = openSession();
+ session.beginTransaction();
+ MapHolder mapHolder = getMapHolder( session );
+ // Fails here (expected:<4> but was:<1>)
+ Assert.assertEquals( 4, mapHolder.getMap().size() );
+ session.getTransaction().commit();
+ session.close();
+ }
+ }
+
+ private void addMapEntry(Session session, MapHolder mapHolder, String key, String value) {
+ System.out.println( "Inserting (" + key + "," + value + ") into map" );
+ MapValue entityValue = new MapValue( value );
+ session.save( entityValue );
+ MapKey entityKey = new MapKey( key, entityValue );
+ session.save( entityKey );
+ mapHolder.getMap().put( entityKey, entityValue );
+ }
+
+ private MapHolder getMapHolder(Session session) {
+ List mapHolders = session.createQuery( "select distinct mh from MapHolder mh" ).list();
+ Assert.assertEquals( 1, mapHolders.size() );
+ return (MapHolder) mapHolders.get( 0 );
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/map/hhh7557/MapHolder.java b/hibernate-core/src/test/java/org/hibernate/test/collection/map/hhh7557/MapHolder.java
new file mode 100644
index 0000000000..6055c7f2e9
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/collection/map/hhh7557/MapHolder.java
@@ -0,0 +1,80 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.collection.map.hhh7557;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.MapKeyJoinColumn;
+import javax.persistence.Table;
+import java.util.Map;
+
+/**
+ * @author Elizabeth Chatman
+ * @author Steve Ebersole
+ */
+@Entity
+@Table(name = "map_holder")
+public class MapHolder {
+ private Long id;
+ private Map map;
+
+ @Id
+ @GeneratedValue
+ @Column(name = "id", unique = true, nullable = false)
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @ManyToMany
+ @JoinTable(
+ name = "map_key_map_value",
+ joinColumns = @JoinColumn(name = "map_holder_id", nullable = false),
+ inverseJoinColumns = @JoinColumn(name = "map_value_id", nullable = false)
+ )
+ @MapKeyJoinColumn(name = "map_key_id", nullable = false)
+ public Map getMap() {
+ return map;
+ }
+
+ public void setMap(Map map) {
+ this.map = map;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append( "MapHolder [id=" ).append( id ).append( "]" );
+ return builder.toString();
+ }
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/map/hhh7557/MapKey.java b/hibernate-core/src/test/java/org/hibernate/test/collection/map/hhh7557/MapKey.java
new file mode 100644
index 0000000000..3bba1a0ae1
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/collection/map/hhh7557/MapKey.java
@@ -0,0 +1,154 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.collection.map.hhh7557;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author Elizabeth Chatman
+ * @author Steve Ebersole
+ */
+@Entity
+@Table(name = "map_key", uniqueConstraints = {
+ @UniqueConstraint(columnNames = {"name", "default_map_value_id"})
+})
+public class MapKey {
+ private static final Logger log = Logger.getLogger( MapKey.class );
+
+ private Long id;
+ private String name;
+ private MapValue defaultValue;
+
+ public MapKey() {
+ }
+
+ public MapKey(String name, MapValue defaultValue) {
+ this.name = name;
+ this.defaultValue = defaultValue;
+ }
+
+ @Id
+ @GeneratedValue
+ @Column(name = "id", unique = true, nullable = false)
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name = "name", nullable = false)
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ log.tracef( "Setting name : %s", name );
+ this.name = name;
+ }
+
+ @ManyToOne(fetch = FetchType.EAGER)
+ @JoinColumn(name = "default_map_value_id", nullable = false)
+ public MapValue getDefaultValue() {
+ return defaultValue;
+ }
+
+ public void setDefaultValue(MapValue defaultValue) {
+ log.tracef( "Setting defaultValue : %s", defaultValue );
+ this.defaultValue = defaultValue;
+ }
+
+ private int previousHashCode = -1;
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((getDefaultValue() == null) ? 0 : getDefaultValue().hashCode());
+ result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
+ log.tracef(
+ "Calculated hashcode [%s] = %s (previous=%s, changed?=%s)",
+ this,
+ result,
+ previousHashCode,
+ !(previousHashCode == -1 || previousHashCode == result)
+ );
+ previousHashCode = result;
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ log.tracef( "Checking equality : %s -> %s", this, obj );
+ if ( this == obj ) {
+ return true;
+ }
+ if ( obj == null ) {
+ return false;
+ }
+ if ( !(obj instanceof MapKey) ) {
+ return false;
+ }
+ MapKey other = (MapKey) obj;
+ if ( getDefaultValue() == null ) {
+ if ( other.getDefaultValue() != null ) {
+ return false;
+ }
+ }
+ else if ( !getDefaultValue().equals( other.getDefaultValue() ) ) {
+ return false;
+ }
+ if ( getName() == null ) {
+ if ( other.getName() != null ) {
+ return false;
+ }
+ }
+ else if ( !getName().equals( other.getName() ) ) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append( "MapKey [id=" ).append( getId() )
+ .append( ", name=" ).append( getName() )
+ .append( ", defaultValue=" ).append( getDefaultValue() )
+ .append( "]" );
+ return builder.toString();
+ }
+
+}
\ No newline at end of file
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/map/hhh7557/MapValue.java b/hibernate-core/src/test/java/org/hibernate/test/collection/map/hhh7557/MapValue.java
new file mode 100644
index 0000000000..0a1c1473d7
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/collection/map/hhh7557/MapValue.java
@@ -0,0 +1,123 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.collection.map.hhh7557;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author Elizabeth Chatman
+ * @author Steve Ebersole
+ */
+@Entity
+@Table(name = "map_value")
+public class MapValue {
+ private static final Logger log = Logger.getLogger( MapValue.class );
+
+ private Long id;
+ private String name;
+
+ public MapValue() {
+ }
+
+ public MapValue(String name) {
+ this.name = name;
+ }
+
+ @Id
+ @GeneratedValue
+ @Column(name = "id", unique = true, nullable = false)
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name = "name", unique = true, nullable = false)
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ log.tracef( "Setting name : %s", name );
+ this.name = name;
+ }
+
+ int previousHashCode = -1;
+
+ @Override
+ public int hashCode() {
+
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
+ log.tracef(
+ "Calculated hashcode [%s] = %s (previous=%s, changed?=%s)",
+ this,
+ result,
+ previousHashCode,
+ !(previousHashCode == -1 || previousHashCode == result)
+ );
+ previousHashCode = result;
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ log.tracef( "Checking equality : %s -> %s", this, obj );
+ if ( this == obj ) {
+ return true;
+ }
+ if ( obj == null ) {
+ return false;
+ }
+ if ( !(obj instanceof MapValue) ) {
+ return false;
+ }
+ MapValue other = (MapValue) obj;
+ if ( getName() == null ) {
+ if ( other.getName() != null ) {
+ return false;
+ }
+ }
+ else if ( !getName().equals( other.getName() ) ) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append( "MapValue [id=" ).append( getId() ).append( ", name=" ).append( getName() ).append( "]" );
+ return builder.toString();
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collectionalias/ATable.java b/hibernate-core/src/test/java/org/hibernate/test/collectionalias/ATable.java
new file mode 100644
index 0000000000..73aaa4ced1
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/collectionalias/ATable.java
@@ -0,0 +1,119 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.collectionalias;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+/**
+ * @author Dave Stephan
+ */
+@Entity
+public class ATable implements Serializable
+{
+ private Integer firstId;
+
+ private List tablebs = new ArrayList();
+
+ public ATable()
+ {
+ }
+
+ /** minimal constructor */
+ public ATable(Integer firstId)
+ {
+ this.firstId = firstId;
+ }
+
+ @Id
+ @Column(name = "idcolumn", nullable = false)
+ public Integer getFirstId()
+ {
+ return this.firstId;
+ }
+
+ public void setFirstId(Integer firstId)
+ {
+ this.firstId = firstId;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((firstId == null) ? 0 : firstId.hashCode());
+ result = prime * result + ((tablebs == null) ? 0 : tablebs.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ ATable other = (ATable) obj;
+ if (firstId == null)
+ {
+ if (other.firstId != null)
+ return false;
+ }
+ else if (!firstId.equals(other.firstId))
+ return false;
+ if (tablebs == null)
+ {
+ if (other.tablebs != null)
+ return false;
+ }
+ else if (!tablebs.equals(other.tablebs))
+ return false;
+ return true;
+ }
+
+
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tablea")
+ public List getTablebs()
+ {
+ return tablebs;
+ }
+
+ public void setTablebs(List tablebs)
+ {
+ this.tablebs = tablebs;
+ }
+
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collectionalias/CollectionAliasTest.java b/hibernate-core/src/test/java/org/hibernate/test/collectionalias/CollectionAliasTest.java
new file mode 100644
index 0000000000..ac1c1e9c58
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/collectionalias/CollectionAliasTest.java
@@ -0,0 +1,78 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.collectionalias;
+
+import org.junit.Test;
+
+import org.hibernate.Session;
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+/**
+ * @author Dave Stephan
+ * @author Gail Badner
+ */
+public class CollectionAliasTest extends BaseCoreFunctionalTestCase {
+
+ @TestForIssue( jiraKey = "HHH-7545" )
+ @Test
+ public void test() {
+ Session s = openSession();
+ s.getTransaction().begin();
+ ATable aTable = new ATable( 1 );
+ TableB tableB = new TableB(
+ new TableBId( 1, "a", "b" )
+ );
+ aTable.getTablebs().add( tableB );
+ tableB.setTablea( aTable );
+ s.save( aTable );
+ s.getTransaction().commit();
+ s.close();
+
+ s = openSession();
+ aTable = (ATable) s.createQuery( "select distinct tablea from ATable tablea LEFT JOIN FETCH tablea.tablebs " ).uniqueResult();
+ assertEquals( new Integer( 1 ), aTable.getFirstId() );
+ assertEquals( 1, aTable.getTablebs().size() );
+ tableB = aTable.getTablebs().get( 0 );
+ assertSame( aTable, tableB.getTablea() );
+ assertEquals( new Integer( 1 ), tableB.getId().getFirstId() );
+ assertEquals( "a", tableB.getId().getSecondId() );
+ assertEquals( "b", tableB.getId().getThirdId() );
+ s.close();
+ }
+
+ @Override
+ protected Class[] getAnnotatedClasses() {
+ return new Class[] {
+ TableBId.class,
+ TableB.class,
+ TableA.class,
+ ATable.class
+ };
+ }
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collectionalias/ReorderedMappingsCollectionAliasTest.java b/hibernate-core/src/test/java/org/hibernate/test/collectionalias/ReorderedMappingsCollectionAliasTest.java
new file mode 100644
index 0000000000..616f528a79
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/collectionalias/ReorderedMappingsCollectionAliasTest.java
@@ -0,0 +1,45 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.collectionalias;
+
+/**
+ * The bug fixed by HHH-7545 showed showed different results depending on the order
+ * in which entity mappings were processed.
+ *
+ * This mappings are in the opposite order here than in CollectionAliasTest.
+ *
+ * @Author Gail Badner
+ */
+public class ReorderedMappingsCollectionAliasTest extends CollectionAliasTest {
+
+ @Override
+ protected Class[] getAnnotatedClasses() {
+ return new Class[] {
+ ATable.class,
+ TableA.class,
+ TableB.class,
+ TableBId.class,
+ };
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collectionalias/TableA.java b/hibernate-core/src/test/java/org/hibernate/test/collectionalias/TableA.java
new file mode 100644
index 0000000000..685685d1e4
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/collectionalias/TableA.java
@@ -0,0 +1,113 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.collectionalias;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * @author Dave Stephan
+ */
+@Entity
+public class TableA
+{
+ @Id
+ private int id;
+
+ private String test;
+
+ private String test2;
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + id;
+ result = prime * result + ((test == null) ? 0 : test.hashCode());
+ result = prime * result + ((test2 == null) ? 0 : test2.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ TableA other = (TableA) obj;
+ if (id != other.id)
+ return false;
+ if (test == null)
+ {
+ if (other.test != null)
+ return false;
+ }
+ else if (!test.equals(other.test))
+ return false;
+ if (test2 == null)
+ {
+ if (other.test2 != null)
+ return false;
+ }
+ else if (!test2.equals(other.test2))
+ return false;
+ return true;
+ }
+
+ public String getTest2()
+ {
+ return test2;
+ }
+
+ public void setTest2(String test2)
+ {
+ this.test2 = test2;
+ }
+
+ public String getTest()
+ {
+ return test;
+ }
+
+ public void setTest(String test)
+ {
+ this.test = test;
+ }
+
+ public int getId()
+ {
+ return id;
+ }
+
+ public void setId(int id)
+ {
+ this.id = id;
+ }
+
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collectionalias/TableB.java b/hibernate-core/src/test/java/org/hibernate/test/collectionalias/TableB.java
new file mode 100644
index 0000000000..677d44e905
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/collectionalias/TableB.java
@@ -0,0 +1,118 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.collectionalias;
+
+import java.io.Serializable;
+
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
+
+/**
+ * @author Dave Stephan
+ */
+@Entity
+public class TableB implements Serializable
+{
+
+ private TableBId id;
+
+ private ATable tablea;
+
+ public TableB() {
+ }
+
+ /** full constructor */
+ public TableB(TableBId id) {
+ this.id = id;
+ }
+
+ // Property accessors
+ @EmbeddedId
+ @AttributeOverrides( {
+ @AttributeOverride(name = "firstId", column = @Column(name = "idcolumn", nullable = false)),
+ @AttributeOverride(name = "secondId", column = @Column(name = "idcolumn_second", nullable = false, length = 50)),
+ @AttributeOverride(name = "thirdId", column = @Column(name = "thirdcolumn", nullable = false, length = 20)) })
+ public TableBId getId() {
+ return this.id;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((tablea == null) ? 0 : tablea.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ TableB other = (TableB) obj;
+ if (id == null)
+ {
+ if (other.id != null)
+ return false;
+ }
+ else if (!id.equals(other.id))
+ return false;
+ if (tablea == null)
+ {
+ if (other.tablea != null)
+ return false;
+ }
+ else if (!tablea.equals(other.tablea))
+ return false;
+ return true;
+ }
+
+ public void setId(TableBId id) {
+ this.id = id;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumns( { @JoinColumn(name = "idcolumn", referencedColumnName = "idcolumn", nullable = false, insertable = false, updatable = false) })
+ public ATable getTablea() {
+ return tablea;
+ }
+
+ public void setTablea(ATable tablea) {
+ this.tablea = tablea;
+ }
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collectionalias/TableBId.java b/hibernate-core/src/test/java/org/hibernate/test/collectionalias/TableBId.java
new file mode 100644
index 0000000000..3623c7718a
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/collectionalias/TableBId.java
@@ -0,0 +1,133 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.collectionalias;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * @author Dave Stephan
+ */
+@Embeddable
+public class TableBId implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ // Fields
+
+ private Integer firstId;
+
+ private String secondId;
+
+ private String thirdId;
+
+ // Constructors
+
+ /** default constructor */
+ public TableBId() {
+ }
+
+ /** full constructor */
+ public TableBId(Integer firstId, String secondId, String thirdId) {
+ this.firstId = firstId;
+ this.secondId = secondId;
+ this.thirdId = thirdId;
+ }
+
+ // Property accessors
+
+ @Column(name = "idcolumn", nullable = false)
+ public Integer getFirstId() {
+ return this.firstId;
+ }
+
+ public void setFirstId(Integer firstId) {
+ this.firstId = firstId;
+ }
+
+ @Column(name = "idcolumn_second", nullable = false, length = 50)
+ public String getSecondId() {
+ return this.secondId;
+ }
+
+ public void setSecondId(String secondId) {
+ this.secondId = secondId;
+ }
+
+ @Column(name = "thirdcolumn", nullable = false, length = 50)
+ public String getThirdId() {
+ return this.thirdId;
+ }
+
+ public void setThirdId(String thirdId) {
+ this.thirdId = thirdId;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((firstId == null) ? 0 : firstId.hashCode());
+ result = prime * result + ((secondId == null) ? 0 : secondId.hashCode());
+ result = prime * result + ((thirdId == null) ? 0 : thirdId.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ TableBId other = (TableBId) obj;
+ if (firstId == null)
+ {
+ if (other.firstId != null)
+ return false;
+ }
+ else if (!firstId.equals(other.firstId))
+ return false;
+ if (secondId == null)
+ {
+ if (other.secondId != null)
+ return false;
+ }
+ else if (!secondId.equals(other.secondId))
+ return false;
+ if (thirdId == null)
+ {
+ if (other.thirdId != null)
+ return false;
+ }
+ else if (!thirdId.equals(other.thirdId))
+ return false;
+ return true;
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java b/hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java
index 8bc8c1c12b..8b153b6b1b 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java
@@ -29,6 +29,7 @@ import java.util.Set;
import org.hibernate.dialect.Dialect;
import org.hibernate.engine.jdbc.LobCreationContext;
import org.hibernate.engine.jdbc.LobCreator;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.jdbc.internal.ResultSetWrapperImpl;
import org.hibernate.engine.jdbc.internal.TypeInfo;
import org.hibernate.engine.jdbc.spi.JdbcServices;
@@ -36,7 +37,6 @@ import org.hibernate.engine.jdbc.spi.ResultSetWrapper;
import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
import org.hibernate.metamodel.spi.relational.Identifier;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.jdbc.env.internal.ExtractedDatabaseMetaDataImpl;
import org.hibernate.service.jdbc.env.internal.LobCreatorBuilderImpl;
import org.hibernate.service.jdbc.env.spi.ExtractedDatabaseMetaData;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java b/hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java
index d1080faed0..68895887ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java
@@ -26,9 +26,9 @@ package org.hibernate.test.common;
import java.sql.Connection;
import java.sql.SQLException;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.transaction.spi.TransactionEnvironment;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.jdbc.connections.spi.JdbcConnectionAccess;
/**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/common/TransactionEnvironmentImpl.java b/hibernate-core/src/test/java/org/hibernate/test/common/TransactionEnvironmentImpl.java
index 41e8f596a4..be0ed8f3a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/common/TransactionEnvironmentImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/common/TransactionEnvironmentImpl.java
@@ -30,7 +30,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.transaction.spi.TransactionEnvironment;
import org.hibernate.engine.transaction.spi.TransactionFactory;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.stat.internal.ConcurrentStatisticsImpl;
import org.hibernate.stat.spi.StatisticsImplementor;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
index 04e428fe54..c63131040e 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
@@ -1,35 +1,38 @@
// $Id: AggressiveReleaseTest.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
package org.hibernate.test.connections;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.sql.Connection;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.junit.Test;
-
import org.hibernate.ConnectionReleaseMode;
import org.hibernate.Hibernate;
import org.hibernate.ScrollableResults;
import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory;
import org.hibernate.internal.util.SerializationHelper;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
+import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.jta.TestingJtaBootstrap;
import org.hibernate.testing.jta.TestingJtaPlatformImpl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.junit.Test;
/**
* Implementation of AggressiveReleaseTest.
*
* @author Steve Ebersole
*/
+@RequiresDialect(H2Dialect.class)
public class AggressiveReleaseTest extends ConnectionManagementTestCase {
@Override
public void configure(Configuration cfg) {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/connections/BasicConnectionProviderTest.java b/hibernate-core/src/test/java/org/hibernate/test/connections/BasicConnectionProviderTest.java
index c297fd862d..a147c0e3b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/connections/BasicConnectionProviderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/connections/BasicConnectionProviderTest.java
@@ -27,12 +27,15 @@ import org.hibernate.ConnectionReleaseMode;
import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.testing.RequiresDialect;
/**
* Implementation of BasicConnectionProviderTest.
*
* @author Steve Ebersole
*/
+@RequiresDialect(H2Dialect.class)
public class BasicConnectionProviderTest extends ConnectionManagementTestCase {
@Override
protected Session getSessionUnderTest() {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java b/hibernate-core/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java
index 9a7f9b404c..ba3a685f27 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java
@@ -27,6 +27,7 @@ import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.internal.util.SerializationHelper;
+
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -46,6 +47,7 @@ import static org.junit.Assert.fail;
*
* @author Steve Ebersole
*/
+
public abstract class ConnectionManagementTestCase extends BaseCoreFunctionalTestCase {
@Override
public final String[] getMappings() {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/connections/CurrentSessionConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/connections/CurrentSessionConnectionTest.java
index 7caa8d8ecb..380795baa5 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/connections/CurrentSessionConnectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/connections/CurrentSessionConnectionTest.java
@@ -24,12 +24,15 @@
package org.hibernate.test.connections;
import org.hibernate.Session;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.testing.RequiresDialect;
/**
* Implementation of CurrentSessionConnectionTest.
*
* @author Steve Ebersole
*/
+@RequiresDialect(H2Dialect.class)
public class CurrentSessionConnectionTest extends AggressiveReleaseTest {
@Override
protected Session getSessionUnderTest() throws Throwable {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/connections/SuppliedConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/connections/SuppliedConnectionTest.java
index 103665315a..b329a6a0e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/connections/SuppliedConnectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/connections/SuppliedConnectionTest.java
@@ -31,11 +31,13 @@ import org.hibernate.ConnectionReleaseMode;
import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
-import org.hibernate.service.jdbc.connections.internal.UserSuppliedConnectionProviderImpl;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.engine.jdbc.connections.internal.UserSuppliedConnectionProviderImpl;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.Stoppable;
import org.hibernate.testing.AfterClassOnce;
import org.hibernate.testing.BeforeClassOnce;
+import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.env.ConnectionProviderBuilder;
import org.hibernate.tool.hbm2ddl.SchemaExport;
@@ -44,6 +46,7 @@ import org.hibernate.tool.hbm2ddl.SchemaExport;
*
* @author Steve Ebersole
*/
+@RequiresDialect(H2Dialect.class)
public class SuppliedConnectionTest extends ConnectionManagementTestCase {
private ConnectionProvider cp = ConnectionProviderBuilder.buildConnectionProvider();
private Connection connectionUnderTest;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java b/hibernate-core/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java
index 6162119056..cc7797b1bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java
@@ -30,9 +30,11 @@ import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.context.internal.ThreadLocalSessionContext;
+import org.hibernate.dialect.H2Dialect;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.transaction.spi.LocalStatus;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
+import org.hibernate.testing.RequiresDialect;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -42,6 +44,7 @@ import static org.junit.Assert.fail;
/**
* @author Steve Ebersole
*/
+@RequiresDialect(H2Dialect.class)
public class ThreadLocalCurrentSessionTest extends ConnectionManagementTestCase {
@Override
public void configure(Configuration cfg) {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java
index e7f7c6ddda..cb299f9a7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java
@@ -1,7 +1,7 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2008-2011, Red Hat Inc. or third-party contributors as
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
@@ -22,11 +22,11 @@
* Boston, MA 02110-1301 USA
*/
package org.hibernate.test.criteria;
+import static org.junit.Assert.assertEquals;
+
import java.util.ArrayList;
import java.util.List;
-import org.junit.Test;
-
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.Session;
@@ -34,13 +34,13 @@ import org.hibernate.Transaction;
import org.hibernate.criterion.Restrictions;
import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SybaseDialect;
import org.hibernate.dialect.TeradataDialect;
import org.hibernate.test.hql.StateProvince;
import org.hibernate.testing.SkipForDialect;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
/**
* HHH-2166 Long "in" lists in queries results in a Java stack overflow
@@ -60,7 +60,7 @@ public class LongInElementsTest extends BaseCoreFunctionalTestCase {
@Test
@TestForIssue( jiraKey = "HHH-2166" )
@SkipForDialect(
- value = { SQLServerDialect.class, Oracle8iDialect.class, TeradataDialect.class },
+ value = { SQLServerDialect.class, Oracle8iDialect.class, TeradataDialect.class, SybaseDialect.class },
comment = "this test fails on oracle and ms sql server, for more info, see HHH-1123"
)
public void testLongInElementsByHQL() {
@@ -90,7 +90,7 @@ public class LongInElementsTest extends BaseCoreFunctionalTestCase {
@Test
@TestForIssue( jiraKey = "HHH-2166" )
@SkipForDialect(
- value = { SQLServerDialect.class, Oracle8iDialect.class, TeradataDialect.class },
+ value = { SQLServerDialect.class, Oracle8iDialect.class, TeradataDialect.class, SybaseDialect.class },
comment = "this test fails on oracle and ms sql server, for more info, see HHH-1123"
)
public void testLongInElementsByCriteria() {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/enums/InvalidEnumeratedJavaTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/enums/InvalidEnumeratedJavaTypeTest.java
new file mode 100644
index 0000000000..a26dd02205
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/enums/InvalidEnumeratedJavaTypeTest.java
@@ -0,0 +1,61 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.enums;
+
+import javax.persistence.Entity;
+import javax.persistence.Enumerated;
+import javax.persistence.Id;
+
+import org.hibernate.AnnotationException;
+import org.hibernate.cfg.Configuration;
+
+import org.junit.Test;
+
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+
+import static org.junit.Assert.fail;
+
+/**
+ * @author Steve Ebersole
+ */
+public class InvalidEnumeratedJavaTypeTest extends BaseUnitTestCase {
+ @Test
+ public void testInvalidMapping() {
+ final Configuration cfg = new Configuration();
+ try {
+ cfg.addAnnotatedClass( TheEntity.class );
+ cfg.buildMappings();
+ fail( "Was expecting failure" );
+ }
+ catch (AnnotationException expected) {
+ System.out.println( expected );
+ }
+ }
+
+ @Entity
+ public static class TheEntity {
+ @Id private Long id;
+ @Enumerated private Boolean yesNo;
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/events/CallbackTest.java b/hibernate-core/src/test/java/org/hibernate/test/events/CallbackTest.java
index 4ec9633906..0d13e5d33c 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/events/CallbackTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/events/CallbackTest.java
@@ -30,6 +30,7 @@ import org.junit.Test;
import org.hibernate.HibernateException;
import org.hibernate.SessionFactory;
import org.hibernate.SessionFactoryObserver;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.event.service.spi.EventListenerRegistry;
@@ -38,7 +39,6 @@ import org.hibernate.event.spi.DeleteEventListener;
import org.hibernate.event.spi.EventType;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.metamodel.spi.MetadataImplementor;
-import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java
index bb7a228b18..d4ce19796c 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java
@@ -7,7 +7,7 @@ import org.junit.Test;
import org.hibernate.HibernateException;
import org.hibernate.cfg.Configuration;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.ServiceRegistryBuilder;
import org.hibernate.testing.junit4.BaseUnitTestCase;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/selfReferencing/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/selfReferencing/Employee.java
new file mode 100644
index 0000000000..8fdf82ba2e
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/selfReferencing/Employee.java
@@ -0,0 +1,86 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.fetchprofiles.join.selfReferencing;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.annotations.FetchProfile;
+import org.hibernate.annotations.FetchProfiles;
+
+/**
+ * @author Steve Ebersole
+ */
+@Entity
+@FetchProfiles(
+ @FetchProfile(
+ name = Employee.FETCH_PROFILE_TREE,
+ fetchOverrides = {
+ @FetchProfile.FetchOverride(entity = Employee.class, association = "manager", mode = FetchMode.JOIN),
+ @FetchProfile.FetchOverride(entity = Employee.class, association = "minions", mode = FetchMode.JOIN)
+ }
+ )
+)
+public class Employee {
+ public final static String FETCH_PROFILE_TREE = "locationTree";
+
+ private Long id;
+ private Employee manager;
+ private Collection minions = new ArrayList();
+
+ @Id
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "manager_id")
+ public Employee getManager() {
+ return manager;
+ }
+
+ public void setManager(Employee manager) {
+ this.manager = manager;
+ }
+
+ @OneToMany(mappedBy = "manager", fetch = FetchType.LAZY)
+ public Collection getMinions() {
+ return minions;
+ }
+
+ public void setMinions(Collection minions) {
+ this.minions = minions;
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java
new file mode 100644
index 0000000000..2cd272d41f
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java
@@ -0,0 +1,53 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.fetchprofiles.join.selfReferencing;
+
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+
+import org.junit.Test;
+
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+
+/**
+ * @author Steve Ebersole
+ */
+public class JoinSelfReferentialFetchProfileTest extends BaseCoreFunctionalTestCase {
+ @Override
+ protected Class[] getAnnotatedClasses() {
+ return new Class[] { Employee.class };
+ }
+
+ @Test
+ public void testEnablingJoinFetchProfileAgainstSelfReferentialAssociation() {
+ Session s = openSession();
+ s.beginTransaction();
+ s.enableFetchProfile( Employee.FETCH_PROFILE_TREE );
+ s.createCriteria( Employee.class )
+ .add( Restrictions.isNull( "manager" ) )
+ .list();
+ s.getTransaction().commit();
+ s.close();
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/fileimport/CommandExtractorServiceTest.java b/hibernate-core/src/test/java/org/hibernate/test/fileimport/CommandExtractorServiceTest.java
index 516b659e86..793749f250 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/fileimport/CommandExtractorServiceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/fileimport/CommandExtractorServiceTest.java
@@ -23,9 +23,11 @@
*/
package org.hibernate.test.fileimport;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
-import org.hibernate.service.ServiceRegistryBuilder;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.TestForIssue;
import org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractor;
import org.hibernate.tool.hbm2ddl.MultipleLinesSqlCommandExtractor;
@@ -34,6 +36,10 @@ import org.hibernate.tool.hbm2ddl.MultipleLinesSqlCommandExtractor;
* @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
*/
@TestForIssue( jiraKey = "HHH-2403" )
+@RequiresDialect(value = H2Dialect.class,
+ jiraKey = "HHH-6286",
+ comment = "Only running the tests against H2, because the sql statements in the import file are not generic. " +
+ "This test should actually not test directly against the db")
public class CommandExtractorServiceTest extends MultiLineImportFileTest {
@Override
public void configure(Configuration cfg) {
@@ -41,7 +47,7 @@ public class CommandExtractorServiceTest extends MultiLineImportFileTest {
}
@Override
- protected void prepareBasicRegistryBuilder(ServiceRegistryBuilder serviceRegistryBuilder) {
+ protected void prepareBasicRegistryBuilder(StandardServiceRegistryBuilder serviceRegistryBuilder) {
super.prepareBasicRegistryBuilder( serviceRegistryBuilder );
serviceRegistryBuilder.addService( ImportSqlCommandExtractor.class, new MultipleLinesSqlCommandExtractor() );
}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java b/hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java
index 747f89b911..4057f501bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java
@@ -43,8 +43,8 @@ import org.hibernate.event.spi.PreUpdateEvent;
import org.hibernate.event.spi.PreUpdateEventListener;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.internal.SessionImpl;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
import org.hibernate.metamodel.spi.MetadataImplementor;
-import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.TestForIssue;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java b/hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java
index f1864c8f18..861531a0f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java
@@ -27,6 +27,7 @@ import org.junit.Test;
import org.hibernate.Hibernate;
import org.hibernate.Session;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.event.service.spi.EventListenerRegistry;
@@ -35,7 +36,6 @@ import org.hibernate.event.spi.PreUpdateEvent;
import org.hibernate.event.spi.PreUpdateEventListener;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.metamodel.spi.MetadataImplementor;
-import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.TestForIssue;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java
index 01ce5c0374..fe98879562 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java
@@ -72,6 +72,19 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase {
};
}
+ @Test
+ public void testUpdateWithSubquery() {
+ Session s = openSession();
+ s.beginTransaction();
+
+ // just checking parsing and syntax...
+ s.createQuery( "update Human h set h.bodyWeight = h.bodyWeight + (select count(1) from IntegerVersioned)" ).executeUpdate();
+ s.createQuery( "update Human h set h.bodyWeight = h.bodyWeight + (select count(1) from IntegerVersioned) where h.description = 'abc'" ).executeUpdate();
+
+ s.getTransaction().commit();
+ s.close();
+ }
+
@Test
public void testDeleteNonExistentEntity() {
Session s = openSession();
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/identity/joinedSubClass/JoinedSubclassHierarchyWithIdentityGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/identity/joinedSubClass/JoinedSubclassHierarchyWithIdentityGenerationTest.java
new file mode 100644
index 0000000000..3f27d7f9b8
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/idgen/identity/joinedSubClass/JoinedSubclassHierarchyWithIdentityGenerationTest.java
@@ -0,0 +1,59 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.idgen.identity.joinedSubClass;
+
+import org.hibernate.Session;
+
+import org.junit.Test;
+
+import org.hibernate.testing.DialectChecks;
+import org.hibernate.testing.RequiresDialectFeature;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+
+/**
+ * @author Andrey Vlasov
+ * @author Steve Ebersole
+ */
+@RequiresDialectFeature( DialectChecks.SupportsIdentityColumns.class )
+public class JoinedSubclassHierarchyWithIdentityGenerationTest extends BaseCoreFunctionalTestCase {
+ @Override
+ protected Class[] getAnnotatedClasses() {
+ return new Class[] { Sub.class };
+ }
+
+ @Test
+ public void shouldPersistDebtorAccountWhenParentServiceAgreementPersisted() {
+ Session s = openSession();
+ s.beginTransaction();
+ s.save( new Sub() );
+ s.getTransaction().commit();
+ s.close();
+
+ s = openSession();
+ s.beginTransaction();
+ s.createQuery( "delete Sub" ).executeUpdate();
+ s.getTransaction().commit();
+ s.close();
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/identity/joinedSubClass/Sub.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/identity/joinedSubClass/Sub.java
new file mode 100644
index 0000000000..db6c9cfc13
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/idgen/identity/joinedSubClass/Sub.java
@@ -0,0 +1,36 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.idgen.identity.joinedSubClass;
+
+import javax.persistence.Entity;
+import javax.persistence.PrimaryKeyJoinColumn;
+
+/**
+ * @author Andrey Vlasov
+ * @author Steve Ebersole
+ */
+@Entity
+@PrimaryKeyJoinColumn(name = "super_id")
+public class Sub extends Super {
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/identity/joinedSubClass/Super.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/identity/joinedSubClass/Super.java
new file mode 100644
index 0000000000..41f320e828
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/idgen/identity/joinedSubClass/Super.java
@@ -0,0 +1,48 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.idgen.identity.joinedSubClass;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+
+import static javax.persistence.GenerationType.IDENTITY;
+import static javax.persistence.InheritanceType.JOINED;
+
+/**
+ * @author Andrey Vlasov
+ * @author Steve Ebersole
+ */
+@Entity
+@Inheritance(strategy = JOINED)
+public class Super {
+ @Id
+ @GeneratedValue(strategy = IDENTITY)
+ private Long id;
+
+ @Column
+ private Long value;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java
index f4d4d1cf24..8acd8a1ab5 100755
--- a/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java
@@ -34,6 +34,8 @@ import org.hibernate.EmptyInterceptor;
import org.hibernate.Interceptor;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.TransactionException;
+
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -44,6 +46,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* @author Gavin King
@@ -136,6 +139,40 @@ public class InterceptorTest extends BaseCoreFunctionalTestCase {
}
+ /**
+ * Test that setting a transaction timeout will cause an Exception to occur
+ * if the transaction timeout is exceeded.
+ */
+ @Test
+ public void testTimeout() throws Exception {
+ final int TIMEOUT = 2;
+ final int WAIT = TIMEOUT + 1;
+ Session s = openSession();
+ // Get the transaction and set the timeout BEFORE calling begin()
+ Transaction t = s.getTransaction();
+ t.setTimeout( TIMEOUT );
+ t.begin();
+ // Sleep for an amount of time that exceeds the transaction timeout
+ Thread.sleep( WAIT * 1000 );
+ try {
+ // Do something with the transaction and try to commit it
+ s.persist( new User( "john", "test" ) );
+ t.commit();
+ fail( "Transaction should have timed out" );
+ }
+ catch ( TransactionException e ) {
+ // Insure that the Exception is "transaction timeout expired"
+ String exceptionActual = e.toString();
+ String exceptionExpected = "org.hibernate.TransactionException: transaction timeout expired";
+ if ( !exceptionActual.contains( exceptionExpected ) ) {
+ String msg = String.format( "Transaction failed for the wrong reason. Expected [%s] but received [%s]",
+ exceptionExpected, exceptionActual );
+ fail( msg );
+
+ }
+ }
+ }
+
@Test
public void testComponentInterceptor() {
final int checkPerm = 500;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/BatchingTest.java b/hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/BatchingTest.java
index 5f787044b8..df5624df10 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/BatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/BatchingTest.java
@@ -31,6 +31,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
import org.hibernate.engine.jdbc.batch.internal.BatchBuilderImpl;
import org.hibernate.engine.jdbc.batch.internal.BatchingBatch;
@@ -45,8 +46,7 @@ import org.hibernate.engine.transaction.spi.TransactionContext;
import org.hibernate.engine.transaction.spi.TransactionImplementor;
import org.hibernate.jdbc.Expectation;
import org.hibernate.jdbc.Expectations;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.test.common.JournalingBatchObserver;
import org.hibernate.test.common.JournalingTransactionObserver;
import org.hibernate.test.common.TransactionContextImpl;
@@ -67,7 +67,7 @@ public class BatchingTest extends BaseUnitTestCase implements BatchKey {
@Before
public void setUp() throws Exception {
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder()
.applySettings( ConnectionProviderBuilder.getConnectionProviderProperties() )
.buildServiceRegistry();
}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java
index df44a13605..f3bcb7d636 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java
@@ -27,6 +27,7 @@ import java.io.Serializable;
import java.util.IdentityHashMap;
import javax.persistence.EntityNotFoundException;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.spi.CascadingAction;
@@ -45,7 +46,6 @@ import org.hibernate.event.spi.PersistEventListener;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.metamodel.spi.MetadataImplementor;
import org.hibernate.proxy.EntityNotFoundDelegate;
-import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
index ba72672c97..cbd636ce8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
@@ -36,8 +36,8 @@ import org.hibernate.event.spi.EventType;
import org.hibernate.event.spi.LoadEvent;
import org.hibernate.event.spi.LoadEventListener;
import org.hibernate.integrator.spi.Integrator;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
import org.hibernate.metamodel.spi.MetadataImplementor;
-import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.TestForIssue;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java
index 59193b4dc6..c824bcec51 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java
@@ -84,7 +84,7 @@ import org.hibernate.internal.util.collections.JoinedIterator;
import org.hibernate.jdbc.AbstractReturningWork;
import org.hibernate.jdbc.AbstractWork;
import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.testing.DialectChecks;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.RequiresDialect;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/EnumUserType.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/EnumUserType.java
new file mode 100644
index 0000000000..ff95a7b2f6
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/EnumUserType.java
@@ -0,0 +1,116 @@
+package org.hibernate.test.mapping.usertypes;
+import java.io.Serializable;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.Properties;
+
+import org.hibernate.HibernateException;
+import org.hibernate.MappingException;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.usertype.ParameterizedType;
+import org.hibernate.usertype.UserType;
+
+public class EnumUserType implements UserType, ParameterizedType {
+
+ private Class clazz = null;
+
+ public static EnumUserType createInstance(Class clazz){
+ if (!clazz.isEnum())
+ throw new IllegalArgumentException("Parameter has to be an enum-class");
+ EnumUserType that=new EnumUserType();
+ Properties p=new Properties();
+ p.setProperty("enumClassName", clazz.getName());
+ that.setParameterValues(p);
+ return that;
+ }
+
+ public void setParameterValues(Properties params) {
+ String enumClassName = params.getProperty("enumClassName");
+ if (enumClassName == null) {
+ throw new MappingException("enumClassName parameter not specified");
+ }
+
+ try {
+ this.clazz = Class.forName(enumClassName);
+ } catch (ClassNotFoundException e) {
+ throw new MappingException("enumClass " + enumClassName + " not found", e);
+ }
+ if (!this.clazz.isEnum()){
+ throw new MappingException("enumClass "+enumClassName+" doesn't refer to an Enum");
+ }
+ }
+
+ private static final int[] SQL_TYPES = {Types.CHAR};
+ public int[] sqlTypes() {
+ return SQL_TYPES;
+ }
+
+ public Class returnedClass() {
+ return clazz;
+ }
+
+ public Object nullSafeGet(ResultSet resultSet, String[] names, Object owner)
+ throws HibernateException, SQLException {
+ String name = resultSet.getString(names[0]);
+ Object result = null;
+ if (!resultSet.wasNull()) {
+ result = Enum.valueOf(clazz, name.trim());
+ }
+ return result;
+ }
+
+ @Override
+ public Object nullSafeGet(ResultSet resultSet, String[] names,
+ SessionImplementor session, Object owner) throws HibernateException,
+ SQLException {
+ return nullSafeGet(resultSet, names, owner);
+ }
+
+public void nullSafeSet(PreparedStatement preparedStatement, Object value, int index)
+ throws HibernateException, SQLException {
+ if (null == value) {
+ preparedStatement.setNull(index, Types.VARCHAR);
+ } else {
+ preparedStatement.setString(index, ((Enum)value).name());
+ }
+ }
+
+ @Override
+public void nullSafeSet(PreparedStatement preparedStatement, Object value, int index,
+ SessionImplementor session) throws HibernateException, SQLException {
+ nullSafeSet(preparedStatement, value, index);
+}
+
+ public Object deepCopy(Object value) throws HibernateException{
+ return value;
+ }
+
+ public boolean isMutable() {
+ return false;
+ }
+
+ public Object assemble(Serializable cached, Object owner) throws HibernateException {
+ return cached;
+ }
+
+ public Serializable disassemble(Object value) throws HibernateException {
+ return (Serializable)value;
+ }
+
+ public Object replace(Object original, Object target, Object owner) throws HibernateException {
+ return original;
+ }
+ public int hashCode(Object x) throws HibernateException {
+ return x.hashCode();
+ }
+ public boolean equals(Object x, Object y) throws HibernateException {
+ if (x == y)
+ return true;
+ if (null == x || null == y)
+ return false;
+ return x.equals(y);
+ }
+}
+
diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/TestEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/TestEntity.hbm.xml
new file mode 100644
index 0000000000..df6ed68b30
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/TestEntity.hbm.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/TestEntity.java
new file mode 100644
index 0000000000..79ed360bd5
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/TestEntity.java
@@ -0,0 +1,19 @@
+package org.hibernate.test.mapping.usertypes;
+
+public class TestEntity {
+ private int id;
+ private TestEnum testEnum;
+
+ public void setId(int id) {
+ this.id = id;
+ }
+ public int getId() {
+ return id;
+ }
+ public void setTestEnum(TestEnum testEnum) {
+ this.testEnum = testEnum;
+ }
+ public TestEnum getTestEnum() {
+ return testEnum;
+ }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/TestEnum.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/TestEnum.java
new file mode 100644
index 0000000000..8aab6b72ba
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/TestEnum.java
@@ -0,0 +1,6 @@
+package org.hibernate.test.mapping.usertypes;
+
+public enum TestEnum {
+ FOO,
+ BAR;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/TestEnumType.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/TestEnumType.hbm.xml
new file mode 100644
index 0000000000..20acceaae2
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/TestEnumType.hbm.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/UserTypeMappingTest.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/UserTypeMappingTest.java
new file mode 100644
index 0000000000..dcd4cbc133
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/usertypes/UserTypeMappingTest.java
@@ -0,0 +1,58 @@
+package org.hibernate.test.mapping.usertypes;
+
+
+import java.util.Properties;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.testing.ServiceRegistryBuilder;
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test for read-order independent resolution of user-defined types
+ * Testcase for issue HHH-7300
+ * @author Stefan Schulze
+ */
+@TestForIssue(jiraKey = "HHH-7300")
+public class UserTypeMappingTest extends BaseUnitTestCase{
+
+private Configuration cfg;
+private ServiceRegistry serviceRegistry;
+
+ @Before
+ public void setup(){
+ cfg=new Configuration();
+ Properties p = new Properties();
+ p.put( Environment.DIALECT, "org.hibernate.dialect.HSQLDialect" );
+ p.put( "hibernate.connection.driver_class", "org.h2.Driver" );
+ p.put( "hibernate.connection.url", "jdbc:h2:mem:" );
+ p.put( "hibernate.connection.username", "sa" );
+ p.put( "hibernate.connection.password", "" );
+ cfg.setProperties(p);
+ serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() );
+ }
+
+ @Test
+ public void testFirstTypeThenEntity(){
+ cfg.addResource("org/hibernate/test/mapping/usertypes/TestEnumType.hbm.xml")
+ .addResource("org/hibernate/test/mapping/usertypes/TestEntity.hbm.xml");
+ SessionFactory sessions=cfg.buildSessionFactory(serviceRegistry);
+ Assert.assertNotNull(sessions);
+ }
+
+ @Test
+ public void testFirstEntityThenType(){
+ cfg.addResource("org/hibernate/test/mapping/usertypes/TestEntity.hbm.xml")
+ .addResource("org/hibernate/test/mapping/usertypes/TestEnumType.hbm.xml");
+
+ SessionFactory sessions=cfg.buildSessionFactory(serviceRegistry);
+ Assert.assertNotNull(sessions);
+ }
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/ConfigurationValidationTest.java b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/ConfigurationValidationTest.java
index f258c62f57..b84e8e4435 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/ConfigurationValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/ConfigurationValidationTest.java
@@ -4,10 +4,10 @@ import org.junit.Test;
import org.hibernate.ConnectionReleaseMode;
import org.hibernate.MultiTenancyStrategy;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
import org.hibernate.service.spi.ServiceException;
import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.testing.TestForIssue;
@@ -25,7 +25,7 @@ public class ConfigurationValidationTest extends BaseUnitTestCase {
cfg.getProperties().put( Environment.MULTI_TENANT, MultiTenancyStrategy.SCHEMA );
cfg.setProperty( Environment.MULTI_TENANT_CONNECTION_PROVIDER, "class.not.present.in.classpath" );
cfg.buildMappings();
- ServiceRegistryImplementor serviceRegistry = (ServiceRegistryImplementor) new ServiceRegistryBuilder()
+ ServiceRegistryImplementor serviceRegistry = (ServiceRegistryImplementor) new StandardServiceRegistryBuilder()
.applySettings( cfg.getProperties() ).buildServiceRegistry();
cfg.buildSessionFactory( serviceRegistry );
}
@@ -37,7 +37,7 @@ public class ConfigurationValidationTest extends BaseUnitTestCase {
cfg.getProperties().put( Environment.RELEASE_CONNECTIONS, ConnectionReleaseMode.AFTER_STATEMENT.name() );
cfg.buildMappings();
- ServiceRegistryImplementor serviceRegistry = (ServiceRegistryImplementor) new ServiceRegistryBuilder()
+ ServiceRegistryImplementor serviceRegistry = (ServiceRegistryImplementor) new StandardServiceRegistryBuilder()
.applySettings( cfg.getProperties() )
.addService(
MultiTenantConnectionProvider.class,
diff --git a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/TestingConnectionProvider.java b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/TestingConnectionProvider.java
index 64d78abae8..8ca54675f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/TestingConnectionProvider.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/TestingConnectionProvider.java
@@ -26,8 +26,8 @@ package org.hibernate.test.multitenancy;
import java.util.HashMap;
import java.util.Map;
-import org.hibernate.service.jdbc.connections.spi.AbstractMultiTenantConnectionProvider;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.AbstractMultiTenantConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
/**
* @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java
index d20f253416..5ddcfc1837 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java
@@ -38,11 +38,11 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.mapping.RootClass;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
-import org.hibernate.service.jdbc.connections.spi.AbstractMultiTenantConnectionProvider;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
+import org.hibernate.engine.jdbc.connections.spi.AbstractMultiTenantConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.testing.cache.CachingRegionFactory;
import org.hibernate.testing.env.ConnectionProviderBuilder;
@@ -66,7 +66,7 @@ public class SchemaBasedMultiTenancyTest extends BaseUnitTestCase {
AbstractMultiTenantConnectionProvider multiTenantConnectionProvider = buildMultiTenantConnectionProvider();
Configuration cfg = buildConfiguration();
- serviceRegistry = (ServiceRegistryImplementor) new ServiceRegistryBuilder()
+ serviceRegistry = (ServiceRegistryImplementor) new StandardServiceRegistryBuilder()
.applySettings( cfg.getProperties() )
.addService( MultiTenantConnectionProvider.class, multiTenantConnectionProvider )
.buildServiceRegistry();
diff --git a/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java
index 54cdd62da1..1371dd159c 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java
@@ -159,6 +159,48 @@ public class ImmutableEntityNaturalIdTest extends BaseCoreFunctionalTestCase {
tx.rollback();
s.close();
}
+
+ @Test
+ @TestForIssue( jiraKey = "HHH-7371" )
+ public void testImmutableNaturalIdLifecycle2() {
+ Building b1 = new Building();
+ b1.setName( "Computer Science" );
+ b1.setAddress( "1210 W. Dayton St." );
+ b1.setCity( "Madison" );
+ b1.setState( "WI" );
+
+ Session s = openSession();
+ Transaction tx = s.beginTransaction();
+ s.persist( b1 );
+ tx.commit();
+ s.close();
+
+
+ s = openSession();
+ tx = s.beginTransaction();
+ NaturalIdLoadAccess naturalIdLoader = s.byNaturalId( Building.class );
+ naturalIdLoader.using( "address", "1210 W. Dayton St." ).using( "city", "Madison" ).using( "state", "WI" );
+ Building building = (Building) naturalIdLoader.getReference();
+ assertNotNull( building );
+
+ s.delete( building );
+ building = (Building) naturalIdLoader.load();
+ //org.hibernate.ObjectNotFoundException: No row with the given identifier exists: [org.hibernate.test.naturalid.immutableentity.Building#1]
+// at org.hibernate.internal.SessionFactoryImpl$1$1.handleEntityNotFound(SessionFactoryImpl.java:247)
+// at org.hibernate.event.internal.DefaultLoadEventListener.returnNarrowedProxy(DefaultLoadEventListener.java:282)
+// at org.hibernate.event.internal.DefaultLoadEventListener.proxyOrLoad(DefaultLoadEventListener.java:248)
+// at org.hibernate.event.internal.DefaultLoadEventListener.onLoad(DefaultLoadEventListener.java:148)
+// at org.hibernate.internal.SessionImpl.fireLoad(SessionImpl.java:1079)
+// at org.hibernate.internal.SessionImpl.access$13(SessionImpl.java:1075)
+// at org.hibernate.internal.SessionImpl$IdentifierLoadAccessImpl.load(SessionImpl.java:2425)
+// at org.hibernate.internal.SessionImpl$NaturalIdLoadAccessImpl.load(SessionImpl.java:2586)
+// at org.hibernate.test.naturalid.immutableentity.ImmutableEntityNaturalIdTest.testImmutableNaturalIdLifecycle2(ImmutableEntityNaturalIdTest.java:188)
+
+ assertNull( building );
+
+ tx.commit();
+ s.close();
+ }
@Override
protected Class[] getAnnotatedClasses() {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkTest.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkTest.java
index 7650b2c5d0..18a4db1353 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkTest.java
@@ -30,13 +30,17 @@ import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
+import org.hibernate.dialect.H2Dialect;
+
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
+import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
/**
* @author Steve Ebersole
*/
@FailureExpectedWithNewMetamodel
+@RequiresDialect(H2Dialect.class)
public class DoesNotWorkTest extends BaseCoreFunctionalTestCase {
@Override
protected Class[] getAnnotatedClasses() {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkWithHbmTest.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkWithHbmTest.java
index 33def68a71..5c3d7405c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkWithHbmTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkWithHbmTest.java
@@ -23,6 +23,9 @@
*/
package org.hibernate.test.propertyref;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.util.List;
import org.junit.Test;
@@ -30,16 +33,17 @@ import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
-import org.hibernate.testing.FailureExpectedWithNewMetamodel;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.hibernate.dialect.H2Dialect;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import org.hibernate.testing.FailureExpectedWithNewMetamodel;
+import org.hibernate.testing.RequiresDialect;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
/**
* @author Steve Ebersole
*/
@FailureExpectedWithNewMetamodel
+@RequiresDialect(H2Dialect.class)
public class DoesNotWorkWithHbmTest extends BaseCoreFunctionalTestCase {
@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportSuppliedConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportSuppliedConnectionTest.java
index 92e9c291e6..4fc2d0fcb2 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportSuppliedConnectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportSuppliedConnectionTest.java
@@ -37,19 +37,6 @@ import org.hibernate.tool.hbm2ddl.SchemaExport;
*/
public class SchemaExportSuppliedConnectionTest extends SchemaExportTest {
- private ServiceRegistry serviceRegistry;
-
- @Before
- public void setUp() {
- serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() );
- }
-
- @After
- public void tearDown() {
- ServiceRegistryBuilder.destroy( serviceRegistry );
- serviceRegistry = null;
- }
-
@Override
protected SchemaExport createSchemaExport(Configuration cfg) {
return new SchemaExport( serviceRegistry, cfg );
diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportTest.java b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportTest.java
index f30de872f3..a0d55002fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportTest.java
@@ -23,10 +23,15 @@
*/
package org.hibernate.test.schemaupdate;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
import org.hibernate.dialect.Dialect;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.testing.ServiceRegistryBuilder;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.tool.hbm2ddl.SchemaExport;
@@ -44,6 +49,22 @@ public abstract class SchemaExportTest extends BaseUnitTestCase {
return Dialect.getDialect().supportsIfExistsAfterTableName() || Dialect.getDialect()
.supportsIfExistsBeforeTableName();
}
+ protected ServiceRegistry serviceRegistry;
+
+ @Before
+ public void setUp() {
+ serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() );
+ Configuration cfg = new Configuration();
+ cfg.addResource( MAPPING );
+ SchemaExport schemaExport = createSchemaExport( cfg );
+ schemaExport.drop( true, true );
+ }
+
+ @After
+ public void tearDown() {
+ ServiceRegistryBuilder.destroy( serviceRegistry );
+ serviceRegistry = null;
+ }
@Test
public void testCreateAndDropOnlyType() {
@@ -52,12 +73,12 @@ public abstract class SchemaExportTest extends BaseUnitTestCase {
SchemaExport schemaExport = createSchemaExport( cfg );
// create w/o dropping first; (OK because tables don't exist yet
schemaExport.execute( false, true, false, true );
- if ( doesDialectSupportDropTableIfExist() ) {
+// if ( doesDialectSupportDropTableIfExist() ) {
assertEquals( 0, schemaExport.getExceptions().size() );
- }
- else {
- assertEquals( 2, schemaExport.getExceptions().size() );
- }
+// }
+// else {
+// assertEquals( 2, schemaExport.getExceptions().size() );
+// }
// create w/o dropping again; should be an exception for each table
// (2 total) because the tables exist already
// assertEquals( 0, schemaExport.getExceptions().size() );
@@ -96,7 +117,12 @@ public abstract class SchemaExportTest extends BaseUnitTestCase {
SchemaExport schemaExport = createSchemaExport( cfg );
// should drop before creating, but tables don't exist yet
schemaExport.create( true, true );
- assertEquals( 0, schemaExport.getExceptions().size() );
+ if ( doesDialectSupportDropTableIfExist() ) {
+ assertEquals( 0, schemaExport.getExceptions().size() );
+ }
+ else {
+ assertEquals( 2, schemaExport.getExceptions().size() );
+ }
// call create again; it should drop tables before re-creating
schemaExport.create( true, true );
assertEquals( 0, schemaExport.getExceptions().size() );
diff --git a/hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java b/hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java
index 64c7632e49..7609a5ffc8 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java
@@ -1,14 +1,13 @@
package org.hibernate.test.service;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import javax.persistence.Entity;
-
+import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
import org.junit.Assert;
import org.junit.Test;
-import org.hibernate.service.classloading.internal.ClassLoaderServiceImpl;
+import javax.persistence.Entity;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
/**
* @author Artem V. Navrotskiy
diff --git a/hibernate-core/src/test/java/org/hibernate/test/service/ServiceBootstrappingTest.java b/hibernate-core/src/test/java/org/hibernate/test/service/ServiceBootstrappingTest.java
index 12b5a287b7..f92c6f060a 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/service/ServiceBootstrappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/service/ServiceBootstrappingTest.java
@@ -23,31 +23,33 @@
*/
package org.hibernate.test.service;
-import java.util.Properties;
-
-import org.junit.Test;
-
-import org.hibernate.cfg.Environment;
-import org.hibernate.dialect.H2Dialect;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
-import org.hibernate.service.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
-import org.hibernate.service.jdbc.connections.internal.UserSuppliedConnectionProviderImpl;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.testing.env.ConnectionProviderBuilder;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
-
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import java.util.Properties;
+
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
+import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
+import org.hibernate.engine.jdbc.connections.internal.UserSuppliedConnectionProviderImpl;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.testing.RequiresDialect;
+import org.hibernate.testing.RequiresDialect;
+import org.hibernate.testing.env.ConnectionProviderBuilder;
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.junit.Test;
+
/**
* @author Steve Ebersole
*/
+@RequiresDialect( H2Dialect.class )
public class ServiceBootstrappingTest extends BaseUnitTestCase {
@Test
public void testBasicBuild() {
- StandardServiceRegistryImpl serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
+ StandardServiceRegistryImpl serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder()
.applySettings( ConnectionProviderBuilder.getConnectionProviderProperties() )
.buildServiceRegistry();
JdbcServices jdbcServices = serviceRegistry.getService( JdbcServices.class );
@@ -64,7 +66,7 @@ public class ServiceBootstrappingTest extends BaseUnitTestCase {
Properties props = ConnectionProviderBuilder.getConnectionProviderProperties();
props.put( Environment.SHOW_SQL, "true" );
- StandardServiceRegistryImpl serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
+ StandardServiceRegistryImpl serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder()
.applySettings( props )
.buildServiceRegistry();
@@ -79,7 +81,7 @@ public class ServiceBootstrappingTest extends BaseUnitTestCase {
@Test
public void testBuildWithServiceOverride() {
- StandardServiceRegistryImpl serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
+ StandardServiceRegistryImpl serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder()
.applySettings( ConnectionProviderBuilder.getConnectionProviderProperties() )
.buildServiceRegistry();
JdbcServices jdbcServices = serviceRegistry.getService( JdbcServices.class );
@@ -90,7 +92,7 @@ public class ServiceBootstrappingTest extends BaseUnitTestCase {
Properties props = ConnectionProviderBuilder.getConnectionProviderProperties();
props.setProperty( Environment.DIALECT, H2Dialect.class.getName() );
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder()
.applySettings( props )
.addService( ConnectionProvider.class, new UserSuppliedConnectionProviderImpl() )
.buildServiceRegistry();
diff --git a/hibernate-core/src/test/java/org/hibernate/test/transaction/jdbc/TestExpectedUsage.java b/hibernate-core/src/test/java/org/hibernate/test/transaction/jdbc/TestExpectedUsage.java
index fcd64f33b0..accc188c0a 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/transaction/jdbc/TestExpectedUsage.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/transaction/jdbc/TestExpectedUsage.java
@@ -33,12 +33,12 @@ import org.junit.Before;
import org.junit.Test;
import org.hibernate.ConnectionReleaseMode;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
import org.hibernate.engine.transaction.internal.TransactionCoordinatorImpl;
import org.hibernate.engine.transaction.spi.TransactionContext;
import org.hibernate.engine.transaction.spi.TransactionImplementor;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.test.common.JournalingTransactionObserver;
import org.hibernate.test.common.TransactionContextImpl;
import org.hibernate.test.common.TransactionEnvironmentImpl;
@@ -58,7 +58,7 @@ public class TestExpectedUsage extends BaseUnitTestCase {
@Before
public void setUp() throws Exception {
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder()
.applySettings( ConnectionProviderBuilder.getConnectionProviderProperties() )
.buildServiceRegistry();
}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/transaction/jta/BasicDrivingTest.java b/hibernate-core/src/test/java/org/hibernate/test/transaction/jta/BasicDrivingTest.java
index 397ef9546c..4230cba476 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/transaction/jta/BasicDrivingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/transaction/jta/BasicDrivingTest.java
@@ -34,15 +34,15 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
import org.hibernate.engine.transaction.internal.TransactionCoordinatorImpl;
import org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory;
import org.hibernate.engine.transaction.spi.TransactionContext;
import org.hibernate.engine.transaction.spi.TransactionImplementor;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.test.common.JournalingTransactionObserver;
import org.hibernate.test.common.TransactionContextImpl;
import org.hibernate.test.common.TransactionEnvironmentImpl;
@@ -70,7 +70,7 @@ public class BasicDrivingTest extends BaseUnitTestCase {
configValues.putAll( ConnectionProviderBuilder.getConnectionProviderProperties() );
configValues.put( Environment.TRANSACTION_STRATEGY, JtaTransactionFactory.class.getName() );
TestingJtaBootstrap.prepare( configValues );
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder()
.applySettings( configValues )
.buildServiceRegistry();
}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/transaction/jta/ManagedDrivingTest.java b/hibernate-core/src/test/java/org/hibernate/test/transaction/jta/ManagedDrivingTest.java
index c983b85fd2..05fd185188 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/transaction/jta/ManagedDrivingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/transaction/jta/ManagedDrivingTest.java
@@ -23,44 +23,47 @@
*/
package org.hibernate.test.transaction.jta;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.HashMap;
import java.util.Map;
+
import javax.transaction.TransactionManager;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
import org.hibernate.ConnectionReleaseMode;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.H2Dialect;
import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
import org.hibernate.engine.transaction.internal.TransactionCoordinatorImpl;
import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.engine.transaction.spi.TransactionContext;
import org.hibernate.engine.transaction.spi.TransactionImplementor;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.test.common.JournalingTransactionObserver;
import org.hibernate.test.common.TransactionContextImpl;
import org.hibernate.test.common.TransactionEnvironmentImpl;
+import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.jta.TestingJtaBootstrap;
import org.hibernate.testing.junit4.BaseUnitTestCase;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* Testing transaction facade handling when the transaction is being driven by something other than the facade.
*
* @author Steve Ebersole
*/
+@RequiresDialect(H2Dialect.class)
public class ManagedDrivingTest extends BaseUnitTestCase {
private StandardServiceRegistryImpl serviceRegistry;
@@ -71,7 +74,7 @@ public class ManagedDrivingTest extends BaseUnitTestCase {
TestingJtaBootstrap.prepare( configValues );
configValues.put( Environment.TRANSACTION_STRATEGY, CMTTransactionFactory.class.getName() );
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder()
.applySettings( configValues )
.buildServiceRegistry();
}
diff --git a/hibernate-core/src/test/resources/org/hibernate/jmx/Entity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/jmx/Entity.hbm.xml
deleted file mode 100644
index a4502b40d7..0000000000
--- a/hibernate-core/src/test/resources/org/hibernate/jmx/Entity.hbm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java
index db1edbc53f..fff05b346d 100644
--- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java
+++ b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java
@@ -48,15 +48,10 @@ import org.hibernate.cache.spi.CollectionRegion;
import org.hibernate.cache.spi.EntityRegion;
import org.hibernate.cache.spi.NaturalIdRegion;
import org.hibernate.cache.spi.QueryResultsRegion;
-import org.hibernate.cache.spi.RegionFactory;
import org.hibernate.cache.spi.TimestampsRegion;
import org.hibernate.cache.spi.access.AccessType;
import org.hibernate.cfg.Settings;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.spi.InjectService;
-import org.hibernate.service.spi.ServiceRegistryAwareService;
-import org.hibernate.service.spi.ServiceRegistryImplementor;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
/**
* Abstract implementation of an Ehcache specific RegionFactory.
diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/AvailabilityAnnouncerImpl.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/AvailabilityAnnouncerImpl.java
new file mode 100644
index 0000000000..9efe6fa462
--- /dev/null
+++ b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/AvailabilityAnnouncerImpl.java
@@ -0,0 +1,68 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.cache.ehcache;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.boot.registry.selector.Availability;
+import org.hibernate.boot.registry.selector.AvailabilityAnnouncer;
+import org.hibernate.boot.registry.selector.SimpleAvailabilityImpl;
+import org.hibernate.cache.spi.RegionFactory;
+
+/**
+ * Makes the 2 contained region factory implementations available to the Hibernate
+ * {@link org.hibernate.boot.registry.selector.spi.StrategySelector} service.
+ *
+ * @author Steve Ebersole
+ */
+public class AvailabilityAnnouncerImpl implements AvailabilityAnnouncer {
+ @Override
+ @SuppressWarnings("unchecked")
+ public Iterable getAvailabilities() {
+ final List availabilities = new ArrayList();
+
+ availabilities.add(
+ new SimpleAvailabilityImpl(
+ RegionFactory.class,
+ EhCacheRegionFactory.class,
+ "ehcache",
+ EhCacheRegionFactory.class.getSimpleName(),
+ "org.hibernate.cache.EhCacheRegionFactory" // legacy impl class name
+ )
+ );
+
+ availabilities.add(
+ new SimpleAvailabilityImpl(
+ RegionFactory.class,
+ SingletonEhCacheRegionFactory.class,
+ "ehcache-singleton",
+ SingletonEhCacheRegionFactory.class.getSimpleName(),
+ "org.hibernate.cache.SingletonEhCacheRegionFactory" // legacy impl class name
+ )
+ );
+
+ return availabilities;
+ }
+}
diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/ProviderMBeanRegistrationHelper.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/ProviderMBeanRegistrationHelper.java
index f8a78ba138..10a4c28caf 100644
--- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/ProviderMBeanRegistrationHelper.java
+++ b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/ProviderMBeanRegistrationHelper.java
@@ -149,7 +149,7 @@ public class ProviderMBeanRegistrationHelper {
throw new RuntimeException( "Expected 'sessionFactoryMap' field on " + SessionFactoryRegistry.class.getName() );
}
instancesField.setAccessible( true );
- Map map = (Map) instancesField.get( null );
+ Map map = (Map) instancesField.get( SessionFactoryRegistry.INSTANCE );
if ( map == null ) {
return null;
}
diff --git a/hibernate-ehcache/src/main/resources/META-INF/services/org.hibernate.boot.registry.selector.AvailabilityAnnouncer b/hibernate-ehcache/src/main/resources/META-INF/services/org.hibernate.boot.registry.selector.AvailabilityAnnouncer
new file mode 100644
index 0000000000..4089ec9f31
--- /dev/null
+++ b/hibernate-ehcache/src/main/resources/META-INF/services/org.hibernate.boot.registry.selector.AvailabilityAnnouncer
@@ -0,0 +1 @@
+org.hibernate.cache.ehcache.AvailabilityAnnouncerImpl
\ No newline at end of file
diff --git a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/HibernateCacheTest.java b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/HibernateCacheTest.java
index e118a6c163..a8244b3ef1 100644
--- a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/HibernateCacheTest.java
+++ b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/HibernateCacheTest.java
@@ -1,17 +1,15 @@
package org.hibernate.test.cache;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.hamcrest.CoreMatchers;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import org.hibernate.HibernateException;
import org.hibernate.Session;
-import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.cache.ehcache.internal.strategy.ItemValueExtractor;
import org.hibernate.cache.spi.access.SoftLock;
@@ -25,49 +23,31 @@ import org.hibernate.test.domain.Item;
import org.hibernate.test.domain.Person;
import org.hibernate.test.domain.PhoneNumber;
import org.hibernate.test.domain.VersionedItem;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.junit.Test;
/**
* @author Chris Dennis
+ * @author Brett Meyer
*/
-public class HibernateCacheTest {
+public class HibernateCacheTest extends BaseCoreFunctionalTestCase {
- private static SessionFactory sessionFactory;
- private static Configuration config;
private static final String REGION_PREFIX = "hibernate.test.";
- public synchronized static SessionFactory getSessionFactory() {
- if ( sessionFactory == null ) {
- try {
- sessionFactory = config.buildSessionFactory();
- }
- catch ( HibernateException ex ) {
- System.err.println( "Initial SessionFactory creation failed." + ex );
- throw new ExceptionInInitializerError( ex );
- }
- }
- return sessionFactory;
- }
-
- @BeforeClass
- public static void setUp() {
+ @Override
+ protected void configure(Configuration config) {
System.setProperty( "derby.system.home", "target/derby" );
- config = new Configuration().configure( "/hibernate-config/hibernate.cfg.xml" );
- config.setProperty( "hibernate.hbm2ddl.auto", "create" );
- getSessionFactory().getStatistics().setStatisticsEnabled( true );
+ config.configure( "hibernate-config/hibernate.cfg.xml" );
}
-
- @AfterClass
- public static void tearDown() {
- getSessionFactory().close();
+
+ @Override
+ protected void afterSessionFactoryBuilt() {
+ sessionFactory().getStatistics().setStatisticsEnabled( true );
}
@Test
public void testQueryCacheInvalidation() throws Exception {
- Session s = getSessionFactory().openSession();
+ Session s = sessionFactory().openSession();
Transaction t = s.beginTransaction();
Item i = new Item();
i.setName( "widget" );
@@ -76,7 +56,7 @@ public class HibernateCacheTest {
t.commit();
s.close();
- SecondLevelCacheStatistics slcs = s.getSessionFactory()
+ SecondLevelCacheStatistics slcs = sessionFactory()
.getStatistics()
.getSecondLevelCacheStatistics( REGION_PREFIX + Item.class.getName() );
@@ -84,7 +64,7 @@ public class HibernateCacheTest {
assertThat( slcs.getElementCountInMemory(), equalTo( 1L ) );
assertThat( slcs.getEntries().size(), equalTo( 1 ) );
- s = getSessionFactory().openSession();
+ s = sessionFactory().openSession();
t = s.beginTransaction();
i = (Item) s.get( Item.class, i.getId() );
@@ -110,7 +90,7 @@ public class HibernateCacheTest {
assertThat( (String) map.get( "name" ), equalTo( "widget" ) );
// cleanup
- s = getSessionFactory().openSession();
+ s = sessionFactory().openSession();
t = s.beginTransaction();
s.delete( i );
t.commit();
@@ -119,8 +99,8 @@ public class HibernateCacheTest {
@Test
public void testEmptySecondLevelCacheEntry() throws Exception {
- getSessionFactory().evictEntity( Item.class.getName() );
- Statistics stats = getSessionFactory().getStatistics();
+ sessionFactory().evictEntity( Item.class.getName() );
+ Statistics stats = sessionFactory().getStatistics();
stats.clear();
SecondLevelCacheStatistics statistics = stats.getSecondLevelCacheStatistics( REGION_PREFIX + Item.class.getName() );
Map cacheEntries = statistics.getEntries();
@@ -129,7 +109,7 @@ public class HibernateCacheTest {
@Test
public void testStaleWritesLeaveCacheConsistent() {
- Session s = getSessionFactory().openSession();
+ Session s = sessionFactory().openSession();
Transaction txn = s.beginTransaction();
VersionedItem item = new VersionedItem();
item.setName( "steve" );
@@ -144,7 +124,7 @@ public class HibernateCacheTest {
item.setVersion( item.getVersion() - 1 );
try {
- s = getSessionFactory().openSession();
+ s = sessionFactory().openSession();
txn = s.beginTransaction();
s.update( item );
txn.commit();
@@ -172,7 +152,7 @@ public class HibernateCacheTest {
}
// check the version value in the cache...
- SecondLevelCacheStatistics slcs = getSessionFactory().getStatistics()
+ SecondLevelCacheStatistics slcs = sessionFactory().getStatistics()
.getSecondLevelCacheStatistics( REGION_PREFIX + VersionedItem.class.getName() );
assertThat( slcs, CoreMatchers.notNullValue() );
final Map entries = slcs.getEntries();
@@ -189,7 +169,7 @@ public class HibernateCacheTest {
// cleanup
- s = getSessionFactory().openSession();
+ s = sessionFactory().openSession();
txn = s.beginTransaction();
item = (VersionedItem) s.load( VersionedItem.class, item.getId() );
s.delete( item );
@@ -200,8 +180,8 @@ public class HibernateCacheTest {
@Test
public void testGeneralUsage() {
- EventManager mgr = new EventManager( getSessionFactory() );
- Statistics stats = getSessionFactory().getStatistics();
+ EventManager mgr = new EventManager( sessionFactory() );
+ Statistics stats = sessionFactory().getStatistics();
// create 3 persons Steve, Orion, Tim
Person stevePerson = new Person();
@@ -247,8 +227,6 @@ public class HibernateCacheTest {
mgr.listEmailsOfEvent( event.getId() );
}
- getSessionFactory().close();
-
QueryStatistics queryStats = stats.getQueryStatistics( "from Event" );
assertThat( "Cache Miss Count", queryStats.getCacheMissCount(), equalTo( 1L ) );
assertThat( "Cache Hit Count", queryStats.getCacheHitCount(), equalTo( 0L ) );
diff --git a/hibernate-entitymanager/hibernate-entitymanager.gradle b/hibernate-entitymanager/hibernate-entitymanager.gradle
index fb219fe5a3..617ce7a0d3 100644
--- a/hibernate-entitymanager/hibernate-entitymanager.gradle
+++ b/hibernate-entitymanager/hibernate-entitymanager.gradle
@@ -24,7 +24,6 @@ dependencies {
////////////////////////////////////////////////////////////////////////////////////////////////////////
// JPA model-gen set up
////////////////////////////////////////////////////////////////////////////////////////////////////////
-aptDumpDir = file( "${buildDir}/tmp/apt" )
sourceSets.test {
originalJavaSrcDirs = java.srcDirs
@@ -32,6 +31,7 @@ sourceSets.test {
java.srcDir generatedJpaMetamodelSrcDir
}
task generateTestJpaMetamodelClasses(type: Compile) {
+ ext.aptDumpDir = file( "${buildDir}/tmp/apt/jpamodelgen" )
classpath = compileTestJava.classpath + configurations.hibernateJpaModelGenTool
source = sourceSets.test.originalJavaSrcDirs
destinationDir = aptDumpDir
@@ -46,6 +46,9 @@ task generateTestJpaMetamodelClasses(type: Compile) {
doFirst {
sourceSets.test.generatedJpaMetamodelSrcDir.mkdirs()
}
+ doLast {
+ aptDumpDir.delete()
+ }
}
// for the time being eat the annoying output from running the annotation processors
generateTestJpaMetamodelClasses.logging.captureStandardError(LogLevel.INFO)
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
index 548790aeee..2123fd1846 100644
--- a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
+++ b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
@@ -64,6 +64,11 @@ import org.hibernate.MappingException;
import org.hibernate.MappingNotFoundException;
import org.hibernate.SessionFactory;
import org.hibernate.SessionFactoryObserver;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.boot.spi.CacheRegionDefinition;
import org.hibernate.boot.spi.JaccDefinition;
import org.hibernate.cfg.Configuration;
@@ -74,15 +79,17 @@ import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.transaction.internal.jdbc.JdbcTransactionFactory;
import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory;
import org.hibernate.id.factory.spi.MutableIdentifierGeneratorFactory;
+import org.hibernate.integrator.spi.Integrator;
import org.hibernate.internal.util.StringHelper;
+import org.hibernate.jaxb.spi.cfg.JaxbHibernateConfiguration;
import org.hibernate.jpa.AvailableSettings;
import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder;
import org.hibernate.jpa.boot.spi.IntegratorProvider;
import org.hibernate.jpa.boot.spi.JpaUnifiedSettingsBuilder;
import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
+import org.hibernate.jpa.event.spi.JpaIntegrator;
import org.hibernate.jpa.internal.EntityManagerFactoryImpl;
import org.hibernate.jpa.internal.EntityManagerMessageLogger;
-import org.hibernate.jpa.event.spi.JpaIntegrator;
import org.hibernate.jpa.internal.util.LogHelper;
import org.hibernate.jpa.internal.util.PersistenceUnitTransactionTypeHelper;
import org.hibernate.jpa.packaging.internal.NativeScanner;
@@ -93,15 +100,10 @@ import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.secure.internal.JACCConfiguration;
-import org.hibernate.service.BootstrapServiceRegistry;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.classloading.internal.ClassLoaderServiceImpl;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.ServiceRegistryImplementor;
import static org.hibernate.jaxb.spi.cfg.JaxbHibernateConfiguration.JaxbSessionFactory.JaxbMapping;
-import static org.hibernate.jpa.boot.spi.JpaBootstrapServiceRegistryBuilder.buildBootstrapServiceRegistry;
/**
* @author Steve Ebersole
@@ -131,7 +133,7 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil
private final PersistenceUnitDescriptor persistenceUnit;
private final SettingsImpl settings = new SettingsImpl();
- private final ServiceRegistryBuilder serviceRegistryBuilder;
+ private final StandardServiceRegistryBuilder serviceRegistryBuilder;
private final Map configurationValues;
private final List jaccDefinitions = new ArrayList();
@@ -164,9 +166,9 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// First we build the boot-strap service registry, which mainly handles class loader interactions
- final BootstrapServiceRegistry bootstrapServiceRegistry = buildBootstrapServiceRegistry( persistenceUnit, integrationSettings );
+ final BootstrapServiceRegistry bootstrapServiceRegistry = buildBootstrapServiceRegistry( integrationSettings );
// And the main service registry. This is needed to start adding configuration values, etc
- this.serviceRegistryBuilder = new ServiceRegistryBuilder( bootstrapServiceRegistry );
+ this.serviceRegistryBuilder = new StandardServiceRegistryBuilder( bootstrapServiceRegistry );
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Next we build a merged map of all the configuration values
@@ -195,6 +197,38 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil
}
}
+ /**
+ * Builds the {@link BootstrapServiceRegistry} used to eventually build the {@link org.hibernate.boot.registry.StandardServiceRegistryBuilder}; mainly
+ * used here during instantiation to define class-loading behavior.
+ *
+ * @param integrationSettings Any integration settings passed by the EE container or SE application
+ *
+ * @return The built BootstrapServiceRegistry
+ */
+ private BootstrapServiceRegistry buildBootstrapServiceRegistry(Map integrationSettings) {
+ final BootstrapServiceRegistryBuilder bootstrapServiceRegistryBuilder = new BootstrapServiceRegistryBuilder();
+ bootstrapServiceRegistryBuilder.with( new JpaIntegrator() );
+
+ final IntegratorProvider integratorProvider = (IntegratorProvider) integrationSettings.get( INTEGRATOR_PROVIDER );
+ if ( integratorProvider != null ) {
+ integrationSettings.remove( INTEGRATOR_PROVIDER );
+ for ( Integrator integrator : integratorProvider.getIntegrators() ) {
+ bootstrapServiceRegistryBuilder.with( integrator );
+ }
+ }
+
+ ClassLoader classLoader = (ClassLoader) integrationSettings.get( org.hibernate.cfg.AvailableSettings.APP_CLASSLOADER );
+ if ( classLoader != null ) {
+ integrationSettings.remove( org.hibernate.cfg.AvailableSettings.APP_CLASSLOADER );
+ }
+ else {
+ classLoader = persistenceUnit.getClassLoader();
+ }
+ bootstrapServiceRegistryBuilder.withApplicationClassLoader( classLoader );
+
+ return bootstrapServiceRegistryBuilder.build();
+ }
+
@SuppressWarnings("unchecked")
private Map mergePropertySources(
PersistenceUnitDescriptor persistenceUnit,
@@ -789,7 +823,9 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil
SessionFactoryImplementor sessionFactory;
try {
- sessionFactory = (SessionFactoryImplementor) hibernateConfiguration.buildSessionFactory( serviceRegistry );
+ sessionFactory = (SessionFactoryImplementor) hibernateConfiguration.buildSessionFactory(
+ serviceRegistry
+ );
}
catch (MappingException e) {
throw persistenceException( "Unable to build Hibernate SessionFactory", e );
@@ -801,7 +837,13 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil
sessionFactory.addObserver( new ServiceRegistryCloser() );
// NOTE : passing cfg is temporary until
- return new EntityManagerFactoryImpl( persistenceUnit.getName(), sessionFactory, settings, configurationValues, hibernateConfiguration );
+ return new EntityManagerFactoryImpl(
+ persistenceUnit.getName(),
+ sessionFactory,
+ settings,
+ configurationValues,
+ hibernateConfiguration
+ );
}
}
);
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java
index 437ac2283e..bcb70600d7 100644
--- a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java
+++ b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java
@@ -58,9 +58,9 @@ import org.hibernate.jpa.internal.EntityManagerMessageLogger;
import org.hibernate.jpa.packaging.internal.JarVisitorFactory;
import org.hibernate.jpa.internal.util.ConfigurationHelper;
import org.hibernate.internal.util.StringHelper;
+import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.metamodel.spi.source.XsdException;
-import org.hibernate.service.classloading.internal.ClassLoaderServiceImpl;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
/**
* Used by Hibernate to parse {@code persistence.xml} files in SE environments.
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/spi/JpaUnifiedSettingsBuilder.java b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/spi/JpaUnifiedSettingsBuilder.java
index 5413e1b689..c362742d99 100644
--- a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/spi/JpaUnifiedSettingsBuilder.java
+++ b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/spi/JpaUnifiedSettingsBuilder.java
@@ -29,13 +29,13 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
import org.hibernate.boot.spi.CacheRegionDefinition;
import org.hibernate.boot.spi.JaccDefinition;
import org.hibernate.jaxb.spi.cfg.JaxbHibernateConfiguration;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.ValueHolder;
import org.hibernate.jpa.AvailableSettings;
-import org.hibernate.service.BootstrapServiceRegistry;
import org.hibernate.service.ConfigLoader;
import static org.hibernate.jaxb.spi.cfg.JaxbHibernateConfiguration.JaxbSessionFactory.JaxbMapping;
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/BeanManagerListenerFactory.java b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/BeanManagerListenerFactory.java
index 2e55804b10..5598e8ea05 100644
--- a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/BeanManagerListenerFactory.java
+++ b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/BeanManagerListenerFactory.java
@@ -42,6 +42,10 @@ public class BeanManagerListenerFactory implements ListenerFactory {
private final BeanManager beanManager;
private final Map listeners = new ConcurrentHashMap();
+ public static BeanManagerListenerFactory fromBeanManagerReference(Object beanManagerReference) {
+ return new BeanManagerListenerFactory( ( BeanManager ) beanManagerReference );
+ }
+
public BeanManagerListenerFactory(BeanManager beanManager) {
this.beanManager = beanManager;
}
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
index b9e2a5904d..ebe31e5305 100644
--- a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
+++ b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
@@ -32,11 +32,11 @@ import org.jboss.logging.Logger;
import org.hibernate.MappingException;
import org.hibernate.jpa.event.spi.jpa.Callback;
import org.hibernate.jpa.event.spi.jpa.ListenerFactory;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
import org.hibernate.metamodel.spi.MetadataImplementor;
import org.hibernate.metamodel.spi.binding.EntityBinding;
import org.hibernate.metamodel.spi.source.JpaCallbackSource;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.classloading.spi.ClassLoadingException;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
/**
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java
index b7754ad78b..df602b509c 100644
--- a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java
+++ b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java
@@ -23,7 +23,8 @@
*/
package org.hibernate.jpa.event.spi;
-import javax.enterprise.inject.spi.BeanManager;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.Iterator;
import java.util.Map;
@@ -54,7 +55,6 @@ import org.hibernate.jpa.event.internal.core.JpaPostLoadEventListener;
import org.hibernate.jpa.event.internal.core.JpaPostUpdateEventListener;
import org.hibernate.jpa.event.internal.core.JpaSaveEventListener;
import org.hibernate.jpa.event.internal.core.JpaSaveOrUpdateEventListener;
-import org.hibernate.jpa.event.internal.jpa.BeanManagerListenerFactory;
import org.hibernate.jpa.event.internal.jpa.CallbackProcessor;
import org.hibernate.jpa.event.internal.jpa.CallbackProcessorImpl;
import org.hibernate.jpa.event.internal.jpa.CallbackRegistryConsumer;
@@ -70,7 +70,7 @@ import org.hibernate.secure.internal.JACCPreInsertEventListener;
import org.hibernate.secure.internal.JACCPreLoadEventListener;
import org.hibernate.secure.internal.JACCPreUpdateEventListener;
import org.hibernate.secure.internal.JACCSecurityListener;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
@@ -187,10 +187,10 @@ public class JpaIntegrator implements Integrator {
// handle JPA "entity listener classes"...
this.callbackRegistry = new CallbackRegistryImpl();
- final BeanManager beanManager = (BeanManager) configuration.getProperties().get( AvailableSettings.CDI_BEAN_MANAGER );
- this.jpaListenerFactory = beanManager == null
+ final Object beanManagerRef = configuration.getProperties().get( AvailableSettings.CDI_BEAN_MANAGER );
+ this.jpaListenerFactory = beanManagerRef == null
? new StandardListenerFactory()
- : new BeanManagerListenerFactory( beanManager );
+ : buildBeanManagerListenerFactory( beanManagerRef );
this.callbackProcessor = new LegacyCallbackProcessor( jpaListenerFactory, configuration.getReflectionManager() );
Iterator classes = configuration.getClassMappings();
@@ -213,11 +213,34 @@ public class JpaIntegrator implements Integrator {
}
}
- /**
- * {@inheritDoc}
- *
- * @see org.hibernate.integrator.spi.Integrator#integrate(org.hibernate.metamodel.spi.MetadataImplementor, org.hibernate.engine.spi.SessionFactoryImplementor, org.hibernate.service.spi.SessionFactoryServiceRegistry)
- */
+ private ListenerFactory buildBeanManagerListenerFactory(Object beanManagerRef) {
+ try {
+ // specifically using our classloader here...
+ final Class beanManagerListenerFactoryClass = getClass().getClassLoader()
+ .loadClass( "org.hibernate.jpa.event.internal.jpa.BeanManagerListenerFactory" );
+ final Method beanManagerListenerFactoryBuilderMethod = beanManagerListenerFactoryClass.getMethod(
+ "fromBeanManagerReference",
+ Object.class
+ );
+
+ try {
+ return (ListenerFactory) beanManagerListenerFactoryBuilderMethod.invoke( null, beanManagerRef );
+ }
+ catch (InvocationTargetException e) {
+ throw e.getTargetException();
+ }
+ }
+ catch (ReflectiveOperationException e) {
+ throw new HibernateException( "Could not access BeanManagerListenerFactory class to handle CDI extensions", e );
+ }
+ catch (RuntimeException e) {
+ throw e;
+ }
+ catch (Throwable e) {
+ throw new HibernateException( "Problem calling BeanManagerListenerFactory class to handle CDI extensions", e );
+ }
+ }
+
@Override
public void integrate(
MetadataImplementor metadata,
@@ -293,10 +316,10 @@ public class JpaIntegrator implements Integrator {
// handle JPA "entity listener classes"...
this.callbackRegistry = new CallbackRegistryImpl();
- final BeanManager beanManager = (BeanManager) sessionFactory.getProperties().get( AvailableSettings.CDI_BEAN_MANAGER );
- this.jpaListenerFactory = beanManager == null
+ final Object beanManagerRef = sessionFactory.getProperties().get( AvailableSettings.CDI_BEAN_MANAGER );
+ this.jpaListenerFactory = beanManagerRef == null
? new StandardListenerFactory()
- : new BeanManagerListenerFactory( beanManager );
+ : buildBeanManagerListenerFactory( beanManagerRef );
this.callbackProcessor = new CallbackProcessorImpl( jpaListenerFactory, metadata, serviceRegistry );
for ( EntityBinding binding : metadata.getEntityBindings() ) {
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
index a81080cb9b..74d2444f5e 100755
--- a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
+++ b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
@@ -125,7 +125,7 @@ import org.hibernate.jpa.internal.util.CacheModeHelper;
import org.hibernate.jpa.internal.util.ConfigurationHelper;
import org.hibernate.jpa.internal.util.LockModeTypeHelper;
import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.transform.BasicTransformerAdapter;
import org.hibernate.type.Type;
diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java
index 27df78bada..4fca26b4e3 100644
--- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java
+++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java
@@ -46,7 +46,7 @@ import org.hibernate.internal.util.StringHelper;
import org.hibernate.jpa.HibernatePersistenceProvider;
import org.hibernate.jpa.boot.spi.Bootstrap;
import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.junit.After;
import org.junit.Before;
diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cdi/NoCdiAvailableTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cdi/NoCdiAvailableTest.java
new file mode 100644
index 0000000000..48b4cb9ddb
--- /dev/null
+++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cdi/NoCdiAvailableTest.java
@@ -0,0 +1,138 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.jpa.test.cdi;
+
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+
+import org.hibernate.bytecode.spi.ByteCodeHelper;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.hibernate.testing.junit4.ClassLoadingIsolater;
+
+import static org.junit.Assert.fail;
+
+/**
+ * Test JPA bootstrapping when CDI is not available for classloading.
+ *
+ * @author Steve Ebersole
+ */
+public class NoCdiAvailableTest extends BaseUnitTestCase {
+ public static final String[] EXCLUDED_PACKAGES = new String[] {
+ "javax.enterprise.inject.",
+ "javax.enterprise.context."
+ };
+
+ private static class CdiClassLoadException extends RuntimeException {
+ private CdiClassLoadException(String message) {
+ super( message );
+ }
+ }
+
+ @Rule public ClassLoadingIsolater isolater = new ClassLoadingIsolater(
+ new ClassLoadingIsolater.IsolatedClassLoaderProvider() {
+
+ @Override
+ public ClassLoader buildIsolatedClassLoader() {
+ return new ClassLoader(NoCdiAvailableTest.class.getClassLoader()) {
+ @Override
+ public Class loadClass(String name) throws ClassNotFoundException {
+ for ( String excludedPackage : EXCLUDED_PACKAGES ) {
+ if ( name.startsWith( excludedPackage ) ) {
+ throw new CdiClassLoadException( "CDI classes [" + name + "] excluded from load" );
+ }
+ }
+
+ Class c = findLoadedClass( name );
+ if ( c != null ) {
+ return c;
+ }
+
+ final String resourceName = name.replace( '.', '/' ) + ".class";
+ final URL resource = getResource( resourceName );
+ if ( resource == null ) {
+ throw new ClassNotFoundException( name + " not found" );
+ }
+ if ( !"file".equals( resource.getProtocol() ) ) {
+ return getParent().loadClass( name );
+ }
+
+ InputStream is = this.getResourceAsStream( name.replace( '.', '/' ) + ".class" );
+ if ( is == null ) {
+ throw new ClassNotFoundException( name + " not found" );
+ }
+
+ try {
+ byte[] bytecode = ByteCodeHelper.readByteCode( is );
+ return defineClass( name, bytecode, 0, bytecode.length );
+ }
+ catch( Throwable t ) {
+ throw new ClassNotFoundException( "Error reading class file for " + name, t );
+ }
+ }
+ };
+ }
+
+ @Override
+ public void releaseIsolatedClassLoader(ClassLoader isolatedClassLoader) {
+ // nothing to do
+ }
+ }
+ );
+
+ @Test
+ public void testJpaBootstrapWithoutCdiAvailable() throws Exception {
+ Class delegateClass = Thread.currentThread().getContextClassLoader().loadClass(
+ "org.hibernate.jpa.test.cdi.NoCdiAvailableTestDelegate"
+ );
+ Method mainMethod = delegateClass.getMethod( "passingNoBeanManager" );
+ mainMethod.invoke( null );
+ }
+
+ @Test
+ public void testJpaBootstrapWithoutCdiAvailablePassingCdi() throws Throwable {
+ Class delegateClass = Thread.currentThread().getContextClassLoader().loadClass(
+ "org.hibernate.jpa.test.cdi.NoCdiAvailableTestDelegate"
+ );
+ Method mainMethod = delegateClass.getMethod( "passingBeanManager" );
+ try {
+ mainMethod.invoke( null );
+ fail( "Expecting failure from missing CDI classes" );
+ }
+ catch (InvocationTargetException e) {
+ try {
+ throw e.getTargetException();
+ }
+ catch (CdiClassLoadException expected) {
+ }
+// catch (ClassCastException expectedAlt) {
+// }
+ }
+ }
+}
diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cdi/NoCdiAvailableTestDelegate.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cdi/NoCdiAvailableTestDelegate.java
new file mode 100644
index 0000000000..36fc59a044
--- /dev/null
+++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cdi/NoCdiAvailableTestDelegate.java
@@ -0,0 +1,49 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.jpa.test.cdi;
+
+import java.util.Collections;
+
+import org.hibernate.jpa.AvailableSettings;
+import org.hibernate.jpa.HibernatePersistenceProvider;
+import org.hibernate.jpa.test.PersistenceUnitInfoAdapter;
+
+/**
+ * @author Steve Ebersole
+ */
+public class NoCdiAvailableTestDelegate {
+ public static void passingNoBeanManager() {
+ new HibernatePersistenceProvider().createContainerEntityManagerFactory(
+ new PersistenceUnitInfoAdapter(),
+ Collections.emptyMap()
+ );
+ }
+
+ public static void passingBeanManager() {
+ new HibernatePersistenceProvider().createContainerEntityManagerFactory(
+ new PersistenceUnitInfoAdapter(),
+ Collections.singletonMap( AvailableSettings.CDI_BEAN_MANAGER, new Object() )
+ );
+ }
+}
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditConfiguration.java
index 9ccd515913..1316da28d3 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditConfiguration.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditConfiguration.java
@@ -40,7 +40,7 @@ import org.hibernate.envers.strategy.ValidityAuditStrategy;
import org.hibernate.envers.synchronization.AuditProcessManager;
import org.hibernate.envers.tools.reflection.ReflectionTools;
import org.hibernate.property.Getter;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
/**
* @author Adam Warski (adam at warski dot org)
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java
index 9de2e5a9c6..a6b37dc602 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java
@@ -26,6 +26,7 @@ package org.hibernate.envers.event;
import org.jboss.logging.Logger;
import org.hibernate.cfg.Configuration;
+import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.envers.configuration.AuditConfiguration;
import org.hibernate.event.service.spi.EventListenerRegistry;
@@ -33,9 +34,8 @@ import org.hibernate.event.spi.EventType;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.config.ConfigurationHelper;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.metamodel.spi.MetadataImplementor;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.config.spi.ConfigurationService;
import org.hibernate.service.config.spi.StandardConverters;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
@@ -73,11 +73,6 @@ public class EnversIntegrator implements Integrator {
// nothing to do afaik
}
- /**
- * {@inheritDoc}
- *
- * @see org.hibernate.integrator.spi.Integrator#integrate(org.hibernate.metamodel.spi.MetadataImplementor, org.hibernate.engine.spi.SessionFactoryImplementor, org.hibernate.service.spi.SessionFactoryServiceRegistry)
- */
@Override
public void integrate( MetadataImplementor metadata,
SessionFactoryImplementor sessionFactory,
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostUpdateEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostUpdateEventListenerImpl.java
index 659396ee5b..d14819b3e4 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostUpdateEventListenerImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostUpdateEventListenerImpl.java
@@ -78,12 +78,14 @@ public class EnversPostUpdateEventListenerImpl extends BaseEnversEventListener i
private Object[] postUpdateDBState(PostUpdateEvent event) {
Object[] newDbState = event.getState().clone();
- EntityPersister entityPersister = event.getPersister();
- for ( int i = 0; i < entityPersister.getPropertyNames().length; ++i ) {
- if ( !entityPersister.getPropertyUpdateability()[i] ) {
- // Assuming that PostUpdateEvent#getOldState() returns database state of the record before modification.
- // Otherwise, we would have to execute SQL query to be sure of @Column(updatable = false) column value.
- newDbState[i] = event.getOldState()[i];
+ if ( event.getOldState() != null ) {
+ EntityPersister entityPersister = event.getPersister();
+ for ( int i = 0; i < entityPersister.getPropertyNames().length; ++i ) {
+ if ( !entityPersister.getPropertyUpdateability()[i] ) {
+ // Assuming that PostUpdateEvent#getOldState() returns database state of the record before modification.
+ // Otherwise, we would have to execute SQL query to be sure of @Column(updatable = false) column value.
+ newDbState[i] = event.getOldState()[i];
+ }
}
}
return newDbState;
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/Tools.java b/hibernate-envers/src/main/java/org/hibernate/envers/tools/Tools.java
index 5c6f09f271..5f388b9075 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/Tools.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/tools/Tools.java
@@ -82,7 +82,7 @@ public class Tools {
public static Object getTargetFromProxy(SessionFactoryImplementor sessionFactoryImplementor, HibernateProxy proxy) {
- if (!proxy.getHibernateLazyInitializer().isUninitialized()) {
+ if (!proxy.getHibernateLazyInitializer().isUninitialized() || activeProxySession(proxy)) {
return proxy.getHibernateLazyInitializer().getImplementation();
}
@@ -102,6 +102,11 @@ public class Tools {
}
}
+ private static boolean activeProxySession(HibernateProxy proxy) {
+ Session session = (Session) proxy.getHibernateLazyInitializer().getSession();
+ return session != null && session.isOpen() && session.isConnected();
+ }
+
/**
* @param clazz Class wrapped with a proxy or not.
* @param Class type.
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java
index 3eea5518fa..8e76f72c47 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java
@@ -47,7 +47,7 @@ import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
import org.hibernate.jpa.boot.spi.Bootstrap;
import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
import org.hibernate.jpa.internal.EntityManagerFactoryImpl;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.junit.After;
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DetachedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DetachedTest.java
new file mode 100644
index 0000000000..10e7c65af7
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DetachedTest.java
@@ -0,0 +1,80 @@
+package org.hibernate.envers.test.integration.onetomany.detached;
+
+import java.util.Arrays;
+
+import junit.framework.Assert;
+import org.junit.Test;
+
+import org.hibernate.Session;
+import org.hibernate.envers.test.BaseEnversFunctionalTestCase;
+import org.hibernate.envers.test.Priority;
+import org.hibernate.envers.test.entities.StrTestEntity;
+import org.hibernate.envers.test.entities.onetomany.detached.ListRefCollEntity;
+import org.hibernate.testing.TestForIssue;
+
+/**
+ * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
+ */
+public class DetachedTest extends BaseEnversFunctionalTestCase {
+ private Integer parentId = null;
+ private Integer childId = null;
+
+ @Override
+ protected Class[] getAnnotatedClasses() {
+ return new Class[] { ListRefCollEntity.class, StrTestEntity.class };
+ }
+
+ @Test
+ @Priority(10)
+ @TestForIssue(jiraKey = "HHH-7543")
+ public void testUpdatingDetachedEntityWithRelation() {
+ Session session = getSession();
+
+ // Revision 1
+ session.getTransaction().begin();
+ ListRefCollEntity parent = new ListRefCollEntity( 1, "initial data" );
+ StrTestEntity child = new StrTestEntity( "data" );
+ session.save( child );
+ parent.setCollection( Arrays.asList( child ) );
+ session.save( parent );
+ session.getTransaction().commit();
+
+ session.close();
+ session = getSession();
+
+ // Revision 2 - updating detached entity
+ session.getTransaction().begin();
+ parent.setData( "modified data" );
+ session.update( parent );
+ session.getTransaction().commit();
+
+ session.close();
+
+ parentId = parent.getId();
+ childId = child.getId();
+ }
+
+ @Test
+ public void testRevisionsCounts() {
+ Assert.assertEquals( Arrays.asList( 1, 2 ), getAuditReader().getRevisions( ListRefCollEntity.class, parentId ) );
+ Assert.assertEquals( Arrays.asList( 1 ), getAuditReader().getRevisions( StrTestEntity.class, childId ) );
+ }
+
+ @Test
+ public void testHistoryOfParent() {
+ ListRefCollEntity parent = new ListRefCollEntity( parentId, "initial data" );
+ parent.setCollection( Arrays.asList( new StrTestEntity( "data", childId ) ) );
+
+ ListRefCollEntity ver1 = getAuditReader().find( ListRefCollEntity.class, parentId, 1 );
+
+ Assert.assertEquals( parent, ver1 );
+ Assert.assertEquals( parent.getCollection(), ver1.getCollection() );
+
+ parent.setData( "modified data" );
+
+ ListRefCollEntity ver2 = getAuditReader().find( ListRefCollEntity.class, parentId, 2 );
+
+ Assert.assertEquals( parent, ver2 );
+ Assert.assertEquals( parent.getCollection(), ver2.getCollection() );
+ }
+}
\ No newline at end of file
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java
index a4c6e56b39..da3fdd326a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java
@@ -28,6 +28,7 @@ import java.util.Arrays;
import java.util.Properties;
import javax.persistence.EntityManager;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
import org.hibernate.jpa.test.PersistenceUnitDescriptorAdapter;
import org.hibernate.envers.test.AbstractEnversTest;
import org.junit.Before;
@@ -41,8 +42,7 @@ import org.hibernate.jpa.internal.EntityManagerFactoryImpl;
import org.hibernate.envers.AuditReader;
import org.hibernate.envers.AuditReaderFactory;
import org.hibernate.envers.event.EnversIntegrator;
-import org.hibernate.service.BootstrapServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.AfterClassOnce;
import org.hibernate.testing.BeforeClassOnce;
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/AvailabilityAnnouncerImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/AvailabilityAnnouncerImpl.java
new file mode 100644
index 0000000000..fc6ad8eccd
--- /dev/null
+++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/AvailabilityAnnouncerImpl.java
@@ -0,0 +1,65 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.cache.infinispan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.boot.registry.selector.Availability;
+import org.hibernate.boot.registry.selector.AvailabilityAnnouncer;
+import org.hibernate.boot.registry.selector.SimpleAvailabilityImpl;
+import org.hibernate.cache.spi.RegionFactory;
+
+/**
+ * Makes the 2 contained region factory implementations available to the Hibernate
+ * {@link org.hibernate.boot.registry.selector.spi.StrategySelector} service.
+ *
+ * @author Steve Ebersole
+ */
+public class AvailabilityAnnouncerImpl implements AvailabilityAnnouncer {
+ @Override
+ public Iterable getAvailabilities() {
+ final List availabilities = new ArrayList();
+
+ availabilities.add(
+ new SimpleAvailabilityImpl(
+ RegionFactory.class,
+ InfinispanRegionFactory.class,
+ "infinispan",
+ InfinispanRegionFactory.class.getSimpleName()
+ )
+ );
+
+ availabilities.add(
+ new SimpleAvailabilityImpl(
+ RegionFactory.class,
+ JndiInfinispanRegionFactory.class,
+ "infinispan-jndi",
+ JndiInfinispanRegionFactory.class.getSimpleName()
+ )
+ );
+
+ return availabilities;
+ }
+}
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java
index c3345e92c6..fb09623f13 100644
--- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java
+++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java
@@ -25,8 +25,8 @@ import java.util.Properties;
import javax.transaction.TransactionManager;
import org.hibernate.cfg.Settings;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
/**
* HibernateTransactionManagerLookup.
diff --git a/hibernate-infinispan/src/main/resources/META-INF/services/org.hibernate.boot.registry.selector.AvailabilityAnnouncer b/hibernate-infinispan/src/main/resources/META-INF/services/org.hibernate.boot.registry.selector.AvailabilityAnnouncer
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractEntityCollectionRegionTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractEntityCollectionRegionTestCase.java
index 6ee5e505d4..16e007b671 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractEntityCollectionRegionTestCase.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractEntityCollectionRegionTestCase.java
@@ -88,7 +88,7 @@ public abstract class AbstractEntityCollectionRegionTestCase extends AbstractReg
// // Make it non-transactional
// cfg.getProperties().remove( AvailableSettings.JTA_PLATFORM );
// regionFactory = CacheTestUtil.startRegionFactory(
-// ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ),
+// StandardServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ),
// cfg,
// getCacheTestSupport()
// );
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java
index babe5f8e48..88d2530530 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java
@@ -29,13 +29,14 @@ import org.infinispan.transaction.tm.BatchModeTransactionManager;
import org.jboss.logging.Logger;
import org.junit.Test;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cache.infinispan.InfinispanRegionFactory;
import org.hibernate.cache.infinispan.util.CacheAdapter;
import org.hibernate.cache.spi.GeneralDataRegion;
import org.hibernate.cache.spi.QueryResultsRegion;
import org.hibernate.cache.spi.Region;
import org.hibernate.cfg.Configuration;
-import org.hibernate.service.ServiceRegistryBuilder;
+
import org.hibernate.test.cache.infinispan.util.CacheTestUtil;
import static org.junit.Assert.assertEquals;
@@ -77,7 +78,7 @@ public abstract class AbstractGeneralDataRegionTestCase extends AbstractRegionIm
private void evictOrRemoveTest() throws Exception {
Configuration cfg = createConfiguration();
InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(
- new ServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
+ new StandardServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
cfg,
getCacheTestSupport()
);
@@ -93,7 +94,7 @@ public abstract class AbstractGeneralDataRegionTestCase extends AbstractRegionIm
cfg = createConfiguration();
regionFactory = CacheTestUtil.startRegionFactory(
- new ServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
+ new StandardServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
cfg,
getCacheTestSupport()
);
@@ -147,7 +148,7 @@ public abstract class AbstractGeneralDataRegionTestCase extends AbstractRegionIm
private void evictOrRemoveAllTest(String configName) throws Exception {
Configuration cfg = createConfiguration();
InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(
- new ServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
+ new StandardServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
cfg,
getCacheTestSupport()
);
@@ -165,7 +166,7 @@ public abstract class AbstractGeneralDataRegionTestCase extends AbstractRegionIm
cfg = createConfiguration();
regionFactory = CacheTestUtil.startRegionFactory(
- new ServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
+ new StandardServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
cfg,
getCacheTestSupport()
);
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
index 8a1010aa34..89f04fb7da 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
@@ -41,8 +41,9 @@ import org.hibernate.cache.internal.RegionFactoryInitiator;
import org.hibernate.cache.spi.RegionFactory;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.transaction.jta.platform.internal.JBossStandAloneJtaPlatform;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform;
+
import org.hibernate.testing.ServiceRegistryBuilder;
import static org.junit.Assert.assertEquals;
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
index e71a96a97c..2d5097ee26 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Callable;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cache.infinispan.InfinispanRegionFactory;
import org.hibernate.cache.infinispan.collection.CollectionRegionImpl;
import org.hibernate.cache.infinispan.entity.EntityRegionImpl;
@@ -34,10 +35,8 @@ import org.hibernate.cache.infinispan.util.FlagAdapter;
import org.hibernate.cache.spi.CacheDataDescription;
import org.hibernate.cache.spi.RegionFactory;
import org.hibernate.cfg.Configuration;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
-import org.hibernate.test.cache.infinispan.util.CacheTestUtil;
import static org.hibernate.cache.infinispan.util.CacheHelper.withinTx;
@@ -114,7 +113,7 @@ public class NodeEnvironment {
}
public void prepare() throws Exception {
- serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
+ serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder()
.applySettings( configuration.getProperties() )
.buildServiceRegistry();
sessionFactory = (SessionFactoryImplementor)configuration.buildSessionFactory( serviceRegistry );
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ConcurrentWriteTest.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ConcurrentWriteTest.java
index 2c92b77d6d..7ef3ca0ebc 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ConcurrentWriteTest.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ConcurrentWriteTest.java
@@ -47,8 +47,8 @@ import org.hibernate.Session;
import org.hibernate.cache.infinispan.InfinispanRegionFactory;
import org.hibernate.cache.spi.RegionFactory;
import org.hibernate.cfg.Configuration;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.stat.SecondLevelCacheStatistics;
import org.hibernate.test.cache.infinispan.functional.cluster.DualNodeConnectionProviderImpl;
import org.hibernate.test.cache.infinispan.functional.cluster.DualNodeJtaPlatformImpl;
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java
index e2b9d14e25..590a7d8fad 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java
@@ -37,8 +37,8 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory;
import org.hibernate.engine.transaction.spi.TransactionFactory;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.test.cache.infinispan.tm.JtaPlatformImpl;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java
index 2a92e251a2..ffc9da4ac4 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java
@@ -38,8 +38,8 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory;
import org.hibernate.engine.transaction.spi.TransactionFactory;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.stat.SecondLevelCacheStatistics;
import org.hibernate.test.cache.infinispan.functional.Contact;
import org.hibernate.test.cache.infinispan.functional.Customer;
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeConnectionProviderImpl.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeConnectionProviderImpl.java
index 53afc9aa93..78318ae252 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeConnectionProviderImpl.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeConnectionProviderImpl.java
@@ -29,7 +29,7 @@ import java.util.Map;
import org.hibernate.HibernateException;
import org.hibernate.service.UnknownUnwrapTypeException;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.Stoppable;
import org.hibernate.testing.env.ConnectionProviderBuilder;
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaPlatformImpl.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaPlatformImpl.java
index 80fe23837e..ac8f980aad 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaPlatformImpl.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaPlatformImpl.java
@@ -33,7 +33,7 @@ import javax.transaction.UserTransaction;
import org.hibernate.HibernateException;
import org.hibernate.TransactionException;
import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.service.spi.Configurable;
/**
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java
index 4735d0693a..d75ef850d6 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java
@@ -33,7 +33,7 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
/**
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTransactionManagerLookup.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTransactionManagerLookup.java
deleted file mode 100644
index 6a8ed79294..0000000000
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTransactionManagerLookup.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2007, Red Hat, Inc. and/or it's affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc. and/or it's affiliates.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.test.cache.infinispan.functional.cluster;
-
-import java.util.Properties;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-import org.hibernate.HibernateException;
-import org.hibernate.transaction.TransactionManagerLookup;
-
-/**
- * SimpleJtaTransactionManagerLookupImpl subclass that finds a different DualNodeTransactionManager
- * based on the value of property {@link DualNodeTestUtil#NODE_ID_PROP}.
- *
- * @author Brian Stansberry
- */
-public class DualNodeTransactionManagerLookup implements TransactionManagerLookup {
-
- public TransactionManager getTransactionManager(Properties props) throws HibernateException {
- String nodeId = props.getProperty(DualNodeTestCase.NODE_ID_PROP);
- if (nodeId == null)
- throw new HibernateException(DualNodeTestCase.NODE_ID_PROP + " not configured");
- return DualNodeJtaTransactionManagerImpl.getInstance(nodeId);
- }
-
- public String getUserTransactionName() {
- throw new UnsupportedOperationException("jndi currently not implemented for these tests");
- }
-
- public Object getTransactionIdentifier(Transaction transaction) {
- return transaction;
- }
-}
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java
index 7d52f2df21..3991bd708c 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java
@@ -36,6 +36,7 @@ import org.infinispan.transaction.tm.BatchModeTransactionManager;
import org.infinispan.util.concurrent.IsolationLevel;
import org.jboss.logging.Logger;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cache.infinispan.InfinispanRegionFactory;
import org.hibernate.cache.infinispan.util.CacheAdapter;
import org.hibernate.cache.infinispan.util.CacheAdapterImpl;
@@ -46,7 +47,7 @@ import org.hibernate.cache.spi.GeneralDataRegion;
import org.hibernate.cache.spi.QueryResultsRegion;
import org.hibernate.cache.spi.Region;
import org.hibernate.cfg.Configuration;
-import org.hibernate.service.ServiceRegistryBuilder;
+
import org.hibernate.test.cache.infinispan.AbstractGeneralDataRegionTestCase;
import org.hibernate.test.cache.infinispan.util.CacheTestUtil;
@@ -112,7 +113,7 @@ public class QueryRegionImplTestCase extends AbstractGeneralDataRegionTestCase {
private void putDoesNotBlockGetTest() throws Exception {
Configuration cfg = createConfiguration();
InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(
- new ServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
+ new StandardServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
cfg,
getCacheTestSupport()
);
@@ -212,7 +213,7 @@ public class QueryRegionImplTestCase extends AbstractGeneralDataRegionTestCase {
private void getDoesNotBlockPutTest() throws Exception {
Configuration cfg = createConfiguration();
InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(
- new ServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
+ new StandardServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
cfg,
getCacheTestSupport()
);
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
index 41d7d00a15..977fcc031e 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
@@ -38,6 +38,7 @@ import org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited;
import org.infinispan.notifications.cachelistener.event.Event;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cache.infinispan.InfinispanRegionFactory;
import org.hibernate.cache.infinispan.impl.ClassLoaderAwareCache;
import org.hibernate.cache.infinispan.timestamp.TimestampsRegionImpl;
@@ -48,7 +49,7 @@ import org.hibernate.cache.spi.CacheDataDescription;
import org.hibernate.cache.spi.Region;
import org.hibernate.cache.spi.UpdateTimestampsCache;
import org.hibernate.cfg.Configuration;
-import org.hibernate.service.ServiceRegistryBuilder;
+
import org.hibernate.test.cache.infinispan.AbstractGeneralDataRegionTestCase;
import org.hibernate.test.cache.infinispan.functional.classloader.Account;
import org.hibernate.test.cache.infinispan.functional.classloader.AccountHolder;
@@ -81,7 +82,7 @@ public class TimestampsRegionImplTestCase extends AbstractGeneralDataRegionTestC
public void testClearTimestampsRegionInIsolated() throws Exception {
Configuration cfg = createConfiguration();
InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(
- new ServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
+ new StandardServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
cfg,
getCacheTestSupport()
);
@@ -90,7 +91,7 @@ public class TimestampsRegionImplTestCase extends AbstractGeneralDataRegionTestC
Configuration cfg2 = createConfiguration();
InfinispanRegionFactory regionFactory2 = CacheTestUtil.startRegionFactory(
- new ServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
+ new StandardServiceRegistryBuilder().applySettings( cfg.getProperties() ).buildServiceRegistry(),
cfg2,
getCacheTestSupport()
);
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java
index 4deab3b463..d0258ba3d4 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java
@@ -23,12 +23,8 @@
*/
package org.hibernate.test.cache.infinispan.tm;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
import java.util.Iterator;
import java.util.Properties;
-import java.util.logging.Logger;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.Name;
@@ -36,10 +32,8 @@ import javax.naming.NameNotFoundException;
import javax.naming.Reference;
import javax.naming.StringRefAddr;
import javax.transaction.Status;
-import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
-import org.enhydra.jdbc.standard.StandardXADataSource;
import org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
@@ -59,10 +53,11 @@ import org.hibernate.cfg.Environment;
import org.hibernate.mapping.Collection;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform;
+import org.hibernate.engine.transaction.jta.platform.internal.JBossStandAloneJtaPlatform;
import org.hibernate.stat.Statistics;
import org.hibernate.test.cache.infinispan.functional.Item;
import org.hibernate.testing.ServiceRegistryBuilder;
+import org.hibernate.testing.jta.JtaAwareConnectionProviderImpl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -90,10 +85,9 @@ public class JBossStandaloneJtaExampleTest {
jndiServer = startJndiServer();
ctx = createJndiContext();
// Inject configuration to initialise transaction manager from config classloader
- lookup.init(new org.infinispan.config.Configuration());
+ lookup.init( new org.infinispan.config.Configuration() );
bindTransactionManager();
bindUserTransaction();
- bindDataSource();
}
@After
@@ -180,55 +174,20 @@ public class JBossStandaloneJtaExampleTest {
}
- public static class ExtendedXADataSource extends StandardXADataSource { // XAPOOL
- @Override
- public Connection getConnection() throws SQLException {
-
- if (getTransactionManager() == null) { // although already set before, it results null again after retrieving the datasource by jndi
- TransactionManager tm; // this is because the TransactionManager information is not serialized.
- try {
- tm = lookup.getTransactionManager();
- } catch (Exception e) {
- throw new SQLException(e);
- }
- setTransactionManager(tm); // resets the TransactionManager on the datasource retrieved by jndi,
- // this makes the datasource JTA-aware
- }
-
- // According to Enhydra documentation, here we must return the connection of our XAConnection
- // see http://cvs.forge.objectweb.org/cgi-bin/viewcvs.cgi/xapool/xapool/examples/xapooldatasource/DatabaseHelper.java?sortby=rev
- return super.getXAConnection().getConnection();
- }
-
- @Override
- public T unwrap(Class iface) throws SQLException {
- return null; // JDK6 stuff
- }
-
- @Override
- public boolean isWrapperFor(Class iface) throws SQLException {
- return false; // JDK6 stuff
- }
-
- public Logger getParentLogger() throws SQLFeatureNotSupportedException {
- return null;
- }
- }
-
private Main startJndiServer() throws Exception {
// Create an in-memory jndi
NamingServer namingServer = new NamingServer();
NamingContext.setLocal(namingServer);
Main namingMain = new Main();
namingMain.setInstallGlobalService(true);
- namingMain.setPort(-1);
+ namingMain.setPort( -1 );
namingMain.start();
return namingMain;
}
private Context createJndiContext() throws Exception {
Properties props = new Properties();
- props.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
+ props.put( Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory" );
props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
return new InitialContext(props);
}
@@ -240,14 +199,7 @@ public class JBossStandaloneJtaExampleTest {
private void bindUserTransaction() throws Exception {
// also the UserTransaction must be registered on jndi: org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory#getUserTransaction() requires this
- bind("UserTransaction", lookup.getUserTransaction(), lookup.getUserTransaction().getClass(), ctx);
- }
-
- private void bindDataSource() throws Exception {
- ExtendedXADataSource xads = new ExtendedXADataSource();
- xads.setDriverName("org.h2.Driver");
- xads.setUrl("jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE");
- ctx.bind("java:/MyDatasource", xads);
+ bind( "UserTransaction", lookup.getUserTransaction(), lookup.getUserTransaction().getClass(), ctx );
}
/**
@@ -289,12 +241,11 @@ public class JBossStandaloneJtaExampleTest {
private SessionFactory buildSessionFactory() {
// Extra options located in src/test/resources/hibernate.properties
Configuration cfg = new Configuration();
- cfg.setProperty(Environment.DIALECT, "org.hibernate.dialect.HSQLDialect");
- cfg.setProperty(Environment.HBM2DDL_AUTO, "create-drop");
- cfg.setProperty(Environment.DATASOURCE, "java:/MyDatasource");
+ cfg.setProperty( Environment.DIALECT, "HSQL" );
+ cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );
+ cfg.setProperty( Environment.CONNECTION_PROVIDER, JtaAwareConnectionProviderImpl.class.getName() );
cfg.setProperty(Environment.JNDI_CLASS, "org.jnp.interfaces.NamingContextFactory");
- cfg.setProperty(Environment.TRANSACTION_MANAGER_STRATEGY, "org.hibernate.transaction.JBossTransactionManagerLookup");
- cfg.setProperty(Environment.TRANSACTION_STRATEGY, "org.hibernate.transaction.JTATransactionFactory");
+ cfg.setProperty(Environment.TRANSACTION_STRATEGY, "jta");
cfg.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "jta");
cfg.setProperty(Environment.RELEASE_CONNECTIONS, "auto");
cfg.setProperty(Environment.USE_SECOND_LEVEL_CACHE, "true");
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JtaPlatformImpl.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JtaPlatformImpl.java
index 95db052882..20e0674c09 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JtaPlatformImpl.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JtaPlatformImpl.java
@@ -31,7 +31,7 @@ import javax.transaction.UserTransaction;
import org.hibernate.TransactionException;
import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
/**
* @author Steve Ebersole
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaConnectionProvider.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaConnectionProvider.java
index e0ec86a820..2be132d95c 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaConnectionProvider.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaConnectionProvider.java
@@ -27,7 +27,7 @@ import java.util.Properties;
import org.hibernate.HibernateException;
import org.hibernate.service.UnknownUnwrapTypeException;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.Stoppable;
import org.hibernate.testing.env.ConnectionProviderBuilder;
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeJtaPlatform.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeJtaPlatform.java
index 6d6f75d17d..a53aced180 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeJtaPlatform.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeJtaPlatform.java
@@ -34,7 +34,7 @@ import org.infinispan.transaction.tm.BatchModeTransactionManager;
import org.hibernate.HibernateException;
import org.hibernate.TransactionException;
import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
/**
* @author Steve Ebersole
diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionManagerLookup.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionManagerLookup.java
deleted file mode 100755
index bf2f29625a..0000000000
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionManagerLookup.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2007, Red Hat, Inc. and/or it's affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc. and/or it's affiliates.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.test.cache.infinispan.util;
-
-import java.util.Properties;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-import org.infinispan.transaction.tm.BatchModeTransactionManager;
-
-import org.hibernate.HibernateException;
-import org.hibernate.transaction.TransactionManagerLookup;
-
-/**
- * Uses the JBoss Cache BatchModeTransactionManager. Should not be used in
- * any tests that simulate usage of database connections.
- *
- * @author Brian Stansberry
- */
-public class BatchModeTransactionManagerLookup
- implements TransactionManagerLookup {
-
- public TransactionManager getTransactionManager(Properties props) throws HibernateException {
- try {
- return BatchModeTransactionManager.getInstance();
- }
- catch (Exception e) {
- throw new HibernateException("Failed getting BatchModeTransactionManager", e);
- }
- }
-
- public String getUserTransactionName() {
- throw new UnsupportedOperationException();
- }
-
- public Object getTransactionIdentifier(Transaction transaction) {
- return transaction;
- }
-
-}
diff --git a/hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProvider.java b/hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProvider.java
index 116116b5fc..a4ac220c2c 100644
--- a/hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProvider.java
+++ b/hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProvider.java
@@ -40,7 +40,7 @@ import org.hibernate.internal.util.ConfigHelper;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.UnknownUnwrapTypeException;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
/**
* A connection provider that uses a Proxool connection pool. Hibernate will use this by
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java b/hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java
index 902d14ce91..efab4e2d63 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java
@@ -25,9 +25,10 @@ package org.hibernate.testing;
import java.util.Map;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Environment;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
/**
* @author Steve Ebersole
@@ -38,7 +39,7 @@ public class ServiceRegistryBuilder {
}
public static StandardServiceRegistryImpl buildServiceRegistry(Map serviceRegistryConfig) {
- return (StandardServiceRegistryImpl) new org.hibernate.service.ServiceRegistryBuilder()
+ return (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder()
.applySettings( serviceRegistryConfig )
.buildServiceRegistry();
}
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/CachingRegionFactory.java b/hibernate-testing/src/main/java/org/hibernate/testing/cache/CachingRegionFactory.java
index 2a71f83f38..b6453dc475 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cache/CachingRegionFactory.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cache/CachingRegionFactory.java
@@ -34,15 +34,9 @@ import org.hibernate.cache.spi.CollectionRegion;
import org.hibernate.cache.spi.EntityRegion;
import org.hibernate.cache.spi.NaturalIdRegion;
import org.hibernate.cache.spi.QueryResultsRegion;
-import org.hibernate.cache.spi.RegionFactory;
import org.hibernate.cache.spi.TimestampsRegion;
import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.cfg.Settings;
import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.service.config.spi.ConfigurationService;
-import org.hibernate.service.config.spi.StandardConverters;
-import org.hibernate.service.spi.InjectService;
/**
* @author Strong Liu
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java b/hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java
index 443a13a346..e7aef85b82 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java
@@ -28,7 +28,7 @@ import java.util.Properties;
import org.hibernate.cfg.Environment;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.H2Dialect;
-import org.hibernate.service.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
+import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
/**
* Defines the JDBC connection information (currently H2) used by Hibernate for unit (not functional!) tests
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java
index 74ec5f1e1e..c429a64c39 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java
@@ -37,10 +37,9 @@ import java.util.Map;
import java.util.Properties;
import org.hibernate.cfg.Environment;
-import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
-import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator;
-import org.hibernate.service.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator;
+import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.Stoppable;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java
index 5cac046eb0..fc607fd48e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java
@@ -32,10 +32,10 @@ import com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean;
import com.arjuna.ats.internal.arjuna.objectstore.VolatileStore;
import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
-import org.hibernate.service.jta.platform.internal.AbstractJtaPlatform;
-import org.hibernate.service.jta.platform.internal.JtaSynchronizationStrategy;
-import org.hibernate.service.jta.platform.internal.SynchronizationRegistryAccess;
-import org.hibernate.service.jta.platform.internal.SynchronizationRegistryBasedSynchronizationStrategy;
+import org.hibernate.engine.transaction.jta.platform.internal.AbstractJtaPlatform;
+import org.hibernate.engine.transaction.jta.platform.internal.JtaSynchronizationStrategy;
+import org.hibernate.engine.transaction.jta.platform.internal.SynchronizationRegistryAccess;
+import org.hibernate.engine.transaction.jta.platform.internal.SynchronizationRegistryBasedSynchronizationStrategy;
/**
* A test-specific implementation of the JtaPlatform contract for testing JTA-based functionality.
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseAnnotationBindingTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseAnnotationBindingTestCase.java
index 3e073fe6ab..7c190bef17 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseAnnotationBindingTestCase.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseAnnotationBindingTestCase.java
@@ -33,10 +33,10 @@ import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.internal.MetadataImpl;
import org.hibernate.metamodel.spi.binding.EntityBinding;
-import org.hibernate.service.ServiceRegistryBuilder;
/**
* @author Hardy Ferentschik
@@ -106,7 +106,7 @@ public abstract class BaseAnnotationBindingTestCase extends BaseUnitTestCase {
private void createBindings() {
try {
- sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
+ sources = new MetadataSources( new StandardServiceRegistryBuilder().buildServiceRegistry() );
Resources resourcesAnnotation = description.getAnnotation( Resources.class );
if ( resourcesAnnotation != null ) {
sources.getMetadataBuilder().with( resourcesAnnotation.cacheMode() );
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
index 01c8a5eeba..96e6169b64 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
@@ -40,6 +40,7 @@ import org.junit.Before;
import org.hibernate.HibernateException;
import org.hibernate.Interceptor;
import org.hibernate.Session;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cache.spi.access.AccessType;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
@@ -58,17 +59,16 @@ import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.SimpleValue;
import org.hibernate.metamodel.MetadataSources;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
import org.hibernate.metamodel.spi.MetadataImplementor;
import org.hibernate.metamodel.spi.binding.AbstractPluralAttributeBinding;
import org.hibernate.metamodel.spi.binding.AttributeBinding;
import org.hibernate.metamodel.spi.binding.Caching;
import org.hibernate.metamodel.spi.binding.EntityBinding;
-import org.hibernate.service.BootstrapServiceRegistry;
-import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.config.spi.ConfigurationService;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+import org.hibernate.engine.config.spi.ConfigurationService;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.AfterClassOnce;
import org.hibernate.testing.BeforeClassOnce;
import org.hibernate.testing.OnExpectedFailure;
@@ -197,7 +197,7 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
protected Configuration constructConfiguration() {
Configuration configuration = new Configuration()
- .setProperty(Environment.CACHE_REGION_FACTORY, CachingRegionFactory.class.getName() );
+ .setProperty( Environment.CACHE_REGION_FACTORY, CachingRegionFactory.class.getName() );
configuration.setProperty( AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "true" );
if ( createSchema() ) {
configuration.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );
@@ -399,7 +399,7 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
ConfigurationHelper.resolvePlaceHolders( properties );
final BootstrapServiceRegistry bootstrapServiceRegistry = generateBootstrapRegistry( properties );
- ServiceRegistryBuilder registryBuilder = new ServiceRegistryBuilder( bootstrapServiceRegistry )
+ StandardServiceRegistryBuilder registryBuilder = new StandardServiceRegistryBuilder( bootstrapServiceRegistry )
.applySettings( properties );
prepareBasicRegistryBuilder( registryBuilder );
return (StandardServiceRegistryImpl) registryBuilder.buildServiceRegistry();
@@ -414,7 +414,7 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryBuilder builder) {
}
- protected void prepareBasicRegistryBuilder(ServiceRegistryBuilder serviceRegistryBuilder) {
+ protected void prepareBasicRegistryBuilder(StandardServiceRegistryBuilder serviceRegistryBuilder) {
}
protected void afterSessionFactoryBuilt() {
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtraAssertions.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtraAssertions.java
index f80b801194..7866276c2d 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtraAssertions.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtraAssertions.java
@@ -23,8 +23,16 @@
*/
package org.hibernate.testing.junit4;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.sql.Types;
+import java.util.HashMap;
+import java.util.Map;
+
import org.junit.Assert;
+import static org.junit.Assert.fail;
+
/**
* @author Steve Ebersole
*/
@@ -51,4 +59,44 @@ public class ExtraAssertions {
}
return (T) value;
}
+
+ public static void assertJdbcTypeCode(int expected, int actual) {
+ if ( expected != actual ) {
+ final String message = String.format(
+ "JDBC type codes did not match...\n" +
+ "Expected: %s (%s)\n" +
+ "Actual : %s (%s)",
+ jdbcTypeCodeMap().get( expected ),
+ expected,
+ jdbcTypeCodeMap().get( actual ),
+ actual
+ );
+ fail( message );
+ }
+ }
+
+ private static Map jdbcTypeCodeMap;
+
+ private static synchronized Map jdbcTypeCodeMap() {
+ if ( jdbcTypeCodeMap == null ) {
+ jdbcTypeCodeMap = generateJdbcTypeCache();
+ }
+ return jdbcTypeCodeMap;
+ }
+
+ private static Map generateJdbcTypeCache() {
+ final Field[] fields = Types.class.getFields();
+ Map cache = new HashMap( (int)( fields.length * .75 ) + 1 );
+ for ( int i = 0; i < fields.length; i++ ) {
+ final Field field = fields[i];
+ if ( Modifier.isStatic( field.getModifiers() ) ) {
+ try {
+ cache.put( field.get( null ), field.getName() );
+ }
+ catch ( Throwable ignore ) {
+ }
+ }
+ }
+ return cache;
+ }
}