From bd78c6d9b0856cfae5e7a446647e350eb186ed67 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Fri, 24 Mar 2017 07:22:51 +0100
Subject: [PATCH] Drop unused SQL requests from ActiveRuleDao and
 QualityProfileDao

---
 .../db/qualityprofile/ActiveRuleDao.java      |  8 ++--
 .../db/qualityprofile/QualityProfileDao.java  | 23 -----------
 .../qualityprofile/QualityProfileMapper.java  | 12 ------
 .../qualityprofile/QualityProfileMapper.xml   | 34 +---------------
 .../db/qualityprofile/ActiveRuleDaoTest.java  | 13 -------
 .../qualityprofile/QualityProfileDaoTest.java | 39 -------------------
 .../server/qualityprofile/QProfileLookup.java |  2 +-
 .../qualityprofile/ws/DeleteActionTest.java   |  2 +-
 8 files changed, 7 insertions(+), 126 deletions(-)

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDao.java
index 246e79feb80..ffa57508df2 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDao.java
@@ -59,10 +59,6 @@ public class ActiveRuleDao implements Dao {
     throw new RowNotFoundException(String.format("Active rule with key '%s' does not exist", key));
   }
 
-  public List<ActiveRuleDto> selectByKeys(DbSession dbSession, List<ActiveRuleKey> keys) {
-    return executeLargeInputs(keys, mapper(dbSession)::selectByKeys);
-  }
-
   public List<ActiveRuleDto> selectByRuleId(DbSession dbSession, int ruleId) {
     return mapper(dbSession).selectByRuleId(ruleId);
   }
@@ -140,6 +136,10 @@ public class ActiveRuleDao implements Dao {
     return null;
   }
 
+  /**
+   * @deprecated currently used only by tests
+   */
+  @Deprecated
   public List<ActiveRuleParamDto> selectAllParams(DbSession dbSession) {
     return mapper(dbSession).selectAllParams();
   }
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java
index be1e23a7aca..89aa8281d90 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java
@@ -97,11 +97,6 @@ public class QualityProfileDao implements Dao {
     mapper.update(profile);
   }
 
-  public void delete(DbSession session, int profileId) {
-    QualityProfileMapper mapper = mapper(session);
-    mapper.delete(profileId);
-  }
-
   public List<QualityProfileDto> selectDefaultProfiles(DbSession session, OrganizationDto organization, Collection<String> languageKeys) {
     return executeLargeInputs(languageKeys, chunk -> mapper(session).selectDefaultProfiles(organization.getUuid(), chunk));
   }
@@ -124,16 +119,6 @@ public class QualityProfileDao implements Dao {
     return mapper(dbSession).selectByLanguage(organization.getUuid(), language);
   }
 
-  @CheckForNull
-  public QualityProfileDto selectById(DbSession session, int id) {
-    return mapper(session).selectById(id);
-  }
-
-  @CheckForNull
-  public QualityProfileDto selectParentById(DbSession session, int childId) {
-    return mapper(session).selectParentById(childId);
-  }
-
   public List<QualityProfileDto> selectChildren(DbSession session, String key) {
     return mapper(session).selectChildren(key);
   }
@@ -159,10 +144,6 @@ public class QualityProfileDao implements Dao {
     return executeLargeInputs(languageKeys, input -> mapper(session).selectByNameAndLanguages(organization.getUuid(), name, input));
   }
 
-  public List<String> selectUuidsOfAssociatedProjects(DbSession dbSession, String profileKey) {
-    return mapper(dbSession).selectUuidsOfAssociatedProjects(profileKey);
-  }
-
   public Map<String, Long> countProjectsByProfileKey(DbSession dbSession, OrganizationDto organization) {
     return KeyLongValue.toMap(mapper(dbSession).countProjectsByProfileKey(organization.getUuid()));
   }
@@ -179,10 +160,6 @@ public class QualityProfileDao implements Dao {
     mapper(session).updateProjectProfileAssociation(projectUuid, newProfileKey, oldProfileKey);
   }
 
