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

HHH-18337 Avoid calling `Configurable#create` for `null` creation context 

Also change a failing test so it doesn't pass `null` as creation context
This commit is contained in:
Marco Belladelli 2024-09-18 11:40:03 +02:00
parent 7a0bbd63cb
commit e55bdbcc94
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,7 +225,9 @@ public class StandardIdentifierGeneratorFactory
if ( identifierGenerator instanceof Configurable ) {
final Configurable configurable = (Configurable) identifierGenerator;
configurable.create( creationContext );
if ( creationContext != null ) {
configurable.create( creationContext );
}
configurable.configure( type, parameters, serviceRegistry );
}
return identifierGenerator;

12
hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/NativeGenerator.java
View File

@ -8,12 +8,15 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.generator.BeforeExecutionGenerator;
import org.hibernate.generator.EventType;
import org.hibernate.generator.Generator;
import org.hibernate.generator.GeneratorCreationContext;
import org.hibernate.generator.OnExecutionGenerator;
import org.hibernate.id.Configurable;
import org.hibernate.id.PostInsertIdentityPersister;
import org.hibernate.id.factory.IdentifierGeneratorFactory;
import org.hibernate.id.factory.spi.CustomIdGeneratorCreationContext;
import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.type.Type;
@ -26,10 +29,12 @@ public class NativeGenerator
private final IdentifierGeneratorFactory factory;
private final String strategy;
private final CustomIdGeneratorCreationContext creationContext;
private Generator generator;
public NativeGenerator(NativeId nativeId, Member member, CustomIdGeneratorCreationContext creationContext) {
this.creationContext = creationContext;
factory = creationContext.getIdentifierGeneratorFactory();
strategy = creationContext.getDatabase().getDialect().getNativeIdentifierGeneratorStrategy();
if ( "identity".equals(strategy) ) {
@ -49,7 +54,12 @@ public class NativeGenerator
@Override
public void configure(Type type, Properties parameters, ServiceRegistry serviceRegistry) {
generator = factory.createIdentifierGenerator(strategy, type, parameters);
generator = factory.createIdentifierGenerator(
strategy,
type,
creationContext,
parameters
);
//TODO: should use this instead of the deprecated method, but see HHH-18135
// GenerationType generationType;
// switch (strategy) {