Fix Hibernate 7.3 strict parameter type checking for primitives and subquery limit/offset

Signed-off-by: Marvin Froeder <velo.br@gmail.com>

Author: velo

querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLSerializer.java

@@ -427,10 +427,10 @@ public Void visit(SubQueryExpression<?> query, Void context) {
         && modifiers.isRestricting()
         && templates.isSubQueryModifiersSupported()) {
       if (modifiers.getLimit() != null) {
-        append(LIMIT).handle(modifiers.getLimit());
+        append(LIMIT).handle(modifiers.getLimitAsInteger());
       }
       if (modifiers.getOffset() != null) {
-        append(OFFSET).handle(modifiers.getOffset());
+        append(OFFSET).handle(modifiers.getOffsetAsInteger());
       }
     }
 

querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateUtil.java

@@ -108,8 +108,6 @@ private static void setValueWithNumberedLabel(
       query.setParameterList(key, collection);
     } else if (val instanceof Object[] objects && !BUILT_IN.contains(val.getClass())) {
       query.setParameterList(key, objects);
-    } else if (val instanceof Number && TYPES.containsKey(val.getClass())) {
-      query.setParameter(key, val, getType(val.getClass()));
     } else {
       query.setParameter(key, val);
     }

querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAUtil.java

@@ -29,6 +29,20 @@
  */
 public final class JPAUtil {
 
+  private static final Map<Class<?>, Class<?>> PRIMITIVE_TO_WRAPPER =
+      Map.of(
+          int.class, Integer.class,
+          long.class, Long.class,
+          double.class, Double.class,
+          float.class, Float.class,
+          short.class, Short.class,
+          byte.class, Byte.class);
+
+  @SuppressWarnings("unchecked")
+  private static <T extends Number> Class<T> primitiveToWrapper(Class<?> type) {
+    return (Class<T>) PRIMITIVE_TO_WRAPPER.getOrDefault(type, type);
+  }
+
   private JPAUtil() {}
 
   public static void setConstants(
@@ -50,8 +64,9 @@ public static void setConstants(
         Parameter parameter = query.getParameter(i + 1);
         var parameterType = parameter != null ? parameter.getParameterType() : null;
         if (parameterType != null && !parameterType.isInstance(val)) {
-          if (val instanceof Number number && Number.class.isAssignableFrom(parameterType)) {
-            val = MathUtils.cast(number, parameterType);
+          var targetType = primitiveToWrapper(parameterType);
+          if (val instanceof Number number && Number.class.isAssignableFrom(targetType)) {
+            val = MathUtils.cast(number, targetType);
           }
         }
       }