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 1e2bcb47582605feb9d0f5569c32722bec81afa5..47eb81dcfc76eaad621056bd809d4bffed85f931 100644 (file)
--- 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 686db41ae2f14459b0f14b0fc9e9b2e94b7c6582..7a16b8a51542ec68cb24f8de31468bf43d68e343 100644 (file)
--- 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();
   }
 }