Add support for addScalar in the Hibernate 7 module #792

Author: oscarfanchin

hypersistence-utils-hibernate-70/pom.xml

@@ -204,7 +204,7 @@
     </build>
 
     <properties>
-        <jdk.version>11</jdk.version>
+        <jdk.version>17</jdk.version>
         <jdk-test.version>17</jdk-test.version>
         <maven.compiler.release>${jdk.version}</maven.compiler.release>
         <maven.compiler.testRelease>${jdk-test.version}</maven.compiler.testRelease>

hypersistence-utils-hibernate-70/src/main/java/io/hypersistence/utils/hibernate/type/basic/internal/NumberJdbcTypeDescriptor.java

@@ -89,15 +89,17 @@ private JdbcType sqlTypeDescriptor() {
     }
 
     private JdbcType resolveJdbcTypeDescriptor() {
-        DynamicParameterizedType.ParameterType parameterType = ParameterTypeUtils.resolve(properties);
-        if (parameterType != null) {
-            String columnType = ParameterTypeUtils.getColumnType(parameterType);
-            if (!StringUtils.isBlank(columnType)) {
-                switch (columnType) {
-                    case "tinyint":
-                        return TinyIntJdbcType.INSTANCE;
-                    case "smallint":
-                        return SmallIntJdbcType.INSTANCE;
+        if (properties != null && !properties.isEmpty()) {
+            DynamicParameterizedType.ParameterType parameterType = ParameterTypeUtils.resolve(properties);
+            if (parameterType != null) {
+                String columnType = ParameterTypeUtils.getColumnType(parameterType);
+                if (!StringUtils.isBlank(columnType)) {
+                    switch (columnType) {
+                        case "tinyint":
+                            return TinyIntJdbcType.INSTANCE;
+                        case "smallint":
+                            return SmallIntJdbcType.INSTANCE;
+                    }
                 }
             }
         }

hypersistence-utils-hibernate-70/src/main/java/io/hypersistence/utils/hibernate/type/json/JsonBlobType.java

@@ -1,15 +1,16 @@
 package io.hypersistence.utils.hibernate.type.json;
 
+import java.lang.reflect.Type;
+import java.sql.Blob;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.hypersistence.utils.hibernate.type.MutableDynamicParameterizedType;
+
+import io.hypersistence.utils.hibernate.type.json.internal.AbstractJsonType;
 import io.hypersistence.utils.hibernate.type.json.internal.JsonBlobJdbcTypeDescriptor;
 import io.hypersistence.utils.hibernate.type.json.internal.JsonJavaTypeDescriptor;
 import io.hypersistence.utils.hibernate.type.util.JsonConfiguration;
 import io.hypersistence.utils.hibernate.type.util.ObjectMapperWrapper;
 
-import java.lang.reflect.Type;
-import java.sql.Blob;
-
 /**
  * <p>
  * Maps any given Java object on a JSON column type that is managed via {@link java.sql.PreparedStatement#setBlob(int, Blob)} at JDBC Driver level.
@@ -26,7 +27,7 @@
  *
  * @author Vlad Mihalcea
  */
-public class JsonBlobType extends MutableDynamicParameterizedType<Object, JsonBlobJdbcTypeDescriptor, JsonJavaTypeDescriptor> {
+public class JsonBlobType extends AbstractJsonType<Object> {
 
     public static final JsonBlobType INSTANCE = new JsonBlobType();
 

hypersistence-utils-hibernate-70/src/main/java/io/hypersistence/utils/hibernate/type/json/JsonClobType.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.hypersistence.utils.hibernate.type.MutableDynamicParameterizedType;
+import io.hypersistence.utils.hibernate.type.json.internal.AbstractJsonType;
 import io.hypersistence.utils.hibernate.type.json.internal.JsonClobJdbcTypeDescriptor;
 import io.hypersistence.utils.hibernate.type.json.internal.JsonJavaTypeDescriptor;
 import io.hypersistence.utils.hibernate.type.util.JsonConfiguration;
@@ -10,6 +11,8 @@
 import java.lang.reflect.Type;
 import java.sql.Clob;
 
+import org.hibernate.boot.models.annotations.internal.ExtendsXmlAnnotation;
+
 /**
  * <p>
  * Maps any given Java object on a JSON column type that is managed via {@link java.sql.PreparedStatement#setClob(int, Clob)} at JDBC Driver level.
@@ -27,7 +30,7 @@
  * @author Vlad Mihalcea
  * @author Andreas Gebhardt
  */
-public class JsonClobType extends MutableDynamicParameterizedType<Object, JsonClobJdbcTypeDescriptor, JsonJavaTypeDescriptor> {
+public class JsonClobType extends AbstractJsonType<Object> {
 
     public static final JsonClobType INSTANCE = new JsonClobType();
 

hypersistence-utils-hibernate-70/src/main/java/io/hypersistence/utils/hibernate/type/json/JsonStringType.java

@@ -1,15 +1,17 @@
 package io.hypersistence.utils.hibernate.type.json;
 
+import java.lang.reflect.Type;
+
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.spi.TypeConfiguration;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.hypersistence.utils.hibernate.type.MutableDynamicParameterizedType;
+
+import io.hypersistence.utils.hibernate.type.json.internal.AbstractJsonType;
 import io.hypersistence.utils.hibernate.type.json.internal.JsonJavaTypeDescriptor;
 import io.hypersistence.utils.hibernate.type.json.internal.JsonStringJdbcTypeDescriptor;
 import io.hypersistence.utils.hibernate.type.util.JsonConfiguration;
 import io.hypersistence.utils.hibernate.type.util.ObjectMapperWrapper;
-import org.hibernate.type.descriptor.jdbc.JdbcType;
-import org.hibernate.type.spi.TypeConfiguration;
-
-import java.lang.reflect.Type;
 
 /**
  * <p>
@@ -34,7 +36,7 @@
  *
  * @author Vlad Mihalcea
  */
-public class JsonStringType extends MutableDynamicParameterizedType<Object, JsonStringJdbcTypeDescriptor, JsonJavaTypeDescriptor> {
+public class JsonStringType extends AbstractJsonType<Object> {
 
     public static final JsonStringType INSTANCE = new JsonStringType();
 

hypersistence-utils-hibernate-70/src/main/java/io/hypersistence/utils/hibernate/type/json/internal/AbstractJsonType.java

@@ -0,0 +1,51 @@
+package io.hypersistence.utils.hibernate.type.json.internal;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
+import org.hibernate.type.descriptor.java.AbstractClassJavaType;
+import org.hibernate.type.descriptor.java.JavaType;
+
+import io.hypersistence.utils.hibernate.type.MutableDynamicParameterizedType;
+import io.hypersistence.utils.hibernate.type.util.Configuration;
+
+public abstract class AbstractJsonType<T> extends MutableDynamicParameterizedType<T, AbstractJsonJdbcTypeDescriptor, AbstractClassJavaType<T>> {
+
+    protected AbstractJsonType(Class<T> returnedClass, AbstractJsonJdbcTypeDescriptor jdbcTypeDescriptor,
+                               AbstractClassJavaType<T> javaTypeDescriptor, Configuration configuration) {
+        super(returnedClass, jdbcTypeDescriptor, javaTypeDescriptor, configuration);
+    }
+
+    protected AbstractJsonType(Class<T> returnedClass, AbstractJsonJdbcTypeDescriptor jdbcTypeDescriptor,
+                               AbstractClassJavaType<T> javaTypeDescriptor) {
+        super(returnedClass, jdbcTypeDescriptor, javaTypeDescriptor);
+    }
+
+    @Override
+    public BasicValueConverter<T, Object> getValueConverter() {
+        return new BasicValueConverterImplementation();
+    }
+
+    private final class BasicValueConverterImplementation implements BasicValueConverter<T, Object> {
+        @SuppressWarnings("unchecked")
+        @Override
+        public @Nullable T toDomainValue(@Nullable Object relationalForm) {
+            return (T) relationalForm;
+        }
+
+        @Override
+        public @Nullable Object toRelationalValue(@Nullable T domainForm) {
+            return domainForm;
+        }
+
+        @Override
+        public JavaType<T> getDomainJavaType() {
+            return getJavaTypeDescriptor();
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public JavaType<Object> getRelationalJavaType() {
+            return (JavaType<Object>) getJavaTypeDescriptor();
+        }
+    }
+}

hypersistence-utils-hibernate-70/src/test/java/io/hypersistence/utils/hibernate/id/AbstractBatchSequenceGeneratorTest.java

@@ -3,13 +3,10 @@
 import io.hypersistence.utils.hibernate.util.AbstractTest;
 import io.hypersistence.utils.test.providers.DataSourceProvider;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import net.ttddyy.dsproxy.QueryCount;
 import net.ttddyy.dsproxy.QueryCountHolder;
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Parameter;
 import org.hibernate.cfg.AvailableSettings;
 import org.junit.Test;
 

hypersistence-utils-hibernate-70/src/test/java/io/hypersistence/utils/hibernate/type/basic/PostgreSQLCITextTypeTest.java

@@ -119,7 +119,7 @@ public Void apply(EntityManager entityManager) {
                     FROM Country AS c
                     WHERE c.name LIKE :token
                     """)
-                    .setParameter("token", token)
+                .setParameter("token", token)
                 .getResultList();
 
                 assertEquals(1, countries.size());

hypersistence-utils-hibernate-70/src/test/java/io/hypersistence/utils/hibernate/type/basic/PostgreSQLYearMonthIntegerTest.java

@@ -97,7 +97,7 @@ public void testIndexing() {
         doInJPA(entityManager -> {
 
             YearMonth yearMonth = YearMonth.of(1970, 1);
-                    
+            
             for (int i = 0; i < 5000; i++) {
                 yearMonth = yearMonth.plusMonths(1);
 

hypersistence-utils-hibernate-70/src/test/java/io/hypersistence/utils/hibernate/type/json/OracleJsonStringPropertyTest.java

@@ -12,7 +12,6 @@
 import org.hibernate.annotations.Type;
 import org.hibernate.jpa.boot.spi.TypeContributorList;
 import org.hibernate.query.NativeQuery;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -61,7 +60,6 @@ protected void additionalProperties(Properties properties) {
     }
 
     @Test
-    @Ignore("TODO : addScalar")
     public void test() {
         doInJPA(entityManager -> {
             Book book = entityManager.unwrap(Session.class)