SQLDatabaseConnection#setProxyMapping

Author: ZorTik

api/src/main/java/me/zort/sqllib/api/mapping/StatementMappingFactory.java

@@ -19,6 +19,7 @@ public interface StatementMappingFactory {
      * @return The StatementMapping.
      * @param <T> The interface class type.
      */
-    <T> StatementMappingStrategy<T> create(Class<T> interfaceClass, SQLConnection connection);
+    <T> StatementMappingStrategy<T> strategy(Class<T> interfaceClass, SQLConnection connection);
+    StatementMappingResultAdapter resultAdapter();
 
 }

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

@@ -9,6 +9,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.api.mapping.StatementMappingFactory;
 import me.zort.sqllib.api.mapping.StatementMappingOptions;
 import me.zort.sqllib.internal.factory.SQLConnectionFactory;
 import me.zort.sqllib.internal.impl.QueryResultImpl;
@@ -45,6 +46,13 @@ public SQLDatabaseConnection(final @NotNull SQLConnectionFactory connectionFacto
         SQLConnectionRegistry.register(this);
     }
 
+    /**
+     * Sets a mapping to use when using {@link SQLDatabaseConnection#createProxy(Class, StatementMappingOptions)}.
+     *
+     * @param mappingFactory Mapping factory to use.
+     */
+    public abstract void setProxyMapping(final @NotNull StatementMappingFactory mappingFactory);
+
     /**
      * @deprecated Use {@link SQLDatabaseConnection#createProxy(Class)} instead.
      */

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

@@ -69,9 +69,8 @@ public class SQLDatabaseConnectionImpl extends PooledSQLDatabaseConnection {
 
     @Getter
     private final ISQLDatabaseOptions options;
-    private final transient StatementMappingFactory mappingFactory;
-    private final transient StatementMappingResultAdapter mappingResultAdapter;
     private final transient List<ErrorStateObserver> errorStateHandlers;
+    private transient StatementMappingFactory mappingFactory;
     private transient ObjectMapper objectMapper;
     private transient CacheManager cacheManager;
     @Setter
@@ -103,7 +102,6 @@ public SQLDatabaseConnectionImpl(final @NotNull SQLConnectionFactory connectionF
         this.options = options;
         this.objectMapper = new DefaultObjectMapper(this);
         this.mappingFactory = new DefaultStatementMappingFactory();
-        this.mappingResultAdapter = new DefaultResultAdapter();
         this.errorStateHandlers = new CopyOnWriteArrayList<>();
         this.transaction = null;
         this.logger = Logger.getGlobal();
@@ -138,6 +136,15 @@ public void setObjectMapper(final @NotNull ObjectMapper objectMapper) {
         this.objectMapper = Objects.requireNonNull(objectMapper, "Object mapper cannot be null!");
     }
 
+    /**
+     * Sets a mapping to use when using {@link SQLDatabaseConnection#createProxy(Class, StatementMappingOptions)}.
+     *
+     * @param mappingFactory Mapping factory to use.
+     */
+    public void setProxyMapping(final @NotNull StatementMappingFactory mappingFactory) {
+        this.mappingFactory = Objects.requireNonNull(mappingFactory, "Mapping factory cannot be null!");
+    }
+
     /**
      * Adds an error state observer to the list of observers to be
      * notified when a fatal error occurs.
@@ -221,7 +228,8 @@ public final <T> T createProxy(final @NotNull Class<T> mappingInterface, final @
         Objects.requireNonNull(mappingInterface, "Mapping interface cannot be null!");
         Objects.requireNonNull(options, "Options cannot be null!");
 
-        StatementMappingStrategy<T> statementMapping = mappingFactory.create(mappingInterface, this);
+        StatementMappingStrategy<T> statementMapping = mappingFactory.strategy(mappingInterface, this);
+        StatementMappingResultAdapter mappingResultAdapter = mappingFactory.resultAdapter();
         List<Method> pendingMethods = new CopyOnWriteArrayList<>();
 
         return (T) Proxy.newProxyInstance(mappingInterface.getClassLoader(),

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

@@ -138,7 +138,7 @@ public QueryResult exec(@NotNull Query query) {
         return super.exec(query);
     }
 
-    class UpsertQueryDecorator extends UpsertQuery {
+    final class UpsertQueryDecorator extends UpsertQuery {
         private final QueryNode<?> query;
 
         public UpsertQueryDecorator(QueryNode<?> query) {

core/src/main/java/me/zort/sqllib/mapping/DefaultStatementMappingFactory.java

@@ -1,16 +1,23 @@
 package me.zort.sqllib.mapping;
 
 import me.zort.sqllib.api.SQLConnection;
+import me.zort.sqllib.api.mapping.StatementMappingResultAdapter;
 import me.zort.sqllib.api.mapping.StatementMappingStrategy;
 import me.zort.sqllib.api.mapping.StatementMappingFactory;
 
 import java.lang.reflect.Modifier;
 
 public class DefaultStatementMappingFactory implements StatementMappingFactory {
+    private final DefaultResultAdapter resultAdapter = new DefaultResultAdapter();
     @Override
-    public <T> StatementMappingStrategy<T> create(Class<T> interfaceClass, SQLConnection connection) {
+    public <T> StatementMappingStrategy<T> strategy(Class<T> interfaceClass, SQLConnection connection) {
         if (!interfaceClass.isInterface() || !Modifier.isAbstract(interfaceClass.getModifiers()))
             throw new IllegalArgumentException("The given class is not an interface or is not abstract");
         return new DefaultStatementMapping<>(connection);
     }
+
+    @Override
+    public StatementMappingResultAdapter resultAdapter() {
+        return resultAdapter;
+    }
 }