diff options
author | Anita Stanisz <106669481+anita-stanisz-sonarsource@users.noreply.github.com> | 2024-11-22 11:08:07 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2024-11-29 20:03:07 +0000 |
commit | dfe8c0a21bd4b817b18a212ee4f59ed4ad0e05a7 (patch) | |
tree | bd40e0b222a3a13bea83bdffe4dd68930bd65c01 /server/sonar-db-dao/src | |
parent | ef4ed37bdfa1b2591a6d1b1df259384bf0270713 (diff) | |
download | sonarqube-dfe8c0a21bd4b817b18a212ee4f59ed4ad0e05a7.tar.gz sonarqube-dfe8c0a21bd4b817b18a212ee4f59ed4ad0e05a7.zip |
SONAR-23619 Rename ai_code_assurance_column (#12320)
Diffstat (limited to 'server/sonar-db-dao/src')
9 files changed, 33 insertions, 33 deletions
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 4b1e31c4f16..51d0f300426 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 @@ -138,17 +138,17 @@ class ProjectDaoIT { } @Test - void selectProjects_returnsAiCodeAssurance() { - ProjectDto dto1 = createProject("o1", "p1").setAiCodeAssurance(true); + void selectProjects_returns_containsAiCode() { + ProjectDto dto1 = createProject("o1", "p1").setContainsAiCode(true); ProjectDto dto2 = createProject("o1", "p2"); projectDao.insert(db.getSession(), dto1); projectDao.insert(db.getSession(), dto2); List<ProjectDto> projects = projectDao.selectProjects(db.getSession()); - Map<String, Boolean> projectToAiCodeAssurance = projects.stream().collect(Collectors.toMap(EntityDto::getName, - ProjectDto::getAiCodeAssurance)); - assertThat(projectToAiCodeAssurance) + Map<String, Boolean> projectToContainsAiCode = projects.stream().collect(Collectors.toMap(EntityDto::getName, + ProjectDto::getContainsAiCode)); + assertThat(projectToContainsAiCode) .hasSize(2) .containsEntry("projectName_p1", true) .containsEntry("projectName_p2", false); @@ -273,8 +273,8 @@ class ProjectDaoIT { } @Test - void update_aiCodeAssurance() { - ProjectDto dto1 = createProject("o1", "p1").setAiCodeAssurance(true); + void update_containsAiCode() { + ProjectDto dto1 = createProject("o1", "p1").setContainsAiCode(true); ProjectDto dto2 = createProject("o1", "p2"); projectDao.insert(db.getSession(), dto1); @@ -285,8 +285,8 @@ class ProjectDaoIT { assertProject(projectsByUuids.get(0), "projectName_p1", "projectKee_o1_p1", "uuid_o1_p1", "desc_p1", "tag1,tag2", false, true); assertProject(projectsByUuids.get(1), "projectName_p2", "projectKee_o1_p2", "uuid_o1_p2", "desc_p2", "tag1,tag2", false, false); - projectDao.updateAiCodeAssurance(db.getSession(), dto1.getUuid(), false); - projectDao.updateAiCodeAssurance(db.getSession(), dto2.getUuid(), true); + projectDao.updateContainsAiCode(db.getSession(), dto1.getUuid(), false); + projectDao.updateContainsAiCode(db.getSession(), dto2.getUuid(), true); projectsByUuids = projectDao.selectByUuids(db.getSession(), new HashSet<>(Arrays.asList("uuid_o1_p1", "uuid_o1_p2"))); assertThat(projectsByUuids).hasSize(2); @@ -510,9 +510,9 @@ class ProjectDaoIT { assertProject(dto, name, kee, uuid, desc, tags, isPrivate, false); } - private void assertProject(ProjectDto dto, String name, String kee, String uuid, String desc, @Nullable String tags, boolean isPrivate, boolean isAiCodeAssurance) { - assertThat(dto).extracting("name", "kee", "key", "uuid", "description", "tagsString", "private", "aiCodeAssurance") - .containsExactly(name, kee, kee, uuid, desc, tags, isPrivate, isAiCodeAssurance); + private void assertProject(ProjectDto dto, String name, String kee, String uuid, String desc, @Nullable String tags, boolean isPrivate, boolean containsAiCode) { + assertThat(dto).extracting("name", "kee", "key", "uuid", "description", "tagsString", "private", "containsAiCode") + .containsExactly(name, kee, kee, uuid, desc, tags, isPrivate, containsAiCode); } private void assertProjectAiCodeFixEnablement(ProjectDto dto, String uuid, boolean isAiCodeFixEnabled) { 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 c34f26ff0fc..40ff12f7d9e 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 @@ -119,8 +119,8 @@ public class ProjectDao implements Dao { mapper(session).updateVisibility(uuid, isPrivate, system2.now()); } - public void updateAiCodeAssurance(DbSession session, String uuid, boolean aiCodeAssurance) { - mapper(session).updateAiCodeAssurance(uuid, aiCodeAssurance, system2.now()); + public void updateContainsAiCode(DbSession session, String uuid, boolean containsAiCode) { + mapper(session).updateContainsAiCode(uuid, containsAiCode, system2.now()); } public void updateAiCodeFixEnablementForAllProjects(DbSession dbSession, boolean featureEnablement) { diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectDto.java index 06414302257..3a3c7040bcc 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectDto.java @@ -32,7 +32,7 @@ public class ProjectDto extends EntityDto { private static final String TAGS_SEPARATOR = ","; private String tags; private CreationMethod creationMethod; - private boolean aiCodeAssurance; + private boolean containsAiCode; private boolean aiCodeFixEnabled = false; private long createdAt; private long updatedAt; @@ -126,12 +126,12 @@ public class ProjectDto extends EntityDto { return this; } - public boolean getAiCodeAssurance() { - return aiCodeAssurance; + public boolean getContainsAiCode() { + return containsAiCode; } - public ProjectDto setAiCodeAssurance(boolean aiCodeAssurance) { - this.aiCodeAssurance = aiCodeAssurance; + public ProjectDto setContainsAiCode(boolean containsAiCode) { + this.containsAiCode = containsAiCode; return this; } 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 e994de456f6..fff27584ee6 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 @@ -58,7 +58,7 @@ public interface ProjectMapper { void updateVisibility(@Param("uuid") String uuid, @Param("isPrivate") boolean isPrivate, @Param("updatedAt") long updatedAt); - void updateAiCodeAssurance(@Param("uuid") String uuid, @Param("aiCodeAssurance") boolean aiCodeAssurance, @Param("updatedAt") long updatedAt); + void updateContainsAiCode(@Param("uuid") String uuid, @Param("containsAiCode") boolean containsAiCode, @Param("updatedAt") long updatedAt); void updateAiCodeFixEnablementForAllProjects(@Param("aiCodeFixEnabled") boolean aiCodeFixEnabled, @Param("updatedAt") long updatedAt); diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociationDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociationDto.java index 965ad98dd64..b2ef04f7f28 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociationDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociationDto.java @@ -31,7 +31,7 @@ public class ProjectQgateAssociationDto { private String key; private String name; private String gateUuid; - private boolean aiCodeAssurance; + private boolean containsAiCode; public ProjectQgateAssociationDto() { // do nothing @@ -74,12 +74,12 @@ public class ProjectQgateAssociationDto { return this; } - public boolean getAiCodeAssurance() { - return aiCodeAssurance; + public boolean getContainsAiCode() { + return containsAiCode; } - public ProjectQgateAssociationDto setAiCodeAssurance(boolean aiCodeAssurance) { - this.aiCodeAssurance = aiCodeAssurance; + public ProjectQgateAssociationDto setContainsAiCode(boolean containsAiCode) { + this.containsAiCode = containsAiCode; return this; } } 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 3ca1ab6709a..fa11cb1353c 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 @@ -11,7 +11,7 @@ p.tags as tagsString, p.private as isPrivate, p.creation_method as creationMethod, - p.ai_code_assurance as aiCodeAssurance, + p.contains_ai_code as containsAiCode, p.ai_code_fix_enabled as aiCodeFixEnabled, p.created_at as createdAt, p.updated_at as updatedAt @@ -138,7 +138,7 @@ private, tags, creation_method, - ai_code_assurance, + contains_ai_code, ai_code_fix_enabled, created_at, updated_at @@ -152,7 +152,7 @@ #{isPrivate,jdbcType=BOOLEAN}, #{tagsString, jdbcType=VARCHAR}, #{creationMethod, jdbcType=VARCHAR}, - #{aiCodeAssurance, jdbcType=BOOLEAN}, + #{containsAiCode, jdbcType=BOOLEAN}, #{aiCodeFixEnabled, jdbcType=BOOLEAN}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT} @@ -185,9 +185,9 @@ uuid = #{uuid,jdbcType=VARCHAR} </update> - <update id="updateAiCodeAssurance"> + <update id="updateContainsAiCode"> update projects set - ai_code_assurance = #{aiCodeAssurance,jdbcType=BOOLEAN}, + contains_ai_code = #{containsAiCode,jdbcType=BOOLEAN}, updated_at = #{updatedAt,jdbcType=BIGINT} where uuid = #{uuid,jdbcType=VARCHAR} diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/ProjectQgateAssociationMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/ProjectQgateAssociationMapper.xml index 32eb832bdc8..ae3b21a3eda 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/ProjectQgateAssociationMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/ProjectQgateAssociationMapper.xml @@ -4,7 +4,7 @@ <mapper namespace="org.sonar.db.qualitygate.ProjectQgateAssociationMapper"> <select id="selectProjects" parameterType="map" resultType="ProjectQgateAssociation"> - SELECT proj.uuid as uuid, proj.kee as "key", proj.name as name, qg.uuid as gateUuid, proj.ai_code_assurance as aiCodeAssurance + SELECT proj.uuid as uuid, proj.kee as "key", proj.name as name, qg.uuid as gateUuid, proj.contains_ai_code as containsAiCode FROM projects proj LEFT JOIN project_qgates prqg ON prqg.project_uuid=proj.uuid AND prqg.quality_gate_uuid = #{query.gateUuid, jdbcType=VARCHAR} LEFT JOIN quality_gates qg ON qg.uuid = prqg.quality_gate_uuid diff --git a/server/sonar-db-dao/src/schema/schema-sq.ddl b/server/sonar-db-dao/src/schema/schema-sq.ddl index eaa9aa9cf7f..8a2f5916930 100644 --- a/server/sonar-db-dao/src/schema/schema-sq.ddl +++ b/server/sonar-db-dao/src/schema/schema-sq.ddl @@ -799,7 +799,7 @@ CREATE TABLE "PROJECTS"( "UPDATED_AT" BIGINT NOT NULL, "NCLOC" BIGINT, "CREATION_METHOD" CHARACTER VARYING(50) NOT NULL, - "AI_CODE_ASSURANCE" BOOLEAN DEFAULT FALSE NOT NULL, + "CONTAINS_AI_CODE" BOOLEAN DEFAULT FALSE NOT NULL, "AI_CODE_FIX_ENABLED" BOOLEAN DEFAULT FALSE NOT NULL ); ALTER TABLE "PROJECTS" ADD CONSTRAINT "PK_NEW_PROJECTS" PRIMARY KEY("UUID"); diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java index 698fa3609dd..875b7634393 100644 --- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java +++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java @@ -183,7 +183,7 @@ public class ComponentDbTester { } public ProjectData insertProjectWithAiCode() { - return insertComponentAndBranchAndProject(ComponentTesting.newPrivateProjectDto(), true, defaults(), defaults(), p -> p.setAiCodeAssurance(true)); + return insertComponentAndBranchAndProject(ComponentTesting.newPrivateProjectDto(), true, defaults(), defaults(), p -> p.setContainsAiCode(true)); } |