fixed constructor problem of ValueWrapper in Term::wrapConstant

Author: Barakudum

src/main/java/org/dynapi/squirtle/core/Utils.java

@@ -78,10 +78,21 @@ public static void validate(Object[] args, Throwable exc, Class<?> type) throws
      * @param initArgs arguments to pass to the class
      * @return instance of {@code type}
      */
-    public static<T> T newInstance(Class<T> type, Object... initArgs) {
+    public static<T> T newInstance(Class<T> type, Object[] initArgs) {
+        Class<?>[] argTypes = (Class<?>[]) Arrays.stream(initArgs).map(Object::getClass).toList().toArray(new Class[0]);
+        return newInstance(type, initArgs, argTypes);
+    }
+
+    /**
+     *
+     * @param type class to instantiate
+     * @param initArgs arguments to pass to the class
+     * @param signature signature of the constructor if initArgs classes don't match
+     * @return instance of {@code type}
+     */
+    public static<T> T newInstance(Class<T> type, Object[] initArgs, Class<?>[] signature) {
         try {
-            Class<?>[] argTypes = (Class<?>[]) Arrays.stream(initArgs).map(Object::getClass).toList().toArray(new Class[0]);
-            return type.getConstructor(argTypes).newInstance(initArgs);
+            return type.getConstructor(signature).newInstance(initArgs);
         } catch (Exception e) {
             String argsString = String.join(", ", Arrays.stream(initArgs).map(Object::toString).toList());
             String errorMessage = String.format("Can't instantiate %s(%s) because %s (%s)", type.getCanonicalName(), argsString, e.getClass().getSimpleName(), e.getMessage());

src/main/java/org/dynapi/squirtle/core/queries/QueryBuilder.java

@@ -400,7 +400,7 @@ public QueryBuilder set(String fieldName, Objects value) {
         return set(new Field(null, fieldName, null), value);
     }
     public QueryBuilder set(Field field, Objects value) {
-        updates.add(new UpdateEntry(field, Utils.newInstance(wrapperClass, null, value)));
+        updates.add(new UpdateEntry(field, Utils.newInstance(wrapperClass, new Object[]{ null, value})));
         return this;
     }
 

src/main/java/org/dynapi/squirtle/core/queries/Table.java

@@ -111,14 +111,14 @@ public int hashCode() {
     }
 
     public QueryBuilder select(Object... terms) {
-        return Utils.newInstance(queryClass, this).select(List.of(terms));
+        return Utils.newInstance(queryClass, new Object[]{ this }).select(List.of(terms));
     }
 
     public QueryBuilder update() {
-        return Utils.newInstance(queryClass, this).update(this);
+        return Utils.newInstance(queryClass, new Object[]{ this }).update(this);
     }
 
     public QueryBuilder insert(Object... terms) {
-        return Utils.newInstance(queryClass, this).into(this).insert(terms);
+        return Utils.newInstance(queryClass, new Object[]{ this }).into(this).insert(terms);
     }
 }

src/main/java/org/dynapi/squirtle/core/terms/Term.java

@@ -69,7 +69,7 @@ public static Term wrapConstant(Object value, Class<? extends ValueWrapper> wrap
 
         if (wrapperClass == null)
             wrapperClass = ValueWrapper.class;
-        return Utils.newInstance(wrapperClass, value);
+        return Utils.newInstance(wrapperClass, new Object[]{ value }, new Class<?>[] { Object.class });
     }
 
     public static Node wrapJson(Object value) {
@@ -86,7 +86,7 @@ public static Node wrapJson(Object value, Class<? extends ValueWrapper> wrapperC
         if (value instanceof Interval interval)
             return interval;
         if (value instanceof String || value instanceof Integer || value instanceof Boolean)
-            return Utils.newInstance(wrapperClass, value);
+            return Utils.newInstance(wrapperClass, new Object[]{ value });
 
         return new JSON(null, value);
     }