From cab142bde99a75b4040fbaa1bda1c062bca5c25b Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Fri, 24 Feb 2017 18:53:45 +0100 Subject: [PATCH] SONAR-8838 insert and return tags from projects DB table --- .../org/sonar/db/component/ComponentDto.java | 52 +++++++++++++++---- .../sonar/db/component/ComponentMapper.xml | 3 ++ .../sonar/db/component/ComponentDaoTest.java | 6 ++- .../ComponentDaoTest/insert-result.xml | 1 + .../insert_disabled_component-result.xml | 1 + .../schema.sql | 1 + .../ComponentKeyUpdaterDaoTest/shared.xml | 8 +++ .../shouldBulkUpdateKey-result.xml | 8 +++ ...BulkUpdateKeyOnOnlyOneSubmodule-result.xml | 8 +++ .../shouldNotUpdateAllSubmodules-result.xml | 7 +++ .../shouldNotUpdateAllSubmodules.xml | 7 +++ .../shouldUpdateKey-result.xml | 8 +++ .../update_authorization_date-result.xml | 1 + .../update_authorization_date.xml | 1 + ...sources_of_specified_components-result.xml | 3 ++ ...oricalDataOfDirectoriesAndFiles-result.xml | 3 ++ .../shouldPurgeProject-result.xml | 1 + 17 files changed, 106 insertions(+), 13 deletions(-) diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java index 959d0a38381..3c85c7a9625 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java @@ -17,8 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + package org.sonar.db.component; +import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.base.Strings; import java.util.Date; @@ -30,6 +32,7 @@ import org.sonar.api.component.Component; import org.sonar.api.resources.Scopes; import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Collections.emptyList; import static org.sonar.db.component.ComponentValidator.checkComponentKey; import static org.sonar.db.component.ComponentValidator.checkComponentName; @@ -39,6 +42,10 @@ public class ComponentDto implements Component { public static final String UUID_PATH_OF_ROOT = UUID_PATH_SEPARATOR; private static final Splitter UUID_PATH_SPLITTER = Splitter.on(UUID_PATH_SEPARATOR).omitEmptyStrings(); + private static final char TAGS_SEPARATOR = ','; + private static final Joiner TAGS_JOINER = Joiner.on(TAGS_SEPARATOR).skipNulls(); + private static final Splitter TAGS_SPLITTER = Splitter.on(',').trimResults().omitEmptyStrings(); + /** * ID generated by database. Do not use. */ @@ -113,11 +120,18 @@ public class ComponentDto implements Component { private String longName; private String language; private String description; + private String tags; private boolean enabled = true; private Date createdAt; private Long authorizationUpdatedAt; + public static String formatUuidPathFromParent(ComponentDto parent) { + checkArgument(!Strings.isNullOrEmpty(parent.getUuidPath())); + checkArgument(!Strings.isNullOrEmpty(parent.uuid())); + return parent.getUuidPath() + parent.uuid() + UUID_PATH_SEPARATOR; + } + public Long getId() { return id; } @@ -149,6 +163,11 @@ public class ComponentDto implements Component { return uuidPath; } + public ComponentDto setUuidPath(String s) { + this.uuidPath = s; + return this; + } + /** * List of ancestor UUIDs, ordered by depth in tree. */ @@ -156,11 +175,6 @@ public class ComponentDto implements Component { return UUID_PATH_SPLITTER.splitToList(uuidPath); } - public ComponentDto setUuidPath(String s) { - this.uuidPath = s; - return this; - } - @Override public String key() { return kee; @@ -360,6 +374,28 @@ public class ComponentDto implements Component { return moduleUuid == null && Scopes.PROJECT.equals(scope); } + public List getTags() { + return tags == null ? emptyList() : TAGS_SPLITTER.splitToList(tags); + } + + public ComponentDto setTags(List tags) { + setTagsString(TAGS_JOINER.join(tags)); + return this; + } + + /** + * Used by MyBatis + */ + @CheckForNull + public String getTagsString() { + return tags; + } + + public ComponentDto setTagsString(@Nullable String tags) { + this.tags = tags; + return this; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -402,10 +438,4 @@ public class ComponentDto implements Component { .append("authorizationUpdatedAt", authorizationUpdatedAt) .toString(); } - - public static String formatUuidPathFromParent(ComponentDto parent) { - checkArgument(!Strings.isNullOrEmpty(parent.getUuidPath())); - checkArgument(!Strings.isNullOrEmpty(parent.uuid())); - return parent.getUuidPath() + parent.uuid() + UUID_PATH_SEPARATOR; - } } diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml index 3f3f8bb34f6..e20ed6318bf 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml @@ -15,6 +15,7 @@ p.name as name, p.long_name as longName, p.description as description, + p.tags as tagsString, p.qualifier as qualifier, p.scope as scope, p.language as language, @@ -455,6 +456,7 @@ scope, language, description, + tags, root_uuid, path, copy_component_uuid, @@ -489,6 +491,7 @@ #{scope,jdbcType=VARCHAR}, #{language,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{tagsString, jdbcType=VARCHAR}, #{rootUuid,jdbcType=VARCHAR}, #{path,jdbcType=VARCHAR}, #{copyComponentUuid,jdbcType=VARCHAR}, diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java index 5e88b5687d1..e2fc063c2ea 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java @@ -696,7 +696,9 @@ public class ComponentDaoTest { .setDeveloperUuid("uuid_7") .setEnabled(true) .setCreatedAt(DateUtils.parseDate("2014-06-18")) - .setAuthorizationUpdatedAt(123456789L); + .setAuthorizationUpdatedAt(123456789L) + .setTags(newArrayList("platform", "analyzers")) + ; underTest.insert(dbSession, componentDto); dbSession.commit(); @@ -1107,7 +1109,7 @@ public class ComponentDaoTest { ComponentDto project1 = db.components().insertComponent(newProjectDto(organizationDto).setName("project1")); ComponentDto module1 = db.components().insertComponent(newModuleDto(project1).setName("module1")); ComponentDto subModule1 = db.components().insertComponent(newModuleDto(module1).setName("subModule1")); - ComponentDto file = db.components().insertComponent(newFileDto(subModule1).setName("file")); + db.components().insertComponent(newFileDto(subModule1).setName("file")); ComponentDto project2 = db.components().insertComponent(newProjectDto(organizationDto).setName("project2")); ComponentDto project3 = db.components().insertComponent(newProjectDto(organizationDto).setName("project3")); diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert-result.xml index 85e0a295d99..280502a5ea8 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert-result.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert-result.xml @@ -17,6 +17,7 @@ path="src/org/struts/RequestContext.java" root_uuid="uuid_3" description="description" + tags="platform,analyzers" enabled="[true]" copy_component_uuid="uuid_5" developer_uuid="uuid_7" diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert_disabled_component-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert_disabled_component-result.xml index e938c80ac16..7f24dbc8593 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert_disabled_component-result.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert_disabled_component-result.xml @@ -16,6 +16,7 @@ path="src/org/struts/RequestContext.java" root_uuid="uuid_3" description="[null]" + tags="[null]" enabled="[false]" copy_component_uuid="[null]" developer_uuid="[null]" diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoWithDuplicatedKeysTest/schema.sql b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoWithDuplicatedKeysTest/schema.sql index f1420ae723a..e2f822f02d7 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoWithDuplicatedKeysTest/schema.sql +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoWithDuplicatedKeysTest/schema.sql @@ -25,6 +25,7 @@ CREATE TABLE "PROJECTS" ( "MODULE_UUID_PATH" VARCHAR(1500), "NAME" VARCHAR(2000), "DESCRIPTION" VARCHAR(2000), + "TAGS" VARCHAR(4000), "ENABLED" BOOLEAN NOT NULL DEFAULT TRUE, "SCOPE" VARCHAR(3), "QUALIFIER" VARCHAR(10), diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shared.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shared.xml index 10784d93cc5..8a85d695385 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shared.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shared.xml @@ -14,6 +14,7 @@ module_uuid="[null]" module_uuid_path="." description="[null]" + tags="[null]" long_name="Apache Struts" enabled="[true]" language="java" @@ -51,6 +52,7 @@ qualifier="BRC" long_name="Struts Core" description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -86,6 +88,7 @@ module_uuid="B" module_uuid_path=".A.B." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -121,6 +124,7 @@ module_uuid="B" module_uuid_path=".A.B." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -157,6 +161,7 @@ qualifier="BRC" long_name="Struts UI" description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -192,6 +197,7 @@ module_uuid="[null]" module_uuid_path=".E." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -227,6 +233,7 @@ module_uuid="[null]" module_uuid_path=".E." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -263,6 +270,7 @@ qualifier="BRC" long_name="Foo Struts Core" description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml index 7abbcfc4c3a..c734f270dde 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml @@ -14,6 +14,7 @@ module_uuid="[null]" module_uuid_path="." description="[null]" + tags="[null]" long_name="Apache Struts" enabled="[true]" language="java" @@ -53,6 +54,7 @@ qualifier="BRC" long_name="Struts Core" description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" @@ -90,6 +92,7 @@ module_uuid="B" module_uuid_path=".A.B." description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" @@ -127,6 +130,7 @@ module_uuid="B" module_uuid_path=".A.B." description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" @@ -165,6 +169,7 @@ qualifier="BRC" long_name="Struts UI" description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" @@ -202,6 +207,7 @@ module_uuid="[null]" module_uuid_path=".E." description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" @@ -239,6 +245,7 @@ module_uuid="[null]" module_uuid_path=".E." description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" @@ -277,6 +284,7 @@ qualifier="BRC" long_name="Foo Struts Core" description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml index 8eed6e70baa..f0ca1fc2d8f 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml @@ -14,6 +14,7 @@ module_uuid="[null]" module_uuid_path="." description="[null]" + tags="[null]" long_name="Apache Struts" enabled="[true]" language="java" @@ -53,6 +54,7 @@ qualifier="BRC" long_name="Struts Core" description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" @@ -90,6 +92,7 @@ module_uuid="B" module_uuid_path=".A.B." description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" @@ -127,6 +130,7 @@ module_uuid="B" module_uuid_path=".A.B." description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" @@ -165,6 +169,7 @@ qualifier="BRC" long_name="Struts UI" description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" @@ -202,6 +207,7 @@ module_uuid="[null]" module_uuid_path=".E." description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" @@ -239,6 +245,7 @@ module_uuid="[null]" module_uuid_path=".E." description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" @@ -277,6 +284,7 @@ qualifier="BRC" long_name="Foo Struts Core" description="[null]" + tags="[null]" enabled="[true]" language="java" copy_component_uuid="[null]" diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml index fd717059b49..c233d66e2fc 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml @@ -14,6 +14,7 @@ module_uuid="[null]" module_uuid_path="." description="[null]" + tags="[null]" long_name="Apache Struts" enabled="[true]" language="java" @@ -53,6 +54,7 @@ qualifier="BRC" long_name="Struts Core" description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -88,6 +90,7 @@ module_uuid="B" module_uuid_path=".A.B." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -123,6 +126,7 @@ module_uuid="B" module_uuid_path=".A.B." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -159,6 +163,7 @@ qualifier="BRC" long_name="Struts UI" description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -194,6 +199,7 @@ module_uuid="[null]" module_uuid_path=".E." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -229,6 +235,7 @@ module_uuid="[null]" module_uuid_path=".E." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml index ca546580800..b16db864550 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml @@ -14,6 +14,7 @@ module_uuid="[null]" module_uuid_path="." description="[null]" + tags="[null]" long_name="Apache Struts" enabled="[true]" language="java" @@ -51,6 +52,7 @@ qualifier="BRC" long_name="Struts Core" description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -85,6 +87,7 @@ module_uuid="B" module_uuid_path=".A.B." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -119,6 +122,7 @@ module_uuid="B" module_uuid_path=".A.B." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -154,6 +158,7 @@ qualifier="BRC" long_name="Struts UI" description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -188,6 +193,7 @@ module_uuid="[null]" module_uuid_path=".E." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -222,6 +228,7 @@ module_uuid="[null]" module_uuid_path=".E." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldUpdateKey-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldUpdateKey-result.xml index 2a39e7a002d..eb73a95d604 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldUpdateKey-result.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldUpdateKey-result.xml @@ -14,6 +14,7 @@ module_uuid="[null]" module_uuid_path="." description="[null]" + tags="[null]" long_name="Apache Struts" enabled="[true]" language="java" @@ -55,6 +56,7 @@ qualifier="BRC" long_name="Struts Core" description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -90,6 +92,7 @@ module_uuid="B" module_uuid_path=".A.B." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -125,6 +128,7 @@ module_uuid="B" module_uuid_path=".A.B." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -161,6 +165,7 @@ qualifier="BRC" long_name="Struts UI" description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -196,6 +201,7 @@ module_uuid="[null]" module_uuid_path=".E." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -231,6 +237,7 @@ module_uuid="[null]" module_uuid_path=".E." description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" @@ -267,6 +274,7 @@ qualifier="BRC" long_name="Foo Struts Core" description="[null]" + tags="[null]" enabled="[true]" language="java" created_at="[null]" diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml index c2025d9f8bf..8d088b90489 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml @@ -13,6 +13,7 @@ kee="old key" name="old name" description="old name" + tags="[null]" long_name="old long name" enabled="[false]" language="old" diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml index ddc021ff656..a0977901d53 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml @@ -13,6 +13,7 @@ kee="old key" name="old name" description="old name" + tags="[null]" long_name="old long name" enabled="[false]" language="old" diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components-result.xml index c215f710ae8..5faf33d30fe 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components-result.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components-result.xml @@ -22,6 +22,7 @@ What has been changed : kee="project" name="project" description="[null]" + tags="[null]" language="java" copy_component_uuid="[null]" developer_uuid="[null]" @@ -58,6 +59,7 @@ What has been changed : kee="project:my/dir" name="my/dir" description="[null]" + tags="[null]" language="java" copy_component_uuid="[null]" developer_uuid="[null]" @@ -94,6 +96,7 @@ What has been changed : kee="project:my/dir/File.java" name="my/dir/File.java" description="[null]" + tags="[null]" language="java" copy_component_uuid="[null]" developer_uuid="[null]" diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml index 50363033280..25ebc3a8a45 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml @@ -20,6 +20,7 @@ What has been changed : purge_status=1 on snapshot 4 (PRJ) and snapshots 5 and 6 kee="project" name="project" description="[null]" + tags="[null]" language="java" copy_component_uuid="[null]" developer_uuid="[null]" @@ -57,6 +58,7 @@ What has been changed : purge_status=1 on snapshot 4 (PRJ) and snapshots 5 and 6 kee="project:my/dir" name="my/dir" description="[null]" + tags="[null]" language="java" copy_component_uuid="[null]" developer_uuid="[null]" @@ -94,6 +96,7 @@ What has been changed : purge_status=1 on snapshot 4 (PRJ) and snapshots 5 and 6 kee="project:my/dir/File.java" name="my/dir/File.java" description="[null]" + tags="[null]" language="java" copy_component_uuid="[null]" developer_uuid="[null]" diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml index da4577aa3ea..4a779c3b667 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml @@ -16,6 +16,7 @@ name="project" root_uuid="P1" description="[null]" + tags="[null]" language="java" copy_component_uuid="[null]" developer_uuid="[null]" -- 2.39.5