From a1de9fdf025de47f254d48a3528e5a697047ef03 Mon Sep 17 00:00:00 2001 From: Remis Baima Date: Sat, 23 Apr 2022 18:10:55 +0200 Subject: [PATCH] fix: fix Sonarcloud findings --- src/main/java/org/remis/cyclonedx/LicenseChecker.java | 8 ++------ src/test/java/org/remis/cyclonedx/LicenseCheckerTest.java | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/remis/cyclonedx/LicenseChecker.java b/src/main/java/org/remis/cyclonedx/LicenseChecker.java index bd660b8..e9a14b0 100644 --- a/src/main/java/org/remis/cyclonedx/LicenseChecker.java +++ b/src/main/java/org/remis/cyclonedx/LicenseChecker.java @@ -39,16 +39,12 @@ protected Map checkBom(Bom bom, Set allowedLicenses) { for (Component component : bom.getComponents()) { String dependencyId = getDependencyId(component); LicenseChoice licenseChoice = component.getLicenseChoice(); - if (licenseChoice == null) { - nonCompliantDependencies.put(dependencyId, null); - continue; - } - List licenses = licenseChoice.getLicenses(); - if (licenses == null) { + if (licenseChoice == null || licenseChoice.getLicenses() == null) { nonCompliantDependencies.put(dependencyId, null); continue; } + List licenses = licenseChoice.getLicenses(); for (License license : licenses) { String licenseId = license.getId(); if (!allowedLicenses.contains(StringUtils.lowerCase(licenseId))) { diff --git a/src/test/java/org/remis/cyclonedx/LicenseCheckerTest.java b/src/test/java/org/remis/cyclonedx/LicenseCheckerTest.java index 763c785..42661c9 100644 --- a/src/test/java/org/remis/cyclonedx/LicenseCheckerTest.java +++ b/src/test/java/org/remis/cyclonedx/LicenseCheckerTest.java @@ -19,7 +19,7 @@ import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.MethodSource; -public class LicenseCheckerTest { +class LicenseCheckerTest { private static final URL JSON_FILE_URL = LicenseCheckerTest.class.getResource("/complex-project/allowedLicenses.json"); private static final String JSON_PATH = "$[?(@.License_Conflicts=='No')].License_SPDX";