Skip to content

Commit c9627e8

Browse files
dterrybddterrybd
committed
working with manual class no category changes yet
1 parent 3947856 commit c9627e8

15 files changed

+95
-115
lines changed

‎shared-version.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// ALSO CHANGE integration-common version in src/main/resources/create-gradle-airgap-script.ft
2-
gradle.ext.blackDuckCommonVersion='66.2.8-SNAPSHOT-b'
2+
gradle.ext.blackDuckCommonVersion='66.2.8-SNAPSHOT-f'
33
gradle.ext.springBootVersion='2.7.12'

‎src/main/java/com/synopsys/integration/detect/lifecycle/run/operation/OperationRunner.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery;
3030
import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType;
3131
import com.synopsys.integration.blackduck.api.generated.view.BomStatusScanView;
32-
import com.synopsys.integration.blackduck.api.generated.view.DeveloperScansScanView;
32+
import com.synopsys.integration.blackduck.api.manual.view.DeveloperScansScanView;
3333
import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView;
3434
import com.synopsys.integration.blackduck.bdio2.model.GitInfo;
3535
import com.synopsys.integration.blackduck.bdio2.util.Bdio2Factory;

‎src/main/java/com/synopsys/integration/detect/lifecycle/run/step/RapidModeStepRunner.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,17 @@
77
import java.nio.file.Paths;
88
import java.util.ArrayList;
99
import java.util.HashSet;
10-
import java.util.Iterator;
1110
import java.util.List;
1211
import java.util.Optional;
13-
import java.util.UUID;
1412
import java.util.Set;
13+
import java.util.UUID;
1514

1615
import org.slf4j.Logger;
1716
import org.slf4j.LoggerFactory;
1817

1918
import com.google.gson.Gson;
20-
import com.synopsys.integration.blackduck.api.generated.view.DeveloperScansScanView;
19+
import com.synopsys.integration.blackduck.api.manual.view.DeveloperScansScanView;
2120
import com.synopsys.integration.blackduck.codelocation.Result;
22-
import com.synopsys.integration.blackduck.codelocation.signaturescanner.ScanBatchOutput;
2321
import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanCommandOutput;
2422
import com.synopsys.integration.detect.configuration.DetectUserFriendlyException;
2523
import com.synopsys.integration.detect.configuration.enumeration.BlackduckScanMode;

‎src/main/java/com/synopsys/integration/detect/workflow/blackduck/developer/RapidModeGenerateJsonOperation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.slf4j.LoggerFactory;
1010

1111
import com.google.gson.Gson;
12-
import com.synopsys.integration.blackduck.api.generated.view.DeveloperScansScanView;
12+
import com.synopsys.integration.blackduck.api.manual.view.DeveloperScansScanView;
1313
import com.synopsys.integration.detect.configuration.DetectUserFriendlyException;
1414
import com.synopsys.integration.detect.configuration.enumeration.ExitCodeType;
1515
import com.synopsys.integration.detect.workflow.file.DetectFileUtils;

‎src/main/java/com/synopsys/integration/detect/workflow/blackduck/developer/RapidModeLogReportOperation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.slf4j.Logger;
77
import org.slf4j.LoggerFactory;
88

9-
import com.synopsys.integration.blackduck.api.generated.view.DeveloperScansScanView;
9+
import com.synopsys.integration.blackduck.api.manual.view.DeveloperScansScanView;
1010
import com.synopsys.integration.detect.configuration.DetectUserFriendlyException;
1111
import com.synopsys.integration.detect.configuration.enumeration.BlackduckScanMode;
1212
import com.synopsys.integration.detect.configuration.enumeration.ExitCodeType;

‎src/main/java/com/synopsys/integration/detect/workflow/blackduck/developer/RapidModeWaitOperation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.slf4j.Logger;
66
import org.slf4j.LoggerFactory;
77

8-
import com.synopsys.integration.blackduck.api.generated.view.DeveloperScansScanView;
8+
import com.synopsys.integration.blackduck.api.manual.view.DeveloperScansScanView;
99
import com.synopsys.integration.blackduck.service.BlackDuckApiClient;
1010
import com.synopsys.integration.detect.configuration.enumeration.BlackduckScanMode;
1111
import com.synopsys.integration.detect.workflow.blackduck.developer.blackduck.DetectRapidScanWaitJobFull;

‎src/main/java/com/synopsys/integration/detect/workflow/blackduck/developer/aggregate/RapidScanComponentGroupDetail.java

