Revert "SONAR-4301 Replace issues.severity column type from String to Integer"

This reverts commit 2c2728075a1c142965bf6c018ba94919955f80d8.

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java
index 170bf467e3c48ee2290787463b1b9f733f88aa06..e45a749a33deb9636a5b37b81179a2e3d19463b0 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java
@@ -43,6 +43,7 @@ import org.sonar.core.issue.db.IssueDto;
 import org.sonar.core.issue.workflow.IssueWorkflow;
 
 import java.util.Collection;
+import java.util.Map;
 
 @DependedUpon(DecoratorBarriers.END_OF_ISSUES_UPDATES)
 public class IssueTrackingDecorator implements Decorator {
@@ -147,11 +148,11 @@ public class IssueTrackingDecorator implements Decorator {
       // fields to update with current values
       if (ref.isManualSeverity()) {
         issue.setManualSeverity(true);
-        issue.setSeverity(ref.getSeverityLabel());
+        issue.setSeverity(ref.getSeverity());
       } else {
         // Emulate change of severity in the current scan.
         String severity = issue.severity();
-        issue.setSeverity(ref.getSeverityLabel());
+        issue.setSeverity(ref.getSeverity());
         updater.setSeverity(issue, severity, changeContext);
       }
       Integer line = issue.line();

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
index 8bf64abc1a3b0ad7a21dc080999d992bc735c96b..de545172be55b88a41645fb5fadd77e43ec361e4 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
@@ -21,18 +21,14 @@ package org.sonar.core.issue.db;
 
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 import org.sonar.api.rule.RuleKey;
-import org.sonar.api.rule.Severity;
 import org.sonar.api.utils.KeyValueFormat;
 import org.sonar.core.issue.DefaultIssue;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-
 import java.util.Date;
 
 /**
@@ -44,7 +40,7 @@ public final class IssueDto {
   private String kee;
   private Integer resourceId;
   private Integer ruleId;
-  private Integer severity;
+  private String severity;
   private boolean manualSeverity;
   private String message;
   private Integer line;
@@ -119,11 +115,11 @@ public final class IssueDto {
   }
 
   @CheckForNull
-  public Integer getSeverity() {
+  public String getSeverity() {
     return severity;
   }
 
-  public IssueDto setSeverity(@Nullable Integer severity) {
+  public IssueDto setSeverity(@Nullable String severity) {
     this.severity = severity;
     return this;
   }
@@ -292,11 +288,6 @@ public final class IssueDto {
     return componentKey;
   }
 
-  @CheckForNull
-  public String getSeverityLabel() {
-    return severity != null ? Severity.ALL.get(severity - 1) : null;
-  }
-
   /**
    * Only for unit tests
    */
@@ -319,18 +310,6 @@ public final class IssueDto {
     return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
   }
 
-  private static Integer toSeverityIndex(final String severity){
-    if (severity != null) {
-      return Iterables.indexOf(Severity.ALL, new Predicate<String>() {
-        @Override
-        public boolean apply(String currentSeverity) {
-          return currentSeverity.equals(severity);
-        }
-      }) + 1;
-    }
-    return null;
-  }
-
   public static IssueDto toDtoForInsert(DefaultIssue issue, Integer componentId, Integer ruleId, Date now) {
     return new IssueDto()
       .setKee(issue.key())
@@ -339,7 +318,7 @@ public final class IssueDto {
       .setEffortToFix(issue.effortToFix())
       .setResolution(issue.resolution())
       .setStatus(issue.status())
-      .setSeverity(toSeverityIndex(issue.severity()))
+      .setSeverity(issue.severity())
       .setChecksum(issue.getChecksum())
       .setManualSeverity(issue.manualSeverity())
       .setReporter(issue.reporter())
@@ -366,7 +345,7 @@ public final class IssueDto {
       .setEffortToFix(issue.effortToFix())
       .setResolution(issue.resolution())
       .setStatus(issue.status())
-      .setSeverity(toSeverityIndex(issue.severity()))
+      .setSeverity(issue.severity())
       .setChecksum(issue.getChecksum())
       .setManualSeverity(issue.manualSeverity())
       .setReporter(issue.reporter())
@@ -388,7 +367,7 @@ public final class IssueDto {
     issue.setMessage(message);
     issue.setEffortToFix(effortToFix);
     issue.setLine(line);
-    issue.setSeverity(getSeverityLabel());
+    issue.setSeverity(severity);
     issue.setReporter(reporter);
     issue.setAssignee(assignee);
     issue.setAttributes(KeyValueFormat.parse(Objects.firstNonNull(attributes, "")));

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
index 39fdd04cd9867d0e002b5f4efedc714f4639676d..aafefbd4286f0b54380d08ec038620a5aeeee5c2 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
@@ -32,7 +32,7 @@ import java.util.List;
  */
 public class DatabaseVersion implements BatchComponent, ServerComponent {
 
-  public static final int LAST_VERSION = 399;
+  public static final int LAST_VERSION = 397;
 
   public static enum Status {
     UP_TO_DATE, REQUIRES_UPGRADE, REQUIRES_DOWNGRADE, FRESH_INSTALL

diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
index 01991164893c61cfc7bb3f0422da85421d5afe54..9717a2417cfb86c8c7946ef7614b1d981086d10c 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
@@ -210,9 +210,9 @@
         <foreach item="key" index="index" collection="issueKeys" open="(" separator="," close=")">#{key}
         </foreach>
       </if>
-      <if test="severitiesIndexSql != null">
+      <if test="severities != null">
         and i.severity in
-        <foreach item="severity" index="index" collection="severitiesIndexSql" open="(" separator="," close=")">#{severity}
+        <foreach item="severity" index="index" collection="severities" open="(" separator="," close=")">#{severity}
         </foreach>
       </if>
       <if test="statuses != null">

diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
index 2311cec80a3cd6fdcde360071dad87d9f55a4a9d..6b3fcd5313f1c6abd64dfad2986d7e767ca0daae 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
@@ -159,9 +159,9 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('388');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('391');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('392');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('394');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('395');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('396');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('397');
-INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('398');
-INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('399');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '2011-09-26 22:27:48.0', '2011-09-26 22:27:48.0', null, null);
 ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;

diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
index e7bcf22855a9fe8f6eaedda7b462f417c83bc73f..640817337a557bed27674fca8044416974be8304 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
@@ -521,7 +521,7 @@ CREATE TABLE "ISSUES" (
   "KEE" VARCHAR(50) UNIQUE NOT NULL,
   "RESOURCE_ID" INTEGER NOT NULL,
   "RULE_ID" INTEGER,
-  "SEVERITY" INTEGER,
+  "SEVERITY" VARCHAR(10),
   "MANUAL_SEVERITY" BOOLEAN NOT NULL,
   "MESSAGE" VARCHAR(4000),
   "LINE" INTEGER,

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
index 3c962585f1994ec018eb131260aad53e6ef76cd1..cfb30567f2100817a94985030275c38b6687b268 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
@@ -51,7 +51,7 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     assertThat(issue.getId()).isEqualTo(100L);
     assertThat(issue.getResourceId()).isEqualTo(401);
     assertThat(issue.getRuleId()).isEqualTo(500);
-    assertThat(issue.getSeverity()).isEqualTo(5);
+    assertThat(issue.getSeverity()).isEqualTo("BLOCKER");
     assertThat(issue.isManualSeverity()).isFalse();
     assertThat(issue.getMessage()).isNull();
     assertThat(issue.getLine()).isEqualTo(200);
@@ -227,9 +227,9 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     IssueQuery query = IssueQuery.builder().sort(IssueQuery.Sort.SEVERITY).asc(true).build();
     List<IssueDto> results = newArrayList(dao.select(query));
     assertThat(results).hasSize(3);
-    assertThat(results.get(0).getSeverityLabel()).isEqualTo("MINOR");
-    assertThat(results.get(1).getSeverityLabel()).isEqualTo("MAJOR");
-    assertThat(results.get(2).getSeverityLabel()).isEqualTo("BLOCKER");
+    assertThat(results.get(0).getSeverity()).isEqualTo("BLOCKER");
+    assertThat(results.get(1).getSeverity()).isEqualTo("MAJOR");
+    assertThat(results.get(2).getSeverity()).isEqualTo("MINOR");
   }
 
   @Test

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java
index 551dc0926e3e4dabcd6bec30516f9445ceaa50d5..9598b8c796dc4f48997bf63191908522c1baea7e 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java
@@ -63,7 +63,7 @@ public class IssueDtoTest {
         .setResolution(Issue.RESOLUTION_FALSE_POSITIVE)
         .setEffortToFix(15.0)
         .setLine(6)
-        .setSeverity(5)
+        .setSeverity("BLOCKER")
         .setMessage("message")
         .setManualSeverity(true)
         .setReporter("arthur")

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
index 7767c139710494fa6baeaefa1d27e4d0be0d8b11..d606a87080d1fbad9e9aba8aaddc2635d2a3cd6e 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
@@ -46,7 +46,7 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     dto.setEffortToFix(3.14);
     dto.setResolution("FIXED");
     dto.setStatus("RESOLVED");
-    dto.setSeverity(5);
+    dto.setSeverity("BLOCKER");
     dto.setReporter("emmerik");
     dto.setAuthorLogin("morgan");
     dto.setAssignee("karadoc");
@@ -79,7 +79,7 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     dto.setEffortToFix(3.14);
     dto.setResolution("FIXED");
     dto.setStatus("RESOLVED");
-    dto.setSeverity(5);
+    dto.setSeverity("BLOCKER");
     dto.setReporter("emmerik");
     dto.setAuthorLogin("morgan");
     dto.setAssignee("karadoc");

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml
index af6e601bb1806b7fc6b5d42456769e031d45b2a2..f960ecd1b62d88ec7e6599f601438062a58279f7 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml
@@ -8,7 +8,7 @@
       kee="ABCDE"
       resource_id="400"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -32,7 +32,7 @@
       kee="ABCDF"
       resource_id="400"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDG"
       resource_id="400"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
index fb1aedd72222ed89de3730ff0ec5477eb4bf3670..3d7bd96af2126c6adb78f0a22ea32d4875e5168e 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
index de78e71414d1143a4adb475363be0fa3581ed5c7..5655372b58e3d0e895c558d6176e3a62947fa8b5 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
@@ -6,7 +6,7 @@
       resource_id="401"
       rule_id="500"
       action_plan_key="ABC"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -31,7 +31,7 @@
       resource_id="401"
       rule_id="500"
       action_plan_key="ABC"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -57,7 +57,7 @@
       resource_id="401"
       rule_id="501"
       action_plan_key="DEF"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
index 1d3d7943d7eba19896415680b8610f49b63faa12..f25c1c9e8ea5d1b0af0a0524b1bc8063e5c193b7 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
index 2319088e7f06637802cc484c44b724d1769a9b68..34f07c20209acd50515bb2e7de9df21aac765a37 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
@@ -5,7 +5,7 @@
       kee="100"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="101"
       resource_id="402"
       rule_id="501"
-      severity="3"
+      severity="MAJOR"
       manual_severity="[false]"
       message="[null]"
       line="120"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
index c1fddd480d35974d11a2be6d8814de6a7db9b7ad..9b6f20c96ca8aee11be82f76da302db2cc6f3fe2 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
@@ -5,7 +5,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
index d6f85f325c4e951f71ac000033f195c6fd1eaad4..3d6ad15c5a062f9afb02b7e23ecdf4f1c11b022b 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
index 88ca9ebd96062a30f690d4b569bee35f1e420aad..d01f5342d8780aa620dacb210e8c6c35b582c454 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
@@ -5,7 +5,7 @@
       kee="ABCDE"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml
index 9aa1641068bdeb8062c59ee6c2895b81a7ce226b..ded6b072043db4a42483ba8b61dc857feae94511 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml
@@ -6,7 +6,7 @@
       resource_id="401"
       rule_id="500"
       action_plan_key="ABC"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -31,7 +31,7 @@
       resource_id="401"
       rule_id="500"
       action_plan_key="ABC"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -57,7 +57,7 @@
       resource_id="401"
       rule_id="501"
       action_plan_key="[null]"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
index 557be9b7ba50f20f9ce22e9ed9dd38d60bad40b3..816742b954b30158e92d625dd54237a607886d79 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
@@ -5,7 +5,7 @@
       kee="ABCDE"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml
index 886fb14e175d6f3a32d8f9c44d7a2c4c610af902..371d3da3f4f22174fa51c90655ca9d8dd3baffa6 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml
@@ -5,7 +5,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -53,7 +53,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
index d20560f08118650fa01959b74e5590a19a78cb84..d2af6661a9eb7f25faa21faece12c4cbf5d92fd3 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml
index fb1aedd72222ed89de3730ff0ec5477eb4bf3670..3d7bd96af2126c6adb78f0a22ea32d4875e5168e 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
index 8b3a9f44ca382e8b9809a50b5caab5a2f76fc608..12f7036120e18dde09e90cc2991f787a1089eb57 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
@@ -5,7 +5,7 @@
       kee="100"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="101"
       resource_id="402"
       rule_id="501"
-      severity="3"
+      severity="MAJOR"
       manual_severity="[false]"
       message="[null]"
       line="120"
@@ -53,7 +53,7 @@
       kee="102"
       resource_id="402"
       rule_id="501"
-      severity="3"
+      severity="MAJOR"
       manual_severity="[false]"
       message="[null]"
       line="120"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_assignee.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_assignee.xml
index 2f902a85565c709552fca9329a3411decdfd2fae..41a97ef98b80e809108e87d5eb075f0c7d698851 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_assignee.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_assignee.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_close_date.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_close_date.xml
index 9339d6e437ed8daa413b698ccf8f8210d4c080c4..b27051ff2074aeb6bd789fe1235406523fab6311 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_close_date.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_close_date.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_creation_date.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_creation_date.xml
index b4c6ba44d29d4df01ed3ce66f6daebff9cff6cc4..d84b71fa09be5116d390484f358c69ddafbcb66d 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_creation_date.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_creation_date.xml
@@ -5,7 +5,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -53,7 +53,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_severity.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_severity.xml
index e5ffc2e5fda7292df6612d34985b4dd0e0cf7218..9dae4080973c05fa371c73ce8ea59d39142c2f57 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_severity.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_severity.xml
@@ -5,7 +5,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="2"
+      severity="MINOR"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -53,7 +53,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="3"
+      severity="MAJOR"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_status.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_status.xml
index 4e12d924be8d8f06afe8d18dd28bddd5057c2952..b510a5c447ae311f2cb6ffbe3afcf55443eb64c3 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_status.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_status.xml
@@ -6,7 +6,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -30,7 +30,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -56,7 +56,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_update_date.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_update_date.xml
index a74da66a8c88109b4501aa480bff4f4208c2b66f..769bae1454d1a5e9f88f21787640d6fc52f9dd66 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_update_date.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_update_date.xml
@@ -5,7 +5,7 @@
       kee="ABCDE-1"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -29,7 +29,7 @@
       kee="ABCDE-2"
       resource_id="401"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -53,7 +53,7 @@
       kee="ABCDE-3"
       resource_id="401"
       rule_id="501"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml
index e32f7d9f30c0a3d745f813e08035393c16d4ab3c..69e5160f9622b9cceee9f498c2dc1664ab2831bf 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml
@@ -4,7 +4,7 @@
       kee="ABCDE"
       resource_id="123"
       rule_id="200"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="the message"
       line="500"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml
index 7bcccd58b05a1674086951da3e26b6726ef3a2f2..57bc88451eaf3697cd46786105d209c6c65eb2cb 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml
@@ -23,7 +23,7 @@
       kee="ABCDE"
       resource_id="123"
       rule_id="200"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="the message"
       line="500"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml
index 9e13008d3db7c398fdfcd34c770cb1e4927fdd0a..06ee1af1b5061a27444999dbc1c7938c5492dedd 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml
@@ -23,7 +23,7 @@
       kee="ABCDE"
       resource_id="123"
       rule_id="200"
-      severity="1"
+      severity="INFO"
       manual_severity="[false]"
       message="old"
       line="[null]"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
index 0a10ae36591908c41fbc1a2e96dfa88cdabd5719..97ca9b21656101c57cdaa484e17d5ce3cd7eb2e7 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
@@ -1,5 +1,5 @@
 <dataset>
-  <issues id="1" kee="ABCDE" resolution="OPEN" status="OPEN" severity="5" manual_severity="[false]"
+  <issues id="1" kee="ABCDE" resolution="OPEN" status="OPEN" severity="BLOCKER" manual_severity="[false]"
       assignee="[null]"
       author_login="[null]"
       checksum="[null]"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
index 17f7def9bf32291fa4a6c64fc5f8d4c5795d274d..862d14f2b750073c3d2ec15a7d60f60c0bfee6d6 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
@@ -3,7 +3,7 @@
           kee="ABCDE"
           resolution="FIXED"
           status="RESOLVED"
-          severity="5"
+          severity="BLOCKER"
           manual_severity="[false]"
           assignee="loic"
           author_login="simon"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
index 709dc7ccf89a194868f40b2e69939d8ec0640c41..4d8e2449c578896472a29d26cc4013debb724ecd 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
@@ -3,7 +3,7 @@
           kee="ABCDE"
           resolution="OPEN"
           status="OPEN"
-          severity="5"
+          severity="BLOCKER"
           manual_severity="[false]"
           assignee="loic"
           author_login="simon"

diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
index 3a331c758145eae14d7429cb9655341a7c39164d..5bf87b320ac82995aafdf0e7bb925fb5db73d7e2 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
@@ -23,7 +23,7 @@
       kee="100"
       resource_id="400"
       rule_id="500"
-      severity="5"
+      severity="BLOCKER"
       manual_severity="[false]"
       message="[null]"
       line="200"
@@ -47,7 +47,7 @@
       kee="101"
       resource_id="401"
       rule_id="501"
-      severity="3"
+      severity="MAJOR"
       manual_severity="[false]"
       message="[null]"
       line="120"

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml
index 22d0be9cb39efe8f2672537b28d14c273acf7c51..e8a31f031de75e9fe68aa7d68b27e02bd8ca4ee9 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml
@@ -24,7 +24,7 @@
 
   <review_comments id="1" created_at="[null]" updated_at="[null]" review_id="1" user_id="1223" review_text="abc"/>
 
-  <issues id="1" kee="ABCDE" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="5"
+  <issues id="1" kee="ABCDE" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
           reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
           message="[null]"

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
index 887df9002784460c05a4f58859f9c818ce387b00..5c57259dab6ac1a810d961110c79ad0bea54f6c3 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
@@ -31,7 +31,7 @@
 
   <review_comments id="1" created_at="[null]" updated_at="[null]" review_id="2" user_id="1223" review_text="abc"/>
 
-  <issues id="1" kee="ABCDE" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="5"
+  <issues id="1" kee="ABCDE" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
           reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
           message="[null]"
@@ -43,7 +43,7 @@
           issue_close_date="2013-04-16"
       />
 
-  <issues id="2" kee="ABCDF" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="5"
+  <issues id="2" kee="ABCDF" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
           reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
           message="[null]"

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueQuery.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueQuery.java
index 946b71bdbb2ec2a0ccfbfd520110d1e89f343857..4a74dedf0fbafe058f9fdeb6a561adf17336701e 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueQuery.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueQuery.java
@@ -19,13 +19,9 @@
  */
 package org.sonar.api.issue;
 
-import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.sonar.api.rule.RuleKey;
-import org.sonar.api.rule.Severity;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
@@ -33,8 +29,6 @@ import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.Date;
 
-import static com.google.common.collect.Lists.newArrayList;
-
 /**
  * @since 3.6
  */
@@ -74,9 +68,6 @@ public class IssueQuery {
   // index of selected page. Start with 1.
   private final int pageIndex;
 
-  // for internal use in MyBatis
-  protected final Collection<Integer> severitiesIndexSql;
-
   private IssueQuery(Builder builder) {
     this.issueKeys = builder.issueKeys;
     this.severities = builder.severities;
@@ -98,8 +89,6 @@ public class IssueQuery {
     this.pageSize = builder.pageSize;
     this.pageIndex = builder.pageIndex;
     this.requiredRole = builder.requiredRole;
-
-    this.severitiesIndexSql = severitiesIndexSql(severities);
   }
 
   public Collection<String> issueKeys() {
@@ -192,23 +181,6 @@ public class IssueQuery {
     return new Builder();
   }
 
-  private Collection<Integer> severitiesIndexSql(@Nullable Collection<String> severities) {
-    if (severities != null) {
-      return newArrayList(Iterables.transform(severities, new Function<String, Integer>() {
-        @Override
-        public Integer apply(final String currentSeverity) {
-          return Iterables.indexOf(Severity.ALL, new Predicate<String>() {
-            @Override
-            public boolean apply(String severity) {
-              return severity.equals(currentSeverity);
-            }
-          }) + 1;
-        };
-      }));
-    }
-    return null;
-  }
-
   public static class Builder {
     private Collection<String> issueKeys;
     private Collection<String> severities;

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/issue/IssueQueryTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/issue/IssueQueryTest.java
index 938c5ff56f9b1770d8c057332c613797e771f234..fb972c40ceed92a21610c0421a735f1c03f51e7e 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/issue/IssueQueryTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/issue/IssueQueryTest.java
@@ -71,7 +71,6 @@ public class IssueQueryTest {
     assertThat(query.pageSize()).isEqualTo(10);
     assertThat(query.pageIndex()).isEqualTo(2);
     assertThat(query.requiredRole()).isEqualTo(UserRole.CODEVIEWER);
-    assertThat(query.severitiesIndexSql).containsOnly(5);
   }
 
   @Test

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/395_create_issues.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/395_create_issues.rb
new file mode 100644 (file)
index 0000000..2733202
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/395_create_issues.rb
@@ -0,0 +1,66 @@
+#
+# Sonar, entreprise quality control tool.
+# Copyright (C) 2008-2013 SonarSource
+# mailto:contact AT sonarsource DOT com
+#
+# SonarQube is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# SonarQube is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+
+#
+# Sonar 3.6
+#
+class CreateIssues < ActiveRecord::Migration
+
+  def self.up
+    create_table :issues do |t|
+      t.column :kee,                  :string,    :null => false,   :limit => 50
+      t.column :resource_id,          :integer,   :null => false
+      t.column :rule_id,              :integer,   :null => true
+      t.column :severity,                                        :string,        :null => true,          :limit => 10
+      t.column :manual_severity,      :boolean,   :null => false
+      t.column :message,              :string,    :null => true,    :limit => 4000
+      t.column :line,                 :integer,   :null => true
+      t.column :effort_to_fix,        :decimal,   :null => true,    :precision => 30,   :scale => 20
+      t.column :status,               :string ,   :null => true,    :limit => 20
+      t.column :resolution,           :string ,   :null => true,    :limit => 20
+      t.column :checksum,             :string ,   :null => true,    :limit => 1000
+      t.column :reporter,             :string,    :null => true,         :limit => 40
+      t.column :assignee,             :string,    :null => true,         :limit => 40
+      t.column :author_login,         :string,    :null => true,    :limit => 100
+      t.column :action_plan_key,      :string,    :null => true,    :limit => 50
+      t.column :attributes,           :string,    :null => true,    :limit => 4000
+
+      # functional dates
+      t.column :issue_creation_date,  :datetime,  :null => true
+      t.column :issue_close_date,     :datetime,  :null => true
+      t.column :issue_update_date,    :datetime,  :null => true
+
+      # technical dates
+      t.column :created_at,           :datetime,  :null => true
+      t.column :updated_at,           :datetime,  :null => true
+    end
+
+    add_index :issues,  :kee,                 :name => 'issues_kee',         :unique => true
+    add_index :issues,  :resource_id,         :name => 'issues_resource_id'
+    add_index :issues,  :rule_id,             :name => 'issues_rule_id'
+    add_index :issues,  :severity,            :name => 'issues_severity'
+    add_index :issues,  :status,              :name => 'issues_status'
+    add_index :issues,  :assignee,            :name => 'issues_assignee'
+    add_index :issues,  :action_plan_key,     :name => 'issues_action_plan_key'
+    add_index :issues,  :issue_creation_date, :name => 'issues_creation_date'
+  end
+
+end
+

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/396_create_issue_changes.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/396_create_issue_changes.rb
new file mode 100644 (file)
index 0000000..016380c
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/396_create_issue_changes.rb
@@ -0,0 +1,42 @@
+#
+# Sonar, entreprise quality control tool.
+# Copyright (C) 2008-2013 SonarSource
+# mailto:contact AT sonarsource DOT com
+#
+# SonarQube is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# SonarQube is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+
+#
+# Sonar 3.6
+#
+class CreateIssueChanges < ActiveRecord::Migration
+
+  def self.up
+    create_table :issue_changes do |t|
+      t.column :kee,                :string,    :null => true,    :limit => 50
+      t.column :issue_key,          :string,    :null => false,   :limit => 50
+      t.column :user_login,         :string,    :null => true,   :limit => 40
+      t.column :change_type,                           :string,          :null => true,          :limit => 20
+      t.column :change_data,        :text,      :null => true
+      t.column :created_at,         :datetime,  :null => true
+      t.column :updated_at,         :datetime,  :null => true
+    end
+
+    add_index :issue_changes,  :kee,         :name => 'issue_changes_kee'
+    add_index :issue_changes,  :issue_key,   :name => 'issue_changes_issue_key'
+  end
+
+end
+

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/398_create_issues.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/398_create_issues.rb
deleted file mode 100644 (file)
index 7a26290..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/398_create_issues.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Sonar, entreprise quality control tool.
-# Copyright (C) 2008-2013 SonarSource
-# mailto:contact AT sonarsource DOT com
-#
-# SonarQube is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# SonarQube is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-
-#
-# Sonar 3.6
-#
-class CreateIssues < ActiveRecord::Migration
-
-  def self.up
-    create_table :issues do |t|
-      t.column :kee,                  :string,    :null => false,   :limit => 50
-      t.column :resource_id,          :integer,   :null => false
-      t.column :rule_id,              :integer,   :null => true
-      t.column :severity,                                        :integer,       :null => true
-      t.column :manual_severity,      :boolean,   :null => false
-      t.column :message,              :string,    :null => true,    :limit => 4000
-      t.column :line,                 :integer,   :null => true
-      t.column :effort_to_fix,        :decimal,   :null => true,    :precision => 30,   :scale => 20
-      t.column :status,               :string ,   :null => true,    :limit => 20
-      t.column :resolution,           :string ,   :null => true,    :limit => 20
-      t.column :checksum,             :string ,   :null => true,    :limit => 1000
-      t.column :reporter,             :string,    :null => true,         :limit => 40
-      t.column :assignee,             :string,    :null => true,         :limit => 40
-      t.column :author_login,         :string,    :null => true,    :limit => 100
-      t.column :action_plan_key,      :string,    :null => true,    :limit => 50
-      t.column :attributes,           :string,    :null => true,    :limit => 4000
-
-      # functional dates
-      t.column :issue_creation_date,  :datetime,  :null => true
-      t.column :issue_close_date,     :datetime,  :null => true
-      t.column :issue_update_date,    :datetime,  :null => true
-
-      # technical dates
-      t.column :created_at,           :datetime,  :null => true
-      t.column :updated_at,           :datetime,  :null => true
-    end
-
-    add_index :issues,  :kee,                 :name => 'issues_kee',         :unique => true
-    add_index :issues,  :resource_id,         :name => 'issues_resource_id'
-    add_index :issues,  :rule_id,             :name => 'issues_rule_id'
-    add_index :issues,  :severity,            :name => 'issues_severity'
-    add_index :issues,  :status,              :name => 'issues_status'
-    add_index :issues,  :assignee,            :name => 'issues_assignee'
-    add_index :issues,  :action_plan_key,     :name => 'issues_action_plan_key'
-    add_index :issues,  :issue_creation_date, :name => 'issues_creation_date'
-  end
-
-end
-

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/399_create_issue_changes.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/399_create_issue_changes.rb
deleted file mode 100644 (file)
index 016380c..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/399_create_issue_changes.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Sonar, entreprise quality control tool.
-# Copyright (C) 2008-2013 SonarSource
-# mailto:contact AT sonarsource DOT com
-#
-# SonarQube is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# SonarQube is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-
-#
-# Sonar 3.6
-#
-class CreateIssueChanges < ActiveRecord::Migration
-
-  def self.up
-    create_table :issue_changes do |t|
-      t.column :kee,                :string,    :null => true,    :limit => 50
-      t.column :issue_key,          :string,    :null => false,   :limit => 50
-      t.column :user_login,         :string,    :null => true,   :limit => 40
-      t.column :change_type,                           :string,          :null => true,          :limit => 20
-      t.column :change_data,        :text,      :null => true
-      t.column :created_at,         :datetime,  :null => true
-      t.column :updated_at,         :datetime,  :null => true
-    end
-
-    add_index :issue_changes,  :kee,         :name => 'issue_changes_kee'
-    add_index :issue_changes,  :issue_key,   :name => 'issue_changes_issue_key'
-  end
-
-end
-