feat: Initial version of HTML report generation for single scan #573
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Oleg Kopysov <[email protected]>
o-kopysov
requested review from
tiokim,
MoonkiHong and
tdrozdovsky
as code owners
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #573 +/- ##
===========================================
+ Coverage 0 93.04% +93.04%
- Complexity 0 575 +575
===========================================
Files 0 49 +49
Lines 0 1999 +1999
Branches 0 231 +231
===========================================
+ Hits 0 1860 +1860
- Misses 0 66 +66
- Partials 0 73 +73 ☔ View full report in Codecov by Sentry. |
Signed-off-by: Oleg Kopysov <[email protected]>
tdrozdovsky
approved these changes
Aug 15, 2024
|
@tiokim do you have any comments regarding PR? |
m-rudyk
reviewed
Aug 19, 2024
| @@ -38,6 +38,11 @@ | |||
| </properties> | |||
|
|
|||
| <dependencies> | |||
| <dependency> | |||
There was a problem hiding this comment.
Let's check solution with 'ConfigurableApplicationContext'
m-rudyk
requested changes
Aug 19, 2024
| private String scannerType; | ||
|
|
||
| private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | ||
| private Map<String, GroupInfo<Map<String, GroupInfo<Map<String, GroupInfo<List<LPVSFile>>>>>>> |
There was a problem hiding this comment.
I'd suggest to create custom classes for this structure:
'ComponentInfo'
'AccessInfo'
'LicenseInfo'
Comment on lines
+150
to
+208
| if (detectedLicenseInfo == null && scanResults != null && !scanResults.isEmpty()) { | ||
| List<LPVSFile> filesScanResults = getLpvsFilesFromScanResults(scanResults); | ||
|
|
||
| detectedLicenseInfo = | ||
| filesScanResults.stream() | ||
| .collect( | ||
| Collectors.groupingBy( | ||
| LPVSFile -> | ||
| LPVSFile.getLicenses().stream() | ||
| .findFirst() | ||
| .get() | ||
| .getAccess(), | ||
| Collectors.collectingAndThen( | ||
| Collectors.groupingBy( | ||
| LPVSFile -> | ||
| LPVSFile.getLicenses().stream() | ||
| .findFirst() | ||
| .get() | ||
| .getSpdxId(), | ||
| Collectors.collectingAndThen( | ||
| Collectors.groupingBy( | ||
| LPVSFile -> | ||
| LPVSFile | ||
| .getComponentVendor() | ||
| + " / " | ||
| + LPVSFile | ||
| .getComponentName() | ||
| + ":::" | ||
| + LPVSFile | ||
| .getComponentUrl(), | ||
| Collectors | ||
| .collectingAndThen( | ||
| Collectors | ||
| .toList(), | ||
| elements -> | ||
| new GroupInfo<>( | ||
| elements | ||
| .size(), | ||
| elements))), | ||
| groupedByComponent -> | ||
| new GroupInfo<>( | ||
| groupedByComponent | ||
| .values() | ||
| .stream() | ||
| .mapToLong( | ||
| GroupInfo | ||
| ::getCount) | ||
| .sum(), | ||
| groupedByComponent))), | ||
| groupedByLicense -> | ||
| new GroupInfo<>( | ||
| groupedByLicense | ||
| .values() | ||
| .stream() | ||
| .mapToLong( | ||
| GroupInfo | ||
| ::getCount) | ||
| .sum(), | ||
| groupedByLicense)))); |
There was a problem hiding this comment.
to much for single instruction. Split required here.
How about:
Map<String, GroupInfo<?>> detectedLicenseInfo = filesScanResults.stream()
.collect(Collectors.groupingBy(
this::getFirstLicenseAccess,
Collectors.collectingAndThen(
Collectors.groupingBy(
this::getFirstLicenseSpdxId,
Collectors.collectingAndThen(
Collectors.groupingBy(
this::getComponentKey,
Collectors.collectingAndThen(
Collectors.toList(),
this::createGroupInfo
)
),
this::summarizeGroupInfo
)
),
this::summarizeGroupInfo
)
));
and after that implement corresponding methods?
together with created classes above it will be much easier to maintain.
tiokim
reviewed
Aug 19, 2024
|
|
||
| @BeforeEach | ||
| public void setUp() throws Exception { | ||
| lic1 = |
There was a problem hiding this comment.
It would be nice if the variable name is better named around the functionality like licMIT instead of simple number.
17 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request
Description
The current PR contains improvements in the HTML reports generated by a single scan (scan of PR or local file(s)).
Type of change
Please delete options that are not relevant.
Testing
Checklist: