revert to ConnectionPoolSource, update validation options

Author: qqmyers

doc/sphinx-guides/source/installation/config.rst

@@ -935,11 +935,11 @@ Connection Validation
      - Default
    * - dataverse.db.is-connection-validation-required
      - ``true``: Validate connections, allow server to reconnect in case of failure.
-     - false
+     - true
    * - dataverse.db.connection-validation-method
      - | The method of connection validation:
-       | ``table|autocommit|meta-data|custom-validation``.
-     - *Empty string*
+       | ``table|auto-commit|meta-data|custom-validation``.
+     - ``auto-commit``
    * - dataverse.db.validation-table-name
      - The name of the table used for validation if the validation method is set to ``table``.
      - *Empty string*

src/main/java/edu/harvard/iq/dataverse/util/DataSourceProducer.java

@@ -13,7 +13,7 @@
         // The app server (Payara) deploys a managed pool for this data source for us.
         // We don't need to deal with this on our own.
 
-        className = "org.postgresql.ds.PGSimpleDataSource",
+        className = "org.postgresql.ds.PGConnectionPoolDataSource",
 
         // BEWARE: as this resource is created before defaults are read from META-INF/microprofile-config.properties,
         // defaults must be provided in this Payara-proprietary manner.
@@ -41,8 +41,8 @@
             // The following options are documented here:
             // https://docs.payara.fish/community/docs/documentation/payara-server/jdbc/advanced-connection-pool-properties.html
             // VALIDATION
-            "fish.payara.is-connection-validation-required=${MPCONFIG=dataverse.db.is-connection-validation-required:false}",
-            "fish.payara.connection-validation-method=${MPCONFIG=dataverse.db.connection-validation-method:}",
+            "fish.payara.is-connection-validation-required=${MPCONFIG=dataverse.db.is-connection-validation-required:true}",
+            "fish.payara.connection-validation-method=${MPCONFIG=dataverse.db.connection-validation-method:auto-commit}",
             "fish.payara.validation-table-name=${MPCONFIG=dataverse.db.validation-table-name:}",
             "fish.payara.validation-classname=${MPCONFIG=dataverse.db.validation-classname:}",
             "fish.payara.validate-atmost-once-period-in-seconds=${MPCONFIG=dataverse.db.validate-atmost-once-period-in-seconds:0}",
@@ -56,7 +56,7 @@
             "fish.payara.slow-query-threshold-in-seconds=${MPCONFIG=dataverse.db.slow-query-threshold-in-seconds:-1}",
             "fish.payara.log-jdbc-calls=${MPCONFIG=dataverse.db.log-jdbc-calls:false}",
             // OTHER OPTIONS
-            "fish.payara.fail-all-connections=${MPCONFIG=dataverse.db.fail-all-connections:true}"
+            "fish.payara.fail-all-connections=${MPCONFIG=dataverse.db.fail-all-connections:false}"
         })
 public class DataSourceProducer {