+14-15
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
import com.synopsys.integration.blackduck.api.generated.component.DeveloperScansScanItemsPolicyViolationLicensesViolatingPoliciesView;
1212
import com.synopsys.integration.blackduck.api.generated.component.DeveloperScansScanItemsPolicyViolationVulnerabilitiesView;
1313
import com.synopsys.integration.blackduck.api.generated.component.DeveloperScansScanItemsPolicyViolationVulnerabilitiesViolatingPoliciesView;
14-
import com.synopsys.integration.blackduck.api.generated.component.DeveloperScansScanItemsView;
15-
import com.synopsys.integration.blackduck.api.generated.view.DeveloperScansScanView;
14+
import com.synopsys.integration.blackduck.api.manual.view.DeveloperScansScanView;
1615

1716
public class RapidScanComponentGroupDetail {
1817

@@ -91,8 +90,8 @@ public void addMessages(String errorMessage, String warningMessage) {
9190
// While it may be possible to reduce the overall message generation code in this class by pushing
9291
// some common pieces into a parent class or interface, it is likely not worth altering the libraries
9392
// as this may be temporary code.
94-
public void addComponentMessages(DeveloperScansScanItemsView resultItem, DeveloperScansScanItemsComponentViolatingPoliciesView componentPolicyViolation) {
95-
String baseMessage = getBaseMessage(resultItem);
93+
public void addComponentMessages(DeveloperScansScanView resultView, DeveloperScansScanItemsComponentViolatingPoliciesView componentPolicyViolation) {
94+
String baseMessage = getBaseMessage(resultView);
9695

9796
String errorMessage = "", warningMessage = "";
9897

@@ -122,8 +121,8 @@ public void addComponentMessages(DeveloperScansScanItemsView resultItem, Develop
122121
// While it may be possible to reduce the overall message generation code in this class by pushing
123122
// some common pieces into a parent class or interface, it is likely not worth altering the libraries
124123
// as this may be temporary code.
125-
public void addLicenseMessages(DeveloperScansScanItemsView resultItem, DeveloperScansScanItemsPolicyViolationLicensesView licensePolicyViolation) {
126-
String baseMessage = getBaseMessage(resultItem);
124+
public void addLicenseMessages(DeveloperScansScanView resultView, DeveloperScansScanItemsPolicyViolationLicensesView licensePolicyViolation) {
125+
String baseMessage = getBaseMessage(resultView);
127126

128127
List<DeveloperScansScanItemsPolicyViolationLicensesViolatingPoliciesView> violatingPolicies = licensePolicyViolation.getViolatingPolicies();
129128

@@ -168,9 +167,9 @@ public void addLicenseMessages(DeveloperScansScanItemsView resultItem, Developer
168167
// While it may be possible to reduce the overall message generation code in this class by pushing
169168
// some common pieces into a parent class or interface, it is likely not worth altering the libraries
170169
// as this may be temporary code.
171-
public void addVulnerabilityMessages(DeveloperScansScanItemsView resultItem,
170+
public void addVulnerabilityMessages(DeveloperScansScanView resultView,
172171
DeveloperScansScanItemsPolicyViolationVulnerabilitiesView vulnerabilityPolicyViolation) {
173-
String baseMessage = getBaseMessage(resultItem);
172+
String baseMessage = getBaseMessage(resultView);
174173

175174
List<DeveloperScansScanItemsPolicyViolationVulnerabilitiesViolatingPoliciesView> violatingPolicies = vulnerabilityPolicyViolation.getViolatingPolicies();
176175

@@ -196,10 +195,10 @@ public void addVulnerabilityMessages(DeveloperScansScanItemsView resultItem,
196195
warningMessage += summaryMessage;
197196
}
198197

199-
if (resultItem.getLongTermUpgradeGuidance() != null && resultItem.getShortTermUpgradeGuidance() != null) {
198+
if (resultView.getLongTermUpgradeGuidance() != null && resultView.getShortTermUpgradeGuidance() != null) {
200199
String upgradeGuidance = " Long term upgrade guidance: "
201-
+ resultItem.getLongTermUpgradeGuidance().getVersionName() + ", short term upgrade guidance "
202-
+ resultItem.getShortTermUpgradeGuidance().getVersionName();
200+
+ resultView.getLongTermUpgradeGuidance().getVersionName() + ", short term upgrade guidance "
201+
+ resultView.getShortTermUpgradeGuidance().getVersionName();
203202

204203
if (StringUtils.isNotBlank(errorMessage)) {
205204
errorMessage += upgradeGuidance;
@@ -224,10 +223,10 @@ private String constructVulnerabilityMessageSegment(String baseMessage, String o
224223
return overallMessage;
225224
}
226225

227-
private String getBaseMessage(DeveloperScansScanItemsView resultItem) {
228-
String baseMessage = "Component " + resultItem.getComponentName() + " version " + resultItem.getVersionName();
229-
if (StringUtils.isNotBlank(resultItem.getExternalId())) {
230-
baseMessage += " with ID " + resultItem.getExternalId();
226+
private String getBaseMessage(DeveloperScansScanView resultView) {
227+
String baseMessage = "Component " + resultView.getComponentName() + " version " + resultView.getVersionName();
228+
if (StringUtils.isNotBlank(resultView.getExternalId())) {
229+
baseMessage += " with ID " + resultView.getExternalId();
231230
}
232231
baseMessage += " violates policy ";
233232
return baseMessage;

‎src/main/java/com/synopsys/integration/detect/workflow/blackduck/developer/aggregate/RapidScanResultAggregator.java

+57-71
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
import com.synopsys.integration.blackduck.api.generated.component.DeveloperScansScanItemsTransitiveUpgradeGuidanceLongTermUpgradeGuidanceView;
2323
import com.synopsys.integration.blackduck.api.generated.component.DeveloperScansScanItemsTransitiveUpgradeGuidanceShortTermUpgradeGuidanceView;
2424
import com.synopsys.integration.blackduck.api.generated.component.DeveloperScansScanItemsTransitiveUpgradeGuidanceView;
25-
import com.synopsys.integration.blackduck.api.generated.component.DeveloperScansScanItemsView;
26-
import com.synopsys.integration.blackduck.api.generated.view.DeveloperScansScanView;
25+
import com.synopsys.integration.blackduck.api.manual.view.DeveloperScansScanView;
2726

2827
public class RapidScanResultAggregator {
2928

@@ -68,62 +67,49 @@ public RapidScanAggregateResult aggregateData(List<DeveloperScansScanView> resul
6867
private List<RapidScanComponentDetail> aggregateComponentData(List<DeveloperScansScanView> results) {
6968
// the key is the component identifier
7069
List<RapidScanComponentDetail> componentDetails = new LinkedList<>();
71-
72-
for (DeveloperScansScanView resultView : results) {
73-
processViewItems(componentDetails, resultView);
74-
}
75-
76-
return componentDetails;
77-
}
7870

79-
/**
80-
* @param componentDetails
81-
* @param resultView
82-
*/
83-
private void processViewItems(List<RapidScanComponentDetail> componentDetails, DeveloperScansScanView highLevelView) {
84-
85-
for (DeveloperScansScanItemsView resultItem : highLevelView.getItems()) {
86-
87-
compileTransitiveGuidance(resultItem);
88-
89-
RapidScanComponentDetail componentDetail = createDetail(resultItem);
90-
componentDetails.add(componentDetail);
91-
RapidScanComponentGroupDetail componentGroupDetail = componentDetail.getComponentDetails();
92-
RapidScanComponentGroupDetail securityGroupDetail = componentDetail.getSecurityDetails();
93-
RapidScanComponentGroupDetail licenseGroupDetail = componentDetail.getLicenseDetails();
94-
95-
List<DeveloperScansScanItemsComponentViolatingPoliciesView> componentViolations =
96-
resultItem.getComponentViolatingPolicies();
97-
List<DeveloperScansScanItemsPolicyViolationVulnerabilitiesView> vulnerabilityViolations = resultItem
98-
.getPolicyViolationVulnerabilities();
99-
List<DeveloperScansScanItemsPolicyViolationLicensesView> licenseViolations = resultItem
100-
.getPolicyViolationLicenses();
101-
102-
Set<String> vulnerabilityPolicyNames = vulnerabilityViolations.stream()
103-
.map(DeveloperScansScanItemsPolicyViolationVulnerabilitiesView::getViolatingPolicies)
104-
.flatMap(Collection::stream)
105-
.map(DeveloperScansScanItemsPolicyViolationVulnerabilitiesViolatingPoliciesView::getPolicyName)
106-
.collect(Collectors.toSet());
107-
108-
Set<String> licensePolicyNames = licenseViolations.stream()
109-
.map(DeveloperScansScanItemsPolicyViolationLicensesView::getViolatingPolicies)
110-
.flatMap(Collection::stream)
111-
.map(DeveloperScansScanItemsPolicyViolationLicensesViolatingPoliciesView::getPolicyName)
112-
.collect(Collectors.toSet());
113-
114-
Set<String> componentPolicyNames = componentViolations.stream()
115-
.map(DeveloperScansScanItemsComponentViolatingPoliciesView::getPolicyName)
116-
.collect(Collectors.toSet());
71+
for (DeveloperScansScanView resultView : results) {
72+
this.compileTransitiveGuidance(resultView);
73+
74+
RapidScanComponentDetail componentDetail = createDetail(resultView);
75+
componentDetails.add(componentDetail);
76+
RapidScanComponentGroupDetail componentGroupDetail = componentDetail.getComponentDetails();
77+
RapidScanComponentGroupDetail securityGroupDetail = componentDetail.getSecurityDetails();
78+
RapidScanComponentGroupDetail licenseGroupDetail = componentDetail.getLicenseDetails();
79+
80+
List<DeveloperScansScanItemsComponentViolatingPoliciesView> componentViolations =
81+
resultView.getComponentViolatingPolicies();
82+
List<DeveloperScansScanItemsPolicyViolationVulnerabilitiesView> vulnerabilityViolations = resultView
83+
.getPolicyViolationVulnerabilities();
84+
List<DeveloperScansScanItemsPolicyViolationLicensesView> licenseViolations = resultView
85+
.getPolicyViolationLicenses();
86+
87+
Set<String> vulnerabilityPolicyNames = vulnerabilityViolations.stream()
88+
.map(DeveloperScansScanItemsPolicyViolationVulnerabilitiesView::getViolatingPolicies)
89+
.flatMap(Collection::stream)
90+
.map(DeveloperScansScanItemsPolicyViolationVulnerabilitiesViolatingPoliciesView::getPolicyName)
91+
.collect(Collectors.toSet());
92+
93+
Set<String> licensePolicyNames = licenseViolations.stream()
94+
.map(DeveloperScansScanItemsPolicyViolationLicensesView::getViolatingPolicies)
95+
.flatMap(Collection::stream)
96+
.map(DeveloperScansScanItemsPolicyViolationLicensesViolatingPoliciesView::getPolicyName)
97+
.collect(Collectors.toSet());
98+
99+
Set<String> componentPolicyNames = componentViolations.stream()
100+
.map(DeveloperScansScanItemsComponentViolatingPoliciesView::getPolicyName)
101+
.collect(Collectors.toSet());
117102

118-
componentGroupDetail.addPolicies(componentPolicyNames);
119-
securityGroupDetail.addPolicies(vulnerabilityPolicyNames);
120-
licenseGroupDetail.addPolicies(licensePolicyNames);
103+
componentGroupDetail.addPolicies(componentPolicyNames);
104+
securityGroupDetail.addPolicies(vulnerabilityPolicyNames);
105+
licenseGroupDetail.addPolicies(licensePolicyNames);
121106

122-
addComponentData(resultItem, componentViolations, componentGroupDetail);
123-
addVulnerabilityData(resultItem, vulnerabilityViolations, securityGroupDetail);
124-
addLicenseData(resultItem, licenseViolations, licenseGroupDetail);
125-
107+
addComponentData(resultView, componentViolations, componentGroupDetail);
108+
addVulnerabilityData(resultView, vulnerabilityViolations, securityGroupDetail);
109+
addLicenseData(resultView, licenseViolations, licenseGroupDetail);
126110
}
111+
112+
return componentDetails;
127113
}
128114

129115
/**
@@ -134,13 +120,13 @@ private void processViewItems(List<RapidScanComponentDetail> componentDetails, D
134120
* can get a proper lookup of direct comp. -> child component(s). Once this is completed,
135121
* we can put together the string messages needed.
136122
*
137-
* @param resultItem
123+
* @param resultView
138124
* @param results
139125
*/
140-
private void compileTransitiveGuidance(DeveloperScansScanItemsView resultItem) {
141-
List<DeveloperScansScanItemsTransitiveUpgradeGuidanceView> transitiveGuidance = resultItem.getTransitiveUpgradeGuidance();
126+
private void compileTransitiveGuidance(DeveloperScansScanView resultView) {
127+
List<DeveloperScansScanItemsTransitiveUpgradeGuidanceView> transitiveGuidance = resultView.getTransitiveUpgradeGuidance();
142128
if (transitiveGuidance != null && !transitiveGuidance.isEmpty()) {
143-
String childExternalId = resultItem.getExternalId();
129+
String childExternalId = resultView.getExternalId();
144130
for (DeveloperScansScanItemsTransitiveUpgradeGuidanceView guidance : transitiveGuidance) {
145131
String parentId = guidance.getExternalId();
146132
String[] versions = getversionsFromUpgradeGuidance(guidance);
@@ -177,15 +163,15 @@ and suggest that in the guidance (as if stg.version = ltg.version) */
177163
return new String[] { shortTermVersion, longTermVersion };
178164
}
179165

180-
private RapidScanComponentDetail createDetail(DeveloperScansScanItemsView resultItem) {
181-
String componentName = resultItem.getComponentName();
182-
String componentVersion = resultItem.getVersionName();
166+
private RapidScanComponentDetail createDetail(DeveloperScansScanView resultView) {
167+
String componentName = resultView.getComponentName();
168+
String componentVersion = resultView.getVersionName();
183169
String componentIdentifier = "";
184170

185-
if (StringUtils.isNotBlank(resultItem.getComponentIdentifier())) {
186-
componentIdentifier = resultItem.getComponentIdentifier();
187-
} else if (StringUtils.isNotBlank(resultItem.getExternalId())) {
188-
componentIdentifier = resultItem.getExternalId();
171+
if (StringUtils.isNotBlank(resultView.getComponentIdentifier())) {
172+
componentIdentifier = resultView.getComponentIdentifier();
173+
} else if (StringUtils.isNotBlank(resultView.getExternalId())) {
174+
componentIdentifier = resultView.getExternalId();
189175
}
190176

191177
RapidScanComponentGroupDetail componentGroupDetail = new RapidScanComponentGroupDetail(RapidScanDetailGroup.POLICY);
@@ -196,21 +182,21 @@ private RapidScanComponentDetail createDetail(DeveloperScansScanItemsView result
196182
securityGroupDetail, licenseGroupDetail);
197183
}
198184

199-
private void addVulnerabilityData(DeveloperScansScanItemsView resultItem, List<DeveloperScansScanItemsPolicyViolationVulnerabilitiesView> vulnerabilities, RapidScanComponentGroupDetail securityDetail) {
185+
private void addVulnerabilityData(DeveloperScansScanView resultView, List<DeveloperScansScanItemsPolicyViolationVulnerabilitiesView> vulnerabilities, RapidScanComponentGroupDetail securityDetail) {
200186
for (DeveloperScansScanItemsPolicyViolationVulnerabilitiesView vulnerabilityPolicyViolation : vulnerabilities) {
201-
securityDetail.addVulnerabilityMessages(resultItem, vulnerabilityPolicyViolation);
187+
securityDetail.addVulnerabilityMessages(resultView, vulnerabilityPolicyViolation);
202188
}
203189
}
204190

205-
private void addLicenseData(DeveloperScansScanItemsView resultItem, List<DeveloperScansScanItemsPolicyViolationLicensesView> licenseViolations, RapidScanComponentGroupDetail licenseDetail) {
191+
private void addLicenseData(DeveloperScansScanView resultView, List<DeveloperScansScanItemsPolicyViolationLicensesView> licenseViolations, RapidScanComponentGroupDetail licenseDetail) {
206192
for (DeveloperScansScanItemsPolicyViolationLicensesView licensePolicyViolation : licenseViolations) {
207-
licenseDetail.addLicenseMessages(resultItem, licensePolicyViolation);
193+
licenseDetail.addLicenseMessages(resultView, licensePolicyViolation);
208194
}
209195
}
210196

211-
private void addComponentData(DeveloperScansScanItemsView resultItem, List<DeveloperScansScanItemsComponentViolatingPoliciesView> componentViolations, RapidScanComponentGroupDetail componentGroupDetail) {
197+
private void addComponentData(DeveloperScansScanView resultView, List<DeveloperScansScanItemsComponentViolatingPoliciesView> componentViolations, RapidScanComponentGroupDetail componentGroupDetail) {
212198
for (DeveloperScansScanItemsComponentViolatingPoliciesView componentPolicyViolation: componentViolations) {
213-
componentGroupDetail.addComponentMessages(resultItem, componentPolicyViolation);
199+
componentGroupDetail.addComponentMessages(resultView, componentPolicyViolation);
214200
}
215201
}
216202

0 commit comments

Comments
 (0)