diff backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java @ 8856:5e38e2924c07 3.2.x

Fix code style.
author Tom Gottfried <tom@intevation.de>
date Thu, 18 Jan 2018 20:12:01 +0100
parents ff27548d078c
children 0071702ba03f
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java	Thu Jan 18 20:10:59 2018 +0100
+++ b/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java	Thu Jan 18 20:12:01 2018 +0100
@@ -44,10 +44,10 @@
 import org.hibernate.cfg.Environment;
 
 /**
- * <p>A connection provider that uses an Apache commons DBCP connection pool.</p>
+ * A connection provider that uses an Apache commons DBCP connection pool.
  *
- * <p>To use this connection provider set:<br>
- * <code>hibernate.connection.provider_class&nbsp;org.hibernate.connection.DBCPConnectionProvider</code></p>
+ * To use this connection provider set hibernate.connection.provider_class
+ * to org.hibernate.connection.DBCPConnectionProvider
  *
  * <pre>Supported Hibernate properties:
  *   hibernate.connection.driver_class
@@ -61,18 +61,8 @@
  * <br>
  * All DBCP properties are also supported by using the hibernate.dbcp prefix.
  * A complete list can be found on the DBCP configuration page:
- * <a href="http://jakarta.apache.org/commons/dbcp/configuration.html">http://jakarta.apache.org/commons/dbcp/configuration.html</a>.
+ * http://jakarta.apache.org/commons/dbcp/configuration.html
  * <br>
- * <pre>Example:
- *   hibernate.connection.provider_class org.hibernate.connection.DBCPConnectionProvider
- *   hibernate.connection.driver_class org.hsqldb.jdbcDriver
- *   hibernate.connection.username sa
- *   hibernate.connection.password
- *   hibernate.connection.url jdbc:hsqldb:test
- *   hibernate.connection.pool_size 20
- *   hibernate.dbcp.initialSize 10
- *   hibernate.dbcp.maxWait 3000
- *   hibernate.dbcp.validationQuery select 1 from dual</pre>
  *
  * <p>More information about configuring/using DBCP can be found on the
  * <a href="http://jakarta.apache.org/commons/dbcp/">DBCP website</a>.
@@ -123,7 +113,9 @@
             String isolationLevel = props.getProperty(Environment.ISOLATION);
             if (isolationLevel != null
             && (isolationLevel = isolationLevel.trim()).length() > 0) {
-                dbcpProperties.put("defaultTransactionIsolation", isolationLevel);
+                dbcpProperties.put(
+                    "defaultTransactionIsolation",
+                    isolationLevel);
             }
 
             // Turn off autocommit (unless autocommit property is set)
@@ -132,7 +124,9 @@
             && (autocommit = autocommit.trim()).length() > 0) {
                 dbcpProperties.put("defaultAutoCommit", autocommit);
             } else {
-                dbcpProperties.put("defaultAutoCommit", String.valueOf(Boolean.FALSE));
+                dbcpProperties.put(
+                    "defaultAutoCommit",
+                    String.valueOf(Boolean.FALSE));
             }
 
             // Pool size
@@ -206,7 +200,8 @@
 
             // This needs to be done manually as it is somehow ignored
             // by the BasicDataSourceFactory if you set it as a dbcpProperty
-            String connectionInitSqls = props.getProperty("connectionInitSqls");
+            String connectionInitSqls = props.getProperty(
+                "connectionInitSqls");
             if (connectionInitSqls != null) {
                 String[] statements = connectionInitSqls.split(";");
                 ds.setConnectionInitSqls(Arrays.asList(statements));

http://dive4elements.wald.intevation.org