Revert "SONAR-4514 Add a default severity when creating manual rules"

This reverts commit 5fbf1cf28418d2914f18ac89923ba0695d4dfcaa.

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 2eeaa8c21ddd9101356419da86a9b5cc311bb167..c7ff86a5f0c1598bef0b96ef93371676baaebd55 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
@@ -33,7 +33,7 @@ import java.util.List;
  */
 public class DatabaseVersion implements BatchComponent, ServerComponent {
 
-  public static final int LAST_VERSION = 556;
+  public static final int LAST_VERSION = 555;
 
   public static enum Status {
     UP_TO_DATE, REQUIRES_UPGRADE, REQUIRES_DOWNGRADE, FRESH_INSTALL

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 cfc4e72849d1044d6d24f9bb01a37afd0cb5aad2..e93794de62f46405aab0cf722930c74f07aacfc8 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
@@ -248,7 +248,6 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('552');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('553');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('554');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('555');
-INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('556');
 
 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-server/src/main/java/org/sonar/server/rule/RuleCreator.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java
index 639adf6e2e1f3feb7f23fd39167ffdb12d230a36..30dd0f2c058817ab0462ea6e4a64c9511a9440ae 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java
@@ -187,7 +187,7 @@ public class RuleCreator implements ServerComponent {
     RuleDto ruleDto = RuleDto.createFor(ruleKey)
       .setName(newRule.name())
       .setDescription(newRule.htmlDescription())
-      .setSeverity(newRule.severity() != null ? newRule.severity() : Severity.MAJOR)
+      .setSeverity(newRule.severity())
       .setStatus(RuleStatus.READY);
     dbClient.ruleDao().insert(dbSession, ruleDto);
     return ruleKey;

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/556_update_manual_rules_without_severity.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/556_update_manual_rules_without_severity.rb
deleted file mode 100644 (file)
index 3968348..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/556_update_manual_rules_without_severity.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# SonarQube, open source software quality management tool.
-# Copyright (C) 2008-2014 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.
-#
-
-#
-# SonarQube 4.4
-# SONAR-4514
-#
-class UpdateManualRulesWithoutSeverity < ActiveRecord::Migration
-
-  class Rule < ActiveRecord::Base
-  end
-
-  def self.up
-    Rule.reset_column_information
-    Rule.update_all({:priority => 2, :updated_at => Time.now}, "priority IS NULL AND plugin_name = 'manual'")
-  end
-end

diff --git a/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderMediumTest.java
index 6093e9b1be1e3faac136d52800f7158c59147632..c683d6234f00ed711c4d49b625ef8bc95c657c03 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderMediumTest.java
@@ -45,12 +45,10 @@ public class DefaultRuleFinderMediumTest {
   public static ServerTester tester = new ServerTester();
 
   private DefaultRuleFinder finder;
-  private DbClient dbClient;
   private DbSession session;
 
   @Before
   public void setup() {
-    dbClient = tester.get(DbClient.class);
     finder = tester.get(DefaultRuleFinder.class);
 
     session = tester.get(DbClient.class).openSession(false);

diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java
index d258d6c176837912e87feac19d46db8176c2e347..9cc91b2c0b214a7c036876d59f0db1df3022ef10 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java
@@ -409,7 +409,7 @@ public class RuleCreatorMediumTest {
     assertThat(rule.key()).isEqualTo(RuleKey.of("manual", "MANUAL_RULE"));
     assertThat(rule.name()).isEqualTo("My manual");
     assertThat(rule.htmlDescription()).isEqualTo("Some description");
-    assertThat(rule.severity()).isEqualTo(Severity.MAJOR);
+    assertThat(rule.severity()).isNull();
     assertThat(rule.status()).isEqualTo(RuleStatus.READY);
     assertThat(rule.language()).isNull();
     assertThat(rule.internalKey()).isNull();