-
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Issue 1424 : improve Vulnerability query endpoints performance (#886)
- Loading branch information
1 parent
4de679f
commit b8209eb
Showing
8 changed files
with
464 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
src/main/java/org/dependencytrack/persistence/jdbi/mapping/VulnerabilityRowMapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * This file is part of Dependency-Track. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * Copyright (c) OWASP Foundation. All Rights Reserved. | ||
| */ | ||
| package org.dependencytrack.persistence.jdbi.mapping; | ||
|
|
||
| import com.fasterxml.jackson.core.type.TypeReference; | ||
| import org.dependencytrack.model.Component; | ||
| import org.dependencytrack.model.Epss; | ||
| import org.dependencytrack.model.Vulnerability; | ||
| import org.dependencytrack.model.VulnerabilityAlias; | ||
| import org.jdbi.v3.core.mapper.RowMapper; | ||
| import org.jdbi.v3.core.mapper.reflect.BeanMapper; | ||
| import org.jdbi.v3.core.statement.StatementContext; | ||
|
|
||
| import java.sql.ResultSet; | ||
| import java.sql.SQLException; | ||
| import java.util.List; | ||
|
|
||
| import static org.dependencytrack.persistence.jdbi.mapping.RowMapperUtil.deserializeJson; | ||
| import static org.dependencytrack.persistence.jdbi.mapping.RowMapperUtil.hasColumn; | ||
| import static org.dependencytrack.persistence.jdbi.mapping.RowMapperUtil.longArray; | ||
| import static org.dependencytrack.persistence.jdbi.mapping.RowMapperUtil.maybeSet; | ||
|
|
||
| public class VulnerabilityRowMapper implements RowMapper<Vulnerability> { | ||
|
|
||
| private static final TypeReference<List<VulnerabilityAlias>> VULNERABILITY_ALIASES_TYPE_REF = new TypeReference<>() { | ||
| }; | ||
|
|
||
| @Override | ||
| public Vulnerability map(final ResultSet rs, final StatementContext ctx) throws SQLException { | ||
| final Vulnerability vuln = BeanMapper.of(Vulnerability.class).map(rs, ctx); | ||
| final Epss epss = BeanMapper.of(Epss.class).map(rs, ctx); | ||
| vuln.setEpss(epss); | ||
| maybeSet(rs, "vulnAliasesJson", (ignored, columnName) -> | ||
| deserializeJson(rs, columnName, VULNERABILITY_ALIASES_TYPE_REF), vuln::setAliases); | ||
| if (hasColumn(rs, "componentIdsArray")) { | ||
| var vulnerableComponentsIds = longArray(rs, "componentIdsArray"); | ||
| if (!vulnerableComponentsIds.isEmpty()) { | ||
| vuln.setComponents(vulnerableComponentsIds.stream().map(cid -> new Component(cid)).toList()); | ||
| } | ||
| } | ||
| return vuln; | ||
| } | ||
| } |
Oops, something went wrong.