HHH-18974 - Implement runtime intialization for the UuidVersion6/7Strategy.Holder classes

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

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

@@ -34,7 +34,7 @@
 public class UuidVersion6Strategy implements UUIDGenerationStrategy, UuidValueGenerator {
 	public static final UuidVersion6Strategy INSTANCE = new UuidVersion6Strategy();
 
-	private static class Holder {
+	public static class Holder {
 		static final SecureRandom numberGenerator = new SecureRandom();
 		static final long EPOCH_1582_SECONDS = LocalDate.of( 1582, 10, 15 )
 				.atStartOfDay( ZoneId.of( "UTC" ) )

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

@@ -39,7 +39,7 @@ public class UuidVersion7Strategy implements UUIDGenerationStrategy, UuidValueGe
 
 	public static final UuidVersion7Strategy INSTANCE = new UuidVersion7Strategy();
 
-	private static class Holder {
+	public static class Holder {
 		private static final SecureRandom numberGenerator = new SecureRandom();
 
 	}

hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticFeature.java

@@ -8,6 +8,7 @@
 import java.lang.reflect.Executable;
 import java.util.ArrayList;
 
+import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
 import org.hibernate.internal.util.ReflectHelper;
 
 import org.graalvm.nativeimage.hosted.Feature;
@@ -36,6 +37,7 @@ public class GraalVMStaticFeature implements Feature {
 	public void beforeAnalysis(Feature.BeforeAnalysisAccess before) {
 		final Class<?>[] needsHavingSimpleConstructors = StaticClassLists.typesNeedingDefaultConstructorAccessible();
 		final Class<?>[] needingAllConstructorsAccessible = StaticClassLists.typesNeedingAllConstructorsAccessible();
+		final Class<?>[] typesNeedingRuntimeInitialization = StaticClassLists.typesNeedingRuntimeInitialization();
 		//Size formula is just a reasonable guess:
 		ArrayList<Executable> executables = new ArrayList<>( needsHavingSimpleConstructors.length + needingAllConstructorsAccessible.length * 3 );
 		for ( Class<?> c : needsHavingSimpleConstructors ) {
@@ -50,6 +52,8 @@ public void beforeAnalysis(Feature.BeforeAnalysisAccess before) {
 		RuntimeReflection.register( needingAllConstructorsAccessible );
 		RuntimeReflection.register( StaticClassLists.typesNeedingArrayCopy() );
 		RuntimeReflection.register( executables.toArray(new Executable[0]) );
+
+		RuntimeClassInitialization.initializeAtRunTime( typesNeedingRuntimeInitialization );
 	}
 
 	@Override

hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/StaticClassLists.java

@@ -76,4 +76,10 @@ public static Class[] typesNeedingArrayCopy() {
 		};
 	}
 
+	public static Class<?>[] typesNeedingRuntimeInitialization() {
+		return new Class[] {
+				org.hibernate.id.uuid.UuidVersion6Strategy.Holder.class,
+				org.hibernate.id.uuid.UuidVersion7Strategy.Holder.class,
+		};
+	}
 }