From c649f88d76006b217367c39f2f19cc10ceae923d Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Sat, 24 May 2014 13:56:26 +0200
Subject: [PATCH] SONAR-5007 fix db migration when registering q profiles

---
 .../sonar/core/qualityprofile/db/ActiveRuleMapper.java |  2 ++
 .../sonar/core/qualityprofile/db/ActiveRuleMapper.xml  |  8 ++++++++
 .../qualityprofile/persistence/ActiveRuleDao.java      | 10 ++--------
 .../java/org/sonar/server/rule2/index/RuleIndex.java   |  1 -
 .../main/java/org/sonar/server/search/BaseIndex.java   |  2 +-
 .../RegisterQualityProfilesMediumTest.java             |  1 -
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleMapper.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleMapper.java
index 27d71c0265b..b0b45c89e93 100644
--- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleMapper.java
+++ b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleMapper.java
@@ -47,6 +47,8 @@ public interface ActiveRuleMapper {
 
   List<ActiveRuleDto> selectByProfileId(int profileId);
 
+  List<ActiveRuleDto> selectByProfileKey(QualityProfileKey key);
+
   List<ActiveRuleDto> selectAll();
 
   void insertParameter(ActiveRuleParamDto dto);
diff --git a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml b/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml
index 671d9234de2..e38d7a23eb0 100644
--- a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml
@@ -109,6 +109,14 @@
         </where>
     </select>
 
+  <select id="selectByProfileKey" parameterType="map" resultType="ActiveRule">
+    SELECT <include refid="activeRuleKeyColumns"/>
+    FROM active_rules a
+    <include refid="activeRuleKeyJoin"/>
+    where qp.name = #{name}
+    AND qp.language = #{lang}
+  </select>
+
   <select id="selectByProfileAndRule" parameterType="map" resultType="ActiveRule">
     SELECT <include refid="activeRuleColumns"/>
     FROM active_rules a
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDao.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDao.java
index 6ce7d59fe70..071eff56704 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDao.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDao.java
@@ -184,18 +184,12 @@ public class ActiveRuleDao extends BaseDao<ActiveRuleMapper, ActiveRuleDto, Acti
   public void deleteByProfileKey(QualityProfileKey profileKey, DbSession session) {
     /** Functional cascade for params */
     for (ActiveRuleDto activeRule : this.findByProfileKey(profileKey, session)) {
-      this.delete(activeRule, session);
+      delete(activeRule, session);
     }
   }
 
   public List<ActiveRuleDto> findByProfileKey(QualityProfileKey profileKey, DbSession session) {
-    //TODO try/catch due to legacy selectByProfileId SQL.
-    try {
-      int id = this.getQualityProfileId(profileKey, session);
-      return mapper(session).selectByProfileId(id);
-    } catch (Exception e) {
-      throw new IllegalArgumentException("Quality profile not found: " + profileKey.toString());
-    }
+    return mapper(session).selectByProfileKey(profileKey);
   }
 
   public void removeParamByProfileKey(QualityProfileKey profileKey, DbSession session) {
diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java b/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java
index 119c4c3d531..d0e807d034a 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java
@@ -115,7 +115,6 @@ public class RuleIndex extends BaseIndex<Rule, RuleDto, RuleKey> {
     addMatchField(mapping, RuleNormalizer.RuleField.REPOSITORY.key(), "string");
     addMatchField(mapping, RuleNormalizer.RuleField.SEVERITY.key(), "string");
     addMatchField(mapping, RuleNormalizer.RuleField.STATUS.key(), "string");
-    ;
     addMatchField(mapping, RuleNormalizer.RuleField.LANGUAGE.key(), "string");
 
     mapping.startObject(RuleNormalizer.RuleField.CHARACTERISTIC.key())
diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
index a0343ae1410..cc4cc006b65 100644
--- a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
@@ -118,7 +118,7 @@ public abstract class BaseIndex<D, E extends Dto<K>, K extends Serializable>
           .execute().actionGet();
       }
     } catch (Exception e) {
-      throw new RuntimeException("Invalid configuration for index " + this.getIndexName(), e);
+      throw new IllegalStateException("Invalid configuration for index " + this.getIndexName(), e);
     }
   }
 
diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java
index 88033365147..bcc9b7b2c05 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java
@@ -204,7 +204,6 @@ public class RegisterQualityProfilesMediumTest {
    * Probably for db migration
    */
   @Test
-  @Ignore
   public void clean_up_profiles_if_missing_loaded_template() throws Exception {
     tester = new ServerTester().addComponents(XooRulesDefinition.class, XooProfileDefinition.class);
     tester.start();
-- 
2.39.5