Merge pull request #120 from ebean-orm/feature/tidy

No effective change - tidy only

Author: rbygrave

ebean-datasource/pom.xml

@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test-containers</artifactId>
-      <version>7.3</version>
+      <version>7.6</version>
       <scope>test</scope>
     </dependency>
 
@@ -50,14 +50,14 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.4.12</version>
+      <version>1.5.17</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jdk-platform-logging</artifactId>
-      <version>2.0.9</version>
+      <version>2.0.17</version>
       <scope>test</scope>
     </dependency>
 

ebean-datasource/src/main/java/io/ebean/datasource/pool/ExtendedPreparedStatement.java

@@ -27,16 +27,14 @@
  */
 final class ExtendedPreparedStatement extends ExtendedStatement implements PreparedStatement {
 
-  private final String sql;
   private final String cacheKey;
   private boolean closed;
 
   /**
    * Create a wrapped PreparedStatement that can be cached.
    */
-  ExtendedPreparedStatement(PooledConnection pooledConnection, PreparedStatement pstmt, String sql, String cacheKey) {
+  ExtendedPreparedStatement(PooledConnection pooledConnection, PreparedStatement pstmt, String cacheKey) {
     super(pooledConnection, pstmt);
-    this.sql = sql;
     this.cacheKey = cacheKey;
   }
 

ebean-datasource/src/main/java/io/ebean/datasource/pool/FreeConnectionBuffer.java

@@ -15,9 +15,6 @@ final class FreeConnectionBuffer {
    */
   private final LinkedList<PooledConnection> freeBuffer = new LinkedList<>();
 
-  FreeConnectionBuffer() {
-  }
-
   /**
    * Return the number of entries in the buffer.
    */

ebean-datasource/src/main/java/io/ebean/datasource/pool/PooledConnection.java

@@ -2,7 +2,6 @@
 
 import java.sql.*;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -373,7 +372,7 @@ private PreparedStatement prepareStatement(String sql, boolean useFlag, int flag
       } else {
         actualPstmt = connection.prepareStatement(sql);
       }
-      return new ExtendedPreparedStatement(this, actualPstmt, sql, cacheKey);
+      return new ExtendedPreparedStatement(this, actualPstmt, cacheKey);
     } catch (SQLException ex) {
       markWithError(ex);
       throw ex;

ebean-datasource/src/main/java/io/ebean/datasource/pool/PstmtCache.java

@@ -9,7 +9,7 @@
  */
 final class PstmtCache extends LinkedHashMap<String, ExtendedPreparedStatement> {
 
-  static final long serialVersionUID = -3096406924865550697L;
+  private static final long serialVersionUID = -3096406924865550697L;
 
   private final int maxSize;
   private long removeCount;