Cleaned up defaults for connection utils

Author: hylkevds

FROST-Server.SQLjooq/src/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/utils/ConnectionUtils.java

@@ -20,6 +20,8 @@
 import de.fraunhofer.iosb.ilt.settings.ConfigDefaults;
 import de.fraunhofer.iosb.ilt.settings.Settings;
 import de.fraunhofer.iosb.ilt.settings.annotation.DefaultValue;
+import de.fraunhofer.iosb.ilt.settings.annotation.DefaultValueBoolean;
+import de.fraunhofer.iosb.ilt.settings.annotation.DefaultValueInt;
 import de.fraunhofer.iosb.ilt.settings.annotation.SensitiveValue;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -68,13 +70,13 @@ public class ConnectionUtils implements ConfigDefaults {
     public static final String TAG_DB_MINIDLE = "db.conn.idle.min";
 
     // Connection validation settings
-    @DefaultValue("false")
+    @DefaultValueBoolean(false)
     public static final String TAG_DB_TEST_ON_BORROW = "db.conn.testOnBorrow";
-    @DefaultValue("false")
+    @DefaultValueBoolean(false)
     public static final String TAG_DB_TEST_WHILE_IDLE = "db.conn.testWhileIdle";
     @DefaultValue("")
     public static final String TAG_DB_VALIDATION_QUERY = "db.conn.validationQuery";
-    @DefaultValue("0")
+    @DefaultValueInt(0)
     public static final String TAG_DB_EVICTION_INTERVAL = "db.conn.timeBetweenEvictionRunsMillis";
 
     /**
@@ -142,16 +144,15 @@ private static DataSource setupBasicDataSource(Settings settings) {
             ds.setMaxTotal(settings.getInt(TAG_DB_MAXCONN, ds.getMaxTotal()));
             ds.setMinIdle(settings.getInt(TAG_DB_MINIDLE, ds.getMinIdle()));
 
-            // Connection validation settings (default false for backward compatibility)
-            ds.setTestOnBorrow(settings.getBoolean(TAG_DB_TEST_ON_BORROW, false));
-            ds.setTestWhileIdle(settings.getBoolean(TAG_DB_TEST_WHILE_IDLE, false));
+            ds.setTestOnBorrow(settings.getBoolean(TAG_DB_TEST_ON_BORROW, ConnectionUtils.class));
+            ds.setTestWhileIdle(settings.getBoolean(TAG_DB_TEST_WHILE_IDLE, ConnectionUtils.class));
 
             String validationQuery = settings.get(TAG_DB_VALIDATION_QUERY, ConnectionUtils.class);
             if (!validationQuery.isEmpty()) {
                 ds.setValidationQuery(validationQuery);
             }
 
-            long evictionInterval = settings.getLong(TAG_DB_EVICTION_INTERVAL, 0L);
+            long evictionInterval = settings.getLong(TAG_DB_EVICTION_INTERVAL, ConnectionUtils.class);
             if (evictionInterval > 0) {
                 ds.setTimeBetweenEvictionRunsMillis(evictionInterval);
             }

docs/settings/settings.md

@@ -211,13 +211,13 @@ These settings deal with the database connection, for both the HTTP and MQTT pac
 * **persistence.db.conn.idle.min:**  
   The minimum number of idle database connections to keep open, when not using JNDI.
   The default is driver dependent.
-* **persistence.db.conn.testOnBorrow:** Default: `false`  
+* **persistence.db.conn.testOnBorrow:** Since 2.6.3, Default: `false`  
   If true, connections are validated before being borrowed from the pool. Default: `false` (for backward compatibility).
-* **persistence.db.conn.testWhileIdle:** Default: `false`  
+* **persistence.db.conn.testWhileIdle:** Since 2.6.3, Default: `false`  
   If true, connections are validated during idle periods. Default: `false` (for backward compatibility).
-* **persistence.db.conn.validationQuery:** Default: empty  
+* **persistence.db.conn.validationQuery:** Since 2.6.3, Default: empty  
   The SQL query used to validate connections (e.g., `SELECT 1` for PostgreSQL).
-* **persistence.db.conn.timeBetweenEvictionRunsMillis:** Default: `0`  
+* **persistence.db.conn.timeBetweenEvictionRunsMillis:** Since 2.6.3, Default: `0`  
   The time in milliseconds between eviction runs for idle connections. Set to 0 to disable.
 * **persistence.db.schemaPriority:** Since 2.2.0, Default: empty  
   When searching table definitions, if a table with a given name is found in multiple schemas,