diff options
author | Travis Collins <travistx@gmail.com> | 2025-02-05 16:14:01 -0700 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2025-02-19 20:03:12 +0000 |
commit | ca06b89d80a886866b84250408c5214f0a775efc (patch) | |
tree | a455037747723c6ecc3d93e828b028491fc5975c /server/sonar-ce-common | |
parent | dac1fa65a0ab2531c372d01b7422b3a4a3c626ec (diff) | |
download | sonarqube-ca06b89d80a886866b84250408c5214f0a775efc.tar.gz sonarqube-ca06b89d80a886866b84250408c5214f0a775efc.zip |
SQRP-169 Write the ScaDependencies to an in-memory ScaHolder
Diffstat (limited to 'server/sonar-ce-common')
-rw-r--r-- | server/sonar-ce-common/src/main/java/org/sonar/ce/common/sca/ScaHolder.java (renamed from server/sonar-ce-common/src/main/java/org/sonar/ce/common/batch/package-info.java) | 11 | ||||
-rw-r--r-- | server/sonar-ce-common/src/main/java/org/sonar/ce/common/sca/ScaHolderImpl.java | 39 | ||||
-rw-r--r-- | server/sonar-ce-common/src/main/java/org/sonar/ce/common/sca/ScaStepProvider.java | 4 |
3 files changed, 49 insertions, 5 deletions
diff --git a/server/sonar-ce-common/src/main/java/org/sonar/ce/common/batch/package-info.java b/server/sonar-ce-common/src/main/java/org/sonar/ce/common/sca/ScaHolder.java index 42774becbfb..07c8a5a576c 100644 --- a/server/sonar-ce-common/src/main/java/org/sonar/ce/common/batch/package-info.java +++ b/server/sonar-ce-common/src/main/java/org/sonar/ce/common/sca/ScaHolder.java @@ -17,7 +17,12 @@ * 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.ce.common.batch; +package org.sonar.ce.common.sca; -import javax.annotation.ParametersAreNonnullByDefault; +import java.util.List; +import org.sonar.db.sca.ScaDependencyDto; + +public interface ScaHolder { + void setDependencies(List<ScaDependencyDto> dependencies); + List<ScaDependencyDto> getDependencies(); +} diff --git a/server/sonar-ce-common/src/main/java/org/sonar/ce/common/sca/ScaHolderImpl.java b/server/sonar-ce-common/src/main/java/org/sonar/ce/common/sca/ScaHolderImpl.java new file mode 100644 index 00000000000..798f948e565 --- /dev/null +++ b/server/sonar-ce-common/src/main/java/org/sonar/ce/common/sca/ScaHolderImpl.java @@ -0,0 +1,39 @@ +/* + * 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.ce.common.sca; + +import org.sonar.db.sca.ScaDependencyDto; + +import java.util.List; +import java.util.Optional; + +public class ScaHolderImpl implements ScaHolder { + private List<ScaDependencyDto> dependencies = null; + + @Override + public void setDependencies(List<ScaDependencyDto> dependencies) { + this.dependencies = List.copyOf(dependencies); + } + + @Override + public List<ScaDependencyDto> getDependencies() { + return Optional.ofNullable(this.dependencies).orElseThrow(() -> new IllegalStateException("SCA dependencies have not been populated")); + } +} diff --git a/server/sonar-ce-common/src/main/java/org/sonar/ce/common/sca/ScaStepProvider.java b/server/sonar-ce-common/src/main/java/org/sonar/ce/common/sca/ScaStepProvider.java index 1e57f01a499..6a9d3e21823 100644 --- a/server/sonar-ce-common/src/main/java/org/sonar/ce/common/sca/ScaStepProvider.java +++ b/server/sonar-ce-common/src/main/java/org/sonar/ce/common/sca/ScaStepProvider.java @@ -25,9 +25,9 @@ import org.sonar.ce.task.step.ComputationStep; /** * When an implementation of this interface is available in the ioc container, the Compute Engine will use the value returned by - * {@link #get(ScannerReportReader)} as an extra step for software composition analysis. + * {@link #get(ScannerReportReader, ScaHolder)} as an extra step for software composition analysis. */ @ComputeEngineSide public interface ScaStepProvider { - ComputationStep get(ScannerReportReader reportReader); + ComputationStep get(ScannerReportReader reportReader, ScaHolder scaHolder); } |