From 0d294636abe1269932dd3f92ac1590d77a0096c2 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Mon, 3 Mar 2014 10:38:04 +0100 Subject: [PATCH] Fix quality flaws --- .../DevelopmentCostMeasuresMigration.java | 19 +++++-------------- .../debt/IssueChangelogMigration.java | 17 ++++++++--------- .../db/migrations/debt/IssueMigration.java | 4 ++-- .../db/migrations/debt/MassUpdater.java | 13 ++++++------- .../debt/TechnicalDebtMeasuresMigration.java | 14 +++++++------- 5 files changed, 28 insertions(+), 39 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 d3f53511392..1fb759bbfaa 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 @@ -20,7 +20,6 @@ package org.sonar.server.db.migrations.debt; -import org.picocontainer.annotations.Nullable; import org.sonar.api.config.Settings; import org.sonar.core.persistence.Database; import org.sonar.server.db.migrations.DatabaseMigration; @@ -31,7 +30,6 @@ import javax.annotation.CheckForNull; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Types; /** * Used in the Active Record Migration 516 @@ -43,7 +41,7 @@ public class DevelopmentCostMeasuresMigration implements DatabaseMigration { private static final String SELECT_SQL = "SELECT pm.id AS " + ID + ", pm.value AS " + VALUE + " FROM project_measures pm INNER JOIN metrics m on m.id=pm.metric_id " + - " WHERE (m.name='development_cost')"; + " WHERE m.name='development_cost' AND pm.value IS NOT NULL"; private static final String UPDATE_SQL = "UPDATE project_measures SET value=NULL,text_value=? WHERE id=?"; @@ -80,11 +78,7 @@ public class DevelopmentCostMeasuresMigration implements DatabaseMigration { @Override public void convert(Row row, PreparedStatement statement) throws SQLException { - if (row.value != null) { - statement.setString(1, convertDebtForDays(row.value)); - } else { - statement.setNull(1, Types.VARCHAR); - } + statement.setString(1, convertDebtForDays(row.value)); statement.setLong(2, row.id); } } @@ -92,16 +86,13 @@ public class DevelopmentCostMeasuresMigration implements DatabaseMigration { } @CheckForNull - private String convertDebtForDays(@Nullable Double data) { - if (data == null) { - return null; - } + private String convertDebtForDays(Double data) { return Long.toString(workDurationConvertor.createFromDays(data)); } private static class Row { - Long id; - Double value; + private Long id; + private Double value; } } 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 4434de3d08b..4b0d487cdd8 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 @@ -28,7 +28,10 @@ import org.sonar.core.persistence.Database; import org.sonar.server.db.migrations.DatabaseMigration; import org.sonar.server.db.migrations.util.SqlUtil; -import java.sql.*; +import java.sql.Date; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -42,7 +45,7 @@ public class IssueChangelogMigration implements DatabaseMigration { private static final String SELECT_SQL = "SELECT ic.id AS " + ID + ", ic.change_data AS " + CHANGE_DATA + " FROM issue_changes ic " + - " WHERE ic.change_type = 'diff' and ic.change_data LIKE '%technicalDebt%'"; + " WHERE ic.change_type = 'diff' AND ic.change_data LIKE '%technicalDebt%'"; private static final String UPDATE_SQL = "UPDATE issue_changes SET change_data=?,updated_at=? WHERE id=?"; @@ -86,11 +89,7 @@ public class IssueChangelogMigration implements DatabaseMigration { @Override public void convert(Row row, PreparedStatement statement) throws SQLException { - if (row.changeData != null) { - statement.setString(1, convertChangelog(row.changeData)); - } else { - statement.setNull(1, Types.VARCHAR); - } + statement.setString(1, convertChangelog(row.changeData)); statement.setDate(2, new Date(system2.now())); statement.setLong(3, row.id); } @@ -123,8 +122,8 @@ public class IssueChangelogMigration implements DatabaseMigration { } private static class Row { - Long id; - String changeData; + private Long id; + private String changeData; } } 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 777b82d4141..f9b4fa40f8c 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 @@ -93,8 +93,8 @@ public class IssueMigration implements DatabaseMigration { } private static class Row { - Long id; - Long debt; + private Long id; + private Long debt; } } diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/MassUpdater.java b/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/MassUpdater.java index 0ca0e05263d..cf1288c5da7 100644 --- a/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/MassUpdater.java +++ b/sonar-server/src/main/java/org/sonar/server/db/migrations/debt/MassUpdater.java @@ -32,13 +32,12 @@ import java.sql.*; public class MassUpdater { - private static final Logger logger = LoggerFactory.getLogger(MassUpdater.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MassUpdater.class); - static final int GROUP_SIZE = 10000; + static final int GROUP_SIZE = 1000; private static final String FAILURE_MESSAGE = "Fail to migrate data"; - private final Database db; public MassUpdater(Database db) { @@ -105,15 +104,15 @@ public class MassUpdater { DbUtils.closeQuietly(writeConnection); DbUtils.closeQuietly(readConnection, stmt, rs); - logger.info("{} rows have been updated", count); + LOGGER.info("{} rows have been updated", count); } } catch (SQLException e) { - logger.error(FAILURE_MESSAGE, e); - SqlUtil.log(logger, e); + LOGGER.error(FAILURE_MESSAGE, e); + SqlUtil.log(LOGGER, e); throw MessageException.of(FAILURE_MESSAGE); } catch (Exception e) { - logger.error(FAILURE_MESSAGE, e); + LOGGER.error(FAILURE_MESSAGE, e); throw MessageException.of(FAILURE_MESSAGE); } } 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 56fb03d76fa..bebc3f9b0a8 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 @@ -120,13 +120,13 @@ public class TechnicalDebtMeasuresMigration implements DatabaseMigration { } private static class Row { - Long id; - Double value; - Double var1; - Double var2; - Double var3; - Double var4; - Double var5; + private Long id; + private Double value; + private Double var1; + private Double var2; + private Double var3; + private Double var4; + private Double var5; } } -- 2.39.5