From 89448847c08173c261453fc4aa3cf7fca23b6c8f Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Wed, 4 May 2022 15:47:32 -0500 Subject: SONAR-16316 Fill report data --- .../main/java/org/sonar/db/measure/LiveMeasureDao.java | 3 +-- .../java/org/sonar/db/qualitygate/QualityGateDao.java | 6 ++++++ .../org/sonar/db/qualitygate/QualityGateMapper.java | 2 ++ .../org/sonar/db/qualityprofile/QualityProfileDao.java | 8 ++++++-- .../org/sonar/db/qualitygate/QualityGateMapper.xml | 18 ++++++++++++++---- .../sonar/db/qualityprofile/QualityProfileDaoTest.java | 12 ++++++------ 6 files changed, 35 insertions(+), 14 deletions(-) (limited to 'server/sonar-db-dao/src') diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/LiveMeasureDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/measure/LiveMeasureDao.java index 3b1659aaa95..7bbdd0c44e6 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/LiveMeasureDao.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/measure/LiveMeasureDao.java @@ -52,8 +52,7 @@ public class LiveMeasureDao implements Dao { componentUuids -> mapper(dbSession).selectByComponentUuidsAndMetricUuids(componentUuids, metricUuis)); } - public void scrollSelectByComponentUuidAndMetricKeys(DbSession dbSession, String componentUuid, Collection metricKeys, - ResultHandler handler) { + public void scrollSelectByComponentUuidAndMetricKeys(DbSession dbSession, String componentUuid, Collection metricKeys, ResultHandler handler) { if (metricKeys.isEmpty()) { return; } diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateDao.java index e51ee8e4ff3..d05ce597cb0 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateDao.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateDao.java @@ -56,6 +56,11 @@ public class QualityGateDao implements Dao { return mapper(session).selectByUuid(uuid); } + @CheckForNull + public QualityGateDto selectDefault(DbSession session) { + return mapper(session).selectDefault(); + } + public void delete(QualityGateDto qGate, DbSession session) { mapper(session).delete(qGate.getUuid()); } @@ -81,6 +86,7 @@ public class QualityGateDao implements Dao { return session.getMapper(QualityGateMapper.class); } + @CheckForNull public QualityGateDto selectByProjectUuid(DbSession dbSession, String projectUuid) { return mapper(dbSession).selectByProjectUuid(projectUuid); } diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateMapper.java index 5bb80ba9467..ec4901e102b 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateMapper.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateMapper.java @@ -43,5 +43,7 @@ public interface QualityGateMapper { QualityGateDto selectByUuid(String uuid); + QualityGateDto selectDefault(); + QualityGateDto selectByProjectUuid(@Param("projectUuid") String projectUuid); } 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 315027c18e6..b692d37f315 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 @@ -159,8 +159,12 @@ public class QualityProfileDao implements Dao { return mapper(dbSession).selectAssociatedToProjectUuidAndLanguage(project.getUuid(), language); } - public List selectAssociatedToProjectUuidAndLanguages(DbSession dbSession, ProjectDto project, Collection languages) { - return executeLargeInputs(languages, partition -> mapper(dbSession).selectAssociatedToProjectUuidAndLanguages(project.getUuid(), partition)); + public List selectAssociatedToProjectUuidAndLanguages(DbSession dbSession, String projectUuid, Collection languages) { + return executeLargeInputs(languages, partition -> mapper(dbSession).selectAssociatedToProjectUuidAndLanguages(projectUuid, partition)); + } + + public List selectAssociatedToProjectAndLanguages(DbSession dbSession, ProjectDto project, Collection languages) { + return selectAssociatedToProjectUuidAndLanguages(dbSession, project.getUuid(), languages); } public List selectByLanguage(DbSession dbSession, String language) { diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateMapper.xml index 494bccb3f6d..0b52c10da77 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateMapper.xml @@ -4,7 +4,7 @@ - uuid, name, is_built_in as isBuiltIn, created_at as createdAt, updated_at as updatedAt + qg.uuid, qg.name, qg.is_built_in as isBuiltIn, qg.created_at as createdAt, qg.updated_at as updatedAt @@ -22,14 +22,14 @@ @@ -45,11 +45,21 @@ + + delete from quality_gates where uuid=#{uuid} 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 45d0290e2dd..026fb17668e 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 @@ -656,17 +656,17 @@ public class QualityProfileDaoTest { QProfileDto jsProfile = db.qualityProfiles().insert(p -> p.setLanguage("js")); db.qualityProfiles().associateWithProject(project1, javaProfile, jsProfile); - assertThat(underTest.selectAssociatedToProjectUuidAndLanguages(dbSession, project1, singletonList("java"))) + assertThat(underTest.selectAssociatedToProjectAndLanguages(dbSession, project1, singletonList("java"))) .extracting(QProfileDto::getKee).containsOnly(javaProfile.getKee()); - assertThat(underTest.selectAssociatedToProjectUuidAndLanguages(dbSession, project1, singletonList("unknown"))) + assertThat(underTest.selectAssociatedToProjectAndLanguages(dbSession, project1, singletonList("unknown"))) .isEmpty(); - assertThat(underTest.selectAssociatedToProjectUuidAndLanguages(dbSession, project1, of("java", "unknown"))) + assertThat(underTest.selectAssociatedToProjectAndLanguages(dbSession, project1, of("java", "unknown"))) .extracting(QProfileDto::getKee).containsExactly(javaProfile.getKee()); - assertThat(underTest.selectAssociatedToProjectUuidAndLanguages(dbSession, project1, of("java", "js"))) + assertThat(underTest.selectAssociatedToProjectAndLanguages(dbSession, project1, of("java", "js"))) .extracting(QProfileDto::getKee).containsExactlyInAnyOrder(javaProfile.getKee(), jsProfile.getKee()); - assertThat(underTest.selectAssociatedToProjectUuidAndLanguages(dbSession, project2, singletonList("java"))) + assertThat(underTest.selectAssociatedToProjectAndLanguages(dbSession, project2, singletonList("java"))) .isEmpty(); - assertThat(underTest.selectAssociatedToProjectUuidAndLanguages(dbSession, project2, Collections.emptyList())) + assertThat(underTest.selectAssociatedToProjectAndLanguages(dbSession, project2, Collections.emptyList())) .isEmpty(); } -- cgit v1.2.3