Merge pull request #2618 from Siemens-Healthineers/fix/vulnerability-…

…tracking-status-api

fix(rest): Resolved null value returning for svm tracking status.

Reviewed-by: rudra.chopra@siemens.com
Tested-by: sameed.ahmad@siemens-healthineers.com, mishra.gaurav@siemens.com

rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/VulnerabilityController.java

@@ -528,12 +528,12 @@ public ResponseEntity<Map<String, Object>> getVulnerabilitiesTrackingStatus(
  vulnerabilityTrackingStatus.put("name", rel.getRelease().getName());
  vulnerabilityTrackingStatus.put("projectOrigin", rel.getProjectNames());
  vulnerabilityTrackingStatus.put("svmTrackingStatus",
- null != rel.getRelease().getExternalIds()
- ? rel.getRelease().getExternalIds().get("svmComponentId")
- : "");
+ (rel.getRelease().getExternalIds() != null && rel.getRelease().getExternalIds().containsKey(SW360Constants.SVM_COMPONENT_ID))
+ ? "tracked"
+ : "not tracked");
  vulnerabilityTrackingStatus.put("shortStatus",
- null != rel.getRelease().getAdditionalData()
- ? rel.getRelease().getAdditionalData().get("svmShortStatus")
+ (rel.getRelease().getAdditionalData() != null && rel.getRelease().getAdditionalData().containsKey(SW360Constants.SVM_SHORT_STATUS))
+ ? rel.getRelease().getAdditionalData().get(SW360Constants.SVM_SHORT_STATUS)
  : "");
  vulnerabilityTrackingStatus.put("type", rel.getComponentType().toString());
  vulTrackingStatusList.add(vulnerabilityTrackingStatus);