Extended pool test case.

Author: ZorTik

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

@@ -73,6 +73,7 @@ public class SQLDatabaseConnectionImpl extends PooledSQLDatabaseConnection {
     private transient ObjectMapper objectMapper;
     @Setter
     private transient Logger logger;
+    private int errorCount = 0;
 
     /**
      * Constructs new instance of this implementation with default
@@ -223,6 +224,7 @@ public final boolean buildEntitySchema(String tableName, Class<?> entityClass) {
 
     /**
      * Performs new query and returns the result. This result is never null.
+     * This method also maps the result to the specified type using {@link ObjectMapper}.
      * See: {@link QueryRowsResult#isSuccessful()}
      *
      * Examples:
@@ -259,7 +261,7 @@ public <T> QueryRowsResult<T> query(Query query, Class<T> typeClass) {
     /**
      * Performs new query and returns the result. This result is never null.
      *
-     * @see SQLDatabaseConnection#query(Query, Class)
+     * @param query The query to use
      */
     @Override
     public QueryRowsResult<Row> query(Query query) {
@@ -348,21 +350,39 @@ private QueryResult exec(Query query, boolean isRetry) {
      */
     @Override
     public QueryResult save(String table, Object obj) { // by default, it creates and upsert request.
-        Pair<String[], UnknownValueWrapper[]> data = buildDefsVals(obj);
+        DefsVals defsVals = buildDefsVals(obj);
 
-        if(data == null) {
+        if(defsVals == null) {
             return new QueryResultImpl(false);
         }
 
         return save(obj).table(table).execute();
     }
 
+    public UpsertQuery save(Object obj) {
+        DefsVals defsVals = buildDefsVals(obj);
+        if(defsVals == null) return null;
+
+        String[] defs = defsVals.getDefs();
+        UnknownValueWrapper[] vals = defsVals.getVals();
+        UpsertQuery upsert = upsert().into(null, defs);
+        for(UnknownValueWrapper wrapper : vals) {
+            upsert.appendVal(wrapper.getObject());
+        }
+        SetStatement<InsertQuery> setStmt = upsert.onDuplicateKey();
+        for(int i = 0; i < defs.length; i++) {
+            setStmt.and(defs[i], vals[i].getObject());
+        }
+
+        return (UpsertQuery) setStmt.getAncestor();
+    }
+
     public QueryResult insert(String table, Object obj) {
-        Pair<String[], UnknownValueWrapper[]> data = buildDefsVals(obj);
-        if (data == null) return new QueryResultImpl(false);
+        DefsVals defsVals = buildDefsVals(obj);
+        if (defsVals == null) return new QueryResultImpl(false);
 
-        InsertQuery query = insert().into(table, data.getFirst());
-        for (UnknownValueWrapper valueWrapper : data.getSecond()) {
+        InsertQuery query = insert().into(table, defsVals.getDefs());
+        for (UnknownValueWrapper valueWrapper : defsVals.getVals()) {
             query.appendVal(valueWrapper.getObject());
         }
 
@@ -371,7 +391,7 @@ public QueryResult insert(String table, Object obj) {
 
     @SuppressWarnings("unchecked")
     @Nullable
-    protected Pair<String[], UnknownValueWrapper[]> buildDefsVals(Object obj) {
+    protected DefsVals buildDefsVals(Object obj) {
         Objects.requireNonNull(obj);
 
         Class<?> aClass = obj.getClass();
@@ -408,7 +428,7 @@ protected Pair<String[], UnknownValueWrapper[]> buildDefsVals(Object obj) {
             defs[i] = entryArray[i].getKey();
             vals[i] = new UnknownValueWrapper(entryArray[i].getValue());
         }
-        return new Pair<>(defs, vals);
+        return new DefsVals(defs, vals);
     }
 
     @SuppressWarnings("all")
@@ -428,26 +448,20 @@ private boolean reconnect() {
         return true;
     }
 
-    public UpsertQuery save(Object obj) {
-        Pair<String[], UnknownValueWrapper[]> data = buildDefsVals(obj);
-        if(data == null) return null;
+    public void debug(String message) {
+        if(options.isDebug()) logger.info(message);
+    }
 
-        String[] defs = data.getFirst();
-        UnknownValueWrapper[] vals = data.getSecond();
-        UpsertQuery upsert = upsert().into(null, defs);
-        for(UnknownValueWrapper wrapper : vals) {
-            upsert.appendVal(wrapper.getObject());
-        }
-        SetStatement<InsertQuery> setStmt = upsert.onDuplicateKey();
-        for(int i = 0; i < defs.length; i++) {
-            setStmt.and(defs[i], vals[i].getObject());
+    @Override
+    public void close() {
+        if (errorCount > 0 && getAssignedPool() != null) {
+            // If there was any error and this connection is part of a pool,
+            // we won't return object to the pool, but disconnect.
+            disconnect();
+            return;
         }
 
-        return (UpsertQuery) setStmt.getAncestor();
-    }
-
-    public void debug(String message) {
-        if(options.isDebug()) logger.info(message);
+        super.close();
     }
 
     @Override
@@ -461,6 +475,7 @@ public final boolean isDebug() {
     }
 
     private void notifyError(int code) {
+        errorCount++;
         this.errorStateHandlers.forEach(handler -> runCatching(() -> handler.onErrorState(code)));
     }
 
@@ -503,6 +518,13 @@ public static class UnknownValueWrapper {
         private Object object;
     }
 
+    @AllArgsConstructor
+    @Getter
+    public static class DefsVals {
+        private final String[] defs;
+        private final UnknownValueWrapper[] vals;
+    }
+
     public interface ErrorStateObserver {
         void onErrorState(int code);
     }

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

@@ -48,12 +48,12 @@ public SQLiteDatabaseConnectionImpl(SQLConnectionFactory connectionFactory, SQLD
      */
     @Override
     public QueryResult save(String table, Object obj) {
-        Pair<String[], UnknownValueWrapper[]> defsValsPair = buildDefsVals(obj);
-        if(defsValsPair == null) {
+        DefsVals defsVals = buildDefsVals(obj);
+        if(defsVals == null) {
             return new QueryResultImpl(false);
         }
-        String[] defs = defsValsPair.getFirst();
-        UnknownValueWrapper[] vals = defsValsPair.getSecond();
+        String[] defs = defsVals.getDefs();
+        UnknownValueWrapper[] vals = defsVals.getVals();
 
         debug("Saving object into table " + table + " with definitions " + Arrays.toString(defs) + " and values " + Arrays.toString(vals));
 

core/src/main/java/me/zort/sqllib/pool/PooledSQLDatabaseConnection.java

@@ -9,6 +9,7 @@
 
 public abstract class PooledSQLDatabaseConnection extends SQLDatabaseConnection implements Closeable {
 
+    @Getter(onMethod_ = {@Nullable})
     private SQLConnectionPool assignedPool = null;
     @Getter(onMethod_ = {@Nullable})
     private long lastUsed = System.currentTimeMillis();

core/src/main/java/me/zort/sqllib/pool/SQLConnectionPool.java

@@ -40,6 +40,8 @@ public static final class Options {
     private final long borrowObjectTimeout;
     private final boolean blockWhenExhausted;
 
+    private int errorCount = 0;
+
     // --***-- Pooled connection caches --***--
     private final Queue<PooledSQLDatabaseConnection> freeConnections = new ConcurrentLinkedQueue<>();
     private final List<PooledSQLDatabaseConnection> usedConnections = new CopyOnWriteArrayList<>();
@@ -110,6 +112,7 @@ private PooledSQLDatabaseConnection establishObject() throws SQLException {
 
         if (polled instanceof SQLDatabaseConnectionImpl) {
             ((SQLDatabaseConnectionImpl) polled).addErrorHandler(code -> {
+                errorCount++;
                 // Remove the connection from the pool and disconnect
                 // on fatal errors.
                 freeConnections.remove(polled);
@@ -131,6 +134,10 @@ public int size() {
         return usedConnections.size() + freeConnections.size();
     }
 
+    public int errorCount() {
+        return errorCount;
+    }
+
     /**
      * Closes all connections in the pool and
      * clears the caches.

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

@@ -166,6 +166,19 @@ public void test6_Pool() {
             throw new RuntimeException(e);
         }
         assertEquals(1, pool.size());
+        try(SQLDatabaseConnection connection = pool.getResource()) {
+            connection.exec(() -> "xcbnxcvkjonmcvxikjno");
+        } catch(SQLException e) {
+            throw new RuntimeException(e);
+        }
+        assertEquals(1, pool.errorCount());
+        assertEquals(0, pool.size());
+        try {
+            pool.getResource().close();
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+        assertEquals(1, pool.size());
         pool.close();
         assertEquals(0, pool.size());
     }