diff options
author | Javier García Orduña <javier.garcia@sonarsource.com> | 2025-02-04 10:25:06 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2025-02-04 20:03:17 +0000 |
commit | fe461c0778256f68325f6a7f53208999b28582fc (patch) | |
tree | 9e19ff8351ad2521c06db29d7e24bb3ce4abded7 /server/sonar-db-dao/src/main/java/org/sonar/db | |
parent | dcbad1646752f1b7d8eb4904e7e8a1923734cde8 (diff) | |
download | sonarqube-fe461c0778256f68325f6a7f53208999b28582fc.tar.gz sonarqube-fe461c0778256f68325f6a7f53208999b28582fc.zip |
SQRP-154 Cleanup leftovers from FOSSA
Diffstat (limited to 'server/sonar-db-dao/src/main/java/org/sonar/db')
13 files changed, 1 insertions, 345 deletions
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/DaoModule.java b/server/sonar-db-dao/src/main/java/org/sonar/db/DaoModule.java index dedccd4ea73..db5edec1bf1 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/DaoModule.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/DaoModule.java @@ -38,9 +38,6 @@ import org.sonar.db.component.ComponentDao; import org.sonar.db.component.ComponentKeyUpdaterDao; import org.sonar.db.component.ProjectLinkDao; import org.sonar.db.component.SnapshotDao; -import org.sonar.db.dependency.CveCweDao; -import org.sonar.db.dependency.CveDao; -import org.sonar.db.dependency.IssuesDependencyDao; import org.sonar.db.dependency.ProjectDependenciesDao; import org.sonar.db.duplication.DuplicationDao; import org.sonar.db.entity.EntityDao; @@ -132,8 +129,6 @@ public class DaoModule extends Module { CeTaskMessageDao.class, ComponentDao.class, ComponentKeyUpdaterDao.class, - CveDao.class, - CveCweDao.class, DefaultQProfileDao.class, DevOpsPermissionsMappingDao.class, DuplicationDao.class, @@ -155,7 +150,6 @@ public class DaoModule extends Module { IssueChangeDao.class, IssueDao.class, IssueFixedDao.class, - IssuesDependencyDao.class, MeasureDao.class, ProjectMeasureDao.class, MetricDao.class, diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/DbClient.java b/server/sonar-db-dao/src/main/java/org/sonar/db/DbClient.java index f14d4657013..4ddbe135d14 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/DbClient.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/DbClient.java @@ -38,9 +38,6 @@ import org.sonar.db.component.ComponentDao; import org.sonar.db.component.ComponentKeyUpdaterDao; import org.sonar.db.component.ProjectLinkDao; import org.sonar.db.component.SnapshotDao; -import org.sonar.db.dependency.CveCweDao; -import org.sonar.db.dependency.CveDao; -import org.sonar.db.dependency.IssuesDependencyDao; import org.sonar.db.dependency.ProjectDependenciesDao; import org.sonar.db.duplication.DuplicationDao; import org.sonar.db.entity.EntityDao; @@ -204,9 +201,6 @@ public class DbClient { private final ProjectExportDao projectExportDao; private final IssueFixedDao issueFixedDao; private final TelemetryMetricsSentDao telemetryMetricsSentDao; - private final CveDao cveDao; - private final CveCweDao cveCweDao; - private final IssuesDependencyDao issuesDependencyDao; private final ProjectDependenciesDao projectDependenciesDao; public DbClient(Database database, MyBatis myBatis, DBSessions dbSessions, Dao... daos) { @@ -304,9 +298,6 @@ public class DbClient { projectExportDao = getDao(map, ProjectExportDao.class); issueFixedDao = getDao(map, IssueFixedDao.class); telemetryMetricsSentDao = getDao(map, TelemetryMetricsSentDao.class); - cveDao = getDao(map, CveDao.class); - cveCweDao = getDao(map, CveCweDao.class); - issuesDependencyDao = getDao(map, IssuesDependencyDao.class); projectDependenciesDao = getDao(map, ProjectDependenciesDao.class); } @@ -672,18 +663,6 @@ public class DbClient { return projectExportDao; } - public CveDao cveDao() { - return cveDao; - } - - public CveCweDao cveCweDao() { - return cveCweDao; - } - - public IssuesDependencyDao issuesDependencyDao() { - return issuesDependencyDao; - } - public ProjectDependenciesDao projectDependenciesDao() { return projectDependenciesDao; } diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/MyBatis.java b/server/sonar-db-dao/src/main/java/org/sonar/db/MyBatis.java index bcfee9920fb..250f51d9729 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/MyBatis.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/MyBatis.java @@ -63,12 +63,6 @@ import org.sonar.db.component.SnapshotDto; import org.sonar.db.component.SnapshotMapper; import org.sonar.db.component.UuidWithBranchUuidDto; import org.sonar.db.component.ViewsSnapshotDto; -import org.sonar.db.dependency.CveCweDto; -import org.sonar.db.dependency.CveCweMapper; -import org.sonar.db.dependency.CveDto; -import org.sonar.db.dependency.CveMapper; -import org.sonar.db.dependency.IssuesDependencyDto; -import org.sonar.db.dependency.IssuesDependencyMapper; import org.sonar.db.dependency.ProjectDependenciesMapper; import org.sonar.db.dependency.ProjectDependencyDto; import org.sonar.db.duplication.DuplicationMapper; @@ -217,8 +211,6 @@ public class MyBatis { confBuilder.loadAlias("AnticipatedTransition", AnticipatedTransitionDto.class); confBuilder.loadAlias("CeTaskCharacteristic", CeTaskCharacteristicDto.class); confBuilder.loadAlias("Component", ComponentDto.class); - confBuilder.loadAlias("Cve", CveDto.class); - confBuilder.loadAlias("CveCwe", CveCweDto.class); confBuilder.loadAlias("DevOpsPermissionsMapping", DevOpsPermissionsMappingDto.class); confBuilder.loadAlias("DuplicationUnit", DuplicationUnitDto.class); confBuilder.loadAlias("Entity", EntityDto.class); @@ -236,7 +228,6 @@ public class MyBatis { confBuilder.loadAlias("KeyLongValue", KeyLongValue.class); confBuilder.loadAlias("Impact", ImpactDto.class); confBuilder.loadAlias("Issue", IssueDto.class); - confBuilder.loadAlias("IssueDependency", IssuesDependencyDto.class); confBuilder.loadAlias("NewCodeReferenceIssue", NewCodeReferenceIssueDto.class); confBuilder.loadAlias("ProjectMeasure", ProjectMeasureDto.class); confBuilder.loadAlias("LargestBranchNclocDto", LargestBranchNclocDto.class); @@ -296,8 +287,6 @@ public class MyBatis { CeTaskMessageMapper.class, ComponentKeyUpdaterMapper.class, ComponentMapper.class, - CveMapper.class, - CveCweMapper.class, DefaultQProfileMapper.class, DuplicationMapper.class, EntityMapper.class, @@ -317,7 +306,6 @@ public class MyBatis { IssueChangeMapper.class, IssueMapper.class, IssueFixedMapper.class, - IssuesDependencyMapper.class, MeasureMapper.class, ProjectMeasureMapper.class, MetricMapper.class, diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveCweDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveCweDao.java deleted file mode 100644 index 9b2ccb468f5..00000000000 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveCweDao.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2025 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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. - * - * This program 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.dependency; - -import java.util.Set; -import org.sonar.db.Dao; -import org.sonar.db.DbSession; - -public class CveCweDao implements Dao { - - public void insert(DbSession session, CveCweDto cveCweDto) { - mapper(session).insert(cveCweDto); - } - - private static CveCweMapper mapper(DbSession session) { - return session.getMapper(CveCweMapper.class); - } - - public Set<String> selectByCveUuid(DbSession dbSession, String cveUuid) { - return mapper(dbSession).selectByCveUuid(cveUuid); - } - - public void deleteByCveUuid(DbSession dbSession, String cveUuid) { - mapper(dbSession).deleteByCveUuid(cveUuid); - } - -} diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveCweDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveCweDto.java deleted file mode 100644 index 5237687287f..00000000000 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveCweDto.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2025 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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. - * - * This program 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.dependency; - -public record CveCweDto(String cveUuid, String cwe) { -} diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveCweMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveCweMapper.java deleted file mode 100644 index 089dac967c5..00000000000 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveCweMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2025 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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. - * - * This program 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.dependency; - -import java.util.Set; - -public interface CveCweMapper { - void insert(CveCweDto cveCweDto); - - Set<String> selectByCveUuid(String cveUuid); - - void deleteByCveUuid(String cveUuid); -} diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveDao.java deleted file mode 100644 index b36bd46a17a..00000000000 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveDao.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2025 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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. - * - * This program 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.dependency; - -import java.util.Optional; -import org.sonar.db.Dao; -import org.sonar.db.DbSession; - -public class CveDao implements Dao { - - public void insert(DbSession dbSession, CveDto cveDto) { - mapper(dbSession).insert(cveDto); - } - - public Optional<CveDto> selectById(DbSession dbSession, String id) { - return Optional.ofNullable(mapper(dbSession).selectById(id)); - } - - public void update(DbSession dbSession, CveDto cveDto) { - mapper(dbSession).update(cveDto); - } - - private static CveMapper mapper(DbSession dbSession) { - return dbSession.getMapper(CveMapper.class); - } -} diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveDto.java deleted file mode 100644 index ad4d2895eb2..00000000000 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveDto.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2025 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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. - * - * This program 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.dependency; - -import javax.annotation.Nullable; - -public record CveDto( - String uuid, - String id, - String description, - @Nullable - Double cvssScore, - @Nullable - Double epssScore, - @Nullable - Double epssPercentile, - @Nullable - Long publishedAt, - @Nullable - Long lastModifiedAt, - Long createdAt, - Long updatedAt -) { - -} diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveMapper.java deleted file mode 100644 index 1f8e29674bc..00000000000 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2025 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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. - * - * This program 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.dependency; - -public interface CveMapper { - void insert(CveDto cveDto); - - CveDto selectById(String id); - - void update(CveDto cveDto); -} diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/IssuesDependencyDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/IssuesDependencyDao.java deleted file mode 100644 index 8f7e760c99b..00000000000 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/IssuesDependencyDao.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2025 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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. - * - * This program 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.dependency; - -import org.sonar.db.Dao; -import org.sonar.db.DbSession; - -public class IssuesDependencyDao implements Dao { - - public void insert(DbSession session, IssuesDependencyDto issuesDependencyDto) { - mapper(session).insert(issuesDependencyDto); - } - - private static IssuesDependencyMapper mapper(DbSession session) { - return session.getMapper(IssuesDependencyMapper.class); - } -} diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/IssuesDependencyDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/IssuesDependencyDto.java deleted file mode 100644 index 3c4cf5ab91f..00000000000 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/IssuesDependencyDto.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2025 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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. - * - * This program 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.dependency; - -public record IssuesDependencyDto(String issueUuid, String cveUuid) { -} diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/IssuesDependencyMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/IssuesDependencyMapper.java deleted file mode 100644 index 65b4e306b8a..00000000000 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/IssuesDependencyMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2025 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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. - * - * This program 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.dependency; - -public interface IssuesDependencyMapper { - void insert(IssuesDependencyDto issuesDependencyDto); -} diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueDto.java index 43738f43701..61f2b6d96c6 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueDto.java @@ -119,9 +119,6 @@ public final class IssueDto implements Serializable { private CleanCodeAttribute cleanCodeAttribute; private CleanCodeAttribute ruleCleanCodeAttribute; - // issues dependency fields, one-one relationship - private String cveId; - public IssueDto() { // nothing to do } @@ -166,8 +163,7 @@ public final class IssueDto implements Serializable { .setPrioritizedRule(issue.isPrioritizedRule()) // technical dates .setCreatedAt(now) - .setUpdatedAt(now) - .setCveId(issue.getCveId()); + .setUpdatedAt(now); issue.getImpacts().forEach(i -> issueDto.addImpact(new ImpactDto(i.softwareQuality(), i.severity(), i.manualSeverity()))); return issueDto; @@ -873,15 +869,6 @@ public final class IssueDto implements Serializable { return this; } - public String getCveId() { - return cveId; - } - - public IssueDto setCveId(@Nullable String cveId) { - this.cveId = cveId; - return this; - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE); @@ -925,7 +912,6 @@ public final class IssueDto implements Serializable { issue.setCodeVariants(getCodeVariants()); issue.setCleanCodeAttribute(cleanCodeAttribute); impacts.forEach(i -> issue.addImpact(i.getSoftwareQuality(), i.getSeverity(), i.isManualSeverity())); - issue.setCveId(cveId); return issue; } } |