Fix

Author: ZorTik

core/src/main/java/me/zort/sqllib/JVM.java

@@ -0,0 +1,59 @@
+package me.zort.sqllib;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+public abstract class JVM {
+
+    public abstract Object invokeDefault(Class<?> declaringClass, Object instance, Method method, Object[] args) throws Throwable;
+
+    public static JVM getJVM() {
+        int ver = jvmVer();
+        if (ver < 8)
+            throw new UnsupportedOperationException("Unsupported JVM version: " + ver);
+        else if (ver == 8)
+            return new JVM8();
+        else
+            return new JVM9();
+    }
+
+    private static int jvmVer() {
+        String version = System.getProperty("java.version");
+        if(version.startsWith("1.")) {
+            version = version.substring(2, 3);
+        } else {
+            int dot = version.indexOf(".");
+            if(dot != -1) {
+                version = version.substring(0, dot);
+            }
+        }
+        return Integer.parseInt(version);
+    }
+
+
+    static final class JVM8 extends JVM {
+        @Override
+        public Object invokeDefault(Class<?> declaringClass, Object instance, Method method, Object[] args) throws Throwable {
+            Constructor<MethodHandles.Lookup> constructor = MethodHandles.Lookup.class.getDeclaredConstructor(Class.class);
+            constructor.setAccessible(true);
+            return constructor.newInstance(declaringClass)
+                    .in(declaringClass)
+                    .unreflectSpecial(method, declaringClass)
+                    .bindTo(instance)
+                    .invokeWithArguments(args);
+        }
+    }
+
+    static final class JVM9 extends JVM {
+        @Override
+        public Object invokeDefault(Class<?> declaringClass, Object instance, Method method, Object[] args) throws Throwable {
+            MethodHandles.Lookup lookup = MethodHandles.lookup();
+            return lookup.findSpecial(declaringClass, method.getName(), MethodType.methodType(method.getReturnType(), method.getParameterTypes()), declaringClass)
+                    .bindTo(instance)
+                    .invokeWithArguments(args);
+        }
+    }
+
+}

core/src/main/java/me/zort/sqllib/SQLDatabaseConnectionImpl.java

@@ -28,9 +28,12 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.*;
 import java.sql.*;
 import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Main database client object implementation.
@@ -157,6 +160,9 @@ public final <T> T createGate(Class<T> mappingInterface) {
         Objects.requireNonNull(mappingInterface, "Mapping interface cannot be null!");
 
         StatementMappingStrategy<T> statementMapping = mappingFactory.create(mappingInterface, this);
+
+        List<Method> pendingMethods = new CopyOnWriteArrayList<>();
+
         return (T) Proxy.newProxyInstance(mappingInterface.getClassLoader(),
                 new Class[]{mappingInterface}, (proxy, method, args) -> {
 
@@ -170,6 +176,11 @@ public final <T> T createGate(Class<T> mappingInterface) {
                         return mappingResultAdapter.adaptResult(method, result);
                     }
 
+                    // Default methods are invoked normally.
+                    if (declaringClass.isInterface() && method.isDefault()) {
+                        return JVM.getJVM().invokeDefault(declaringClass, proxy, method, args);
+                    }
+
                     throw new UnsupportedOperationException("Method " + method.getName() + " is not supported by this mapping repository!");
                 });
     }

core/src/main/java/me/zort/sqllib/internal/query/InsertQuery.java

@@ -85,6 +85,8 @@ public QueryDetails buildQueryDetails() {
         details.append(" VALUES ");
         insertArray(details, values, true);
 
+        details.append(buildInnerQuery());
+
         return details;
     }
 

core/src/main/java/me/zort/sqllib/internal/query/UpsertQuery.java

@@ -54,11 +54,6 @@ public QueryDetails buildQueryDetails() {
         return stmt;
     }
 
-    @Override
-    public String buildQuery() {
-        return super.buildQuery();
-    }
-
     @Override
     public UpsertQuery then(String part) {
         return (UpsertQuery) super.then(part);

src/test/java/me/zort/sqllib/test/TestCase2.java

@@ -8,6 +8,7 @@
 import me.zort.sqllib.api.data.QueryResult;
 import me.zort.sqllib.api.data.QueryRowsResult;
 import me.zort.sqllib.api.data.Row;
+import me.zort.sqllib.internal.annotation.PrimaryKey;
 import me.zort.sqllib.mapping.annotation.*;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.condition.EnabledOnOs;
@@ -51,12 +52,16 @@ public void prepare() {
     @Test
     public void test1_Mapping() {
         DatabaseRepository repository = connection.createGate(DatabaseRepository.class);
-        assertNull(repository.save(new User("User1", 1000)).getRejectMessage());
+
+        User user1 = new User("User1", 1000);
+
+        assertNull(repository.save(user1).getRejectMessage());
         assertTrue(repository.selectOne("User1").isPresent());
         assertNull(repository.insertNew("User4", 800).getRejectMessage());
         assertTrue(repository.selectOne("User4").isPresent());
         assertFalse(repository.selectAll().isEmpty());
         assertNotEquals(0L, repository.count().get(0).get("COUNT(*)"));
+        assertTrue(repository.saveUser(user1));
 
         assertNull(repository.deleteAll().getRejectMessage());
         assertTrue(repository.selectAll().isEmpty());
@@ -93,10 +98,16 @@ public interface DatabaseRepository {
 
         @Query("SELECT COUNT(*) FROM users;")
         QueryRowsResult<Row> count();
+
+        default boolean saveUser(User user) {
+            System.out.println("Saving user...");
+            return save(user).isSuccessful();
+        }
     }
 
     @AllArgsConstructor
     private static class User {
+        @PrimaryKey
         private final String nickname;
         private final int points;