diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2015-02-13 11:21:31 +0100 |
|---|---|---|
| committer | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2015-02-13 14:39:56 +0100 |
| commit | 13c31ee241629122418aba38f6da034f3a288d87 (patch) | |
| tree | aebe5986acc73fab06ee936c85e6d684afedab2d /sonar-core/src | |
| parent | d11e107895b68fbf056523f6551903c9c02021fb (diff) | |
| download | sonarqube-13c31ee241629122418aba38f6da034f3a288d87.tar.gz sonarqube-13c31ee241629122418aba38f6da034f3a288d87.zip | |
SONAR-6123 Update generation of module UUID path on views and developers
Diffstat (limited to 'sonar-core/src')
| -rw-r--r-- | sonar-core/src/main/java/org/sonar/core/user/AuthorDao.java | 7 | ||||
| -rw-r--r-- | sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/add_missing_module_uuid_path-result.xml | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/user/AuthorDao.java b/sonar-core/src/main/java/org/sonar/core/user/AuthorDao.java index a5a9756c8ee..7b8d140d282 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/AuthorDao.java +++ b/sonar-core/src/main/java/org/sonar/core/user/AuthorDao.java @@ -19,14 +19,13 @@ */ package org.sonar.core.user; -import org.sonar.core.persistence.DaoComponent; - import com.google.common.base.Function; import com.google.common.base.Strings; import org.apache.ibatis.session.SqlSession; import org.sonar.api.BatchComponent; import org.sonar.api.ServerComponent; import org.sonar.core.component.ComponentDto; +import org.sonar.core.persistence.DaoComponent; import org.sonar.core.persistence.DaoUtils; import org.sonar.core.persistence.MyBatis; import org.sonar.core.resource.ResourceDao; @@ -84,9 +83,9 @@ public class AuthorDao implements BatchComponent, ServerComponent, DaoComponent public void insertAuthorAndDeveloper(String login, ResourceDto resourceDto) { SqlSession session = mybatis.openSession(false); try { - // Hack in order to set "." on DEV + // Hack in order to set the right module uuid path on DEVs if (Strings.isNullOrEmpty(resourceDto.getModuleUuidPath())) { - resourceDto.setModuleUuidPath(ComponentDto.MODULE_UUID_PATH_SEP); + resourceDto.setModuleUuidPath(ComponentDto.MODULE_UUID_PATH_SEP + resourceDto.getUuid() + ComponentDto.MODULE_UUID_PATH_SEP); } resourceDao.insertUsingExistingSession(resourceDto, session); insertAuthor(login, resourceDto.getId(), session); diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/add_missing_module_uuid_path-result.xml b/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/add_missing_module_uuid_path-result.xml index b8737c88118..742ae70faad 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/add_missing_module_uuid_path-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/add_missing_module_uuid_path-result.xml @@ -1,7 +1,7 @@ <dataset> - <projects id="1" name="developer@company.net" qualifier="DEV" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="."/> + <projects id="1" name="developer@company.net" qualifier="DEV" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path=".ABCD."/> <authors id="1" person_id="1" login="developer@company.net"/> - <projects id="2" name="developer2@company.net" qualifier="DEV" uuid="BCDE" project_uuid="BCDE" module_uuid="[null]" module_uuid_path="."/> + <projects id="2" name="developer2@company.net" qualifier="DEV" uuid="BCDE" project_uuid="BCDE" module_uuid="[null]" module_uuid_path=".BCDE."/> <authors id="2" person_id="2" login="developer2@company.net"/> </dataset> |