From: Julien Lancelot Date: Thu, 11 Sep 2014 14:46:49 +0000 (+0200) Subject: rename package org.sonar.server.component.persistence to org.sonar.server.component.db X-Git-Tag: 5.0-RC1~1027 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=942b11f2d9496c13e5cd1ebdd330871ac53ee84a;p=sonarqube.git rename package org.sonar.server.component.persistence to org.sonar.server.component.db --- diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java new file mode 100644 index 00000000000..fc14d1aeeb7 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java @@ -0,0 +1,125 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * 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.db; + +import org.sonar.api.ServerComponent; +import org.sonar.api.utils.System2; +import org.sonar.core.component.AuthorizedComponentDto; +import org.sonar.core.component.ComponentDto; +import org.sonar.core.component.db.ComponentMapper; +import org.sonar.core.persistence.DaoComponent; +import org.sonar.core.persistence.DbSession; +import org.sonar.server.db.BaseDao; +import org.sonar.server.exceptions.NotFoundException; + +import javax.annotation.CheckForNull; + +import java.util.List; + +/** + * @since 4.3 + */ +public class ComponentDao extends BaseDao implements ServerComponent, DaoComponent { + + public ComponentDao(System2 system) { + super(ComponentMapper.class, system); + } + + public ComponentDto getById(Long id, DbSession session) { + ComponentDto componentDto = getNullableById(id, session); + if (componentDto == null) { + throw new NotFoundException(String.format("Project with id '%s' not found", id)); + } + return componentDto; + } + + @CheckForNull + public ComponentDto getNullableById(Long id, DbSession session) { + return mapper(session).selectById(id); + } + + public boolean existsById(Long id, DbSession session) { + return mapper(session).countById(id) > 0; + } + + /** + * Return null only if the component does not exists. + * If the component if a root project, it will return itself. + */ + @CheckForNull + public ComponentDto getNullableRootProjectByKey(String componentKey, DbSession session) { + return mapper(session).selectRootProjectByKey(componentKey); + } + + public ComponentDto getRootProjectByKey(String componentKey, DbSession session) { + ComponentDto componentDto = getNullableRootProjectByKey(componentKey, session); + if (componentDto == null) { + throw new NotFoundException(String.format("Root project for project '%s' not found", componentKey)); + } + return componentDto; + } + + @CheckForNull + public ComponentDto getParentModuleByKey(String componentKey, DbSession session) { + return mapper(session).selectParentModuleByKey(componentKey); + } + + public List findModulesByProject(String projectKey, DbSession session) { + return mapper(session).findModulesByProject(projectKey); + } + + @CheckForNull + public AuthorizedComponentDto getNullableAuthorizedComponentById(Long id, DbSession session) { + return mapper(session).selectAuthorizedComponentById(id); + } + + public AuthorizedComponentDto getAuthorizedComponentById(Long id, DbSession session) { + AuthorizedComponentDto componentDto = getNullableAuthorizedComponentById(id, session); + if (componentDto == null) { + throw new NotFoundException(String.format("Project with id '%s' not found", id)); + } + return componentDto; + } + + @CheckForNull + public AuthorizedComponentDto getNullableAuthorizedComponentByKey(String key, DbSession session) { + return mapper(session).selectAuthorizedComponentByKey(key); + } + + public AuthorizedComponentDto getAuthorizedComponentByKey(String key, DbSession session) { + AuthorizedComponentDto componentDto = getNullableAuthorizedComponentByKey(key, session); + if (componentDto == null) { + throw new NotFoundException(String.format("Project with key '%s' not found", key)); + } + return componentDto; + } + + @Override + @CheckForNull + protected ComponentDto doGetNullableByKey(DbSession session, String key) { + return mapper(session).selectByKey(key); + } + + @Override + protected ComponentDto doInsert(DbSession session, ComponentDto item) { + mapper(session).insert(item); + return item; + } +} diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/package-info.java new file mode 100644 index 00000000000..40b3a85fcb4 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/component/db/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +@ParametersAreNonnullByDefault +package org.sonar.server.component.db; + +import javax.annotation.ParametersAreNonnullByDefault; 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/persistence/ComponentDao.java deleted file mode 100644 index edcbe529d16..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/component/persistence/ComponentDao.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * 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; - -import org.sonar.api.ServerComponent; -import org.sonar.api.utils.System2; -import org.sonar.core.component.AuthorizedComponentDto; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.db.ComponentMapper; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.server.db.BaseDao; -import org.sonar.server.exceptions.NotFoundException; - -import javax.annotation.CheckForNull; -import java.util.List; - -/** - * @since 4.3 - */ -public class ComponentDao extends BaseDao implements ServerComponent, DaoComponent { - - public ComponentDao(System2 system) { - super(ComponentMapper.class, system); - } - - public ComponentDto getById(Long id, DbSession session) { - ComponentDto componentDto = getNullableById(id, session); - if (componentDto == null) { - throw new NotFoundException(String.format("Project with id '%s' not found", id)); - } - return componentDto; - } - - @CheckForNull - public ComponentDto getNullableById(Long id, DbSession session) { - return mapper(session).selectById(id); - } - - public boolean existsById(Long id, DbSession session) { - return mapper(session).countById(id) > 0; - } - - /** - * Return null only if the component does not exists. - * If the component if a root project, it will return itself. - */ - @CheckForNull - public ComponentDto getNullableRootProjectByKey(String componentKey, DbSession session) { - return mapper(session).selectRootProjectByKey(componentKey); - } - - public ComponentDto getRootProjectByKey(String componentKey, DbSession session) { - ComponentDto componentDto = getNullableRootProjectByKey(componentKey, session); - if (componentDto == null) { - throw new NotFoundException(String.format("Root project for project '%s' not found", componentKey)); - } - return componentDto; - } - - @CheckForNull - public ComponentDto getParentModuleByKey(String componentKey, DbSession session) { - return mapper(session).selectParentModuleByKey(componentKey); - } - - public List findModulesByProject(String projectKey, DbSession session) { - return mapper(session).findModulesByProject(projectKey); - } - - @CheckForNull - public AuthorizedComponentDto getNullableAuthorizedComponentById(Long id, DbSession session) { - return mapper(session).selectAuthorizedComponentById(id); - } - - public AuthorizedComponentDto getAuthorizedComponentById(Long id, DbSession session) { - AuthorizedComponentDto componentDto = getNullableAuthorizedComponentById(id, session); - if (componentDto == null) { - throw new NotFoundException(String.format("Project with id '%s' not found", id)); - } - return componentDto; - } - - @CheckForNull - public AuthorizedComponentDto getNullableAuthorizedComponentByKey(String key, DbSession session) { - return mapper(session).selectAuthorizedComponentByKey(key); - } - - public AuthorizedComponentDto getAuthorizedComponentByKey(String key, DbSession session) { - AuthorizedComponentDto componentDto = getNullableAuthorizedComponentByKey(key, session); - if (componentDto == null) { - throw new NotFoundException(String.format("Project with key '%s' not found", key)); - } - return componentDto; - } - - @Override - @CheckForNull - protected ComponentDto doGetNullableByKey(DbSession session, String key) { - return mapper(session).selectByKey(key); - } - - @Override - protected ComponentDto doInsert(DbSession session, ComponentDto item) { - mapper(session).insert(item); - return item; - } -} 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/persistence/package-info.java deleted file mode 100644 index 4be4a89a5c9..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/component/persistence/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -@ParametersAreNonnullByDefault -package org.sonar.server.component.persistence; - -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/db/ComponentDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java new file mode 100644 index 00000000000..f710f66d1a4 --- /dev/null +++ b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java @@ -0,0 +1,279 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * 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.db; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.sonar.api.utils.DateUtils; +import org.sonar.api.utils.System2; +import org.sonar.core.component.AuthorizedComponentDto; +import org.sonar.core.component.ComponentDto; +import org.sonar.core.persistence.AbstractDaoTestCase; +import org.sonar.core.persistence.DbSession; +import org.sonar.server.exceptions.NotFoundException; + +import java.util.Date; +import java.util.List; + +import static org.fest.assertions.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class ComponentDaoTest extends AbstractDaoTestCase { + + DbSession session; + + ComponentDao dao; + + System2 system2; + + @Before + public void createDao() throws Exception { + session = getMyBatis().openSession(false); + system2 = mock(System2.class); + dao = new ComponentDao(system2); + } + + @After + public void tearDown() throws Exception { + session.close(); + } + + @Test + public void get_by_key() { + setupData("shared"); + + ComponentDto result = dao.getNullableByKey(session, "org.struts:struts-core:src/org/struts/RequestContext.java"); + assertThat(result).isNotNull(); + assertThat(result.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java"); + assertThat(result.path()).isEqualTo("src/org/struts/RequestContext.java"); + assertThat(result.name()).isEqualTo("RequestContext.java"); + assertThat(result.longName()).isEqualTo("org.struts.RequestContext"); + assertThat(result.qualifier()).isEqualTo("FIL"); + assertThat(result.scope()).isEqualTo("FIL"); + assertThat(result.language()).isEqualTo("java"); + assertThat(result.subProjectId()).isEqualTo(2); + assertThat(result.projectId()).isEqualTo(1); + + assertThat(dao.getNullableByKey(session, "unknown")).isNull(); + } + + @Test + public void get_by_key_on_a_root_project() { + setupData("shared"); + + ComponentDto result = dao.getNullableByKey(session, "org.struts:struts"); + assertThat(result).isNotNull(); + assertThat(result.key()).isEqualTo("org.struts:struts"); + assertThat(result.path()).isNull(); + assertThat(result.name()).isEqualTo("Struts"); + assertThat(result.longName()).isEqualTo("Apache Struts"); + assertThat(result.qualifier()).isEqualTo("TRK"); + assertThat(result.scope()).isEqualTo("PRJ"); + assertThat(result.language()).isNull(); + assertThat(result.subProjectId()).isNull(); + assertThat(result.projectId()).isEqualTo(1); + assertThat(result.getAuthorizationUpdatedAt()).isEqualTo(DateUtils.parseDate("2014-06-18")); + } + + @Test + public void get_by_id() { + setupData("shared"); + + assertThat(dao.getById(4L, session)).isNotNull(); + } + + @Test(expected = NotFoundException.class) + public void fail_to_get_by_id_when_project_not_found() { + setupData("shared"); + + dao.getById(111L, session); + } + + @Test + public void get_nullable_by_id() { + setupData("shared"); + + assertThat(dao.getNullableById(4L, session)).isNotNull(); + assertThat(dao.getNullableById(111L, session)).isNull(); + } + + @Test + public void count_by_id() { + setupData("shared"); + + assertThat(dao.existsById(4L, session)).isTrue(); + assertThat(dao.existsById(111L, session)).isFalse(); + } + + @Test + public void find_modules_by_project() throws Exception { + setupData("multi-modules"); + + List results = dao.findModulesByProject("org.struts:struts", session); + assertThat(results).hasSize(1); + assertThat(results.get(0).getKey()).isEqualTo("org.struts:struts-core"); + + results = dao.findModulesByProject("org.struts:struts-core", session); + assertThat(results).hasSize(1); + assertThat(results.get(0).getKey()).isEqualTo("org.struts:struts-data"); + + assertThat(dao.findModulesByProject("org.struts:struts-data", session)).isEmpty(); + + assertThat(dao.findModulesByProject("unknown", session)).isEmpty(); + } + + @Test + public void get_nullable_root_project_by_key() throws Exception { + setupData("multi-modules"); + + assertThat(dao.getNullableRootProjectByKey("org.struts:struts-data", session).getKey()).isEqualTo("org.struts:struts"); + assertThat(dao.getNullableRootProjectByKey("org.struts:struts-core", session).getKey()).isEqualTo("org.struts:struts"); + + // Root project of a project is itself + assertThat(dao.getNullableRootProjectByKey("org.struts:struts", session).getKey()).isEqualTo("org.struts:struts"); + + assertThat(dao.getNullableRootProjectByKey("unknown", session)).isNull(); + } + + @Test + public void get_root_project_by_key() throws Exception { + setupData("multi-modules"); + + assertThat(dao.getRootProjectByKey("org.struts:struts-data", session).getKey()).isEqualTo("org.struts:struts"); + assertThat(dao.getRootProjectByKey("org.struts:struts-core", session).getKey()).isEqualTo("org.struts:struts"); + + // Root project of a project is itself + assertThat(dao.getRootProjectByKey("org.struts:struts", session).getKey()).isEqualTo("org.struts:struts"); + } + + @Test(expected = NotFoundException.class) + public void get_root_project_by_key_on_unknown_project() throws Exception { + dao.getRootProjectByKey("unknown", session); + } + + @Test + public void get_parent_module_by_key() throws Exception { + setupData("multi-modules"); + + assertThat(dao.getParentModuleByKey("org.struts:struts-data", session).getKey()).isEqualTo("org.struts:struts-core"); + assertThat(dao.getParentModuleByKey("org.struts:struts-core", session).getKey()).isEqualTo("org.struts:struts"); + assertThat(dao.getParentModuleByKey("org.struts:struts", session)).isNull(); + + assertThat(dao.getParentModuleByKey("unknown", session)).isNull(); + } + + @Test + public void get_nullable_authorized_component_by_id() { + setupData("shared"); + + AuthorizedComponentDto result = dao.getNullableAuthorizedComponentById(4L, session); + assertThat(result).isNotNull(); + assertThat(result.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java"); + + assertThat(dao.getNullableAuthorizedComponentById(111L, session)).isNull(); + } + + @Test + public void get_authorized_component_by_id() { + setupData("shared"); + + assertThat(dao.getAuthorizedComponentById(4L, session)).isNotNull(); + } + + @Test(expected = NotFoundException.class) + public void fail_to_get_authorized_component_by_id_when_project_not_found() { + setupData("shared"); + + dao.getAuthorizedComponentById(111L, session); + } + + @Test + public void get_nullable_authorized_component_by_key() { + setupData("shared"); + + AuthorizedComponentDto result = dao.getNullableAuthorizedComponentByKey("org.struts:struts-core:src/org/struts/RequestContext.java", session); + assertThat(result).isNotNull(); + assertThat(result.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java"); + + assertThat(dao.getNullableAuthorizedComponentByKey("unknown", session)).isNull(); + } + + @Test + public void get_authorized_component_by_key() { + setupData("shared"); + + assertThat(dao.getAuthorizedComponentByKey("org.struts:struts-core:src/org/struts/RequestContext.java", session)).isNotNull(); + } + + @Test(expected = NotFoundException.class) + public void fail_to_get_authorized_component_by_key_when_project_not_found() { + setupData("shared"); + + dao.getAuthorizedComponentByKey("unknown", session); + } + + @Test + public void insert() { + when(system2.now()).thenReturn(DateUtils.parseDate("2014-06-18").getTime()); + setupData("empty"); + + ComponentDto componentDto = new ComponentDto() + .setId(1L) + .setKey("org.struts:struts-core:src/org/struts/RequestContext.java") + .setName("RequestContext.java") + .setLongName("org.struts.RequestContext") + .setQualifier("FIL") + .setScope("FIL") + .setLanguage("java") + .setPath("src/org/struts/RequestContext.java") + .setSubProjectId(3L) + .setEnabled(true) + .setAuthorizationUpdatedAt(DateUtils.parseDate("2014-06-18")); + + dao.insert(session, componentDto); + session.commit(); + + assertThat(componentDto.getId()).isNotNull(); + checkTables("insert", "projects"); + } + + @Test(expected = IllegalStateException.class) + public void update() { + dao.update(session, new ComponentDto() + .setId(1L) + .setKey("org.struts:struts-core:src/org/struts/RequestContext.java") + ); + } + + @Test(expected = IllegalStateException.class) + public void delete() { + dao.delete(session, new ComponentDto() + .setId(1L) + .setKey("org.struts:struts-core:src/org/struts/RequestContext.java") + ); + } + + @Test(expected = IllegalStateException.class) + public void synchronize_after() { + dao.synchronizeAfter(session, new Date(0L)); + } +} 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/persistence/ComponentDaoTest.java deleted file mode 100644 index cbb7d8ece59..00000000000 --- a/server/sonar-server/src/test/java/org/sonar/server/component/persistence/ComponentDaoTest.java +++ /dev/null @@ -1,279 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * 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; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.sonar.api.utils.DateUtils; -import org.sonar.api.utils.System2; -import org.sonar.core.component.AuthorizedComponentDto; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; -import org.sonar.server.exceptions.NotFoundException; - -import java.util.Date; -import java.util.List; - -import static org.fest.assertions.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -public class ComponentDaoTest extends AbstractDaoTestCase { - - DbSession session; - - ComponentDao dao; - - System2 system2; - - @Before - public void createDao() throws Exception { - session = getMyBatis().openSession(false); - system2 = mock(System2.class); - dao = new ComponentDao(system2); - } - - @After - public void tearDown() throws Exception { - session.close(); - } - - @Test - public void get_by_key() { - setupData("shared"); - - ComponentDto result = dao.getNullableByKey(session, "org.struts:struts-core:src/org/struts/RequestContext.java"); - assertThat(result).isNotNull(); - assertThat(result.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java"); - assertThat(result.path()).isEqualTo("src/org/struts/RequestContext.java"); - assertThat(result.name()).isEqualTo("RequestContext.java"); - assertThat(result.longName()).isEqualTo("org.struts.RequestContext"); - assertThat(result.qualifier()).isEqualTo("FIL"); - assertThat(result.scope()).isEqualTo("FIL"); - assertThat(result.language()).isEqualTo("java"); - assertThat(result.subProjectId()).isEqualTo(2); - assertThat(result.projectId()).isEqualTo(1); - - assertThat(dao.getNullableByKey(session, "unknown")).isNull(); - } - - @Test - public void get_by_key_on_a_root_project() { - setupData("shared"); - - ComponentDto result = dao.getNullableByKey(session, "org.struts:struts"); - assertThat(result).isNotNull(); - assertThat(result.key()).isEqualTo("org.struts:struts"); - assertThat(result.path()).isNull(); - assertThat(result.name()).isEqualTo("Struts"); - assertThat(result.longName()).isEqualTo("Apache Struts"); - assertThat(result.qualifier()).isEqualTo("TRK"); - assertThat(result.scope()).isEqualTo("PRJ"); - assertThat(result.language()).isNull(); - assertThat(result.subProjectId()).isNull(); - assertThat(result.projectId()).isEqualTo(1); - assertThat(result.getAuthorizationUpdatedAt()).isEqualTo(DateUtils.parseDate("2014-06-18")); - } - - @Test - public void get_by_id() { - setupData("shared"); - - assertThat(dao.getById(4L, session)).isNotNull(); - } - - @Test(expected = NotFoundException.class) - public void fail_to_get_by_id_when_project_not_found() { - setupData("shared"); - - dao.getById(111L, session); - } - - @Test - public void get_nullable_by_id() { - setupData("shared"); - - assertThat(dao.getNullableById(4L, session)).isNotNull(); - assertThat(dao.getNullableById(111L, session)).isNull(); - } - - @Test - public void count_by_id() { - setupData("shared"); - - assertThat(dao.existsById(4L, session)).isTrue(); - assertThat(dao.existsById(111L, session)).isFalse(); - } - - @Test - public void find_modules_by_project() throws Exception { - setupData("multi-modules"); - - List results = dao.findModulesByProject("org.struts:struts", session); - assertThat(results).hasSize(1); - assertThat(results.get(0).getKey()).isEqualTo("org.struts:struts-core"); - - results = dao.findModulesByProject("org.struts:struts-core", session); - assertThat(results).hasSize(1); - assertThat(results.get(0).getKey()).isEqualTo("org.struts:struts-data"); - - assertThat(dao.findModulesByProject("org.struts:struts-data", session)).isEmpty(); - - assertThat(dao.findModulesByProject("unknown", session)).isEmpty(); - } - - @Test - public void get_nullable_root_project_by_key() throws Exception { - setupData("multi-modules"); - - assertThat(dao.getNullableRootProjectByKey("org.struts:struts-data", session).getKey()).isEqualTo("org.struts:struts"); - assertThat(dao.getNullableRootProjectByKey("org.struts:struts-core", session).getKey()).isEqualTo("org.struts:struts"); - - // Root project of a project is itself - assertThat(dao.getNullableRootProjectByKey("org.struts:struts", session).getKey()).isEqualTo("org.struts:struts"); - - assertThat(dao.getNullableRootProjectByKey("unknown", session)).isNull(); - } - - @Test - public void get_root_project_by_key() throws Exception { - setupData("multi-modules"); - - assertThat(dao.getRootProjectByKey("org.struts:struts-data", session).getKey()).isEqualTo("org.struts:struts"); - assertThat(dao.getRootProjectByKey("org.struts:struts-core", session).getKey()).isEqualTo("org.struts:struts"); - - // Root project of a project is itself - assertThat(dao.getRootProjectByKey("org.struts:struts", session).getKey()).isEqualTo("org.struts:struts"); - } - - @Test(expected = NotFoundException.class) - public void get_root_project_by_key_on_unknown_project() throws Exception { - dao.getRootProjectByKey("unknown", session); - } - - @Test - public void get_parent_module_by_key() throws Exception { - setupData("multi-modules"); - - assertThat(dao.getParentModuleByKey("org.struts:struts-data", session).getKey()).isEqualTo("org.struts:struts-core"); - assertThat(dao.getParentModuleByKey("org.struts:struts-core", session).getKey()).isEqualTo("org.struts:struts"); - assertThat(dao.getParentModuleByKey("org.struts:struts", session)).isNull(); - - assertThat(dao.getParentModuleByKey("unknown", session)).isNull(); - } - - @Test - public void get_nullable_authorized_component_by_id() { - setupData("shared"); - - AuthorizedComponentDto result = dao.getNullableAuthorizedComponentById(4L, session); - assertThat(result).isNotNull(); - assertThat(result.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java"); - - assertThat(dao.getNullableAuthorizedComponentById(111L, session)).isNull(); - } - - @Test - public void get_authorized_component_by_id() { - setupData("shared"); - - assertThat(dao.getAuthorizedComponentById(4L, session)).isNotNull(); - } - - @Test(expected = NotFoundException.class) - public void fail_to_get_authorized_component_by_id_when_project_not_found() { - setupData("shared"); - - dao.getAuthorizedComponentById(111L, session); - } - - @Test - public void get_nullable_authorized_component_by_key() { - setupData("shared"); - - AuthorizedComponentDto result = dao.getNullableAuthorizedComponentByKey("org.struts:struts-core:src/org/struts/RequestContext.java", session); - assertThat(result).isNotNull(); - assertThat(result.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java"); - - assertThat(dao.getNullableAuthorizedComponentByKey("unknown", session)).isNull(); - } - - @Test - public void get_authorized_component_by_key() { - setupData("shared"); - - assertThat(dao.getAuthorizedComponentByKey("org.struts:struts-core:src/org/struts/RequestContext.java", session)).isNotNull(); - } - - @Test(expected = NotFoundException.class) - public void fail_to_get_authorized_component_by_key_when_project_not_found() { - setupData("shared"); - - dao.getAuthorizedComponentByKey("unknown", session); - } - - @Test - public void insert() { - when(system2.now()).thenReturn(DateUtils.parseDate("2014-06-18").getTime()); - setupData("empty"); - - ComponentDto componentDto = new ComponentDto() - .setId(1L) - .setKey("org.struts:struts-core:src/org/struts/RequestContext.java") - .setName("RequestContext.java") - .setLongName("org.struts.RequestContext") - .setQualifier("FIL") - .setScope("FIL") - .setLanguage("java") - .setPath("src/org/struts/RequestContext.java") - .setSubProjectId(3L) - .setEnabled(true) - .setAuthorizationUpdatedAt(DateUtils.parseDate("2014-06-18")); - - dao.insert(session, componentDto); - session.commit(); - - assertThat(componentDto.getId()).isNotNull(); - checkTables("insert", "projects"); - } - - @Test(expected = IllegalStateException.class) - public void update() { - dao.update(session, new ComponentDto() - .setId(1L) - .setKey("org.struts:struts-core:src/org/struts/RequestContext.java") - ); - } - - @Test(expected = IllegalStateException.class) - public void delete() { - dao.delete(session, new ComponentDto() - .setId(1L) - .setKey("org.struts:struts-core:src/org/struts/RequestContext.java") - ); - } - - @Test(expected = IllegalStateException.class) - public void synchronize_after() { - dao.synchronizeAfter(session, new Date(0L)); - } -} 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/db/ComponentDaoTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/empty.xml new file mode 100644 index 00000000000..871dedcb5e9 --- /dev/null +++ b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/empty.xml @@ -0,0 +1,3 @@ + + + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/insert-result.xml new file mode 100644 index 00000000000..741a3eb7d84 --- /dev/null +++ b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/insert-result.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/multi-modules.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/multi-modules.xml new file mode 100644 index 00000000000..771faf6ec97 --- /dev/null +++ b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/multi-modules.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/shared.xml new file mode 100644 index 00000000000..77ef9f1bdbc --- /dev/null +++ b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/shared.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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/persistence/ComponentDaoTest/empty.xml deleted file mode 100644 index 871dedcb5e9..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/empty.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - 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/persistence/ComponentDaoTest/insert-result.xml deleted file mode 100644 index 741a3eb7d84..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/insert-result.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - 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/persistence/ComponentDaoTest/multi-modules.xml deleted file mode 100644 index 771faf6ec97..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/multi-modules.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/persistence/ComponentDaoTest/shared.xml deleted file mode 100644 index 77ef9f1bdbc..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/shared.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - -