SONAR-15060 Database migration dropping index should not fail when index does not exist

3 files changed, 8 insertions, 5 deletions

diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/sql/DropIndexBuilder.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/DropIndexBuilder.java
index 18eef66d6a5..ba1d4815915 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/sql/DropIndexBuilder.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/DropIndexBuilder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.platform.db.migration.sql;
+package org.sonar.server.platform.db.migration.step;
 
 import java.util.List;
 import org.sonar.db.dialect.Dialect;
@@ -30,13 +30,17 @@ import static java.util.Collections.singletonList;
 import static org.sonar.server.platform.db.migration.def.Validations.validateIndexNameIgnoreCase;
 import static org.sonar.server.platform.db.migration.def.Validations.validateTableName;
 
-public class DropIndexBuilder {
+/**
+ * Should not be used directly.
+ * Use {@link org.sonar.server.platform.db.migration.step.DropIndexChange} instead.
+ */
+class DropIndexBuilder {
 
   private final Dialect dialect;
   private String tableName;
   private String indexName;
 
-  public DropIndexBuilder(Dialect dialect) {
+  DropIndexBuilder(Dialect dialect) {
     this.dialect = dialect;
   }
 
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/DropIndexChange.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/DropIndexChange.java
index 393a7835ee8..ab08c549d7e 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/DropIndexChange.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/DropIndexChange.java
@@ -24,7 +24,6 @@ import java.sql.SQLException;
 import java.util.Optional;
 import org.sonar.db.Database;
 import org.sonar.db.DatabaseUtils;
-import org.sonar.server.platform.db.migration.sql.DropIndexBuilder;
 
 public abstract class DropIndexChange extends DdlChange {
   private final String indexName;
diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/sql/DropIndexBuilderTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/DropIndexBuilderTest.java
index d02dcacf249..d7a5cb339b7 100644
--- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/sql/DropIndexBuilderTest.java
+++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/DropIndexBuilderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.platform.db.migration.sql;
+package org.sonar.server.platform.db.migration.step;
 
 import java.util.List;
 import org.junit.Rule;