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

HHH-18377 - Support for uuid v6 and v7 generated ids

This commit is contained in:
Steve Ebersole 2024-09-23 13:44:48 -05:00
parent d1cb9c3679
commit 2f335cd786
2 changed files with 55 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/annotations/UuidGenerator.java
View File

@ -60,12 +60,14 @@ public @interface UuidGenerator {
* version 6.
* @see UuidVersion6Strategy
*/
@Incubating
VERSION_6,
/**
* Use a time-based generation strategy consistent with RFC 4122
* version 7.
* @see UuidVersion7Strategy
*/
@Incubating
VERSION_7
}

118
hibernate-core/src/main/java/org/hibernate/id/uuid/UuidGenerator.java
View File

@ -56,25 +56,68 @@ public class UuidGenerator implements BeforeExecutionGenerator {
public UuidGenerator(
org.hibernate.annotations.UuidGenerator config,
MemberDetails memberDetails) {
generator = determineValueGenerator( config, memberDetails );
generator = determineValueGenerator( config, memberDetails.getDeclaringType().getName(), memberDetails.getName() );
final Class<?> memberType = memberDetails.getType().determineRawClass().toJavaClass();
valueTransformer = determineProperTransformer( memberType );
}
@Internal
public UuidGenerator(
org.hibernate.annotations.UuidGenerator config,
Member idMember) {
generator = determineValueGenerator( config, idMember.getDeclaringClass().getName(), idMember.getName() );
final Class<?> propertyType = getPropertyType( idMember );
this.valueTransformer = determineProperTransformer( propertyType );
}
public UuidGenerator(
org.hibernate.annotations.UuidGenerator config,
Member member,
GeneratorCreationContext creationContext) {
this( config, member );
}
/**
* @return {@link EventTypeSets#INSERT_ONLY}
*/
@Override
public EnumSet<EventType> getEventTypes() {
return INSERT_ONLY;
}
@Override
public Object generate(SharedSessionContractImplementor session, Object owner, Object currentValue, EventType eventType) {
return valueTransformer.transform( generator.generateUuid( session ) );
}
@Internal
public UuidValueGenerator getValueGenerator() {
return generator;
}
@Internal
public ValueTransformer getValueTransformer() {
return valueTransformer;
}
private static UuidValueGenerator determineValueGenerator(
org.hibernate.annotations.UuidGenerator config,
MemberDetails memberDetails) {
String memberDeclaringClassName,
String memberName) {
if ( config != null ) {
// there is an annotation
if ( config.algorithm() != UuidValueGenerator.class ) {
// the annotation specified a custom algorithm
if ( config.style() != AUTO ) {
throw new MappingException(
String.format(
Locale.ROOT,
"Style [%s] should not be specified with custom UUID value generator : %s.%s",
config.style().name(),
memberDetails.getDeclaringType().getName(),
memberDetails.getName()
memberDeclaringClassName,
memberName
)
);
}
@ -83,46 +126,21 @@ public class UuidGenerator implements BeforeExecutionGenerator {
if ( config.style() == TIME ) {
return new CustomVersionOneStrategy();
}
else if ( config.style() == VERSION_6 ) {
if ( config.style() == VERSION_6 ) {
return UuidVersion6Strategy.INSTANCE;
}
else if ( config.style() == VERSION_7 ) {
if ( config.style() == VERSION_7 ) {
return UuidVersion7Strategy.INSTANCE;
}
// NOTE : AUTO falls through
}
// Either -
// 1. there is no annotation
// 2. the annotation specified AUTO (with no custom algorithm)
return StandardRandomStrategy.INSTANCE;
}
@Internal
public UuidGenerator(
org.hibernate.annotations.UuidGenerator config,
Member idMember) {
if ( config.algorithm() != UuidValueGenerator.class ) {
if ( config.style() != AUTO ) {
throw new MappingException(
String.format(
Locale.ROOT,
"Style [%s] should not be specified with custom UUID value generator : %s.%s",
config.style().name(),
idMember.getDeclaringClass().getName(),
idMember.getName()
)
);
}
generator = instantiateCustomGenerator( config.algorithm() );
}
else if ( config.style() == TIME ) {
generator = new CustomVersionOneStrategy();
}
else {
generator = StandardRandomStrategy.INSTANCE;
}
final Class<?> propertyType = getPropertyType( idMember );
this.valueTransformer = determineProperTransformer( propertyType );
}
private static UuidValueGenerator instantiateCustomGenerator(Class<? extends UuidValueGenerator> algorithmClass) {
try {
return algorithmClass.getDeclaredConstructor().newInstance();
@ -147,34 +165,4 @@ public class UuidGenerator implements BeforeExecutionGenerator {
throw new HibernateException( "Unanticipated return type [" + propertyType.getName() + "] for UUID conversion" );
}
public UuidGenerator(
org.hibernate.annotations.UuidGenerator config,
Member member,
GeneratorCreationContext creationContext) {
this(config, member);
}
/**
* @return {@link EventTypeSets#INSERT_ONLY}
*/
@Override
public EnumSet<EventType> getEventTypes() {
return INSERT_ONLY;
}
@Override
public Object generate(SharedSessionContractImplementor session, Object owner, Object currentValue, EventType eventType) {
return valueTransformer.transform( generator.generateUuid( session ) );
}
@Internal
public UuidValueGenerator getValueGenerator() {
return generator;
}
@Internal
public ValueTransformer getValueTransformer() {
return valueTransformer;
}
}