From 942b11f2d9496c13e5cd1ebdd330871ac53ee84a Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 11 Sep 2014 16:46:49 +0200 Subject: [PATCH] rename package org.sonar.server.component.persistence to org.sonar.server.component.db --- .../{persistence => db}/ComponentDao.java | 3 ++- .../{persistence => db}/package-info.java | 2 +- .../main/java/org/sonar/server/db/DbClient.java | 2 +- .../duplication/ws/DuplicationsJsonWriter.java | 2 +- .../duplication/ws/DuplicationsParser.java | 2 +- .../sonar/server/duplication/ws/ShowAction.java | 2 +- .../server/issue/db/IssueAuthorizationDao.java | 17 +++++++++++------ .../sonar/server/platform/ServerComponents.java | 2 +- .../sonar/server/qualitygate/QualityGates.java | 2 +- .../batch/ProjectReferentialsActionTest.java | 2 +- .../{persistence => db}/ComponentDaoTest.java | 2 +- .../component/ws/ComponentAppActionTest.java | 2 +- .../ws/DuplicationsJsonWriterTest.java | 2 +- .../duplication/ws/DuplicationsParserTest.java | 2 +- .../duplication/ws/DuplicationsWsTest.java | 2 +- .../server/duplication/ws/ShowActionTest.java | 2 +- .../server/issue/IssueServiceMediumTest.java | 2 +- .../server/issue/db/IssueBackendMediumTest.java | 2 +- .../issue/index/IssueIndexMediumTest.java | 2 +- .../server/issue/ws/IssuesWsMediumTest.java | 2 +- .../InternalPermissionServiceTest.java | 2 +- .../server/qualitygate/QualityGatesTest.java | 2 +- .../ComponentDaoTest/empty.xml | 0 .../ComponentDaoTest/insert-result.xml | 0 .../ComponentDaoTest/multi-modules.xml | 0 .../ComponentDaoTest/shared.xml | 0 26 files changed, 33 insertions(+), 27 deletions(-) rename server/sonar-server/src/main/java/org/sonar/server/component/{persistence => db}/ComponentDao.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/component/{persistence => db}/package-info.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/component/{persistence => db}/ComponentDaoTest.java (99%) rename server/sonar-server/src/test/resources/org/sonar/server/component/{persistence => db}/ComponentDaoTest/empty.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/component/{persistence => db}/ComponentDaoTest/insert-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/component/{persistence => db}/ComponentDaoTest/multi-modules.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/component/{persistence => db}/ComponentDaoTest/shared.xml (100%) diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/persistence/ComponentDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/component/persistence/ComponentDao.java rename to server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java index edcbe529d16..fc14d1aeeb7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/persistence/ComponentDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java @@ -17,7 +17,7 @@ * 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.server.component.persistence; +package org.sonar.server.component.db; import org.sonar.api.ServerComponent; import org.sonar.api.utils.System2; @@ -30,6 +30,7 @@ import org.sonar.server.db.BaseDao; import org.sonar.server.exceptions.NotFoundException; import javax.annotation.CheckForNull; + import java.util.List; /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/persistence/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/package-info.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/component/persistence/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/component/db/package-info.java index 4be4a89a5c9..40b3a85fcb4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/persistence/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/db/package-info.java @@ -19,6 +19,6 @@ */ @ParametersAreNonnullByDefault -package org.sonar.server.component.persistence; +package org.sonar.server.component.db; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java b/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java index 38ba30fc39e..e8a4de33c07 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java @@ -34,7 +34,7 @@ import org.sonar.core.template.LoadedTemplateDao; import org.sonar.core.user.AuthorizationDao; import org.sonar.core.user.UserDao; import org.sonar.server.activity.db.ActivityDao; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.issue.db.IssueAuthorizationDao; import org.sonar.server.issue.db.IssueDao; import org.sonar.server.measure.persistence.MeasureDao; diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java index 2c6addbbfb4..28463640567 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java @@ -25,7 +25,7 @@ import org.sonar.api.ServerComponent; import org.sonar.api.utils.text.JsonWriter; import org.sonar.core.component.ComponentDto; import org.sonar.core.persistence.DbSession; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java index fd448b98f91..55dec878986 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java @@ -27,7 +27,7 @@ import org.codehaus.staxmate.in.SMInputCursor; import org.sonar.api.ServerComponent; import org.sonar.core.component.ComponentDto; import org.sonar.core.persistence.DbSession; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java index f6c228ab57f..4b3f6f69d6f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java @@ -33,7 +33,7 @@ import org.sonar.core.measure.db.MeasureDto; import org.sonar.core.measure.db.MeasureKey; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.measure.persistence.MeasureDao; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java b/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java index e3d3535163a..6ff7ca36400 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java @@ -95,6 +95,14 @@ public class IssueAuthorizationDao extends BaseDao params = super.getSynchronizationParams(date); + params.put("permission", UserRole.USER); + params.put("anyone", DefaultGroups.ANYONE); + return params; + } + @Override public List findAfterDate(DbSession session, Date date) { @@ -130,11 +138,8 @@ public class IssueAuthorizationDao extends BaseDaocopyOf(authorizationDtoMap.values()); } - @Override - protected Map getSynchronizationParams(Date date) { - Map params = super.getSynchronizationParams(date); - params.put("permission", UserRole.USER); - params.put("anyone", DefaultGroups.ANYONE); - return params; + protected void doDeleteByKey(DbSession session, String key) { + // Nothing to do on db side, only remove the index (done in BaseDao) } + } diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java index 2009a7e741c..6a289ce0464 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java @@ -84,7 +84,7 @@ import org.sonar.server.batch.ProjectReferentialsAction; import org.sonar.server.charts.ChartFactory; import org.sonar.server.component.DefaultComponentFinder; import org.sonar.server.component.DefaultRubyComponentService; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.component.ws.*; import org.sonar.server.config.ws.PropertiesWs; import org.sonar.server.db.DatabaseChecker; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java index 8ce814ba46c..871ba293139 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java @@ -40,7 +40,7 @@ import org.sonar.core.qualitygate.db.QualityGateConditionDao; import org.sonar.core.qualitygate.db.QualityGateConditionDto; import org.sonar.core.qualitygate.db.QualityGateDao; import org.sonar.core.qualitygate.db.QualityGateDto; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.exceptions.*; import org.sonar.server.user.UserSession; import org.sonar.server.util.Validation; diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectReferentialsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectReferentialsActionTest.java index 34125be594b..67651e2e5f3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectReferentialsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectReferentialsActionTest.java @@ -38,7 +38,7 @@ import org.sonar.core.properties.PropertiesDao; import org.sonar.core.properties.PropertyDto; import org.sonar.core.qualityprofile.db.ActiveRuleKey; import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.qualityprofile.ActiveRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/persistence/ComponentDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/component/persistence/ComponentDaoTest.java rename to server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java index cbb7d8ece59..f710f66d1a4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/persistence/ComponentDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java @@ -17,7 +17,7 @@ * 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.server.component.persistence; +package org.sonar.server.component.db; import org.junit.After; import org.junit.Before; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java index edb05332e3e..d69f1b5b542 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java @@ -51,7 +51,7 @@ import org.sonar.core.resource.ResourceDao; import org.sonar.core.resource.SnapshotDto; import org.sonar.core.rule.RuleDto; import org.sonar.core.timemachine.Periods; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.issue.IssueService; import org.sonar.server.issue.RulesAggregation; diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsJsonWriterTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsJsonWriterTest.java index 226f7d4ecec..287a40b2472 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsJsonWriterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsJsonWriterTest.java @@ -30,7 +30,7 @@ import org.skyscreamer.jsonassert.JSONAssert; import org.sonar.api.utils.text.JsonWriter; import org.sonar.core.component.ComponentDto; import org.sonar.core.persistence.DbSession; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import java.io.StringWriter; import java.util.Collections; diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java index 1e04f073c7d..aa31f8dec12 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java @@ -32,7 +32,7 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.core.component.ComponentDto; import org.sonar.core.persistence.DbSession; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWsTest.java index 8f392dbedaf..3e77df43941 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.duplication.ws; import org.junit.Test; import org.sonar.api.server.ws.WebService; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.measure.persistence.MeasureDao; import org.sonar.server.ws.WsTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java index 987a387b69d..d5c75738840 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java @@ -33,7 +33,7 @@ import org.sonar.core.component.ComponentDto; import org.sonar.core.measure.db.MeasureDto; import org.sonar.core.measure.db.MeasureKey; import org.sonar.core.persistence.DbSession; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.measure.persistence.MeasureDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java index b6fb6e7dc62..4e313a65763 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java @@ -33,7 +33,7 @@ import org.sonar.core.issue.db.IssueDto; import org.sonar.core.permission.PermissionFacade; import org.sonar.core.persistence.DbSession; import org.sonar.core.rule.RuleDto; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.issue.db.IssueDao; import org.sonar.server.rule.RuleTesting; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueBackendMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueBackendMediumTest.java index 0d667e41a2e..80fe1f10446 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueBackendMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueBackendMediumTest.java @@ -30,7 +30,7 @@ import org.sonar.core.component.ComponentDto; import org.sonar.core.issue.db.IssueDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.rule.RuleDto; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.issue.index.IssueIndex; import org.sonar.server.platform.Platform; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java index cf8058d72cd..fcdc2b7e3fd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java @@ -36,7 +36,7 @@ import org.sonar.core.persistence.DbSession; import org.sonar.core.rule.RuleDto; import org.sonar.core.user.GroupDto; import org.sonar.core.user.UserDto; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.rule.RuleTesting; import org.sonar.server.rule.db.RuleDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsMediumTest.java index 094bb6c66c1..eb3747a7bfe 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsMediumTest.java @@ -33,7 +33,7 @@ import org.sonar.core.permission.GlobalPermissions; import org.sonar.core.permission.PermissionFacade; import org.sonar.core.persistence.DbSession; import org.sonar.core.rule.RuleDto; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.rule.RuleTesting; import org.sonar.server.rule.db.RuleDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceTest.java index 609a073f708..d78d72cd0b0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceTest.java @@ -45,7 +45,7 @@ import org.sonar.core.resource.ResourceDto; import org.sonar.core.user.GroupDto; import org.sonar.core.user.UserDao; import org.sonar.core.user.UserDto; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java index 99d5b8319e0..bfe3863e048 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java @@ -45,7 +45,7 @@ import org.sonar.core.qualitygate.db.QualityGateConditionDao; import org.sonar.core.qualitygate.db.QualityGateConditionDto; import org.sonar.core.qualitygate.db.QualityGateDao; import org.sonar.core.qualitygate.db.QualityGateDto; -import org.sonar.server.component.persistence.ComponentDao; +import org.sonar.server.component.db.ComponentDao; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/empty.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/empty.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/insert-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/insert-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/insert-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/multi-modules.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/multi-modules.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/multi-modules.xml rename to server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/multi-modules.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/shared.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/shared.xml -- 2.39.5