refactor ObjectBigIntIdIdentifierGenerator

Author: fprochazka

modules/typed-ids-hibernate-62/src/main/java/org/framefork/typedIds/bigint/hibernate/ObjectBigIntIdType.java

@@ -4,6 +4,7 @@
 import io.hypersistence.utils.hibernate.type.util.ParameterizedParameterType;
 import org.framefork.typedIds.bigint.ObjectBigIntId;
 import org.framefork.typedIds.bigint.ObjectBigIntIdTypeUtils;
+import org.hibernate.HibernateException;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.metamodel.model.domain.DomainType;
@@ -145,6 +146,21 @@ public MutabilityPlan<ObjectBigIntId<?>> getExposedMutabilityPlan()
         return javaTypeDescriptor.getMutabilityPlan();
     }
 
+    public ObjectBigIntId<?> wrapJdbcValue(final Object value)
+    {
+        if (value instanceof Long longValue) {
+            return javaTypeDescriptor.wrap(longValue, null);
+        }
+        if (value instanceof Number numberValue) {
+            return wrapJdbcValue(numberValue.longValue());
+        }
+        if (getReturnedClass().isInstance(value)) {
+            return getReturnedClass().cast(value);
+        }
+
+        throw new HibernateException("Could not convert '%s' to '%s'".formatted(value.getClass().getName(), getReturnedClass()));
+    }
+
     /**
      * the nullSafeGet() is delegated here in the {@link ImmutableType}
      */

modules/typed-ids-hibernate-62/src/main/java/org/framefork/typedIds/bigint/hibernate/ObjectBigIntIdTypeGenerationMetadataContributor.java

@@ -2,7 +2,7 @@
 
 import com.google.auto.service.AutoService;
 import org.framefork.typedIds.bigint.ObjectBigIntId;
-import org.framefork.typedIds.bigint.hibernate.id.ObjectBigIntIdIdentifierGenerator;
+import org.framefork.typedIds.bigint.hibernate.id.ObjectBigIntIdSequenceStyleGenerator;
 import org.hibernate.boot.ResourceStreamLocator;
 import org.hibernate.boot.spi.AdditionalMappingContributions;
 import org.hibernate.boot.spi.AdditionalMappingContributor;
