From c77fc7f84763ead9dc262c107e23c0bddba4c8f2 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Thu, 16 Jan 2014 18:19:25 +0100
Subject: [PATCH] SONAR-4923 Delete profile now uses Java facade

---
 .../sonar/core/properties/PropertiesDao.java  | 43 +++++++-----
 .../core/qualityprofile/db/ActiveRuleDao.java | 66 +++++++++++++------
 .../qualityprofile/db/ActiveRuleMapper.java   | 24 ++++---
 .../qualityprofile/db/QualityProfileDao.java  | 18 ++++-
 .../qualityprofile/db/ActiveRuleMapper.xml    |  8 +++
 .../qualityprofile/db/ActiveRuleDaoTest.java  | 18 +++++
 .../delete_from_profile-result.xml            | 12 ++++
 ...lete_parameters_from_profile_id-result.xml | 19 ++++++
 .../delete_parameters_from_profile_id.xml     | 19 ++++++
 .../QProfileActiveRuleOperations.java         |  3 +-
 .../server/qualityprofile/QProfileLookup.java | 46 +++++++++++--
 .../qualityprofile/QProfileOperations.java    | 42 ++++++++++--
 .../server/qualityprofile/QProfiles.java      | 11 +++-
 .../org/sonar/server/rule/RuleRegistry.java   | 11 +++-
 .../controllers/api/profiles_controller.rb    |  7 +-
 .../app/controllers/profiles_controller.rb    | 10 +--
 .../qualityprofile/QProfileLookupTest.java    | 31 ++++++++-
 .../QProfileOperationsTest.java               | 46 +++++++++++--
 .../server/qualityprofile/QProfilesTest.java  | 33 ++++++----
 .../sonar/server/rule/RuleRegistryTest.java   | 36 +++++++---
 .../delete_from_profile/active_rule25.json    |  6 ++
 .../delete_from_profile/active_rule2702.json  | 16 +++++
 .../delete_from_profile/active_rule523.json   |  6 ++
 .../{rules => shared}/rule1.json              |  0
 .../{rules => shared}/rule2.json              |  0
 .../{rules => shared}/rule3.json              |  0
 26 files changed, 431 insertions(+), 100 deletions(-)
 create mode 100644 sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_from_profile-result.xml
 create mode 100644 sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id-result.xml
 create mode 100644 sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id.xml
 create mode 100644 sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/delete_from_profile/active_rule25.json
 create mode 100644 sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/delete_from_profile/active_rule2702.json
 create mode 100644 sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/delete_from_profile/active_rule523.json
 rename sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/{rules => shared}/rule1.json (100%)
 rename sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/{rules => shared}/rule2.json (100%)
 rename sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/{rules => shared}/rule3.json (100%)

diff --git a/sonar-core/src/main/java/org/sonar/core/properties/PropertiesDao.java b/sonar-core/src/main/java/org/sonar/core/properties/PropertiesDao.java
index 2d77d816c97..27e6a86ad24 100644
--- a/sonar-core/src/main/java/org/sonar/core/properties/PropertiesDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/properties/PropertiesDao.java
@@ -110,20 +110,22 @@ public class PropertiesDao implements BatchComponent, ServerComponent {
     }
   }
 
+  public void setProperty(PropertyDto property, SqlSession session) {
+    PropertiesMapper mapper = session.getMapper(PropertiesMapper.class);
+    PropertyDto persistedProperty = mapper.selectByKey(property);
+    if (persistedProperty != null && !StringUtils.equals(persistedProperty.getValue(), property.getValue())) {
+      persistedProperty.setValue(property.getValue());
+      mapper.update(persistedProperty);
+    } else if (persistedProperty == null) {
+      mapper.insert(property);
+    }
+  }
+
   public void setProperty(PropertyDto property) {
     SqlSession session = mybatis.openSession();
-    PropertiesMapper mapper = session.getMapper(PropertiesMapper.class);
     try {
-      PropertyDto persistedProperty = mapper.selectByKey(property);
-      if (persistedProperty != null && !StringUtils.equals(persistedProperty.getValue(), property.getValue())) {
-        persistedProperty.setValue(property.getValue());
-        mapper.update(persistedProperty);
-        session.commit();
-
-      } else if (persistedProperty == null) {
-        mapper.insert(property);
-        session.commit();
-      }
+      setProperty(property, session);
+      session.commit();
     } finally {
       MyBatis.closeQuietly(session);
     }
@@ -140,11 +142,15 @@ public class PropertiesDao implements BatchComponent, ServerComponent {
     }
   }
 
