#8 - ENH: Support 3.1 API with read-only configuration support

Author: rbygrave

pom.xml

@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>avaje-datasource</artifactId>
-  <version>2.1.2-SNAPSHOT</version>
+  <version>3.1.1-SNAPSHOT</version>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/avaje-datasource.git</developerConnection>
@@ -21,13 +21,13 @@
     <dependency>
       <groupId>org.avaje</groupId>
       <artifactId>avaje-datasource-api</artifactId>
-      <version>1.1</version>
+      <version>3.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>[1.7.12,)</version>
+      <version>1.7.12</version>
       <scope>provided</scope>
     </dependency>
 

src/main/java/org/avaje/datasource/pool/ConnectionPool.java

@@ -92,6 +92,8 @@ public class ConnectionPool implements DataSourcePool {
    */
   private final boolean autoCommit;
 
+  private final boolean readOnly;
+
   /**
    * Max idle time in millis.
    */
@@ -177,6 +179,7 @@ public ConnectionPool(String name, DataSourceConfig params) {
     this.poolListener = params.getListener();
 
     this.autoCommit = params.isAutoCommit();
+    this.readOnly = params.isReadOnly();
     this.transactionIsolation = params.getIsolationLevel();
 
     this.maxInactiveMillis = 1000 * params.getMaxInactiveTimeSecs();
@@ -429,6 +432,9 @@ public Connection createUnpooledConnection() throws SQLException {
       Connection conn = DriverManager.getConnection(databaseUrl, connectionProps);
       conn.setAutoCommit(autoCommit);
       conn.setTransactionIsolation(transactionIsolation);
+      if (readOnly) {
+        conn.setReadOnly(readOnly);
+      }
       return conn;
 
     } catch (SQLException ex) {

src/main/java/org/avaje/datasource/pool/FreeConnectionBuffer.java

@@ -22,7 +22,7 @@ class FreeConnectionBuffer {
   /**
    * Buffer oriented for add and remove.
    */
-  private final LinkedList<PooledConnection> freeBuffer = new LinkedList<PooledConnection>();
+  private final LinkedList<PooledConnection> freeBuffer = new LinkedList<>();
 
   FreeConnectionBuffer() {
   }
@@ -61,12 +61,10 @@ PooledConnection remove() {
   void closeAll(boolean logErrors) {
 
     // create a temporary list
-    List<PooledConnection> tempList = new ArrayList<PooledConnection>(freeBuffer.size());
+    List<PooledConnection> tempList = new ArrayList<>(freeBuffer.size());
 
     // add all the connections into it
-    for (PooledConnection c : freeBuffer) {
-      tempList.add(c);
-    }
+    tempList.addAll(freeBuffer);
 
     // clear the buffer (in case it takes some time to close these connections).
     freeBuffer.clear();

src/main/java/org/avaje/datasource/pool/PooledConnection.java

@@ -127,6 +127,8 @@ public class PooledConnection extends ConnectionDelegator {
    */
   private boolean hadErrors;
 
+  private boolean resetAutoCommit;
+
   /**
    * The last start time. When the connection was given to a thread.
    */
@@ -484,8 +486,9 @@ public void close() throws SQLException {
 
     try {
       // reset the autoCommit back if client code changed it
-      if (connection.getAutoCommit() != pool.isAutoCommit()) {
+      if (resetAutoCommit) {
         connection.setAutoCommit(pool.isAutoCommit());
+        resetAutoCommit = false;
       }
       // Generally resetting Isolation level seems expensive.
       // Hence using resetIsolationReadOnlyRequired flag
@@ -769,6 +772,7 @@ public void setAutoCommit(boolean autoCommit) throws SQLException {
     }
     try {
       connection.setAutoCommit(autoCommit);
+      resetAutoCommit = true;
     } catch (SQLException ex) {
       markWithError();
       throw ex;