SONAR-13155 Drop usage of commons-dbutils

except for unit tests

diff --git a/server/sonar-db-core/build.gradle b/server/sonar-db-core/build.gradle
index f8bb54ca37371c52a6689587eb4bb69fe553bba6..2ab4e3e0148529ce0554b103417e8ef456e3e586 100644 (file)
--- a/server/sonar-db-core/build.gradle
+++ b/server/sonar-db-core/build.gradle
@@ -10,7 +10,6 @@ dependencies {
   compile 'ch.qos.logback:logback-classic'
   compile 'ch.qos.logback:logback-core'
   compile 'com.google.guava:guava'
-  compile 'commons-dbutils:commons-dbutils'
   compile 'commons-io:commons-io'
   compile 'commons-lang:commons-lang'
   compile 'org.apache.commons:commons-dbcp2'
@@ -37,6 +36,7 @@ dependencies {
   testRuntime 'com.oracle.jdbc:ojdbc8'
   testRuntime 'org.postgresql:postgresql'
 
+  testFixturesApi 'commons-dbutils:commons-dbutils'
   testFixturesApi 'junit:junit'
   testFixturesApi 'org.assertj:assertj-core'
 

diff --git a/server/sonar-db-core/src/main/java/org/sonar/db/DefaultDatabase.java b/server/sonar-db-core/src/main/java/org/sonar/db/DefaultDatabase.java
index 02c4ad51fc7ab40b33b7ca417821664b61b8e49d..40991c11ca939fba4e1160ad5fe3446cbcde554a 100644 (file)
--- a/server/sonar-db-core/src/main/java/org/sonar/db/DefaultDatabase.java
+++ b/server/sonar-db-core/src/main/java/org/sonar/db/DefaultDatabase.java
@@ -30,7 +30,6 @@ import java.util.Properties;
 import javax.sql.DataSource;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.dbcp2.BasicDataSourceFactory;
-import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.log.Logger;
@@ -118,7 +117,7 @@ public class DefaultDatabase implements Database {
     } catch (SQLException e) {
       throw new IllegalStateException("Can not connect to database. Please check connectivity and settings (see the properties prefixed by 'sonar.jdbc.').", e);
     } finally {
-      DbUtils.closeQuietly(connection);
+      DatabaseUtils.closeQuietly(connection);
     }
   }
 

diff --git a/server/sonar-db-core/src/main/java/org/sonar/db/ResultSetIterator.java b/server/sonar-db-core/src/main/java/org/sonar/db/ResultSetIterator.java
index 0264b9d655a8052a7fbf0c9fb0845e5217fc0664..bc6ab1f167b66f3631c840d9e853ac8cde61174e 100644 (file)
--- a/server/sonar-db-core/src/main/java/org/sonar/db/ResultSetIterator.java
+++ b/server/sonar-db-core/src/main/java/org/sonar/db/ResultSetIterator.java
@@ -25,7 +25,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import org.apache.commons.dbutils.DbUtils;
 
 /**
  * Forward-only {@link java.util.Iterator} over a {@link java.sql.ResultSet}. Rows are
@@ -98,8 +97,8 @@ public abstract class ResultSetIterator<E> implements Iterator<E>, Closeable {
   @Override
   public void close() {
     closed = true;
-    DbUtils.closeQuietly(rs);
-    DbUtils.closeQuietly(stmt);
+    DatabaseUtils.closeQuietly(rs);
+    DatabaseUtils.closeQuietly(stmt);
   }
 
   protected abstract E read(ResultSet rs) throws SQLException;

diff --git a/server/sonar-db-dao/build.gradle b/server/sonar-db-dao/build.gradle
index 2b0f2d86f6edda37941969ef352a71776ee29701..b443df09fd4e8b010e63c7cc87f44fb623d8bcae 100644 (file)
--- a/server/sonar-db-dao/build.gradle
+++ b/server/sonar-db-dao/build.gradle
@@ -9,7 +9,6 @@ dependencies {
 
   compile 'com.google.guava:guava'
   compile 'com.google.protobuf:protobuf-java'
-  compile 'commons-dbutils:commons-dbutils'
   compile 'commons-io:commons-io'
   compile 'commons-lang:commons-lang'
   compile 'net.jpountz.lz4:lz4'
@@ -23,6 +22,7 @@ dependencies {
   compileOnly 'com.google.code.findbugs:jsr305'
 
   testCompile 'com.tngtech.java:junit-dataprovider'
+  testCompile 'commons-dbutils:commons-dbutils'
   testCompile 'junit:junit'
   testCompile 'org.assertj:assertj-core'
   testCompile 'org.assertj:assertj-guava'

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/source/FileSourceDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/source/FileSourceDao.java
index ff006368b287031c19401ec87575a051d3080a7b..b2e3a0daf1d5b1068fbfa8e1369670f27a4edd44 100644 (file)
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/source/FileSourceDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/source/FileSourceDao.java
@@ -30,10 +30,10 @@ import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 import javax.annotation.CheckForNull;
-import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.ibatis.session.ResultHandler;
 import org.sonar.db.Dao;
+import org.sonar.db.DatabaseUtils;
 import org.sonar.db.DbSession;
 
 import static org.sonar.db.DatabaseUtils.toUniqueAndSortedPartitions;
@@ -73,7 +73,9 @@ public class FileSourceDao implements Dao {
     } catch (SQLException e) {
       throw new IllegalStateException("Fail to read FILE_SOURCES.LINE_HASHES of file " + fileUuid, e);
     } finally {
-      DbUtils.closeQuietly(connection, pstmt, rs);
+      DatabaseUtils.closeQuietly(rs);
+      DatabaseUtils.closeQuietly(pstmt);
+      DatabaseUtils.closeQuietly(connection);
     }
   }
 
@@ -106,7 +108,9 @@ public class FileSourceDao implements Dao {
       throw new IllegalStateException("Fail to read FILE_SOURCES.LINE_HASHES of file " + fileUuid, e);
     } finally {
       IOUtils.closeQuietly(reader);
-      DbUtils.closeQuietly(connection, pstmt, rs);
+      DatabaseUtils.closeQuietly(rs);
+      DatabaseUtils.closeQuietly(pstmt);
+      DatabaseUtils.closeQuietly(connection);
     }
   }
 

diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/SQDatabase.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/SQDatabase.java
index 1c4ab5125a481beff8984c86ece75ff65b21afb3..b04f133ee51202db69ae58219b8db73bfbdc5cf2 100644 (file)
--- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/SQDatabase.java
+++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/SQDatabase.java
@@ -24,7 +24,6 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
 import javax.sql.DataSource;
-import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.io.output.NullWriter;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.jdbc.ScriptRunner;
@@ -97,7 +96,7 @@ public class SQDatabase extends DefaultDatabase {
     } catch (SQLException e) {
       throw new IllegalStateException("Fail to create schema", e);
     } finally {
-      DbUtils.closeQuietly(connection);
+      DatabaseUtils.closeQuietly(connection);
     }
   }
 

diff --git a/server/sonar-db-migration/build.gradle b/server/sonar-db-migration/build.gradle
index 4dd9a0d0b5808f9839328ed3b65f28d7e62017e3..b6d51d37714cf399984677ff42d45145d2029838 100644 (file)
--- a/server/sonar-db-migration/build.gradle
+++ b/server/sonar-db-migration/build.gradle
@@ -11,7 +11,6 @@ dependencies {
   compile 'commons-lang:commons-lang'
   compile 'commons-codec:commons-codec'
   compile 'org.picocontainer:picocontainer'
-  compile 'commons-dbutils:commons-dbutils'
 
   compile project(':server:sonar-db-core')
   compile project(':server:sonar-process')
@@ -21,6 +20,7 @@ dependencies {
 
   testCompile 'com.google.code.findbugs:jsr305'
   testCompile 'com.tngtech.java:junit-dataprovider'
+  testCompile 'commons-dbutils:commons-dbutils'
   testCompile 'junit:junit'
   testCompile 'org.assertj:assertj-core'
   testCompile 'org.mindrot:jbcrypt'

diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/BaseSqlStatement.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/BaseSqlStatement.java
index 2d7af722ab91f78376c9647a03fad34a3094504a..e02bc9de48b5248344e93f3f95f6e9889da9ad09 100644 (file)
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/BaseSqlStatement.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/BaseSqlStatement.java
@@ -25,7 +25,7 @@ import java.sql.Timestamp;
 import java.sql.Types;
 import java.util.Date;
 import javax.annotation.Nullable;
-import org.apache.commons.dbutils.DbUtils;
+import org.sonar.db.DatabaseUtils;
 
 class BaseSqlStatement<CHILD extends SqlStatement> implements SqlStatement<CHILD> {
   protected PreparedStatement pstmt;
@@ -36,7 +36,7 @@ class BaseSqlStatement<CHILD extends SqlStatement> implements SqlStatement<CHILD
 
   @Override
   public void close() {
-    DbUtils.closeQuietly(pstmt);
+    DatabaseUtils.closeQuietly(pstmt);
     pstmt = null;
   }
 

diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/SelectImpl.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/SelectImpl.java
index 923f6836b7858c449860a7279419e8c0205aef6d..2cfb5df9c7721d863e96e38b14a63478a71b8e99 100644 (file)
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/SelectImpl.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/SelectImpl.java
@@ -25,8 +25,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.dbutils.DbUtils;
 import org.sonar.db.Database;
+import org.sonar.db.DatabaseUtils;
 
 public class SelectImpl extends BaseSqlStatement<Select> implements Select {
 
@@ -47,7 +47,7 @@ public class SelectImpl extends BaseSqlStatement<Select> implements Select {
     } catch (Exception e) {
       throw newExceptionWithRowDetails(row, e);
     } finally {
-      DbUtils.closeQuietly(rs);
+      DatabaseUtils.closeQuietly(rs);
       close();
     }
   }
@@ -64,7 +64,7 @@ public class SelectImpl extends BaseSqlStatement<Select> implements Select {
     } catch (Exception e) {
       throw newExceptionWithRowDetails(row, e);
     } finally {
-      DbUtils.closeQuietly(rs);
+      DatabaseUtils.closeQuietly(rs);
       close();
     }
   }
@@ -80,7 +80,7 @@ public class SelectImpl extends BaseSqlStatement<Select> implements Select {
     } catch (Exception e) {
       throw newExceptionWithRowDetails(row, e);
     } finally {
-      DbUtils.closeQuietly(rs);
+      DatabaseUtils.closeQuietly(rs);
       close();
     }
   }

diff --git a/server/sonar-webserver-core/build.gradle b/server/sonar-webserver-core/build.gradle
index 221d8981d55a41ab9e74a47432274bc8bb2ddb3f..519e02a0f9a4e7e3664489f7a28c70efc9db3129 100644 (file)
--- a/server/sonar-webserver-core/build.gradle
+++ b/server/sonar-webserver-core/build.gradle
@@ -23,7 +23,6 @@ dependencies {
   compile 'ch.qos.logback:logback-core'
   compile 'com.google.code.gson:gson'
   compile 'com.google.protobuf:protobuf-java'
-  compile 'commons-dbutils:commons-dbutils'
   compile 'io.jsonwebtoken:jjwt-api'
   compile 'io.jsonwebtoken:jjwt-impl'
   compile 'org.apache.httpcomponents:httpclient'
@@ -61,6 +60,7 @@ dependencies {
   testCompile 'com.h2database:h2'
   testCompile 'com.squareup.okhttp3:mockwebserver'
   testCompile 'com.tngtech.java:junit-dataprovider'
+  testCompile 'commons-dbutils:commons-dbutils'
   testCompile 'org.apache.logging.log4j:log4j-api'
   testCompile 'org.apache.logging.log4j:log4j-core'
   testCompile 'org.assertj:assertj-core'