-  public void deleteProjectProperties(String key, String value) {
-    SqlSession session = mybatis.openSession();
+  public void deleteProjectProperties(String key, String value, SqlSession session) {
     PropertiesMapper mapper = session.getMapper(PropertiesMapper.class);
+    mapper.deleteProjectProperties(key, value);
+  }
+
+    public void deleteProjectProperties(String key, String value) {
+    SqlSession session = mybatis.openSession();
     try {
-      mapper.deleteProjectProperties(key, value);
+      deleteProjectProperties(key, value, session);
       session.commit();
     } finally {
       MyBatis.closeQuietly(session);
@@ -163,13 +169,16 @@ public class PropertiesDao implements BatchComponent, ServerComponent {
     }
   }
 
+  public void deleteGlobalProperty(String key, SqlSession session) {
+    PropertiesMapper mapper = session.getMapper(PropertiesMapper.class);
+    mapper.deleteGlobalProperty(key);
+  }
+
   public void deleteGlobalProperty(String key) {
     SqlSession session = mybatis.openSession();
-    PropertiesMapper mapper = session.getMapper(PropertiesMapper.class);
     try {
-      mapper.deleteGlobalProperty(key);
+      deleteGlobalProperty(key, session);
       session.commit();
-
     } finally {
       MyBatis.closeQuietly(session);
     }
diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleDao.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleDao.java
index c92e5a7891d..bdc607fef25 100644
--- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleDao.java
@@ -69,11 +69,11 @@ public class ActiveRuleDao implements ServerComponent {
     }
   }
 
-  public void delete(Integer activeRuleId, SqlSession session) {
+  public void delete(int activeRuleId, SqlSession session) {
     session.getMapper(ActiveRuleMapper.class).delete(activeRuleId);
   }
 
-  public void delete(Integer activeRuleId) {
+  public void delete(int activeRuleId) {
     SqlSession session = mybatis.openSession();
     try {
       delete(activeRuleId, session);
@@ -83,11 +83,11 @@ public class ActiveRuleDao implements ServerComponent {
     }
   }
 
-  public void deleteFromRule(Integer ruleId, SqlSession session) {
+  public void deleteFromRule(int ruleId, SqlSession session) {
     session.getMapper(ActiveRuleMapper.class).deleteFromRule(ruleId);
   }
 
-  public void deleteFromRule(Integer ruleId) {
+  public void deleteFromRule(int ruleId) {
     SqlSession session = mybatis.openSession();
     try {
       deleteFromRule(ruleId, session);
@@ -97,6 +97,20 @@ public class ActiveRuleDao implements ServerComponent {
     }
   }
 
+  public void deleteFromProfile(int profileId, SqlSession session) {
+    session.getMapper(ActiveRuleMapper.class).deleteFromProfile(profileId);
+  }
+
+  public void deleteFromProfile(int profileId) {
+    SqlSession session = mybatis.openSession();
+    try {
+      deleteFromProfile(profileId, session);
+      session.commit();
+    } finally {
+      MyBatis.closeQuietly(session);
+    }
+  }
+
   public List<ActiveRuleDto> selectByIds(List<Integer> ids) {
     SqlSession session = mybatis.openSession();
     try {
@@ -132,7 +146,7 @@ public class ActiveRuleDao implements ServerComponent {
     return session.getMapper(ActiveRuleMapper.class).selectAll();
   }
 
-  public List<ActiveRuleDto> selectByRuleId(Integer ruleId) {
+  public List<ActiveRuleDto> selectByRuleId(int ruleId) {
     SqlSession session = mybatis.openSession();
     try {
       return selectByRuleId(ruleId, session);
@@ -141,7 +155,7 @@ public class ActiveRuleDao implements ServerComponent {
     }
   }
 
-  public List<ActiveRuleDto> selectByRuleId(Integer ruleId, SqlSession session) {
+  public List<ActiveRuleDto> selectByRuleId(int ruleId, SqlSession session) {
     return session.getMapper(ActiveRuleMapper.class).selectByRuleId(ruleId);
   }
 
@@ -160,7 +174,7 @@ public class ActiveRuleDao implements ServerComponent {
 
 
   @CheckForNull
-  public ActiveRuleDto selectById(Integer id) {
+  public ActiveRuleDto selectById(int id) {
     SqlSession session = mybatis.openSession();
     try {
       return selectById(id, session);
@@ -170,12 +184,12 @@ public class ActiveRuleDao implements ServerComponent {
   }
 
   @CheckForNull
-  public ActiveRuleDto selectById(Integer id, SqlSession session) {
+  public ActiveRuleDto selectById(int id, SqlSession session) {
     return session.getMapper(ActiveRuleMapper.class).selectById(id);
   }
 
   @CheckForNull
-  public ActiveRuleDto selectByProfileAndRule(Integer profileId, Integer ruleId) {
+  public ActiveRuleDto selectByProfileAndRule(int profileId, int ruleId) {
     SqlSession session = mybatis.openSession();
     try {
       return selectByProfileAndRule(profileId, ruleId, session);
@@ -185,7 +199,7 @@ public class ActiveRuleDao implements ServerComponent {
   }
 
   @CheckForNull
-  public ActiveRuleDto selectByProfileAndRule(Integer profileId, Integer ruleId, SqlSession session) {
+  public ActiveRuleDto selectByProfileAndRule(int profileId, int ruleId, SqlSession session) {
     return session.getMapper(ActiveRuleMapper.class).selectByProfileAndRule(profileId, ruleId);
   }
 
@@ -218,11 +232,11 @@ public class ActiveRuleDao implements ServerComponent {
   }
 
 
-  public void deleteParameter(Integer activeRuleParamId, SqlSession session) {
+  public void deleteParameter(int activeRuleParamId, SqlSession session) {
     session.getMapper(ActiveRuleMapper.class).deleteParameter(activeRuleParamId);
   }
 
-  public void deleteParameter(Integer activeRuleParamId) {
+  public void deleteParameter(int activeRuleParamId) {
     SqlSession session = mybatis.openSession();
     try {
       deleteParameter(activeRuleParamId, session);
@@ -232,11 +246,11 @@ public class ActiveRuleDao implements ServerComponent {
     }
   }
 
-  public void deleteParameters(Integer activeRuleId, SqlSession session) {
+  public void deleteParameters(int activeRuleId, SqlSession session) {
     session.getMapper(ActiveRuleMapper.class).deleteParameters(activeRuleId);
   }
 
-  public void deleteParameters(Integer activeRuleId) {
+  public void deleteParameters(int activeRuleId) {
     SqlSession session = mybatis.openSession();
     try {
       deleteParameters(activeRuleId, session);
@@ -246,10 +260,24 @@ public class ActiveRuleDao implements ServerComponent {
     }
   }
 
-  public void deleteParametersWithParamId(Integer id, SqlSession session) {
+  public void deleteParametersWithParamId(int id, SqlSession session) {
     session.getMapper(ActiveRuleMapper.class).deleteParametersWithParamId(id);
   }
 
+  public void deleteParametersFromProfile(int profileId) {
+    SqlSession session = mybatis.openSession();
+    try {
+      deleteParametersFromProfile(profileId, session);
+      session.commit();
+    } finally {
+      MyBatis.closeQuietly(session);
+    }
+  }
+
+  public void deleteParametersFromProfile(int profileId, SqlSession session) {
+    session.getMapper(ActiveRuleMapper.class).deleteParametersFromProfile(profileId);
+  }
+
   public ActiveRuleParamDto selectParamById(Integer activeRuleParamId) {
     SqlSession session = mybatis.openSession();
     try {
@@ -259,7 +287,7 @@ public class ActiveRuleDao implements ServerComponent {
     }
   }
 
-  public ActiveRuleParamDto selectParamByActiveRuleAndKey(Integer activeRuleId, String key) {
+  public ActiveRuleParamDto selectParamByActiveRuleAndKey(int activeRuleId, String key) {
     SqlSession session = mybatis.openSession();
     try {
       return selectParamByActiveRuleAndKey(activeRuleId, key, session);
@@ -268,11 +296,11 @@ public class ActiveRuleDao implements ServerComponent {
     }
   }
 
-  public ActiveRuleParamDto selectParamByActiveRuleAndKey(Integer activeRuleId, String key, SqlSession session) {
+  public ActiveRuleParamDto selectParamByActiveRuleAndKey(int activeRuleId, String key, SqlSession session) {
     return session.getMapper(ActiveRuleMapper.class).selectParamByActiveRuleAndKey(activeRuleId, key);
   }
 
-  public List<ActiveRuleParamDto> selectParamsByActiveRuleId(Integer activeRuleId) {
+  public List<ActiveRuleParamDto> selectParamsByActiveRuleId(int activeRuleId) {
     SqlSession session = mybatis.openSession();
     try {
       return selectParamsByActiveRuleId(activeRuleId, session);
@@ -281,7 +309,7 @@ public class ActiveRuleDao implements ServerComponent {
     }
   }
 
-  public List<ActiveRuleParamDto> selectParamsByActiveRuleId(Integer activeRuleId, SqlSession session) {
+  public List<ActiveRuleParamDto> selectParamsByActiveRuleId(int activeRuleId, SqlSession session) {
     return session.getMapper(ActiveRuleMapper.class).selectParamsByActiveRuleId(activeRuleId);
   }
 
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 738606a7ada..aae23290ee5 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
@@ -32,17 +32,19 @@ public interface ActiveRuleMapper {
 
   void update(ActiveRuleDto dto);
 
-  void delete(Integer activeRuleId);
+  void delete(int activeRuleId);
 
-  void deleteFromRule(Integer ruleId);
+  void deleteFromRule(int ruleId);
+
+  void deleteFromProfile(int profileId);
 
   @CheckForNull
   ActiveRuleDto selectById(Integer id);
 
   @CheckForNull
-  ActiveRuleDto selectByProfileAndRule(@Param("profileId") Integer profileId, @Param("ruleId") Integer ruleId);
+  ActiveRuleDto selectByProfileAndRule(@Param("profileId") int profileId, @Param("ruleId") int ruleId);
 
-  List<ActiveRuleDto> selectByRuleId(Integer ruleId);
+  List<ActiveRuleDto> selectByRuleId(int ruleId);
 
   List<ActiveRuleDto> selectByProfileId(int profileId);
 
@@ -52,19 +54,21 @@ public interface ActiveRuleMapper {
 
   void updateParameter(ActiveRuleParamDto dto);
 
-  void deleteParameters(Integer activeRuleId);
+  void deleteParameters(int activeRuleId);
+
+  void deleteParameter(int activeRuleParamId);
 
-  void deleteParameter(Integer activeRuleParamId);
+  void deleteParametersWithParamId(int id);
 
-  void deleteParametersWithParamId(Integer id);
+  void deleteParametersFromProfile(int profileId);
 
   @CheckForNull
-  ActiveRuleParamDto selectParamById(Integer activeRuleParamId);
+  ActiveRuleParamDto selectParamById(int activeRuleParamId);
 
   @CheckForNull
-  ActiveRuleParamDto selectParamByActiveRuleAndKey(@Param("activeRuleId") Integer activeRuleId, @Param("key") String key);
+  ActiveRuleParamDto selectParamByActiveRuleAndKey(@Param("activeRuleId") int activeRuleId, @Param("key") String key);
 
-  List<ActiveRuleParamDto> selectParamsByActiveRuleId(Integer activeRuleId);
+  List<ActiveRuleParamDto> selectParamsByActiveRuleId(int activeRuleId);
 
   List<ActiveRuleParamDto> selectAllParams();
 
diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDao.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDao.java
index 251bfb60470..dc28bc4994c 100644
--- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDao.java
@@ -66,10 +66,14 @@ public class QualityProfileDao implements ServerComponent {
     }
   }
 
+  public void delete(int id, SqlSession session) {
+    session.getMapper(QualityProfileMapper.class).delete(id);
+  }
+
   public void delete(int id) {
     SqlSession session = mybatis.openSession();
     try {
-      session.getMapper(QualityProfileMapper.class).delete(id);
+      delete(id, session);
       session.commit();
     } finally {
       MyBatis.closeQuietly(session);
@@ -85,10 +89,14 @@ public class QualityProfileDao implements ServerComponent {
     }
   }
 
+  public QualityProfileDto selectDefaultProfile(String language, String key, SqlSession session) {
+    return session.getMapper(QualityProfileMapper.class).selectDefaultProfile(language, key);
+  }
+
   public QualityProfileDto selectDefaultProfile(String language, String key) {
     SqlSession session = mybatis.openSession();
     try {
-      return session.getMapper(QualityProfileMapper.class).selectDefaultProfile(language, key);
+      return selectDefaultProfile(language, key, session);
     } finally {
       MyBatis.closeQuietly(session);
     }
@@ -151,10 +159,14 @@ public class QualityProfileDao implements ServerComponent {
     }
   }
 
+  public int countChildren(String name, String language, SqlSession session) {
+    return session.getMapper(QualityProfileMapper.class).countChildren(StringUtils.upperCase(name), language);
+  }
+
   public int countChildren(String name, String language) {
     SqlSession session = mybatis.openSession();
     try {
-      return session.getMapper(QualityProfileMapper.class).countChildren(StringUtils.upperCase(name), language);
+      return countChildren(StringUtils.upperCase(name), language, session);
     } finally {
       MyBatis.closeQuietly(session);
     }
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 8d4cb19f5a0..cf389856b45 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
@@ -48,6 +48,10 @@
     DELETE FROM active_rules WHERE rule_id=#{ruleId}
   </update>
 
+  <update id="deleteFromProfile" parameterType="Integer">
+    DELETE FROM active_rules WHERE profile_id=#{profileId}
+  </update>
+
   <select id="selectByIds" parameterType="map" resultType="ActiveRule">
     select
     <include refid="activeRuleColumns"/>
@@ -136,6 +140,10 @@
     DELETE FROM active_rule_parameters WHERE rules_parameter_id=#{id}
   </update>
 
+  <update id="deleteParametersFromProfile" parameterType="Integer">
+    DELETE FROM active_rule_parameters WHERE active_rule_id IN (SELECT id FROM active_rules WHERE profile_id=#{profileId})
+  </update>
+
   <update id="deleteParameter" parameterType="Integer">
     DELETE FROM active_rule_parameters WHERE id=#{id}
   </update>
diff --git a/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest.java b/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest.java
index 6b805326644..fe8482ee956 100644
--- a/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest.java
@@ -91,6 +91,15 @@ public class ActiveRuleDaoTest extends AbstractDaoTestCase {
     checkTables("delete_from_rule", "active_rules");
   }
 
+  @Test
+  public void delete_from_profile() {
+    setupData("shared");
+
+    dao.deleteFromProfile(2);
+
+    checkTables("delete_from_profile", "active_rules");
+  }
+
   @Test
   public void select_by_id() {
     setupData("shared");
@@ -210,6 +219,15 @@ public class ActiveRuleDaoTest extends AbstractDaoTestCase {
     checkTables("delete_parameter", "active_rule_parameters");
   }
 
+  @Test
+  public void delete_parameters_from_profile_id() {
+    setupData("delete_parameters_from_profile_id");
+
+    dao.deleteParametersFromProfile(2);
+
+    checkTables("delete_parameters_from_profile_id", "active_rule_parameters");
+  }
+
   @Test
   public void select_param_by_id() {
     setupData("shared");
diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_from_profile-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_from_profile-result.xml
new file mode 100644
index 00000000000..231e470df28
--- /dev/null
+++ b/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_from_profile-result.xml
@@ -0,0 +1,12 @@
+<dataset>
+
+  <active_rules id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED"
+    note_created_at="2013-12-18" note_updated_at="2013-12-18" note_user_login="henry" note_data="some note"/>
+
+  <!--<active_rules id="2" profile_id="2" rule_id="10" failure_level="0" inheritance="[null]"-->
+    <!--note_created_at="2013-12-18" note_updated_at="2013-12-18" note_user_login="john" note_data="other note"/>-->
+
+  <!--<active_rules id="3" profile_id="2" rule_id="11" failure_level="1" inheritance="[null]"-->
+    <!--note_created_at="2013-12-18" note_updated_at="2013-12-18" note_user_login="henry" note_data="other note"/>-->
+
+</dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id-result.xml
new file mode 100644
index 00000000000..a77383cece4
--- /dev/null
+++ b/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id-result.xml
@@ -0,0 +1,19 @@
+<dataset>
+
+  <active_rules id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED"
+                note_created_at="2013-12-18" note_updated_at="2013-12-18" note_user_login="henry" note_data="some note"/>
+
+  <!-- Parent of Active rule 1 -->
+  <active_rules id="2" profile_id="2" rule_id="10" failure_level="0" inheritance="[null]"
+                note_created_at="2013-12-18" note_updated_at="2013-12-18" note_user_login="john" note_data="other note"/>
+
+  <active_rules id="3" profile_id="2" rule_id="11" failure_level="1" inheritance="[null]"
+                note_created_at="2013-12-18" note_updated_at="2013-12-18" note_user_login="henry" note_data="other note"/>
+
+  <active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" rules_parameter_key="max" value="20"/>
+  <active_rule_parameters id="2" active_rule_id="1" rules_parameter_id="2" rules_parameter_key="format" value="html"/>
+
+  <!--<active_rule_parameters id="3" active_rule_id="2" rules_parameter_id="1" rules_parameter_key="max" value="15"/>-->
+  <!--<active_rule_parameters id="4" active_rule_id="3" rules_parameter_id="2" rules_parameter_key="format" value="text"/>-->
+
+</dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id.xml b/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id.xml
new file mode 100644
index 00000000000..148ce414a9a
--- /dev/null
+++ b/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id.xml
@@ -0,0 +1,19 @@
+<dataset>
+
+  <active_rules id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED"
+    note_created_at="2013-12-18" note_updated_at="2013-12-18" note_user_login="henry" note_data="some note"/>
+
+  <!-- Parent of Active rule 1 -->
+  <active_rules id="2" profile_id="2" rule_id="10" failure_level="0" inheritance="[null]"
+    note_created_at="2013-12-18" note_updated_at="2013-12-18" note_user_login="john" note_data="other note"/>
+
+  <active_rules id="3" profile_id="2" rule_id="11" failure_level="1" inheritance="[null]"
+    note_created_at="2013-12-18" note_updated_at="2013-12-18" note_user_login="henry" note_data="other note"/>
+
+  <active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" rules_parameter_key="max" value="20"/>
+  <active_rule_parameters id="2" active_rule_id="1" rules_parameter_id="2" rules_parameter_key="format" value="html"/>
+
+  <active_rule_parameters id="3" active_rule_id="2" rules_parameter_id="1" rules_parameter_key="max" value="15"/>
+  <active_rule_parameters id="4" active_rule_id="3" rules_parameter_id="2" rules_parameter_key="format" value="text"/>
+
+</dataset>
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java
index 4c60f06b19f..497aa1bf371 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java
@@ -327,7 +327,8 @@ public class QProfileActiveRuleOperations implements ServerComponent {
     return newParams;
   }
 
-  private void restoreSeverityFromActiveRuleParent(ActiveRuleDto activeRule, ActiveRuleDto parent, ProfilesManager.RuleInheritanceActions actions, UserSession userSession, SqlSession session) {
+  private void restoreSeverityFromActiveRuleParent(ActiveRuleDto activeRule, ActiveRuleDto parent, ProfilesManager.RuleInheritanceActions actions,
+                                                   UserSession userSession, SqlSession session) {
     Integer oldSeverity = activeRule.getSeverity();
     Integer newSeverity = parent.getSeverity();
     if (!oldSeverity.equals(newSeverity)) {
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java
index 6230ce16f94..acf7d110793 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java
@@ -72,7 +72,17 @@ public class QProfileLookup implements ServerComponent {
 
   @CheckForNull
   public QProfile defaultProfile(String language) {
-    QualityProfileDto dto = dao.selectDefaultProfile(language, QProfileOperations.PROFILE_PROPERTY_PREFIX + language);
+    SqlSession session = myBatis.openSession();
+    try {
+      return defaultProfile(language, session);
+    } finally {
+      MyBatis.closeQuietly(session);
+    }
+  }
+
+  @CheckForNull
+  private QProfile defaultProfile(String language, SqlSession session) {
+    QualityProfileDto dto = dao.selectDefaultProfile(language, QProfileOperations.PROFILE_PROPERTY_PREFIX + language, session);
     if (dto != null) {
       return QProfile.from(dto);
     }
@@ -106,11 +116,28 @@ public class QProfileLookup implements ServerComponent {
     return ancestors;
   }
 
-  private void incrementAncestors(QProfile profile, List<QProfile> ancestors, SqlSession session){
+  public boolean isDeletable(QProfile profile, SqlSession session) {
+    QProfile defaultProfile = defaultProfile(profile.language(), session);
+    if (defaultProfile != null && defaultProfile.id().equals(profile.id())) {
+      return false;
+    }
+    return countChildren(profile, session) == 0;
+  }
+
+  public boolean isDeletable(QProfile profile) {
+    SqlSession session = myBatis.openSession();
+    try {
+      return isDeletable(profile, session);
+    } finally {
+      MyBatis.closeQuietly(session);
+    }
+  }
+
+  private void incrementAncestors(QProfile profile, List<QProfile> ancestors, SqlSession session) {
     if (profile.parent() != null) {
       QualityProfileDto parentDto = dao.selectParent(profile.id(), session);
       if (parentDto == null) {
-        throw new IllegalStateException("Cannot find parent of profile : "+ profile.id());
+        throw new IllegalStateException("Cannot find parent of profile : " + profile.id());
       }
       QProfile parent = QProfile.from(parentDto);
       ancestors.add(parent);
@@ -119,10 +146,19 @@ public class QProfileLookup implements ServerComponent {
   }
 
   public int countChildren(QProfile profile) {
-    return dao.countChildren(profile.name(), profile.language());
+    SqlSession session = myBatis.openSession();
+    try {
+      return countChildren(profile, session);
+    } finally {
+      MyBatis.closeQuietly(session);
+    }
+  }
+
+  public int countChildren(QProfile profile, SqlSession session) {
+    return dao.countChildren(profile.name(), profile.language(), session);
   }
 
-  private List<QProfile> toQProfiles(List<QualityProfileDto> dtos){
+  private List<QProfile> toQProfiles(List<QualityProfileDto> dtos) {
     return newArrayList(Iterables.transform(dtos, new Function<QualityProfileDto, QProfile>() {
       @Override
       public QProfile apply(QualityProfileDto input) {
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java
index a67e3c0a59a..56befc8555f 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java
@@ -64,18 +64,19 @@ public class QProfileOperations implements ServerComponent {
   private final List<ProfileImporter> importers;
   private final PreviewCache dryRunCache;
   private final RuleRegistry ruleRegistry;
+  private final QProfileLookup profileLookup;
   private final ProfilesManager profilesManager;
 
   /**
    * Used by pico when no plugin provide profile exporter / importer
    */
   public QProfileOperations(MyBatis myBatis, QualityProfileDao dao, ActiveRuleDao activeRuleDao, PropertiesDao propertiesDao,
-                            PreviewCache dryRunCache, RuleRegistry ruleRegistry, ProfilesManager profilesManager) {
-    this(myBatis, dao, activeRuleDao, propertiesDao, Lists.<ProfileImporter>newArrayList(), dryRunCache, ruleRegistry, profilesManager);
+                            PreviewCache dryRunCache, RuleRegistry ruleRegistry, QProfileLookup profileLookup, ProfilesManager profilesManager) {
+    this(myBatis, dao, activeRuleDao, propertiesDao, Lists.<ProfileImporter>newArrayList(), dryRunCache, ruleRegistry, profileLookup, profilesManager);
   }
 
   public QProfileOperations(MyBatis myBatis, QualityProfileDao dao, ActiveRuleDao activeRuleDao, PropertiesDao propertiesDao,
-                            List<ProfileImporter> importers, PreviewCache dryRunCache, RuleRegistry ruleRegistry, ProfilesManager profilesManager) {
+                            List<ProfileImporter> importers, PreviewCache dryRunCache, RuleRegistry ruleRegistry, QProfileLookup profileLookup, ProfilesManager profilesManager) {
     this.myBatis = myBatis;
     this.dao = dao;
     this.activeRuleDao = activeRuleDao;
@@ -83,6 +84,7 @@ public class QProfileOperations implements ServerComponent {
     this.importers = importers;
     this.dryRunCache = dryRunCache;
     this.ruleRegistry = ruleRegistry;
+    this.profileLookup = profileLookup;
     this.profilesManager = profilesManager;
   }
 
@@ -136,9 +138,38 @@ public class QProfileOperations implements ServerComponent {
     }
   }
 
-  public void setDefaultProfile(QualityProfileDto qualityProfile, UserSession userSession) {
+  public void deleteProfile(int profileId, UserSession userSession) {
     checkPermission(userSession);
-    propertiesDao.setProperty(new PropertyDto().setKey(PROFILE_PROPERTY_PREFIX + qualityProfile.getLanguage()).setValue(qualityProfile.getName()));
+    SqlSession session = myBatis.openSession();
+    try {
+      QualityProfileDto profile = findNotNull(profileId, session);
+      if (!profileLookup.isDeletable(QProfile.from(profile), session)) {
+        throw new BadRequestException("This profile can not be deleted");
+      } else {
+        activeRuleDao.deleteParametersFromProfile(profile.getId(), session);
+        activeRuleDao.deleteFromProfile(profile.getId(), session);
+        dao.delete(profile.getId(), session);
+        propertiesDao.deleteProjectProperties(PROFILE_PROPERTY_PREFIX + profile.getLanguage(), profile.getName(), session);
+        ruleRegistry.deleteActiveRulesFromProfile(profile.getId());
+        session.commit();
+
+        dryRunCache.reportGlobalModification();
+      }
+    } finally {
+      MyBatis.closeQuietly(session);
+    }
+  }
+
+  public void setDefaultProfile(int profileId, UserSession userSession) {
+    checkPermission(userSession);
+    SqlSession session = myBatis.openSession();
+    try {
+      QualityProfileDto qualityProfile = findNotNull(profileId, session);
+      propertiesDao.setProperty(new PropertyDto().setKey(PROFILE_PROPERTY_PREFIX + qualityProfile.getLanguage()).setValue(qualityProfile.getName()));
+      session.commit();
+    } finally {
+      MyBatis.closeQuietly(session);
+    }
   }
 
   public void updateParentProfile(int profileId, @Nullable Integer parentId, UserSession userSession) {
@@ -216,6 +247,7 @@ public class QProfileOperations implements ServerComponent {
     ruleRegistry.bulkIndexActiveRules(activeRuleDtos, paramsByActiveRule);
   }
 
+  @CheckForNull
   private ProfileImporter getProfileImporter(String exporterKey) {
     for (ProfileImporter importer : importers) {
       if (StringUtils.equals(exporterKey, importer.getKey())) {
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfiles.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfiles.java
index 516b21d9047..057d04e8fe2 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfiles.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfiles.java
@@ -126,8 +126,7 @@ public class QProfiles implements ServerComponent {
   }
 
   public void setDefaultProfile(int profileId) {
-    QualityProfileDto qualityProfile = findNotNull(profileId);
-    operations.setDefaultProfile(qualityProfile, UserSession.get());
+    operations.setDefaultProfile(1, UserSession.get());
   }
 
   @CheckForNull
@@ -151,6 +150,14 @@ public class QProfiles implements ServerComponent {
     return backup.restore(xmlBackup, deleteExisting, UserSession.get());
   }
 
+  public boolean isDeletable(QProfile profile) {
+    return profileLookup.isDeletable(profile);
+  }
+
+  public void deleteProfile(int profileId) {
+    operations.deleteProfile(profileId, UserSession.get());
+  }
+
 
   // PROJECTS
 
diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java
index 3c9f4695273..34745185bad 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java
@@ -31,6 +31,8 @@ import org.elasticsearch.common.collect.Maps;
 import org.elasticsearch.common.io.BytesStream;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.index.query.FilterBuilders;
+import org.elasticsearch.index.query.QueryBuilders;
 import org.sonar.api.rule.Severity;
 import org.sonar.api.rules.Rule;
 import org.sonar.api.utils.TimeProfiler;
@@ -82,8 +84,6 @@ public class RuleRegistry {
   }
 
   public void bulkRegisterRules(Collection<RuleDto> rules, Multimap<Integer, RuleParamDto> paramsByRule, Multimap<Integer, RuleTagDto> tagsByRule) {
-    TimeProfiler profiler = new TimeProfiler();
-
     String[] ids = bulkIndexRules(rules, paramsByRule, tagsByRule);
     removeDeletedRules(ids);
   }
@@ -228,6 +228,13 @@ public class RuleRegistry {
     }
   }
 
+  public void deleteActiveRulesFromProfile(int profileId) {
+    searchIndex.client().prepareDeleteByQuery(INDEX_RULES).setTypes(TYPE_ACTIVE_RULE)
+      .setQuery(QueryBuilders.filteredQuery(QueryBuilders.matchAllQuery(),
+        FilterBuilders.termFilter(ActiveRuleDocument.FIELD_PROFILE_ID, profileId)))
+      .execute().actionGet();
+  }
+
   public String[] bulkIndexActiveRules(List<ActiveRuleDto> activeRules, Multimap<Integer, ActiveRuleParamDto> paramsByActiveRule) {
     try {
       int size = activeRules.size();
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/profiles_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/profiles_controller.rb
index 214c2e20404..3835597598e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/profiles_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/profiles_controller.rb
@@ -81,11 +81,12 @@ class Api::ProfilesController < Api::ApiController
     access_denied unless has_role?(:profileadmin)
     require_parameters :language, :name
 
-    profile=Profile.find_by_name_and_language(params[:name], params[:language])
+    profile = Internal.quality_profiles.profile(params[:name], params[:language])
     if profile
-      bad_request('This profile can not be deleted') unless profile.deletable?
-      profile.destroy
+      Internal.quality_profiles.deleteProfile(profile.id())
+      Alert.delete_all(['profile_id=?', profile.id()])
     end
+
     render_success(profile ? 'Profile destroyed' : 'Profile did not exist')
   end
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
index b2aaace191e..cbb5fd58617 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
@@ -60,16 +60,16 @@ class ProfilesController < ApplicationController
   end
 
   # POST /profiles/delete/<id>
-  # TODO use QProfiles facade instead
   def delete
     verify_post_request
-    access_denied unless has_role?(:profileadmin)
     require_parameters 'id'
 
-    @profile = Profile.find(params[:id])
-    if @profile && @profile.deletable?
-      @profile.destroy
+    profile_id = params[:id].to_i
+    call_backend do
+      Internal.quality_profiles.deleteProfile(profile_id)
+      Alert.delete_all(['profile_id=?', profile_id])
     end
+
     redirect_to(:controller => 'profiles', :action => 'index')
   end
 
diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileLookupTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileLookupTest.java
index d1f04813e47..aa5e30da1e3 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileLookupTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileLookupTest.java
@@ -143,12 +143,12 @@ public class QProfileLookupTest {
   @Test
   public void count_children_profiles() throws Exception {
     search.countChildren(new QProfile().setName("Sonar Way").setLanguage("java"));
-    verify(dao).countChildren("Sonar Way", "java");
+    verify(dao).countChildren("Sonar Way", "java", session);
   }
 
   @Test
   public void default_profile() throws Exception {
-    when(dao.selectDefaultProfile("java", "sonar.profile.java")).thenReturn(
+    when(dao.selectDefaultProfile("java", "sonar.profile.java", session)).thenReturn(
       new QualityProfileDto().setId(1).setName("Sonar Way with Findbugs").setLanguage("java").setParent("Sonar Way").setVersion(1).setUsed(false)
     );
 
@@ -184,4 +184,31 @@ public class QProfileLookupTest {
     }
   }
 
+  @Test
+  public void is_deletable_if_not_default_profile_and_have_no_children() throws Exception {
+    when(dao.countChildren("Sonar Way", "java", session)).thenReturn(0);
+
+    assertThat(search.isDeletable(new QProfile().setId(2).setName("Sonar Way").setLanguage("java"))).isTrue();
+  }
+
+  @Test
+  public void is_not_deletable_if_is_default_profile() throws Exception {
+    when(dao.selectDefaultProfile("java", "sonar.profile.java", session)).thenReturn(
+      new QualityProfileDto().setId(1).setName("Sonar Way").setLanguage("java")
+    );
+    when(dao.countChildren("Sonar Way", "java", session)).thenReturn(0);
+
+    assertThat(search.isDeletable(new QProfile().setId(1).setName("Sonar Way").setLanguage("java"))).isFalse();
+  }
+
+  @Test
+  public void is_not_deletable_if_have_children() throws Exception {
+    when(dao.selectDefaultProfile("java", "sonar.profile.java", session)).thenReturn(
+      new QualityProfileDto().setId(1).setName("Sonar Way").setLanguage("java")
+    );
+    when(dao.countChildren("Sonar Way", "java", session)).thenReturn(1);
+
+    assertThat(search.isDeletable(new QProfile().setId(2).setName("Sonar Way").setLanguage("java"))).isFalse();
+  }
+
 }
diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java
index 75706e7cb38..537e8eddb66 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java
@@ -90,6 +90,9 @@ public class QProfileOperationsTest {
   @Mock
   RuleRegistry ruleRegistry;
 
+  @Mock
+  QProfileLookup profileLookup;
+
   @Mock
   ProfilesManager profilesManager;
 
@@ -124,7 +127,7 @@ public class QProfileOperationsTest {
       }
     }).when(qualityProfileDao).insert(any(QualityProfileDto.class), any(SqlSession.class));
 
-    operations = new QProfileOperations(myBatis, qualityProfileDao, activeRuleDao, propertiesDao, importers, dryRunCache, ruleRegistry, profilesManager);
+    operations = new QProfileOperations(myBatis, qualityProfileDao, activeRuleDao, propertiesDao, importers, dryRunCache, ruleRegistry, profileLookup, profilesManager);
   }
 
   @Test
@@ -300,14 +303,14 @@ public class QProfileOperationsTest {
 
   @Test
   public void update_default_profile() throws Exception {
-    QualityProfileDto qualityProfile = new QualityProfileDto().setId(1).setName("My profile").setLanguage("java");
+    when(qualityProfileDao.selectById(1, session)).thenReturn(new QualityProfileDto().setId(1).setName("Default").setLanguage("java"));
 
-    operations.setDefaultProfile(qualityProfile, authorizedUserSession);
+    operations.setDefaultProfile(1, authorizedUserSession);
 
     ArgumentCaptor<PropertyDto> argumentCaptor = ArgumentCaptor.forClass(PropertyDto.class);
     verify(propertiesDao).setProperty(argumentCaptor.capture());
     assertThat(argumentCaptor.getValue().getKey()).isEqualTo("sonar.profile.java");
-    assertThat(argumentCaptor.getValue().getValue()).isEqualTo("My profile");
+    assertThat(argumentCaptor.getValue().getValue()).isEqualTo("Default");
   }
 
   @Test
@@ -419,4 +422,39 @@ public class QProfileOperationsTest {
     assertThat(operations.isCycle(level2, level3, session)).isTrue();
   }
 
+  @Test
+  public void delete_profile() {
+    when(qualityProfileDao.selectById(1, session)).thenReturn(new QualityProfileDto().setId(1).setName("Default").setLanguage("java"));
+    when(profileLookup.isDeletable(any(QProfile.class), eq(session))).thenReturn(true);
+
+    operations.deleteProfile(1, authorizedUserSession);
+
+    verify(session).commit();
+    verify(activeRuleDao).deleteParametersFromProfile(1, session);
+    verify(activeRuleDao).deleteFromProfile(1, session);
+    verify(qualityProfileDao).delete(1, session);
+    verify(propertiesDao).deleteProjectProperties("sonar.profile.java", "Default", session);
+    verify(ruleRegistry).deleteActiveRulesFromProfile(1);
+    verify(dryRunCache).reportGlobalModification();
+  }
+
+  @Test
+  public void not_delete_profile_if_not_deletable() {
+    when(qualityProfileDao.selectById(1, session)).thenReturn(new QualityProfileDto().setId(1).setName("Default").setLanguage("java"));
+    when(profileLookup.isDeletable(any(QProfile.class), eq(session))).thenReturn(false);
+
+    try {
+      operations.deleteProfile(1, authorizedUserSession);
+      fail();
+    } catch (Exception e) {
+      assertThat(e).isInstanceOf(BadRequestException.class);
+    }
+
+    verify(session, never()).commit();
+    verifyZeroInteractions(activeRuleDao);
+    verify(qualityProfileDao, never()).delete(anyInt(), eq(session));
+    verifyZeroInteractions(propertiesDao);
+    verifyZeroInteractions(ruleRegistry);
+  }
+
 }
diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfilesTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfilesTest.java
index ab6346e2d87..988823c7316 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfilesTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfilesTest.java
@@ -79,7 +79,7 @@ public class QProfilesTest {
   QProfileLookup profileLookup;
 
   @Mock
-  QProfileOperations service;
+  QProfileOperations profileOperations;
 
   @Mock
   QProfileActiveRuleOperations activeRuleOperations;
@@ -97,7 +97,7 @@ public class QProfilesTest {
 
   @Before
   public void setUp() throws Exception {
-    qProfiles = new QProfiles(qualityProfileDao, activeRuleDao, ruleDao, resourceDao, projectOperations, projectLookup, backup, profileLookup, service, activeRuleOperations, ruleOperations, rules);
+    qProfiles = new QProfiles(qualityProfileDao, activeRuleDao, ruleDao, resourceDao, projectOperations, projectLookup, backup, profileLookup, profileOperations, activeRuleOperations, ruleOperations, rules);
   }
 
   @Test
@@ -162,7 +162,7 @@ public class QProfilesTest {
   public void create_new_profile() throws Exception {
     Map<String, String> xmlProfilesByPlugin = newHashMap();
     qProfiles.newProfile("Default", "java", xmlProfilesByPlugin);
-    verify(service).newProfile(eq("Default"), eq("java"), eq(xmlProfilesByPlugin), any(UserSession.class));
+    verify(profileOperations).newProfile(eq("Default"), eq("java"), eq(xmlProfilesByPlugin), any(UserSession.class));
   }
 
   @Test
@@ -178,7 +178,7 @@ public class QProfilesTest {
   @Test
   public void rename_profile() throws Exception {
     qProfiles.renameProfile(1, "Default profile");
-    verify(service).renameProfile(eq(1), eq("Default profile"), any(UserSession.class));
+    verify(profileOperations).renameProfile(eq(1), eq("Default profile"), any(UserSession.class));
   }
 
   @Test
@@ -193,18 +193,27 @@ public class QProfilesTest {
   }
 
   @Test
-  public void update_default_profile() throws Exception {
-    QualityProfileDto qualityProfile = new QualityProfileDto().setId(1).setName("Default").setLanguage("java");
-    when(qualityProfileDao.selectById(1)).thenReturn(qualityProfile);
+  public void is_deletable() throws Exception {
+    qProfiles.isDeletable(new QProfile());
+    verify(profileLookup).isDeletable(any(QProfile.class));
+  }
+
+  @Test
+  public void delete_profile() throws Exception {
+    qProfiles.deleteProfile(1);
+    verify(profileOperations).deleteProfile(eq(1), any(UserSession.class));
+  }
 
+  @Test
+  public void update_default_profile() throws Exception {
     qProfiles.setDefaultProfile(1);
-    verify(service).setDefaultProfile(eq(qualityProfile), any(UserSession.class));
+    verify(profileOperations).setDefaultProfile(eq(1), any(UserSession.class));
   }
 
   @Test
   public void update_parent_profile() throws Exception {
     qProfiles.updateParentProfile(1, 2);
-    verify(service).updateParentProfile(eq(1), eq(2), any(UserSession.class));
+    verify(profileOperations).updateParentProfile(eq(1), eq(2), any(UserSession.class));
   }
 
   @Test
@@ -501,7 +510,7 @@ public class QProfilesTest {
       assertThat(e).isInstanceOf(BadRequestException.class);
       assertThat(((BadRequestException) e).errors()).hasSize(3);
     }
-    verifyZeroInteractions(service);
+    verifyZeroInteractions(profileOperations);
     verifyZeroInteractions(rules);
   }
 
@@ -523,7 +532,7 @@ public class QProfilesTest {
       assertThat(e).isInstanceOf(BadRequestException.class);
       assertThat(((BadRequestException) e).errors()).hasSize(1);
     }
-    verifyZeroInteractions(service);
+    verifyZeroInteractions(profileOperations);
     verifyZeroInteractions(rules);
   }
 
@@ -569,7 +578,7 @@ public class QProfilesTest {
     } catch (Exception e) {
       assertThat(e).isInstanceOf(NotFoundException.class);
     }
-    verifyZeroInteractions(service);
+    verifyZeroInteractions(profileOperations);
     verifyZeroInteractions(rules);
   }
 
diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistryTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistryTest.java
index 0ac7a1b4edf..af6049bfd5d 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistryTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistryTest.java
@@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Multimap;
 import org.apache.commons.io.IOUtils;
 import org.apache.ibatis.session.SqlSession;
+import org.elasticsearch.client.Requests;
 import org.elasticsearch.common.collect.Lists;
 import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.search.SearchHit;
@@ -54,9 +55,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.google.common.collect.Lists.newArrayList;
-import static org.elasticsearch.index.query.FilterBuilders.hasChildFilter;
-import static org.elasticsearch.index.query.FilterBuilders.hasParentFilter;
-import static org.elasticsearch.index.query.FilterBuilders.termFilter;
+import static org.elasticsearch.index.query.FilterBuilders.*;
 import static org.fest.assertions.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -102,14 +101,10 @@ public class RuleRegistryTest {
     registry = new RuleRegistry(searchIndex, ruleDao, activeRuleDao, myBatis);
     registry.start();
 
-    String source1 = IOUtils.toString(TestUtils.getResource(getClass(), "rules/rule1.json").toURI());
-    String source2 = IOUtils.toString(TestUtils.getResource(getClass(), "rules/rule2.json").toURI());
-    String source3 = IOUtils.toString(TestUtils.getResource(getClass(), "rules/rule3.json").toURI());
-
     esSetup.execute(
-      EsSetup.index("rules", "rule", "1").withSource(source1),
-      EsSetup.index("rules", "rule", "2").withSource(source2),
-      EsSetup.index("rules", "rule", "3").withSource(source3)
+      EsSetup.index("rules", "rule", "1").withSource(testFileAsString("shared/rule1.json")),
+      EsSetup.index("rules", "rule", "2").withSource(testFileAsString("shared/rule2.json")),
+      EsSetup.index("rules", "rule", "3").withSource(testFileAsString("shared/rule3.json"))
     );
   }
 
@@ -342,4 +337,25 @@ public class RuleRegistryTest {
     assertThat(childHit[0].getId()).isEqualTo("1");
   }
 
+  @Test
+  public void delete_active_rules_from_profile() throws Exception {
+    esSetup.client().prepareBulk()
+      // On profile 1
+      .add(Requests.indexRequest().index("rules").type("active_rule").parent("1").source(testFileAsString("delete_from_profile/active_rule25.json")))
+      .add(Requests.indexRequest().index("rules").type("active_rule").parent("3").source(testFileAsString("delete_from_profile/active_rule2702.json")))
+        // On profile 2
+      .add(Requests.indexRequest().index("rules").type("active_rule").parent("2").source(testFileAsString("delete_from_profile/active_rule523.json")))
+      .setRefresh(true)
+      .execute().actionGet();
+
+    registry.deleteActiveRulesFromProfile(1);
+    assertThat(!esSetup.exists("rules", "active_rule", "25"));
+    assertThat(!esSetup.exists("rules", "active_rule", "2702"));
+    assertThat(esSetup.exists("rules", "active_rule", "523"));
+  }
+
+  private String testFileAsString(String testFile) throws Exception {
+    return IOUtils.toString(TestUtils.getResource(getClass(), testFile).toURI());
+  }
+
 }
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/delete_from_profile/active_rule25.json b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/delete_from_profile/active_rule25.json
new file mode 100644
index 00000000000..38c9040b3b5
--- /dev/null
+++ b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/delete_from_profile/active_rule25.json
@@ -0,0 +1,6 @@
+{
+  "id": 25,
+  "severity": "MINOR",
+  "profileId": 1,
+  "inheritance": "OVERRIDES"
+}
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/delete_from_profile/active_rule2702.json b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/delete_from_profile/active_rule2702.json
new file mode 100644
index 00000000000..2025fbe362c
--- /dev/null
+++ b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/delete_from_profile/active_rule2702.json
@@ -0,0 +1,16 @@
+{
+  "id": 2702,
+  "severity": "CRITICAL",
+  "profileId": 1,
+  "inheritance": null,
+  "params": [
+    {
+      "key": "fromClasses",
+      "value": "**.core.**"
+    },
+    {
+      "key": "toClasses",
+      "value": "**.server.**"
+    }
+  ]
+}
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/delete_from_profile/active_rule523.json b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/delete_from_profile/active_rule523.json
new file mode 100644
index 00000000000..96af0f464a5
--- /dev/null
+++ b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/delete_from_profile/active_rule523.json
@@ -0,0 +1,6 @@
+{
+  "id": 523,
+  "severity": "MAJOR",
+  "profileId": 2,
+  "inheritance": null
+}
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/rules/rule1.json b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule1.json
similarity index 100%
rename from sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/rules/rule1.json
rename to sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule1.json
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/rules/rule2.json b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule2.json
similarity index 100%
rename from sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/rules/rule2.json
rename to sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule2.json
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/rules/rule3.json b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule3.json
similarity index 100%
rename from sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/rules/rule3.json
rename to sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule3.json
-- 
2.39.5