@@ -47,7 +47,7 @@ public void contribute(
     private void remapIdentifierGeneratorStrategy(final SimpleValue identifier)
     {
         var newIdentifierGeneratorStrategy = switch (identifier.getIdentifierGeneratorStrategy()) {
-            case "org.hibernate.id.enhanced.SequenceStyleGenerator" -> ObjectBigIntIdIdentifierGenerator.class.getName();
+            case "org.hibernate.id.enhanced.SequenceStyleGenerator" -> ObjectBigIntIdSequenceStyleGenerator.class.getName();
             default -> identifier.getIdentifierGeneratorStrategy();
         };
 

modules/typed-ids-hibernate-62/src/main/java/org/framefork/typedIds/bigint/hibernate/id/ObjectBigIntIdIdentifierGenerator.java renamed to modules/typed-ids-hibernate-62/src/main/java/org/framefork/typedIds/bigint/hibernate/id/ObjectBigIntIdSequenceStyleGenerator.java

@@ -15,34 +15,21 @@
 import java.util.Objects;
 import java.util.Properties;
 
-public class ObjectBigIntIdIdentifierGenerator extends SequenceStyleGenerator
+/**
+ * This class handles making Hibernate think it's generating a primitive long type instead of a custom type,
+ * and once Hibernate internals do their job, it then handles wrapping the generated long value in an ObjectBigIntId.
+ */
+public class ObjectBigIntIdSequenceStyleGenerator extends SequenceStyleGenerator
 {
 
     @Nullable
     private ObjectBigIntIdType objectBigIntIdType;
 
     @Override
     public Object generate(final SharedSessionContractImplementor session, final Object object)
-    {
-        return wrapToCustomType(toLong(super.generate(session, object)));
-    }
-
-    private Object wrapToCustomType(final Long generatedId)
     {
         var idType = Objects.requireNonNull(objectBigIntIdType, "objectBigIntIdType must not be null");
-        return idType.getExpressibleJavaType().wrap(generatedId, null);
-    }
-
-    private Long toLong(final Object value)
-    {
-        if (value instanceof Long longValue) {
-            return longValue;
-        }
-        if (value instanceof Number numberValue) {
-            return numberValue.longValue();
-        }
-
-        throw new HibernateException("Could not convert '%s' to 'Long'".formatted(value.getClass().getName()));
+        return idType.wrapJdbcValue(super.generate(session, object));
     }
 
     @Override

modules/typed-ids-hibernate-63/src/main/java/org/framefork/typedIds/bigint/hibernate/ObjectBigIntIdType.java

@@ -4,6 +4,7 @@
 import io.hypersistence.utils.hibernate.type.util.ParameterizedParameterType;
 import org.framefork.typedIds.bigint.ObjectBigIntId;
 import org.framefork.typedIds.bigint.ObjectBigIntIdTypeUtils;
+import org.hibernate.HibernateException;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.metamodel.model.domain.DomainType;
@@ -145,6 +146,21 @@ public MutabilityPlan<ObjectBigIntId<?>> getExposedMutabilityPlan()
         return javaTypeDescriptor.getMutabilityPlan();
     }
 
+    public ObjectBigIntId<?> wrapJdbcValue(final Object value)
+    {
+        if (value instanceof Long longValue) {
+            return javaTypeDescriptor.wrap(longValue, null);
+        }
+        if (value instanceof Number numberValue) {
+            return wrapJdbcValue(numberValue.longValue());
+        }
+        if (getReturnedClass().isInstance(value)) {
+            return getReturnedClass().cast(value);
+        }
+
+        throw new HibernateException("Could not convert '%s' to '%s'".formatted(value.getClass().getName(), getReturnedClass()));
+    }
+
     /**
      * the nullSafeGet() is delegated here in the {@link ImmutableType}
      */

modules/typed-ids-hibernate-63/src/main/java/org/framefork/typedIds/bigint/hibernate/ObjectBigIntIdTypeGenerationMetadataContributor.java

@@ -2,7 +2,7 @@
 
 import com.google.auto.service.AutoService;
 import org.framefork.typedIds.bigint.ObjectBigIntId;
-import org.framefork.typedIds.bigint.hibernate.id.ObjectBigIntIdIdentifierGenerator;
+import org.framefork.typedIds.bigint.hibernate.id.ObjectBigIntIdSequenceStyleGenerator;
 import org.hibernate.boot.ResourceStreamLocator;
 import org.hibernate.boot.spi.AdditionalMappingContributions;
 import org.hibernate.boot.spi.AdditionalMappingContributor;
@@ -47,7 +47,7 @@ public void contribute(
     private void remapIdentifierGeneratorStrategy(final SimpleValue identifier)
     {
         var newIdentifierGeneratorStrategy = switch (identifier.getIdentifierGeneratorStrategy()) {
-            case "org.hibernate.id.enhanced.SequenceStyleGenerator" -> ObjectBigIntIdIdentifierGenerator.class.getName();
+            case "org.hibernate.id.enhanced.SequenceStyleGenerator" -> ObjectBigIntIdSequenceStyleGenerator.class.getName();
             default -> identifier.getIdentifierGeneratorStrategy();
         };
 

modules/typed-ids-hibernate-63/src/main/java/org/framefork/typedIds/bigint/hibernate/id/ObjectBigIntIdIdentifierGenerator.java renamed to modules/typed-ids-hibernate-63/src/main/java/org/framefork/typedIds/bigint/hibernate/id/ObjectBigIntIdSequenceStyleGenerator.java

@@ -15,34 +15,21 @@
 import java.util.Objects;
 import java.util.Properties;
 
-public class ObjectBigIntIdIdentifierGenerator extends SequenceStyleGenerator
+/**
+ * This class handles making Hibernate think it's generating a primitive long type instead of a custom type,
+ * and once Hibernate internals do their job, it then handles wrapping the generated long value in an ObjectBigIntId.
+ */
+public class ObjectBigIntIdSequenceStyleGenerator extends SequenceStyleGenerator
 {
 
     @Nullable
     private ObjectBigIntIdType objectBigIntIdType;
 
     @Override
     public Object generate(final SharedSessionContractImplementor session, final Object object)
-    {
-        return wrapToCustomType(toLong(super.generate(session, object)));
-    }
-
-    private Object wrapToCustomType(final Long generatedId)
     {
         var idType = Objects.requireNonNull(objectBigIntIdType, "objectBigIntIdType must not be null");
-        return idType.getExpressibleJavaType().wrap(generatedId, null);
-    }
-
-    private Long toLong(final Object value)
-    {
-        if (value instanceof Long longValue) {
-            return longValue;
-        }
-        if (value instanceof Number numberValue) {
-            return numberValue.longValue();
-        }
-
-        throw new HibernateException("Could not convert '%s' to 'Long'".formatted(value.getClass().getName()));
+        return idType.wrapJdbcValue(super.generate(session, object));
     }
 
     @Override