Fix quality flaws

diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/DevelopmentCostMeasuresMigration.java b/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/DevelopmentCostMeasuresMigration.java
index 86819abe8246dabed4c1c42a0688f359bad9c380..5d2f6479bdeb2b9fa8c330269f670814c645ac06 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/DevelopmentCostMeasuresMigration.java
+++ b/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/DevelopmentCostMeasuresMigration.java
@@ -35,6 +35,7 @@ import org.sonar.server.db.migrations.DatabaseMigration;
 import org.sonar.server.db.migrations.util.SqlUtil;
 
 import javax.annotation.CheckForNull;
+
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -46,7 +47,7 @@ import java.util.Map;
  */
 public class DevelopmentCostMeasuresMigration implements DatabaseMigration {
 
-  private Logger logger = LoggerFactory.getLogger(DevelopmentCostMeasuresMigration.class);
+  private static final Logger logger = LoggerFactory.getLogger(DevelopmentCostMeasuresMigration.class);
 
   private static final String ID = "id";
   private static final String VALUE = "value";
@@ -101,7 +102,7 @@ public class DevelopmentCostMeasuresMigration implements DatabaseMigration {
     }
   }
 
-  public Object convert(Referentials referentials) throws Exception {
+  public Object convert(Referentials referentials) throws SQLException {
     Long[] ids = referentials.pollGroupOfIds();
     while (ids.length > 0) {
       List<Map<String, Object>> rows = selectRows(ids);

diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/IssueChangelogMigration.java b/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/IssueChangelogMigration.java
index df57ca9a3898b7d60c5f2772260d02acbcb3647f..86be661db40d75dea77046cc7f3d15feec3e9798 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/IssueChangelogMigration.java
+++ b/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/IssueChangelogMigration.java
@@ -50,7 +50,7 @@ import java.util.regex.Pattern;
  */
 public class IssueChangelogMigration implements DatabaseMigration {
 
-  private Logger logger = LoggerFactory.getLogger(IssueChangelogMigration.class);
+  private static final Logger logger = LoggerFactory.getLogger(IssueChangelogMigration.class);
 
   private static final String ID = "id";
   private static final String CHANGE_DATA = "changeData";
@@ -110,7 +110,7 @@ public class IssueChangelogMigration implements DatabaseMigration {
     }
   }
 
-  public Object convert(Referentials referentials) throws Exception {
+  public Object convert(Referentials referentials) throws SQLException {
     Long[] ids = referentials.pollGroupOfIds();
     while (ids.length > 0) {
       List<Map<String, Object>> rows = selectRows(ids);

diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/IssueMigration.java b/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/IssueMigration.java
index bfe3873f5d893e9e3b8bb646f6ab90adaf92beca..6713eed48faebcb61b4a71b442d2f261372688a4 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/IssueMigration.java
+++ b/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/IssueMigration.java
@@ -47,7 +47,7 @@ import java.util.Map;
  */
 public class IssueMigration implements DatabaseMigration {
 
-  private Logger logger = LoggerFactory.getLogger(IssueMigration.class);
+  private static final Logger logger = LoggerFactory.getLogger(IssueMigration.class);
 
   private static final String ID = "id";
   private static final String DEBT = "debt";
@@ -107,7 +107,7 @@ public class IssueMigration implements DatabaseMigration {
     }
   }
 
-  public Object convert(Referentials referentials) throws Exception {
+  public Object convert(Referentials referentials) throws SQLException {
     // For each group of 1000 issue ids:
     // - load related issues
     // - in a transaction

diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/TechnicalDebtMeasuresMigration.java b/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/TechnicalDebtMeasuresMigration.java
index 830a036960786433b6a017ba5c4c5ff9c0f3465f..a8c871099c85468245e8770bc73ed00b9bc1e8a2 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/TechnicalDebtMeasuresMigration.java
+++ b/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/TechnicalDebtMeasuresMigration.java
@@ -35,6 +35,7 @@ import org.sonar.server.db.migrations.DatabaseMigration;
 import org.sonar.server.db.migrations.util.SqlUtil;
 
 import javax.annotation.CheckForNull;
+
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -46,7 +47,7 @@ import java.util.Map;
  */
 public class TechnicalDebtMeasuresMigration implements DatabaseMigration {
 
-  private Logger logger = LoggerFactory.getLogger(TechnicalDebtMeasuresMigration.class);
+  private static final Logger logger = LoggerFactory.getLogger(TechnicalDebtMeasuresMigration.class);
 
   private static final String ID = "id";
   private static final String VALUE = "value";
@@ -114,7 +115,7 @@ public class TechnicalDebtMeasuresMigration implements DatabaseMigration {
     }
   }
 
-  public Object convert(Referentials referentials) throws Exception {
+  public Object convert(Referentials referentials) throws SQLException {
     Long[] ids = referentials.pollGroupOfIds();
     while (ids.length > 0) {
       List<Map<String, Object>> rows = selectRows(ids);

diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/violation/ViolationConverter.java b/sonar-server/src/main/java/org/sonar/server/db/migrations/violation/ViolationConverter.java
index 0cddeb30138ad1cc03fc41952766f1374a619d01..e23bdcced8723f87c57bad819a2d4d7e0256edb8 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/db/migrations/violation/ViolationConverter.java
+++ b/sonar-server/src/main/java/org/sonar/server/db/migrations/violation/ViolationConverter.java
@@ -130,7 +130,7 @@ class ViolationConverter implements Callable<Object> {
   }
 
   @Override
-  public Object call() throws Exception {
+  public Object call() throws SQLException {
     // For each group of 1000 violation ids:
     // - load related violations, reviews and action plans
     // - in a transaction

diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/violation/ViolationMigration.java b/sonar-server/src/main/java/org/sonar/server/db/migrations/violation/ViolationMigration.java
index 54d6d9f59353f5acc303a93cc46956fa9462c0cd..cf7debbcfdd5ad309699b18d4a9efcaa17a12f7f 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/db/migrations/violation/ViolationMigration.java
+++ b/sonar-server/src/main/java/org/sonar/server/db/migrations/violation/ViolationMigration.java
@@ -34,10 +34,11 @@ import java.sql.SQLException;
  */
 public class ViolationMigration implements DatabaseMigration {
 
+  private static final Logger logger = LoggerFactory.getLogger(ViolationMigration.class);
+
   private static final String FAILURE_MESSAGE = "Fail to convert violations to issues";
-  private final Settings settings;
 
-  private Logger logger = LoggerFactory.getLogger(ViolationMigration.class);
+  private final Settings settings;
   private final Database db;
 
   public ViolationMigration(Database database, Settings settings) {