Merge develop to main for release 104 (#123)

Fix StringIndexOutOfBoundsException for license #122
sonatype-nexus-community · Feb 26, 2024 · 73a3d20 · 73a3d20
1 parent e627d17
commit 73a3d20
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 5 deletions.
diff --git a/get-metrics/src/main/java/org/sonatype/cs/getmetrics/util/ParseReasons.java b/get-metrics/src/main/java/org/sonatype/cs/getmetrics/util/ParseReasons.java
@@ -52,13 +52,15 @@ private static String getCVE(JsonArray reasons) {
         return cveList;
     }
 
-    private static String getLicense(JsonArray reasons) {
+    public static String getLicense(JsonArray reasons) {
         String licenseList = "";
         List<String> licenses = new ArrayList<>();
 
         for (JsonObject reason : reasons.getValuesAs(JsonObject.class)) {
             String licenseFound = reason.getString("reason");
-
+            if (licenseFound.isEmpty()) {
+                continue;
+            }
             String license =
                     licenseFound.substring(
                             licenseFound.indexOf("(") + 1, licenseFound.indexOf(")"));
@@ -69,11 +71,17 @@ private static String getLicense(JsonArray reasons) {
             }
         }
 
-        for (String l : licenses) {
-            licenseList = l + ":" + licenseList;
+        if (licenses.size() == 0) {
+            return "";
         }
 
-        licenseList = UtilService.removeLastChar(licenseList);
+        for (String l : licenses) {
+            if (licenseList.isEmpty()) {
+                licenseList = l;
+            } else {
+                licenseList = licenseList + ":" + l;
+            }
+        }
 
         return licenseList;
     }

diff --git a/get-metrics/src/test/java/org/sonatype/cs/getmetrics/util/ParseReasonsTest.java b/get-metrics/src/test/java/org/sonatype/cs/getmetrics/util/ParseReasonsTest.java
@@ -0,0 +1,41 @@
+package org.sonatype.cs.getmetrics.util;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import javax.json.Json;
+import javax.json.JsonArray;
+
+public class ParseReasonsTest {
+    @Test
+    void testEmptyLicenseString() {
+        JsonArray reasons =
+                Json.createArrayBuilder().add(Json.createObjectBuilder().add("reason", "")).build();
+
+        String actualReason = ParseReasons.getLicense(reasons);
+        Assertions.assertEquals("", actualReason);
+    }
+
+    @Test
+    void testSingleLicenseString() {
+        JsonArray reasons =
+                Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder().add("reason", "(license)"))
+                        .build();
+
+        String actualReason = ParseReasons.getLicense(reasons);
+        Assertions.assertEquals("license", actualReason);
+    }
+
+    @Test
+    void testMultipltLicenseString() {
+        JsonArray reasons =
+                Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder().add("reason", "(license)"))
+                        .add(Json.createObjectBuilder().add("reason", "(license2)"))
+                        .build();
+
+        String actualReason = ParseReasons.getLicense(reasons);
+        Assertions.assertEquals("license:license2", actualReason);
+    }
+}