Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-6091 Move DefaultIdentifierGeneratorFactory; use MutableIdentifierGeneratorFactory for public contracts

This commit is contained in:
Emmanuel Bernard 2011-09-07 09:39:41 +02:00
parent 88a7edbdd7
commit 7c39b19ab2
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
View File

@ -69,6 +69,8 @@ import org.hibernate.HibernateException;
import org.hibernate.engine.spi.FilterDefinition; import org.hibernate.engine.spi.FilterDefinition;
import org.hibernate.engine.spi.Mapping; import org.hibernate.engine.spi.Mapping;
import org.hibernate.engine.spi.NamedQueryDefinition; import org.hibernate.engine.spi.NamedQueryDefinition;
import org.hibernate.id.factory.internal.DefaultIdentifierGeneratorFactory;
import org.hibernate.id.factory.spi.MutableIdentifierGeneratorFactory;
import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.Interceptor; import org.hibernate.Interceptor;
import org.hibernate.InvalidMappingException; import org.hibernate.InvalidMappingException;
@ -91,7 +93,6 @@ import org.hibernate.engine.ResultSetMappingDefinition;
import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.IdentifierGenerator;
import org.hibernate.id.IdentifierGeneratorAggregator; import org.hibernate.id.IdentifierGeneratorAggregator;
import org.hibernate.id.PersistentIdentifierGenerator; import org.hibernate.id.PersistentIdentifierGenerator;
import org.hibernate.id.factory.DefaultIdentifierGeneratorFactory;
import org.hibernate.id.factory.IdentifierGeneratorFactory; import org.hibernate.id.factory.IdentifierGeneratorFactory;
import org.hibernate.internal.SessionFactoryImpl; import org.hibernate.internal.SessionFactoryImpl;
import org.hibernate.internal.util.ConfigHelper; import org.hibernate.internal.util.ConfigHelper;
@ -230,7 +231,7 @@ public class Configuration implements Serializable {
private transient Mapping mapping = buildMapping(); private transient Mapping mapping = buildMapping();
private DefaultIdentifierGeneratorFactory identifierGeneratorFactory; private MutableIdentifierGeneratorFactory identifierGeneratorFactory;
private Map<Class<?>, org.hibernate.mapping.MappedSuperclass> mappedSuperClasses; private Map<Class<?>, org.hibernate.mapping.MappedSuperclass> mappedSuperClasses;
@ -2285,7 +2286,7 @@ public class Configuration implements Serializable {
* *
* @return This configuration's IdentifierGeneratorFactory. * @return This configuration's IdentifierGeneratorFactory.
*/ */
public DefaultIdentifierGeneratorFactory getIdentifierGeneratorFactory() { public MutableIdentifierGeneratorFactory getIdentifierGeneratorFactory() {
return identifierGeneratorFactory; return identifierGeneratorFactory;
} }
@ -2963,7 +2964,7 @@ public class Configuration implements Serializable {
extendsQueue.put( entry, null ); extendsQueue.put( entry, null );
} }
public DefaultIdentifierGeneratorFactory getIdentifierGeneratorFactory() { public MutableIdentifierGeneratorFactory getIdentifierGeneratorFactory() {
return identifierGeneratorFactory; return identifierGeneratorFactory;
} }

5
hibernate-core/src/main/java/org/hibernate/cfg/Mappings.java
View File

@ -39,7 +39,8 @@ import org.hibernate.engine.spi.FilterDefinition;
import org.hibernate.engine.spi.NamedQueryDefinition; import org.hibernate.engine.spi.NamedQueryDefinition;
import org.hibernate.engine.spi.NamedSQLQueryDefinition; import org.hibernate.engine.spi.NamedSQLQueryDefinition;
import org.hibernate.engine.ResultSetMappingDefinition; import org.hibernate.engine.ResultSetMappingDefinition;
import org.hibernate.id.factory.DefaultIdentifierGeneratorFactory; import org.hibernate.id.factory.internal.DefaultIdentifierGeneratorFactory;
import org.hibernate.id.factory.spi.MutableIdentifierGeneratorFactory;
import org.hibernate.mapping.AuxiliaryDatabaseObject; import org.hibernate.mapping.AuxiliaryDatabaseObject;
import org.hibernate.mapping.Collection; import org.hibernate.mapping.Collection;
import org.hibernate.mapping.Column; import org.hibernate.mapping.Column;
@ -553,7 +554,7 @@ public interface Mappings {
* *
* @return The IdentifierGeneratorFactory * @return The IdentifierGeneratorFactory
*/ */
public DefaultIdentifierGeneratorFactory getIdentifierGeneratorFactory(); public MutableIdentifierGeneratorFactory getIdentifierGeneratorFactory();
/** /**
* add a new MappedSuperclass * add a new MappedSuperclass

4
hibernate-core/src/main/java/org/hibernate/id/factory/DefaultIdentifierGeneratorFactory.java → hibernate-core/src/main/java/org/hibernate/id/factory/internal/DefaultIdentifierGeneratorFactory.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.id.factory; package org.hibernate.id.factory.internal;
import java.io.Serializable; import java.io.Serializable;
import java.util.Properties; import java.util.Properties;
@ -57,7 +57,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.type.Type; import org.hibernate.type.Type;
/** /**
* Basic <tt>templated</tt> support for {@link IdentifierGeneratorFactory} implementations. * Basic <tt>templated</tt> support for {@link org.hibernate.id.factory.IdentifierGeneratorFactory} implementations.
* *
* @author Steve Ebersole * @author Steve Ebersole
*/ */

1
hibernate-core/src/main/java/org/hibernate/id/factory/internal/MutableIdentifierGeneratorFactoryInitiator.java
View File

@ -2,7 +2,6 @@ package org.hibernate.id.factory.internal;
import java.util.Map; import java.util.Map;
import org.hibernate.id.factory.DefaultIdentifierGeneratorFactory;
import org.hibernate.id.factory.spi.MutableIdentifierGeneratorFactory; import org.hibernate.id.factory.spi.MutableIdentifierGeneratorFactory;
import org.hibernate.service.spi.BasicServiceInitiator; import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.ServiceRegistryImplementor;

4
hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
View File

@ -38,13 +38,10 @@ import org.hibernate.SessionFactory;
import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.spi.RegionFactory;
import org.hibernate.cache.spi.access.AccessType; import org.hibernate.cache.spi.access.AccessType;
import org.hibernate.cfg.NamingStrategy; import org.hibernate.cfg.NamingStrategy;
import org.hibernate.dialect.Dialect;
import org.hibernate.engine.ResultSetMappingDefinition; import org.hibernate.engine.ResultSetMappingDefinition;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.engine.spi.FilterDefinition; import org.hibernate.engine.spi.FilterDefinition;
import org.hibernate.engine.spi.NamedQueryDefinition; import org.hibernate.engine.spi.NamedQueryDefinition;
import org.hibernate.engine.spi.NamedSQLQueryDefinition; import org.hibernate.engine.spi.NamedSQLQueryDefinition;
import org.hibernate.id.factory.DefaultIdentifierGeneratorFactory;
import org.hibernate.id.factory.IdentifierGeneratorFactory; import org.hibernate.id.factory.IdentifierGeneratorFactory;
import org.hibernate.id.factory.spi.MutableIdentifierGeneratorFactory; import org.hibernate.id.factory.spi.MutableIdentifierGeneratorFactory;
import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.CoreMessageLogger;
@ -52,7 +49,6 @@ import org.hibernate.internal.util.Value;
import org.hibernate.metamodel.MetadataSourceProcessingOrder; import org.hibernate.metamodel.MetadataSourceProcessingOrder;
import org.hibernate.metamodel.MetadataSources; import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.SessionFactoryBuilder; import org.hibernate.metamodel.SessionFactoryBuilder;
import org.hibernate.metamodel.binding.AbstractPluralAttributeBinding;
import org.hibernate.metamodel.binding.PluralAttributeBinding; import org.hibernate.metamodel.binding.PluralAttributeBinding;
import org.hibernate.metamodel.source.MappingDefaults; import org.hibernate.metamodel.source.MappingDefaults;
import org.hibernate.metamodel.source.MetaAttributeContext; import org.hibernate.metamodel.source.MetaAttributeContext;