From c815ce7870782886d8670b18249208feae290b43 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 26 Feb 2014 10:57:34 +0100 Subject: [PATCH] Fix quality flaws --- .../db/migrations/debt/DevelopmentCostMeasuresMigration.java | 5 +++-- .../server/db/migrations/debt/IssueChangelogMigration.java | 4 ++-- .../org/sonar/server/db/migrations/debt/IssueMigration.java | 4 ++-- .../db/migrations/debt/TechnicalDebtMeasuresMigration.java | 5 +++-- .../server/db/migrations/violation/ViolationConverter.java | 2 +- .../server/db/migrations/violation/ViolationMigration.java | 5 +++-- 6 files changed, 14 insertions(+), 11 deletions(-) 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 86819abe824..5d2f6479bde 100644 --- 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> 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 df57ca9a389..86be661db40 100644 --- 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> 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 bfe3873f5d8..6713eed48fa 100644 --- 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 830a0369607..a8c871099c8 100644 --- 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> 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 0cddeb30138..e23bdcced87 100644 --- 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 { } @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 54d6d9f5935..cf7debbcfdd 100644 --- 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) { -- 2.39.5