From 17a39420ef96aa5adfa361763fc8fe578b437600 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Tue, 15 Sep 2015 14:31:52 +0200 Subject: [PATCH] Remove some useless views queries selectRootViews and selectViewTree are not used anymore in Views --- .../src/main/java/org/sonar/db/MyBatis.java | 2 - .../org/sonar/db/component/ComponentDao.java | 8 -- .../sonar/db/component/ComponentMapper.java | 3 - .../sonar/db/component/ViewsComponentDto.java | 109 ------------------ .../sonar/db/component/ComponentMapper.xml | 24 ---- 5 files changed, 146 deletions(-) delete mode 100644 sonar-db/src/main/java/org/sonar/db/component/ViewsComponentDto.java diff --git a/sonar-db/src/main/java/org/sonar/db/MyBatis.java b/sonar-db/src/main/java/org/sonar/db/MyBatis.java index e8345295856..ea484ad78ef 100644 --- a/sonar-db/src/main/java/org/sonar/db/MyBatis.java +++ b/sonar-db/src/main/java/org/sonar/db/MyBatis.java @@ -45,7 +45,6 @@ import org.sonar.db.component.ResourceMapper; import org.sonar.db.component.SnapshotDto; import org.sonar.db.component.SnapshotMapper; import org.sonar.db.component.UuidWithProjectUuidDto; -import org.sonar.db.component.ViewsComponentDto; import org.sonar.db.component.ViewsSnapshotDto; import org.sonar.db.compute.AnalysisReportDto; import org.sonar.db.compute.AnalysisReportMapper; @@ -210,7 +209,6 @@ public class MyBatis { confBuilder.loadAlias("UuidWithProjectUuid", UuidWithProjectUuidDto.class); confBuilder.loadAlias("Event", EventDto.class); confBuilder.loadAlias("CustomMeasure", CustomMeasureDto.class); - confBuilder.loadAlias("ViewsComponent", ViewsComponentDto.class); confBuilder.loadAlias("ViewsSnapshot", ViewsSnapshotDto.class); // AuthorizationMapper has to be loaded before IssueMapper because this last one used it diff --git a/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java b/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java index 2973460b1b3..47c6575f459 100644 --- a/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java @@ -271,14 +271,6 @@ public class ComponentDao implements Dao { mapper(session).update(item); } - public List selectRootViews(DbSession dbSession) { - return mapper(dbSession).selectRootViews(); - } - - public List selectViewTree(DbSession dbSession, String rootViewUuid) { - return mapper(dbSession).selectViewTree(rootViewUuid); - } - private ComponentMapper mapper(DbSession session) { return session.getMapper(ComponentMapper.class); } diff --git a/sonar-db/src/main/java/org/sonar/db/component/ComponentMapper.java b/sonar-db/src/main/java/org/sonar/db/component/ComponentMapper.java index 4204f8ad370..1fcdb3d1a7f 100644 --- a/sonar-db/src/main/java/org/sonar/db/component/ComponentMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ComponentMapper.java @@ -124,7 +124,4 @@ public interface ComponentMapper { void update(ComponentDto componentDto); - List selectRootViews(); - - List selectViewTree(@Param("rootViewUuid") String rootViewUuid); } diff --git a/sonar-db/src/main/java/org/sonar/db/component/ViewsComponentDto.java b/sonar-db/src/main/java/org/sonar/db/component/ViewsComponentDto.java deleted file mode 100644 index 8aa0669e35f..00000000000 --- a/sonar-db/src/main/java/org/sonar/db/component/ViewsComponentDto.java +++ /dev/null @@ -1,109 +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.db.component; - -public class ViewsComponentDto { - private Long id; - private String name; - private String uuid; - private String kee; - private String scope; - private String qualifier; - private Long copyResourceId; - private String moduleUuid; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - public String getKee() { - return kee; - } - - public void setKee(String kee) { - this.kee = kee; - } - - public String getScope() { - return scope; - } - - public void setScope(String scope) { - this.scope = scope; - } - - public String getQualifier() { - return qualifier; - } - - public void setQualifier(String qualifier) { - this.qualifier = qualifier; - } - - public Long getCopyResourceId() { - return copyResourceId; - } - - public void setCopyResourceId(Long copyResourceId) { - this.copyResourceId = copyResourceId; - } - - public String getModuleUuid() { - return moduleUuid; - } - - public void setModuleUuid(String moduleUuid) { - this.moduleUuid = moduleUuid; - } - - @Override - public String toString() { - return "ViewsComponentDto{" + - "id=" + id + - ", name='" + name + '\'' + - ", uuid='" + uuid + '\'' + - ", kee='" + kee + '\'' + - ", scope='" + scope + '\'' + - ", qualifier='" + qualifier + '\'' + - ", copyResourceId='" + copyResourceId + '\'' + - ", moduleUuid='" + moduleUuid + '\'' + - '}'; - } -} diff --git a/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml b/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml index a3c2a787c13..cc4c2d83500 100644 --- a/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml @@ -385,28 +385,4 @@ WHERE uuid=#{uuid} - - - - -- 2.39.5