fix: fix Sonarcloud findings

remisbaima · Apr 23, 2022 · a1de9fd · a1de9fd
1 parent e771043
commit a1de9fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/main/java/org/remis/cyclonedx/LicenseChecker.java b/src/main/java/org/remis/cyclonedx/LicenseChecker.java
@@ -39,16 +39,12 @@ protected Map<String, String> checkBom(Bom bom, Set<String> allowedLicenses) {
     for (Component component : bom.getComponents()) {
       String dependencyId = getDependencyId(component);
       LicenseChoice licenseChoice = component.getLicenseChoice();
-      if (licenseChoice == null) {
-        nonCompliantDependencies.put(dependencyId, null);
-        continue;
-      }
-      List<License> licenses = licenseChoice.getLicenses();
-      if (licenses == null) {
+      if (licenseChoice == null || licenseChoice.getLicenses() == null) {
         nonCompliantDependencies.put(dependencyId, null);
         continue;
       }
 
+      List<License> 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
@@ -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";