From 5f4872096f1b4cfaa8df11ecc28c895fba323ffb Mon Sep 17 00:00:00 2001 From: Wojtek Wajerowicz <115081248+wojciech-wajerowicz-sonarsource@users.noreply.github.com> Date: Tue, 3 Oct 2023 16:01:34 +0200 Subject: SONAR-20630 Add creationMethod to project telemetry payload. --- .../it/java/org/sonar/db/project/ProjectDaoIT.java | 13 - .../main/java/org/sonar/db/project/ProjectDao.java | 4 - .../java/org/sonar/db/project/ProjectMapper.java | 2 - .../org/sonar/db/project/ProjectMapper.xml | 7 - .../org/sonar/db/component/ComponentDbTester.java | 5 + .../org/sonar/server/telemetry/TelemetryData.java | 14 + .../server/telemetry/TelemetryDataJsonWriter.java | 1 + .../telemetry/TelemetryDataJsonWriterTest.java | 35 +- .../telemetry/TelemetryDataLoaderImplIT.java | 723 +++++++++++++++++++++ .../server/telemetry/TelemetryDataLoaderImpl.java | 17 +- .../telemetry/TelemetryDataLoaderImplTest.java | 702 -------------------- 11 files changed, 769 insertions(+), 754 deletions(-) create mode 100644 server/sonar-webserver-core/src/it/java/org/sonar/server/telemetry/TelemetryDataLoaderImplIT.java delete mode 100644 server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDataLoaderImplTest.java diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoIT.java index b7f294ccb30..1b64206178a 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoIT.java @@ -352,19 +352,6 @@ public class ProjectDaoIT { Assertions.assertThat(nclocSum).isEqualTo(21L); } - @Test - public void selectAllProjectUuids_shouldOnlyReturnProjectWithTRKQualifier() { - ProjectData application = db.components().insertPrivateApplication(); - ProjectData project = db.components().insertPrivateProject(); - ProjectData project2 = db.components().insertPrivateProject(); - db.components().addApplicationProject(application, project, project2); - - List projectUuids = projectDao.selectAllProjectUuids(db.getSession()); - - assertThat(projectUuids).containsExactlyInAnyOrder(project.projectUuid(), project2.projectUuid()); - } - - // methodName_when_should @Test public void selectByUuids_whenUuidsAreEmptyWithPagination_shouldReturnEmptyList() { db.components().insertPublicProject(); diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectDao.java index e10f753f9c2..885b044abf3 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectDao.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectDao.java @@ -132,10 +132,6 @@ public class ProjectDao implements Dao { return session.getMapper(ProjectMapper.class); } - public List selectAllProjectUuids(DbSession session) { - return mapper(session).selectAllProjectUuids(); - } - public Set selectProjectUuidsAssociatedToDefaultQualityProfileByLanguage(DbSession session, String language) { Set languageFilters = Set.of(language + "=%", "%;" + language + "=%"); return mapper(session).selectProjectUuidsAssociatedToDefaultQualityProfileByLanguage(languageFilters); diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectMapper.java index cc4c34a050e..b00fe460ed2 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectMapper.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectMapper.java @@ -66,8 +66,6 @@ public interface ProjectMapper { @CheckForNull ProjectDto selectByBranchUuid(String branchUuid); - List selectAllProjectUuids(); - Set selectProjectUuidsAssociatedToDefaultQualityProfileByLanguage(@Param("languageFilters") Set languageFilters); void updateNcloc(@Param("projectUuid") String projectUuid, @Param("ncloc") long ncloc); diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/project/ProjectMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/project/ProjectMapper.xml index cf0d09cf5e6..aba8dbdf0b2 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/project/ProjectMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/project/ProjectMapper.xml @@ -15,13 +15,6 @@ p.updated_at as updatedAt - -