HHH-18377 Added enum values for UUIDv6 and UUIDv7 to org.hibernate.annotations.UuidGenerator and org.hibernate.id.uuid.UuidGenerator

Author: cigaly

hibernate-core/src/main/java/org/hibernate/annotations/UuidGenerator.java

@@ -9,6 +9,8 @@
 import java.util.UUID;
 
 import org.hibernate.Incubating;
+import org.hibernate.id.uuid.UuidV6ValueGenerator;
+import org.hibernate.id.uuid.UuidV7ValueGenerator;
 import org.hibernate.id.uuid.UuidValueGenerator;
 
 import static java.lang.annotation.ElementType.FIELD;
@@ -52,7 +54,19 @@ enum Style {
 		 * @implNote Can be a bottleneck, since synchronization is used when
 		 *           incrementing an internal counter as part of the algorithm.
 		 */
-		TIME
+		TIME,
+		/**
+		 * Use a time-based generation strategy consistent with RFC 4122
+		 * version 6.
+		 * @see UuidV6ValueGenerator
+		 */
+		UUIDV6,
+		/**
+		 * Use a time-based generation strategy consistent with RFC 4122
+		 * version 7.
+		 * @see UuidV7ValueGenerator
+		 */
+		UUIDV7
 	}
 
 	/**

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

@@ -23,6 +23,8 @@
 
 import static org.hibernate.annotations.UuidGenerator.Style.AUTO;
 import static org.hibernate.annotations.UuidGenerator.Style.TIME;
+import static org.hibernate.annotations.UuidGenerator.Style.UUIDV6;
+import static org.hibernate.annotations.UuidGenerator.Style.UUIDV7;
 import static org.hibernate.generator.EventTypeSets.INSERT_ONLY;
 import static org.hibernate.internal.util.ReflectHelper.getPropertyType;
 
@@ -81,6 +83,12 @@ private static UuidValueGenerator determineValueGenerator(
 			else if ( config.style() == TIME ) {
 				return new CustomVersionOneStrategy();
 			}
+			else if ( config.style() == UUIDV6 ) {
+				return new UuidV6ValueGenerator();
+			}
+			else if ( config.style() == UUIDV7 ) {
+				return new UuidV7ValueGenerator();
+			}
 		}
 
 		return StandardRandomStrategy.INSTANCE;