SONAR-10544 remove DESCRIPTION_URL column from RULES table

diff --git a/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl b/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl
index 4306a0d22f619685d4e4e95c13cbc7b32f8745a5..627c4631e43d24732a4a90863bf2c68d2db1b437 100644 (file)
--- a/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl
+++ b/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl
@@ -186,7 +186,6 @@ CREATE TABLE "RULES" (
   "PLUGIN_NAME" VARCHAR(255) NOT NULL,
   "DESCRIPTION" VARCHAR(16777215),
   "DESCRIPTION_FORMAT" VARCHAR(20),
-  "DESCRIPTION_URL" VARCHAR(256),
   "PRIORITY" INTEGER,
   "IS_TEMPLATE" BOOLEAN DEFAULT FALSE,
   "IS_EXTERNAL" BOOLEAN DEFAULT FALSE,

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDefinitionDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDefinitionDto.java
index c41800284803d180ef36652166c38fcb8db11c1e..4ab077e023b10e9f61cc84fbe02bf76a096fec72 100644 (file)
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDefinitionDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDefinitionDto.java
@@ -42,7 +42,6 @@ public class RuleDefinitionDto {
   private String ruleKey;
   private String description;
   private RuleDto.Format descriptionFormat;
-  private String descriptionURL;
   private RuleStatus status;
   private String name;
   private String configKey;
@@ -122,16 +121,6 @@ public class RuleDefinitionDto {
     return this;
   }
 
-  @CheckForNull
-  public String getDescriptionURL() {
-    return descriptionURL;
-  }
-
-  public RuleDefinitionDto setDescriptionURL(@Nullable String descriptionURL) {
-    this.descriptionURL = descriptionURL;
-    return this;
-  }
-
   public RuleDto.Format getDescriptionFormat() {
     return descriptionFormat;
   }

diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/rule/RuleMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/rule/RuleMapper.xml
index 3aa294ff91d867d39f8b3985e13606c10dbb88f9..7b7dabe472ca0c1686870ffba17c1361867e4545 100644 (file)
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/rule/RuleMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/rule/RuleMapper.xml
@@ -9,7 +9,6 @@
     r.plugin_name as "repositoryKey",
     r.description,
     r.description_format as "descriptionFormat",
-    r.description_url as "descriptionURL",
     r.status,
     r.name,
     r.plugin_config_key as "configKey",
@@ -293,7 +292,6 @@
       plugin_name,
       description,
       description_format,
-      description_url,
       status,
       name,
       plugin_config_key,
@@ -318,7 +316,6 @@
       #{repositoryKey,jdbcType=VARCHAR},
       #{description,jdbcType=VARCHAR},
       #{descriptionFormat,jdbcType=VARCHAR},
-      #{descriptionURL,jdbcType=VARCHAR},
       #{status,jdbcType=VARCHAR},
       #{name,jdbcType=VARCHAR},
       #{configKey,jdbcType=VARCHAR},
@@ -346,7 +343,6 @@
       plugin_name=#{repositoryKey,jdbcType=VARCHAR},
       description=#{description,jdbcType=VARCHAR},
       description_format=#{descriptionFormat,jdbcType=VARCHAR},
-      description_url=#{descriptionURL,jdbcType=VARCHAR},
       status=#{status,jdbcType=VARCHAR},
       name=#{name,jdbcType=VARCHAR},
       plugin_config_key=#{configKey,jdbcType=VARCHAR},

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java
index 99d2e4555c482b72925faf4256aeb6aa6e11ecd4..17f82225c37f266b591edc14ccf83f19bc09640a 100644 (file)
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java
@@ -478,7 +478,6 @@ public class RuleDaoTest {
       .setName("new name")
       .setDescription("new description")
       .setDescriptionFormat(RuleDto.Format.MARKDOWN)
-      .setDescriptionURL("https://eslint.org/docs/rules/no-cond-assign")
       .setStatus(RuleStatus.DEPRECATED)
       .setConfigKey("NewConfigKey")
       .setSeverity(Severity.INFO)
@@ -503,7 +502,6 @@ public class RuleDaoTest {
     assertThat(ruleDto.getName()).isEqualTo("new name");
     assertThat(ruleDto.getDescription()).isEqualTo("new description");
     assertThat(ruleDto.getDescriptionFormat()).isEqualTo(RuleDto.Format.MARKDOWN);
-    assertThat(ruleDto.getDescriptionURL()).isEqualTo("https://eslint.org/docs/rules/no-cond-assign");
     assertThat(ruleDto.getStatus()).isEqualTo(RuleStatus.DEPRECATED);
     assertThat(ruleDto.getRuleKey()).isEqualTo("NewRuleKey");
     assertThat(ruleDto.getRepositoryKey()).isEqualTo("plugin");
@@ -535,7 +533,6 @@ public class RuleDaoTest {
       .setName("new name")
       .setDescription("new description")
       .setDescriptionFormat(RuleDto.Format.MARKDOWN)
-      .setDescriptionURL("https://eslint.org/docs/rules/no-cond-assign")
       .setStatus(RuleStatus.DEPRECATED)
       .setConfigKey("NewConfigKey")
       .setSeverity(Severity.INFO)
@@ -559,7 +556,6 @@ public class RuleDaoTest {
     assertThat(ruleDto.getName()).isEqualTo("new name");
     assertThat(ruleDto.getDescription()).isEqualTo("new description");
     assertThat(ruleDto.getDescriptionFormat()).isEqualTo(RuleDto.Format.MARKDOWN);
-    assertThat(ruleDto.getDescriptionURL()).isEqualTo("https://eslint.org/docs/rules/no-cond-assign");
     assertThat(ruleDto.getStatus()).isEqualTo(RuleStatus.DEPRECATED);
     assertThat(ruleDto.getRuleKey()).isEqualTo("NewRuleKey");
     assertThat(ruleDto.getRepositoryKey()).isEqualTo("plugin");

diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v72/AddRuleExternal.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v72/AddRuleExternal.java
index 236f2bbefcc0502410f90c31dbfb0fa414c645e0..20ef409ab14431c71e65c81f568a1eafbd99a1b5 100644 (file)
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v72/AddRuleExternal.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v72/AddRuleExternal.java
@@ -21,7 +21,6 @@ package org.sonar.server.platform.db.migration.version.v72;
 
 import org.sonar.db.Database;
 import org.sonar.server.platform.db.migration.def.BooleanColumnDef;
-import org.sonar.server.platform.db.migration.def.VarcharColumnDef;
 import org.sonar.server.platform.db.migration.sql.AddColumnsBuilder;
 import org.sonar.server.platform.db.migration.step.DdlChange;
 
@@ -41,11 +40,6 @@ public class AddRuleExternal extends DdlChange {
         .setIsNullable(true)
         .setDefaultValue(false)
         .build())
-      .addColumn(VarcharColumnDef.newVarcharColumnDefBuilder()
-        .setColumnName("description_url")
-        .setIsNullable(true)
-        .setLimit(256)
-        .build())
       .build());
   }
 

diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v72/DbVersion72.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v72/DbVersion72.java
index dbbb14df39bedab2ec2696ad9063323a329e8c9b..dd22e5fb4419959941e8ab5dfe5f27f82cdce096 100644 (file)
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v72/DbVersion72.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v72/DbVersion72.java
@@ -30,6 +30,6 @@ public class DbVersion72 implements DbVersion {
       .add(2100, "Increase size of USERS.CRYPTED_PASSWORD", IncreaseCryptedPasswordSize.class)
       .add(2101, "Add HASH_METHOD to table users", AddHashMethodToUsersTable.class)
       .add(2102, "Populate HASH_METHOD on table users", PopulateHashMethodOnUsers.class)
-      .add(2103, "Add isExternal boolean and description_url to rules", AddRuleExternal.class);
+      .add(2103, "Add isExternal boolean to rules", AddRuleExternal.class);
   }
 }

diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v72/AddRuleExternalTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v72/AddRuleExternalTest.java
index c8ce8263fc7de60ce248263e124a1320f2a5402b..cf44af23344ec733a5bf8e0b46205d8e5c40d4a1 100644 (file)
--- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v72/AddRuleExternalTest.java
+++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v72/AddRuleExternalTest.java
@@ -43,12 +43,10 @@ public class AddRuleExternalTest {
   @Test
   public void column_are_added_to_table() throws SQLException {
     dbTester.assertColumnDoesNotExist("rules", "is_external");
-    dbTester.assertColumnDoesNotExist("rules", "description_url");
 
     underTest.execute();
 
     dbTester.assertColumnDefinition("rules", "is_external", BOOLEAN, null, true);
-    dbTester.assertColumnDefinition("rules", "description_url", VARCHAR, 256, true);
   }
 
   @Test

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java
index f61f8c12d1eaa4d79d29895c5de90efd2c739bb1..6bb6854525ce4d79a094de0a87a5096f3551fe86 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java
@@ -22,11 +22,9 @@ package org.sonar.server.issue;
 import java.util.Collection;
 import java.util.Map;
 
-import com.google.common.base.Preconditions;
 import org.sonar.api.server.ServerSide;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.util.stream.MoreCollectors;
-import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.issue.workflow.Transition;
 import org.sonar.server.user.UserSession;
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java
index 5edebd304e355807d07d4f5d262a33d0f4eccc5e..08b1b8ec7f6006ed00e67c686545997ad1e97d65 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java
@@ -92,7 +92,7 @@ public class DoTransitionAction implements IssuesWsAction {
     String issue = request.mandatoryParam(PARAM_ISSUE);
     try (DbSession dbSession = dbClient.openSession(false)) {
       IssueDto issueDto = issueFinder.getByKey(dbSession, issue);
-      checkRequest(!issueDto.isExternal(), "Transition are not allowed on issues imported from external rule engines");
+      checkRequest(!issueDto.isExternal(), "Transition is not allowed on issues imported from external rule engines");
       SearchResponseData preloadedSearchResponseData = doTransition(dbSession, issueDto, request.mandatoryParam(PARAM_TRANSITION));
       responseWriter.write(issue, preloadedSearchResponseData, request, response);
     }