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

HHH-18139 inline a deprecated method 

Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
Gavin King 2024-05-20 12:44:18 +02:00 committed by Steve Ebersole
parent e7196be0f2
commit 34924ed1f1
8 changed files with 94 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java
View File

@ -7,7 +7,6 @@
package org.hibernate.mapping; package org.hibernate.mapping;
import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Dialect;
import org.hibernate.id.IdentifierGenerator;
import org.hibernate.generator.Generator; import org.hibernate.generator.Generator;
/** /**
@ -30,16 +29,4 @@ public interface KeyValue extends Value {
Generator createGenerator(Dialect dialect, RootClass rootClass); Generator createGenerator(Dialect dialect, RootClass rootClass);
/**
* @deprecated Use {@link #createGenerator(Dialect, RootClass)} instead.
* No longer used except in legacy tests.
*
* @return {@code null} if the {@code Generator} returned by {@link #createGenerator} is not an instance
* of {@link IdentifierGenerator}.
*/
@Deprecated(since="6.2", forRemoval = true)
default IdentifierGenerator createIdentifierGenerator(Dialect dialect, RootClass rootClass) {
final Generator generator = createGenerator( dialect, rootClass );
return generator instanceof IdentifierGenerator ? (IdentifierGenerator) generator : null;
}
} }

12
hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/CustomNamingStrategyTests.java
View File

@ -15,6 +15,9 @@ import jakarta.persistence.Id;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.Identifier;
import org.hibernate.dialect.Dialect;
import org.hibernate.generator.Generator;
import org.hibernate.id.IdentifierGenerator;
import org.hibernate.id.enhanced.ImplicitDatabaseObjectNamingStrategy; import org.hibernate.id.enhanced.ImplicitDatabaseObjectNamingStrategy;
import org.hibernate.boot.model.relational.QualifiedName; import org.hibernate.boot.model.relational.QualifiedName;
import org.hibernate.boot.model.relational.QualifiedSequenceName; import org.hibernate.boot.model.relational.QualifiedSequenceName;
@ -24,6 +27,7 @@ import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.id.PersistentIdentifierGenerator; import org.hibernate.id.PersistentIdentifierGenerator;
import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.id.enhanced.SequenceStyleGenerator;
import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.mapping.KeyValue;
import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistry;
import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModel;
@ -52,10 +56,10 @@ public class CustomNamingStrategyTests {
final JdbcServices jdbcServices = serviceRegistryScope.getRegistry().getService( JdbcServices.class ); final JdbcServices jdbcServices = serviceRegistryScope.getRegistry().getService( JdbcServices.class );
final JdbcEnvironment jdbcEnvironment = jdbcServices.getJdbcEnvironment(); final JdbcEnvironment jdbcEnvironment = jdbcServices.getJdbcEnvironment();
final SequenceStyleGenerator generator = (SequenceStyleGenerator) entityDescriptor.getIdentifier().createIdentifierGenerator( KeyValue keyValue = entityDescriptor.getIdentifier();
jdbcEnvironment.getDialect(), Dialect dialect = jdbcEnvironment.getDialect();
entityDescriptor final Generator generator1 = keyValue.createGenerator( dialect, entityDescriptor);
); final SequenceStyleGenerator generator = (SequenceStyleGenerator) (generator1 instanceof IdentifierGenerator ? (IdentifierGenerator) generator1 : null);
final String sequenceName = generator.getDatabaseStructure().getPhysicalName().getObjectName().getText(); final String sequenceName = generator.getDatabaseStructure().getPhysicalName().getObjectName().getText();
assertThat( sequenceName ).isEqualTo( "ents_ids_seq" ); assertThat( sequenceName ).isEqualTo( "ents_ids_seq" );

6
hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SequenceNamingStrategyTest.java
View File

@ -20,12 +20,14 @@ import org.hibernate.boot.model.relational.Sequence;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.boot.spi.MetadataImplementor;
import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.AvailableSettings;
import org.hibernate.generator.Generator;
import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.IdentifierGenerator;
import org.hibernate.id.enhanced.LegacyNamingStrategy; import org.hibernate.id.enhanced.LegacyNamingStrategy;
import org.hibernate.id.enhanced.SingleNamingStrategy; import org.hibernate.id.enhanced.SingleNamingStrategy;
import org.hibernate.id.enhanced.SequenceStructure; import org.hibernate.id.enhanced.SequenceStructure;
import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.id.enhanced.SequenceStyleGenerator;
import org.hibernate.id.enhanced.StandardNamingStrategy; import org.hibernate.id.enhanced.StandardNamingStrategy;
import org.hibernate.mapping.KeyValue;
import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.PersistentClass;
import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistry;
@ -159,7 +161,9 @@ public class SequenceNamingStrategyTest {
} }
private IdentifierGenerator extractGenerator(PersistentClass entityBinding) { private IdentifierGenerator extractGenerator(PersistentClass entityBinding) {
return entityBinding.getIdentifier().createIdentifierGenerator(null, null ); KeyValue keyValue = entityBinding.getIdentifier();
final Generator generator = keyValue.createGenerator(null, null);
return generator instanceof IdentifierGenerator ? (IdentifierGenerator) generator : null;
} }
@Entity(name = "TestEntity") @Entity(name = "TestEntity")