-  public void deleteAllProjectProfileAssociation(String profileKey, DbSession session) {
-    mapper(session).deleteAllProjectProfileAssociation(profileKey);
-  }
-
   public void deleteProjectAssociationsByProfileKeys(DbSession dbSession, Collection<String> profileKeys) {
     QualityProfileMapper mapper = mapper(dbSession);
     DatabaseUtils.executeLargeUpdates(profileKeys, mapper::deleteProjectAssociationByProfileKeys);
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileMapper.java
index b3c7f66f868..16c13f77431 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileMapper.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileMapper.java
@@ -31,8 +31,6 @@ public interface QualityProfileMapper {
 
   void update(QualityProfileDto dto);
 
-  void delete(int id);
-
   void deleteByKeys(@Param("profileKeys") Collection<String> profileKeys);
 
   List<QualityProfileDto> selectAll(@Param("organizationUuid") String organizationUuid);
@@ -47,9 +45,6 @@ public interface QualityProfileMapper {
 
   List<QualityProfileDto> selectByNameAndLanguages(@Param("organizationUuid") String organizationUuid, @Param("name") String name, @Param("languages") List<String> languages);
 
-  @CheckForNull
-  QualityProfileDto selectById(@Param("id") Integer id);
-
   @CheckForNull
   QualityProfileDto selectByKey(String key);
 
@@ -59,15 +54,10 @@ public interface QualityProfileMapper {
 
   // INHERITANCE
 
-  @CheckForNull
-  QualityProfileDto selectParentById(int childId);
-
   List<QualityProfileDto> selectChildren(String key);
 
   // PROJECTS
 
-  List<String> selectUuidsOfAssociatedProjects(@Param("profileKey") String profileKey);
-
   List<KeyLongValue> countProjectsByProfileKey(@Param("organizationUuid") String organizationUuid);
 
   QualityProfileDto selectByProjectAndLanguage(@Param("projectKey") String projectKey, @Param("language") String language);
@@ -81,8 +71,6 @@ public interface QualityProfileMapper {
 
   void deleteProjectProfileAssociation(@Param("projectUuid") String projectUuid, @Param("profileKey") String profileKey);
 
-  void deleteAllProjectProfileAssociation(@Param("profileKey") String profileKey);
-
   void deleteProjectAssociationByProfileKeys(@Param("profileKeys") Collection<String> profileKeys);
 
   List<ProjectQprofileAssociationDto> selectSelectedProjects(@Param("profileKey") String profileKey, @Param("nameQuery") String nameQuery);
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QualityProfileMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QualityProfileMapper.xml
index e1297149508..2547f35611b 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QualityProfileMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QualityProfileMapper.xml
@@ -47,10 +47,6 @@
     WHERE id=#{id}
   </update>
 
-  <update id="delete" parameterType="int">
-    DELETE FROM rules_profiles WHERE id=#{id}
-  </update>
-
   <update id="deleteByKeys" parameterType="String">
     delete from rules_profiles
     where kee in
@@ -82,9 +78,7 @@
     FROM rules_profiles p
     WHERE p.name=#{name, jdbcType=VARCHAR}
     AND p.language IN <foreach collection="languages" open="(" close=")" item="language" separator=",">#{language, jdbcType=VARCHAR}</foreach>
-    <if test="organizationUuid != null">
-      AND p.organization_uuid = #{organizationUuid, jdbcType=VARCHAR}
-    </if>
+    AND p.organization_uuid = #{organizationUuid, jdbcType=VARCHAR}
   </select>
 
   <select id="selectByKey" parameterType="string" resultType="QualityProfile">
@@ -113,20 +107,6 @@
     ORDER BY p.name
   </select>
 
-  <select id="selectById" parameterType="Integer" resultType="QualityProfile">
-    SELECT
-    <include refid="profilesColumns"/>
-    FROM rules_profiles p
-    WHERE p.id=#{id}
-  </select>
-
-  <select id="selectParentById" parameterType="int" resultType="QualityProfile">
-    SELECT
-    <include refid="profilesColumns"/>
-    FROM rules_profiles p
-    INNER JOIN rules_profiles child ON child.parent_kee=p.kee and child.id=#{id}
-  </select>
-
   <select id="selectChildren" parameterType="string" resultType="QualityProfile">
     SELECT
     <include refid="profilesColumns"/>
@@ -153,14 +133,6 @@
     AND p.organization_uuid = #{organizationUuid, jdbcType=VARCHAR}
   </select>
 
-  <select id="selectUuidsOfAssociatedProjects" resultType="String">
-    select p.uuid
-    from projects p
-    join project_qprofiles pq ON pq.project_uuid = p.uuid
-    join rules_profiles rp ON pq.profile_key = rp.kee
-    where rp.kee = #{profileKey, jdbcType=VARCHAR}
-  </select>
-
   <select id="selectSelectedProjects" resultType="org.sonar.db.qualityprofile.ProjectQprofileAssociationDto">
     SELECT pp.id as id, pj.id as projectId, pj.uuid as projectUuid, pj.kee as projectKey, pj.name as projectName, pp.profile_key as profileKey
     FROM projects pj
@@ -248,9 +220,5 @@
     </foreach>
   </update>
 
-  <update id="deleteAllProjectProfileAssociation">
-    DELETE FROM project_qprofiles WHERE profile_key=#{profileKey}
-  </update>
-
 </mapper>
 
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/ActiveRuleDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/ActiveRuleDaoTest.java
index 9a9553ea327..d8ac744163a 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/ActiveRuleDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/ActiveRuleDaoTest.java
@@ -145,19 +145,6 @@ public class ActiveRuleDaoTest {
     underTest.selectOrFailByKey(dbSession, ActiveRuleKey.of(profile2.getKey(), rule2.getKey()));
   }
 
-  @Test
-  public void select_by_keys() {
-    ActiveRuleDto activeRule1 = createFor(profile1, rule1).setSeverity(BLOCKER);
-    ActiveRuleDto activeRule2 = createFor(profile1, rule2).setSeverity(BLOCKER);
-    underTest.insert(dbTester.getSession(), activeRule1);
-    underTest.insert(dbTester.getSession(), activeRule2);
-    dbSession.commit();
-
-    assertThat(underTest.selectByKeys(dbSession, asList(activeRule1.getKey(), activeRule2.getKey()))).hasSize(2);
-    assertThat(underTest.selectByKeys(dbSession, asList(activeRule1.getKey()))).hasSize(1);
-    assertThat(underTest.selectByKeys(dbSession, asList(ActiveRuleKey.of(profile2.getKey(), rule1.getKey())))).isEmpty();
-  }
-
   @Test
   public void select_by_rule() {
     ActiveRuleDto activeRule1 = createFor(profile1, rule1).setSeverity(BLOCKER);
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java
index f5a808512fc..0017ff2bb5f 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java
@@ -103,16 +103,6 @@ public class QualityProfileDaoTest {
     dbTester.assertDbUnit(getClass(), "update-result.xml", new String[] {"created_at", "updated_at", "rules_updated_at"}, "rules_profiles");
   }
 
-  @Test
-  public void delete() {
-    dbTester.prepareDbUnit(getClass(), "shared.xml");
-
-    underTest.delete(dbSession, 1);
-    dbSession.commit();
-
-    dbTester.assertDbUnit(getClass(), "delete-result.xml", "rules_profiles");
-  }
-
   @Test
   public void test_deleteByKeys() {
     QualityProfileDto p1 = dbTester.qualityProfiles().insert(dbTester.getDefaultOrganization());
@@ -289,27 +279,6 @@ public class QualityProfileDaoTest {
     assertThat(results).isEmpty();
   }
 
-  @Test
-  public void get_by_id() {
-    dbTester.prepareDbUnit(getClass(), "shared.xml");
-
-    QualityProfileDto dto = underTest.selectById(dbTester.getSession(), 1);
-    assertThat(dto.getId()).isEqualTo(1);
-    assertThat(dto.getName()).isEqualTo("Sonar Way");
-    assertThat(dto.getLanguage()).isEqualTo("java");
-    assertThat(dto.getParentKee()).isNull();
-
-    assertThat(underTest.selectById(dbTester.getSession(), 555)).isNull();
-  }
-
-  @Test
-  public void get_parent_by_id() {
-    dbTester.prepareDbUnit(getClass(), "inheritance.xml");
-
-    QualityProfileDto dto = underTest.selectParentById(dbSession, 1);
-    assertThat(dto.getId()).isEqualTo(3);
-  }
-
   @Test
   public void find_children() {
     dbTester.prepareDbUnit(getClass(), "inheritance.xml");
@@ -331,14 +300,6 @@ public class QualityProfileDaoTest {
     assertThat(dto2.getParentKee()).isEqualTo("java_parent");
   }
 
-  @Test
-  public void test_selectUuidsOfAssociatedProjects() {
-    dbTester.prepareDbUnit(getClass(), "projects.xml");
-
-    assertThat(underTest.selectUuidsOfAssociatedProjects(dbTester.getSession(), "java_sonar_way")).containsExactlyInAnyOrder("A", "B");
-    assertThat(underTest.selectUuidsOfAssociatedProjects(dbTester.getSession(), "unknown")).isEmpty();
-  }
-
   @Test
   public void countProjectsByProfileKey() {
     QualityProfileDto profileWithoutProjects = dbTester.qualityProfiles().insert(organization);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java
index 6f3c333e066..1990acbab67 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java
@@ -53,7 +53,7 @@ public class QProfileLookup {
 
   private void incrementAncestors(QualityProfileDto profile, List<QualityProfileDto> ancestors, DbSession session) {
     if (profile.getParentKee() != null) {
-      QualityProfileDto parentDto = db.qualityProfileDao().selectParentById(session, profile.getId());
+      QualityProfileDto parentDto = db.qualityProfileDao().selectByKey(session, profile.getParentKee());
       if (parentDto == null) {
         throw new IllegalStateException("Cannot find parent of profile : " + profile.getId());
       }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java
index a1ddb59c18b..c7375f18b0f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java
@@ -276,7 +276,7 @@ public class DeleteActionTest {
 
   private void verifyProfileDoesNotExist(QualityProfileDto profile) {
     assertThat(dbClient.qualityProfileDao().selectByKey(session, profile.getKey())).isNull();
-    assertThat(dbClient.qualityProfileDao().selectUuidsOfAssociatedProjects(session, profile.getKey())).isEmpty();
+    assertThat(dbClient.qualityProfileDao().selectSelectedProjects(profile.getKey(), null, session)).isEmpty();
   }
 
   private void verifyProfileExists(QualityProfileDto profile) {
-- 
2.39.5