Fix partial license objects being returned by /api/v1/component f…

…or components with unresolved license (#578)
DependencyTrack · Feb 15, 2024 · fc10adb · fc10adb
1 parent efa9fd9
commit fc10adb
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/src/main/java/org/dependencytrack/model/sqlmapping/ComponentProjection.java b/src/main/java/org/dependencytrack/model/sqlmapping/ComponentProjection.java
@@ -217,23 +217,22 @@ public static Component mapToComponent(ComponentProjection result) {
         project.setVersion(result.projectVersion);
         componentPersistent.setProject(project);
 
-        var license = new License();
-        license.setName(result.licenseName);
         if (result.licenseUuid != null) {
+            final var license = new License();
             license.setUuid(UUID.fromString(result.licenseUuid));
+            license.setLicenseId(result.licenseId);
+            license.setName(result.licenseName);
+            if (result.isCustomLicense != null) {
+                license.setCustomLicense(result.isCustomLicense);
+            }
+            if (result.isFsfLibre != null) {
+                license.setFsfLibre(result.isFsfLibre);
+            }
+            if (result.isOsiApproved != null) {
+                license.setOsiApproved(result.isOsiApproved);
+            }
+            componentPersistent.setResolvedLicense(license);
         }
-        if (result.isCustomLicense != null) {
-            license.setCustomLicense(result.isCustomLicense);
-        }
-        if (result.isFsfLibre != null) {
-            license.setFsfLibre(result.isFsfLibre);
-        }
-        license.setLicenseId(result.licenseId);
-        if (result.isOsiApproved != null) {
-            license.setOsiApproved(result.isOsiApproved);
-        }
-        license.setName(result.licenseName);
-        componentPersistent.setResolvedLicense(license);
 
         var componentMetaInformation = new ComponentMetaInformation(result.publishedAt,
                 result.integrityCheckStatus != null ? IntegrityMatchStatus.valueOf(result.integrityCheckStatus) : null,