6
hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/TableNamingStrategyTest.java
View File

@ -18,10 +18,12 @@ import org.hibernate.boot.model.relational.Namespace;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.boot.spi.MetadataImplementor;
import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.AvailableSettings;
import org.hibernate.generator.Generator;
import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.IdentifierGenerator;
import org.hibernate.id.enhanced.LegacyNamingStrategy; import org.hibernate.id.enhanced.LegacyNamingStrategy;
import org.hibernate.id.enhanced.SingleNamingStrategy; import org.hibernate.id.enhanced.SingleNamingStrategy;
import org.hibernate.id.enhanced.StandardNamingStrategy; import org.hibernate.id.enhanced.StandardNamingStrategy;
import org.hibernate.mapping.KeyValue;
import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Table; import org.hibernate.mapping.Table;
import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistry;
@ -140,7 +142,9 @@ public class TableNamingStrategyTest {
} }
private IdentifierGenerator extractGenerator(PersistentClass entityBinding) { private IdentifierGenerator extractGenerator(PersistentClass entityBinding) {
return entityBinding.getIdentifier().createIdentifierGenerator(null, null ); KeyValue keyValue = entityBinding.getIdentifier();
final Generator generator = keyValue.createGenerator(null, null);
return generator instanceof IdentifierGenerator ? (IdentifierGenerator) generator : null;
} }

11
hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/GeneratedValueTest.java
View File

