From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Sun, 2 Aug 2015 23:04:33 +0000 (+0200)
Subject: Minor refactoring of DdlChange
X-Git-Tag: 5.2-RC1~845
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ca9e5122f571ad45988ca7a04e8bf83445709956;p=sonarqube.git

Minor refactoring of DdlChange
---

diff --git a/sonar-db/src/main/java/org/sonar/db/version/DdlChange.java b/sonar-db/src/main/java/org/sonar/db/version/DdlChange.java
index 1e2bcb47582..47eb81dcfc7 100644
--- a/sonar-db/src/main/java/org/sonar/db/version/DdlChange.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/DdlChange.java
@@ -64,4 +64,7 @@ public abstract class DdlChange implements MigrationStep {
 
   public abstract void execute(Context context) throws SQLException;
 
+  protected Database getDatabase() {
+    return db;
+  }
 }
diff --git a/sonar-db/src/main/java/org/sonar/db/version/v52/AddManualMeasuresComponentUuidColumn.java b/sonar-db/src/main/java/org/sonar/db/version/v52/AddManualMeasuresComponentUuidColumn.java
index 686db41ae2f..7a16b8a5154 100644
--- a/sonar-db/src/main/java/org/sonar/db/version/v52/AddManualMeasuresComponentUuidColumn.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/v52/AddManualMeasuresComponentUuidColumn.java
@@ -32,11 +32,9 @@ import static org.sonar.db.version.AddColumnsBuilder.ColumnDef.Type.STRING;
  * - component_uuid
  */
 public class AddManualMeasuresComponentUuidColumn extends DdlChange {
-  private final Database db;
 
   public AddManualMeasuresComponentUuidColumn(Database db) {
     super(db);
-    this.db = db;
   }
 
   @Override
@@ -45,14 +43,13 @@ public class AddManualMeasuresComponentUuidColumn extends DdlChange {
   }
 
   private String generateSql() {
-    return new AddColumnsBuilder(db.getDialect(), "manual_measures")
+    return new AddColumnsBuilder(getDatabase().getDialect(), "manual_measures")
       .addColumn(
         new AddColumnsBuilder.ColumnDef()
           .setName("component_uuid")
           .setType(STRING)
           .setLimit(50)
-          .setNullable(true)
-      )
+          .setNullable(true))
       .build();
   }
 }