Skip to content

Commit

Permalink
refactor(model): Expose spearate getIssues() for related ORT stages
Browse files Browse the repository at this point in the history
Prepare for re-use in upcoming changes.

Signed-off-by: Frank Viernau <[email protected]>
  • Loading branch information
fviernau committed Apr 16, 2024
1 parent f984342 commit 2fa4a58
Showing 1 changed file with 24 additions and 7 deletions.
31 changes: 24 additions & 7 deletions model/src/main/kotlin/OrtResult.kt
Original file line number Diff line number Diff line change
Expand Up @@ -253,15 +253,32 @@ data class OrtResult(
omitExcluded: Boolean = false,
omitResolved: Boolean = false,
minSeverity: Severity = Severity.entries.min()
): Map<Identifier, Set<Issue>> {
val analyzerIssues = analyzer?.result?.getAllIssues().orEmpty()
val scannerIssues = scanner?.getAllIssues().orEmpty()
val advisorIssues = advisor?.results?.getIssues().orEmpty()
): Map<Identifier, Set<Issue>> =
getAnalyzerIssues()
.zipWithCollections(getScanIssues())
.zipWithCollections(getAdvisorIssues())
.filterIssues(omitExcluded, omitResolved, minSeverity)

val allIssues = analyzerIssues.zipWithCollections(scannerIssues).zipWithCollections(advisorIssues)
fun getAnalyzerIssues(

Check notice on line 262 in model/src/main/kotlin/OrtResult.kt

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Class member can have 'private' visibility

Function 'getAnalyzerIssues' could be private
omitExcluded: Boolean = false,
omitResolved: Boolean = false,
minSeverity: Severity = Severity.entries.min()
): Map<Identifier, Set<Issue>> =
analyzer?.result?.getAllIssues().orEmpty().filterIssues(omitExcluded, omitResolved, minSeverity)

return allIssues.filterIssues(omitExcluded, omitResolved, minSeverity)
}
fun getScanIssues(
omitExcluded: Boolean = false,
omitResolved: Boolean = false,
minSeverity: Severity = Severity.entries.min()
): Map<Identifier, Set<Issue>> =
scanner?.getAllIssues().orEmpty().filterIssues(omitExcluded, omitResolved, minSeverity)

fun getAdvisorIssues(

Check notice on line 276 in model/src/main/kotlin/OrtResult.kt

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Class member can have 'private' visibility

Function 'getAdvisorIssues' could be private
omitExcluded: Boolean = false,
omitResolved: Boolean = false,
minSeverity: Severity = Severity.entries.min()
): Map<Identifier, Set<Issue>> =
advisor?.results?.getIssues().orEmpty().filterIssues(omitExcluded, omitResolved, minSeverity)

private fun Map<Identifier, Set<Issue>>.filterIssues(
omitExcluded: Boolean = false,
Expand Down

0 comments on commit 2fa4a58

Please sign in to comment.