@ -20,9 +20,12 @@ import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.boot.spi.MetadataImplementor;
import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.AvailableSettings;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.SybaseDialect; import org.hibernate.dialect.SybaseDialect;
import org.hibernate.generator.Generator;
import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.IdentifierGenerator;
import org.hibernate.id.UUIDGenerator; import org.hibernate.id.UUIDGenerator;
import org.hibernate.mapping.KeyValue;
import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.RootClass; import org.hibernate.mapping.RootClass;
@ -55,10 +58,10 @@ public class GeneratedValueTest {
PersistentClass entityBinding = metadata.getEntityBinding( TheEntity.class.getName() ); PersistentClass entityBinding = metadata.getEntityBinding( TheEntity.class.getName() );
assertEquals( UUID.class, entityBinding.getIdentifier().getType().getReturnedClass() ); assertEquals( UUID.class, entityBinding.getIdentifier().getType().getReturnedClass() );
IdentifierGenerator generator = entityBinding.getIdentifier().createIdentifierGenerator( KeyValue keyValue = entityBinding.getIdentifier();
metadata.getDatabase().getDialect(), Dialect dialect = metadata.getDatabase().getDialect();
(RootClass) entityBinding final Generator generator1 = keyValue.createGenerator( dialect, (RootClass) entityBinding);
); IdentifierGenerator generator = generator1 instanceof IdentifierGenerator ? (IdentifierGenerator) generator1 : null;
assertTyping( UUIDGenerator.class, generator ); assertTyping( UUIDGenerator.class, generator );
// now a functional test // now a functional test

37
hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/auto/AutoGenerationTypeTests.java
View File

@ -20,7 +20,9 @@ import org.hibernate.annotations.CollectionIdJdbcTypeCode;
import org.hibernate.boot.Metadata; import org.hibernate.boot.Metadata;
import org.hibernate.boot.MetadataSources; import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.H2Dialect;
import org.hibernate.generator.Generator;
import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.IdentifierGenerator;
import org.hibernate.id.IncrementGenerator; import org.hibernate.id.IncrementGenerator;
import org.hibernate.id.UUIDGenerator; import org.hibernate.id.UUIDGenerator;
@ -59,10 +61,9 @@ public class AutoGenerationTypeTests {
final PersistentClass entityBinding = metadata.getEntityBinding( Entity1.class.getName() ); final PersistentClass entityBinding = metadata.getEntityBinding( Entity1.class.getName() );
final KeyValue idMapping = entityBinding.getRootClass().getIdentifier(); final KeyValue idMapping = entityBinding.getRootClass().getIdentifier();
final SequenceStyleGenerator entityIdGenerator = (SequenceStyleGenerator) idMapping.createIdentifierGenerator( Dialect dialect = new H2Dialect();
new H2Dialect(), final Generator generator = idMapping.createGenerator( dialect, entityBinding.getRootClass());
entityBinding.getRootClass() final SequenceStyleGenerator entityIdGenerator = (SequenceStyleGenerator) (generator instanceof IdentifierGenerator ? (IdentifierGenerator) generator : null);
);
final DatabaseStructure database1Structure = entityIdGenerator.getDatabaseStructure(); final DatabaseStructure database1Structure = entityIdGenerator.getDatabaseStructure();
@ -83,10 +84,9 @@ public class AutoGenerationTypeTests {
final PersistentClass entityBinding = metadata.getEntityBinding( Entity2.class.getName() ); final PersistentClass entityBinding = metadata.getEntityBinding( Entity2.class.getName() );
final KeyValue idMapping = entityBinding.getRootClass().getIdentifier(); final KeyValue idMapping = entityBinding.getRootClass().getIdentifier();
final SequenceStyleGenerator idGenerator = (SequenceStyleGenerator) idMapping.createIdentifierGenerator( Dialect dialect = new H2Dialect();
new H2Dialect(), final Generator generator = idMapping.createGenerator( dialect, entityBinding.getRootClass());
entityBinding.getRootClass() final SequenceStyleGenerator idGenerator = (SequenceStyleGenerator) (generator instanceof IdentifierGenerator ? (IdentifierGenerator) generator : null);
);
final DatabaseStructure database2Structure = idGenerator.getDatabaseStructure(); final DatabaseStructure database2Structure = idGenerator.getDatabaseStructure();
@ -112,10 +112,9 @@ public class AutoGenerationTypeTests {
final Property theTwos = entity1Binding.getProperty( "theTwos" ); final Property theTwos = entity1Binding.getProperty( "theTwos" );
final IdentifierBag idBagMapping = (IdentifierBag) theTwos.getValue(); final IdentifierBag idBagMapping = (IdentifierBag) theTwos.getValue();
final KeyValue collectionIdMapping = idBagMapping.getIdentifier(); final KeyValue collectionIdMapping = idBagMapping.getIdentifier();
final SequenceStyleGenerator collectionIdGenerator = (SequenceStyleGenerator) collectionIdMapping.createIdentifierGenerator( Dialect dialect = new H2Dialect();
new H2Dialect(), final Generator generator = collectionIdMapping.createGenerator( dialect, null);
null final SequenceStyleGenerator collectionIdGenerator = (SequenceStyleGenerator) (generator instanceof IdentifierGenerator ? (IdentifierGenerator) generator : null);
);
final DatabaseStructure idBagIdGeneratorDbStructure = collectionIdGenerator.getDatabaseStructure(); final DatabaseStructure idBagIdGeneratorDbStructure = collectionIdGenerator.getDatabaseStructure();
@ -133,10 +132,9 @@ public class AutoGenerationTypeTests {
final PersistentClass entityBinding = metadata.getEntityBinding( Entity4.class.getName() ); final PersistentClass entityBinding = metadata.getEntityBinding( Entity4.class.getName() );
final KeyValue idMapping = entityBinding.getRootClass().getIdentifier(); final KeyValue idMapping = entityBinding.getRootClass().getIdentifier();
final IdentifierGenerator idGenerator = idMapping.createIdentifierGenerator( Dialect dialect = new H2Dialect();
new H2Dialect(), final Generator generator = idMapping.createGenerator( dialect, entityBinding.getRootClass());
entityBinding.getRootClass() final IdentifierGenerator idGenerator = generator instanceof IdentifierGenerator ? (IdentifierGenerator) generator : null;
);
assertThat( idGenerator, instanceOf( UUIDGenerator.class ) ); assertThat( idGenerator, instanceOf( UUIDGenerator.class ) );
} }
@ -151,10 +149,9 @@ public class AutoGenerationTypeTests {
final PersistentClass entityBinding = metadata.getEntityBinding( Entity3.class.getName() ); final PersistentClass entityBinding = metadata.getEntityBinding( Entity3.class.getName() );
final KeyValue idMapping = entityBinding.getRootClass().getIdentifier(); final KeyValue idMapping = entityBinding.getRootClass().getIdentifier();
final IdentifierGenerator idGenerator = idMapping.createIdentifierGenerator( Dialect dialect = new H2Dialect();
new H2Dialect(), final Generator generator = idMapping.createGenerator( dialect, entityBinding.getRootClass());
entityBinding.getRootClass() final IdentifierGenerator idGenerator = generator instanceof IdentifierGenerator ? (IdentifierGenerator) generator : null;
);
assertThat( idGenerator, instanceOf( IncrementGenerator.class ) ); assertThat( idGenerator, instanceOf( IncrementGenerator.class ) );
} }

25
hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java
View File

@ -15,9 +15,12 @@ import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.AvailableSettings;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.H2Dialect;
import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.generator.Generator;
import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.IdentifierGenerator;
import org.hibernate.mapping.KeyValue;
import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.PersistentClass;
import org.hibernate.resource.beans.container.spi.BeanContainer; import org.hibernate.resource.beans.container.spi.BeanContainer;
import org.hibernate.resource.beans.container.spi.BeanContainer.LifecycleOptions; import org.hibernate.resource.beans.container.spi.BeanContainer.LifecycleOptions;
@ -76,18 +79,16 @@ public class UserDefinedGeneratorsTests {
final PersistentClass entityBinding1 = metadata.getEntityBinding( Entity1.class.getName() ); final PersistentClass entityBinding1 = metadata.getEntityBinding( Entity1.class.getName() );
final PersistentClass entityBinding2 = metadata.getEntityBinding( Entity2.class.getName() ); final PersistentClass entityBinding2 = metadata.getEntityBinding( Entity2.class.getName() );
final IdentifierGenerator generator1 = entityBinding1.getRootClass() KeyValue keyValue1 = entityBinding1.getRootClass()
.getIdentifier() .getIdentifier();
.createIdentifierGenerator( Dialect dialect1 = new H2Dialect();
new H2Dialect(), final Generator generator3 = keyValue1.createGenerator(dialect1, entityBinding1.getRootClass());
entityBinding1.getRootClass() final IdentifierGenerator generator1 = generator3 instanceof IdentifierGenerator ? (IdentifierGenerator) generator3 : null;
); KeyValue keyValue = entityBinding2.getRootClass()
final IdentifierGenerator generator2 = entityBinding2.getRootClass() .getIdentifier();
.getIdentifier() Dialect dialect = new H2Dialect();
.createIdentifierGenerator( final Generator generator = keyValue.createGenerator( dialect, entityBinding2.getRootClass());
new H2Dialect(), final IdentifierGenerator generator2 = generator instanceof IdentifierGenerator ? (IdentifierGenerator) generator : null;
entityBinding2.getRootClass()
);
then( beanContainer ).should( times( 2 ) ).getBean( same( TestIdentifierGenerator.class ), then( beanContainer ).should( times( 2 ) ).getBean( same( TestIdentifierGenerator.class ),
any( LifecycleOptions.class ), any( LifecycleOptions.class ),

75
hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GeneratedValueTests.java
View File

@ -15,12 +15,15 @@ import org.hibernate.boot.model.relational.SqlStringGenerationContext;
import org.hibernate.boot.model.relational.internal.SqlStringGenerationContextImpl; import org.hibernate.boot.model.relational.internal.SqlStringGenerationContextImpl;
import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.boot.spi.MetadataImplementor;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.H2Dialect;
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
import org.hibernate.generator.Generator;
import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.IdentifierGenerator;
import org.hibernate.id.IncrementGenerator; import org.hibernate.id.IncrementGenerator;
import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.id.enhanced.SequenceStyleGenerator;
import org.hibernate.id.enhanced.TableGenerator; import org.hibernate.id.enhanced.TableGenerator;
import org.hibernate.mapping.KeyValue;
import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.RootClass; import org.hibernate.mapping.RootClass;
@ -56,10 +59,10 @@ public class GeneratedValueTests extends BaseUnitTestCase {
.addAnnotatedClass( ExplicitGeneratorEntity.class ) .addAnnotatedClass( ExplicitGeneratorEntity.class )
.buildMetadata(); .buildMetadata();
final PersistentClass entityMapping = bootModel.getEntityBinding( ExplicitGeneratorEntity.class.getName() ); final PersistentClass entityMapping = bootModel.getEntityBinding( ExplicitGeneratorEntity.class.getName() );
final IdentifierGenerator generator = entityMapping.getIdentifier().createIdentifierGenerator( KeyValue keyValue = entityMapping.getIdentifier();
ssr.getService( JdbcEnvironment.class ).getDialect(), Dialect dialect = ssr.getService( JdbcEnvironment.class ).getDialect();
(RootClass) entityMapping final Generator generator1 = keyValue.createGenerator( dialect, (RootClass) entityMapping);
); final IdentifierGenerator generator = generator1 instanceof IdentifierGenerator ? (IdentifierGenerator) generator1 : null;
generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) ); generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) );
final SequenceStyleGenerator sequenceStyleGenerator = assertTyping( final SequenceStyleGenerator sequenceStyleGenerator = assertTyping(
@ -81,10 +84,10 @@ public class GeneratedValueTests extends BaseUnitTestCase {
.addAnnotatedClass( ImplicitSequenceGeneratorEntity.class ) .addAnnotatedClass( ImplicitSequenceGeneratorEntity.class )
.buildMetadata(); .buildMetadata();
final PersistentClass entityMapping = bootModel.getEntityBinding( ImplicitSequenceGeneratorEntity.class.getName() ); final PersistentClass entityMapping = bootModel.getEntityBinding( ImplicitSequenceGeneratorEntity.class.getName() );
final IdentifierGenerator generator = entityMapping.getIdentifier().createIdentifierGenerator( KeyValue keyValue = entityMapping.getIdentifier();
ssr.getService( JdbcEnvironment.class ).getDialect(), Dialect dialect = ssr.getService( JdbcEnvironment.class ).getDialect();
(RootClass) entityMapping final Generator generator1 = keyValue.createGenerator( dialect, (RootClass) entityMapping);
); final IdentifierGenerator generator = generator1 instanceof IdentifierGenerator ? (IdentifierGenerator) generator1 : null;
generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) ); generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) );
final SequenceStyleGenerator sequenceStyleGenerator = assertTyping( final SequenceStyleGenerator sequenceStyleGenerator = assertTyping(
@ -109,10 +112,10 @@ public class GeneratedValueTests extends BaseUnitTestCase {
.addAnnotatedClass( ImplicitSequenceGeneratorEntity.class ) .addAnnotatedClass( ImplicitSequenceGeneratorEntity.class )
.buildMetadata(); .buildMetadata();
final PersistentClass entityMapping = bootModel.getEntityBinding( ImplicitSequenceGeneratorEntity.class.getName() ); final PersistentClass entityMapping = bootModel.getEntityBinding( ImplicitSequenceGeneratorEntity.class.getName() );
final IdentifierGenerator generator = entityMapping.getIdentifier().createIdentifierGenerator( KeyValue keyValue = entityMapping.getIdentifier();
ssr.getService( JdbcEnvironment.class ).getDialect(), Dialect dialect = ssr.getService( JdbcEnvironment.class ).getDialect();
(RootClass) entityMapping final Generator generator1 = keyValue.createGenerator( dialect, (RootClass) entityMapping);
); final IdentifierGenerator generator = generator1 instanceof IdentifierGenerator ? (IdentifierGenerator) generator1 : null;
generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) ); generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) );
final SequenceStyleGenerator sequenceStyleGenerator = assertTyping( final SequenceStyleGenerator sequenceStyleGenerator = assertTyping(
@ -139,10 +142,10 @@ public class GeneratedValueTests extends BaseUnitTestCase {
.buildMetadata(); .buildMetadata();
final PersistentClass entityMapping = bootModel.getEntityBinding( final PersistentClass entityMapping = bootModel.getEntityBinding(
ExplicitSequenceGeneratorImplicitNameEntity.class.getName() ); ExplicitSequenceGeneratorImplicitNameEntity.class.getName() );
final IdentifierGenerator generator = entityMapping.getIdentifier().createIdentifierGenerator( KeyValue keyValue = entityMapping.getIdentifier();
ssr.getService( JdbcEnvironment.class ).getDialect(), Dialect dialect = ssr.getService( JdbcEnvironment.class ).getDialect();
(RootClass) entityMapping final Generator generator1 = keyValue.createGenerator( dialect, (RootClass) entityMapping);
); final IdentifierGenerator generator = generator1 instanceof IdentifierGenerator ? (IdentifierGenerator) generator1 : null;
Database database = bootModel.getDatabase(); Database database = bootModel.getDatabase();
SqlStringGenerationContext sqlStringGenerationContext = SqlStringGenerationContext sqlStringGenerationContext =
SqlStringGenerationContextImpl.forTests( database.getJdbcEnvironment() ); SqlStringGenerationContextImpl.forTests( database.getJdbcEnvironment() );
@ -182,10 +185,10 @@ public class GeneratedValueTests extends BaseUnitTestCase {
.addAnnotatedClass( ImplicitTableGeneratorEntity.class ) .addAnnotatedClass( ImplicitTableGeneratorEntity.class )
.buildMetadata(); .buildMetadata();
final PersistentClass entityMapping = bootModel.getEntityBinding( ImplicitTableGeneratorEntity.class.getName() ); final PersistentClass entityMapping = bootModel.getEntityBinding( ImplicitTableGeneratorEntity.class.getName() );
final IdentifierGenerator generator = entityMapping.getIdentifier().createIdentifierGenerator( KeyValue keyValue = entityMapping.getIdentifier();
ssr.getService( JdbcEnvironment.class ).getDialect(), Dialect dialect = ssr.getService( JdbcEnvironment.class ).getDialect();
(RootClass) entityMapping final Generator generator1 = keyValue.createGenerator( dialect, (RootClass) entityMapping);
); final IdentifierGenerator generator = generator1 instanceof IdentifierGenerator ? (IdentifierGenerator) generator1 : null;
generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) ); generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) );
final TableGenerator tableGenerator = assertTyping( TableGenerator.class, generator ); final TableGenerator tableGenerator = assertTyping( TableGenerator.class, generator );
@ -205,10 +208,10 @@ public class GeneratedValueTests extends BaseUnitTestCase {
.addAnnotatedClass( ExplicitTableGeneratorImplicitNameEntity.class ) .addAnnotatedClass( ExplicitTableGeneratorImplicitNameEntity.class )
.buildMetadata(); .buildMetadata();
final PersistentClass entityMapping = bootModel.getEntityBinding( ExplicitTableGeneratorImplicitNameEntity.class.getName() ); final PersistentClass entityMapping = bootModel.getEntityBinding( ExplicitTableGeneratorImplicitNameEntity.class.getName() );
final IdentifierGenerator generator = entityMapping.getIdentifier().createIdentifierGenerator( KeyValue keyValue = entityMapping.getIdentifier();
ssr.getService( JdbcEnvironment.class ).getDialect(), Dialect dialect = ssr.getService( JdbcEnvironment.class ).getDialect();
(RootClass) entityMapping final Generator generator1 = keyValue.createGenerator( dialect, (RootClass) entityMapping);
); final IdentifierGenerator generator = generator1 instanceof IdentifierGenerator ? (IdentifierGenerator) generator1 : null;
generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) ); generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) );
final TableGenerator tableGenerator = assertTyping( TableGenerator.class, generator ); final TableGenerator tableGenerator = assertTyping( TableGenerator.class, generator );
@ -228,10 +231,10 @@ public class GeneratedValueTests extends BaseUnitTestCase {
.addAnnotatedClass( ExplicitTableGeneratorEntity.class ) .addAnnotatedClass( ExplicitTableGeneratorEntity.class )
.buildMetadata(); .buildMetadata();
final PersistentClass entityMapping = bootModel.getEntityBinding( ExplicitTableGeneratorEntity.class.getName() ); final PersistentClass entityMapping = bootModel.getEntityBinding( ExplicitTableGeneratorEntity.class.getName() );
final IdentifierGenerator generator = entityMapping.getIdentifier().createIdentifierGenerator( KeyValue keyValue = entityMapping.getIdentifier();
ssr.getService( JdbcEnvironment.class ).getDialect(), Dialect dialect = ssr.getService( JdbcEnvironment.class ).getDialect();
(RootClass) entityMapping final Generator generator1 = keyValue.createGenerator( dialect, (RootClass) entityMapping);
); final IdentifierGenerator generator = generator1 instanceof IdentifierGenerator ? (IdentifierGenerator) generator1 : null;
generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) ); generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) );
final TableGenerator tableGenerator = assertTyping( TableGenerator.class, generator ); final TableGenerator tableGenerator = assertTyping( TableGenerator.class, generator );
@ -253,10 +256,10 @@ public class GeneratedValueTests extends BaseUnitTestCase {
.addAnnotatedClass( ExplicitIncrementGeneratorEntity.class ) .addAnnotatedClass( ExplicitIncrementGeneratorEntity.class )
.buildMetadata(); .buildMetadata();
final PersistentClass entityMapping = bootModel.getEntityBinding( ExplicitIncrementGeneratorEntity.class.getName() ); final PersistentClass entityMapping = bootModel.getEntityBinding( ExplicitIncrementGeneratorEntity.class.getName() );
final IdentifierGenerator generator = entityMapping.getIdentifier().createIdentifierGenerator( KeyValue keyValue = entityMapping.getIdentifier();
ssr.getService( JdbcEnvironment.class ).getDialect(), Dialect dialect = ssr.getService( JdbcEnvironment.class ).getDialect();
(RootClass) entityMapping final Generator generator1 = keyValue.createGenerator( dialect, (RootClass) entityMapping);
); final IdentifierGenerator generator = generator1 instanceof IdentifierGenerator ? (IdentifierGenerator) generator1 : null;
generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) ); generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) );
assertTyping( IncrementGenerator.class, generator ); assertTyping( IncrementGenerator.class, generator );
@ -270,10 +273,10 @@ public class GeneratedValueTests extends BaseUnitTestCase {
.addAnnotatedClass( ImplicitIncrementGeneratorEntity.class ) .addAnnotatedClass( ImplicitIncrementGeneratorEntity.class )
.buildMetadata(); .buildMetadata();
final PersistentClass entityMapping = bootModel.getEntityBinding( ImplicitIncrementGeneratorEntity.class.getName() ); final PersistentClass entityMapping = bootModel.getEntityBinding( ImplicitIncrementGeneratorEntity.class.getName() );
final IdentifierGenerator generator = entityMapping.getIdentifier().createIdentifierGenerator( KeyValue keyValue = entityMapping.getIdentifier();
ssr.getService( JdbcEnvironment.class ).getDialect(), Dialect dialect = ssr.getService( JdbcEnvironment.class ).getDialect();
(RootClass) entityMapping final Generator generator1 = keyValue.createGenerator( dialect, (RootClass) entityMapping);
); final IdentifierGenerator generator = generator1 instanceof IdentifierGenerator ? (IdentifierGenerator) generator1 : null;
generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) ); generator.initialize( SqlStringGenerationContextImpl.forTests( bootModel.getDatabase().getJdbcEnvironment() ) );
assertTyping( IncrementGenerator.class, generator ); assertTyping( IncrementGenerator.class, generator );