Merge pull request #188 from tatlax3636/npe-fix

Handle NPE in filteredForBap and filteredForASV for infra evaluator

Author: nameisaravind

pom.xml

@@ -4,7 +4,7 @@
     <artifactId>api-audit</artifactId>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
-    <version>3.7.32-SNAPSHOT</version>
+    <version>3.7.33-SNAPSHOT</version>
     <description>Hygieia Audit Rest API Layer</description>
     <url>https://github.com/Hygieia/${repository.name}</url>
 

src/main/java/com/capitalone/dashboard/evaluator/InfrastructureEvaluator.java

@@ -72,17 +72,22 @@ private InfrastructureAuditResponse getInfrastructureScanResponse(CollectorItem
         infrastructureAuditResponse.setLastUpdated(collectorItem.getLastUpdated());
 
         List<InfrastructureScan> infrastructureScans = infrastructureScanRepository.findByCollectorItemIdAndTimestampIsBetweenOrderByTimestampDesc(collectorItem.getId(), beginDate - 1, endDate + 1);
+
         List<InfrastructureScan> filteredForBAP = StringUtils.isEmpty(businessComponent) ? Collections.EMPTY_LIST :
-                infrastructureScans.stream().filter(infrastructureScan -> infrastructureScan.getBusinessApplication().equalsIgnoreCase(businessComponent)).collect(Collectors.toList());
+                infrastructureScans.stream().filter(infrastructureScan ->
+                        businessComponent.equalsIgnoreCase(infrastructureScan.getBusinessApplication())).collect(Collectors.toList()
+                );
 
         if (CollectionUtils.isNotEmpty(filteredForBAP)) {
             List<InfrastructureScan> sortedDistinctForBAP = getSortedAndDistinctByInstanceId(filteredForBAP);
             setInfraAudit(infrastructureAuditResponse, sortedDistinctForBAP, InfrastructureAuditStatus.INFRA_SCAN_BUSS_COMP_CRITICAL, InfrastructureAuditStatus.INFRA_SCAN_BUSS_COMP_HIGH, InfrastructureAuditStatus.INFRA_SCAN_BUSS_COMP_OK);
             infrastructureAuditResponse.setInfrastructureScans(sortedDistinctForBAP);
         } else {
             infrastructureAuditResponse.addAuditStatus(InfrastructureAuditStatus.INFRA_SEC_SCAN_BUSS_COMP_NOT_FOUND);
+
             List<InfrastructureScan> filteredForASV = StringUtils.isEmpty(businessService) ? Collections.EMPTY_LIST :
-                    infrastructureScans.stream().filter(infrastructureScan -> infrastructureScan.getBusinessService().equalsIgnoreCase(businessService)).collect(Collectors.toList());
+                    infrastructureScans.stream().filter(infrastructureScan -> businessService.equalsIgnoreCase(infrastructureScan.getBusinessService())).collect(Collectors.toList());
+
             if (CollectionUtils.isNotEmpty(filteredForASV)) {
                 List<InfrastructureScan> sortedDistinctForASV = getSortedAndDistinctByInstanceId(filteredForASV);
                 setInfraAudit(infrastructureAuditResponse, sortedDistinctForASV, InfrastructureAuditStatus.INFRA_SEC_SCAN_BUSS_APP_CRITICAL, InfrastructureAuditStatus.INFRA_SEC_SCAN_BUSS_APP_HIGH, InfrastructureAuditStatus.INFRA_SEC_SCAN_BUSS_APP_OK);