Skip to content

Commit 33b193c

Browse files
mnonnenmachersschuberth
authored andcommitted
chore(nuget): Use the createAndLogIssue helper function
Signed-off-by: Martin Nonnenmacher <[email protected]>
1 parent ebe3095 commit 33b193c

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

plugins/package-managers/nuget/src/main/kotlin/NuGet.kt

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import org.ossreviewtoolkit.model.ProjectAnalyzerResult
2828
import org.ossreviewtoolkit.model.Severity
2929
import org.ossreviewtoolkit.model.config.AnalyzerConfiguration
3030
import org.ossreviewtoolkit.model.config.Excludes
31+
import org.ossreviewtoolkit.model.createAndLogIssue
3132
import org.ossreviewtoolkit.plugins.api.OrtPlugin
3233
import org.ossreviewtoolkit.plugins.api.PluginDescriptor
3334
import org.ossreviewtoolkit.plugins.packagemanagers.nuget.utils.NuGetInspector
@@ -73,19 +74,11 @@ class NuGet(override val descriptor: PluginDescriptor = NuGetFactory.descriptor,
7374

7475
private fun collectTopLevelIssues(result: NuGetInspector.Result): List<Issue> {
7576
val errors = (result.headers.flatMap { it.errors } + result.packages.flatMap { it.errors }).map { message ->
76-
Issue(
77-
source = descriptor.displayName,
78-
message = message,
79-
severity = Severity.ERROR
80-
)
77+
createAndLogIssue(message, Severity.ERROR)
8178
}
8279

8380
val warnings = result.packages.flatMap { it.warnings }.map { message ->
84-
Issue(
85-
source = descriptor.displayName,
86-
message = message,
87-
severity = Severity.WARNING
88-
)
81+
createAndLogIssue(message, Severity.WARNING)
8982
}
9083

9184
return errors + warnings

plugins/package-managers/nuget/src/main/kotlin/utils/NuGetInspectorExtensions.kt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import org.ossreviewtoolkit.analyzer.PackageManager
2525
import org.ossreviewtoolkit.downloader.VersionControlSystem
2626
import org.ossreviewtoolkit.model.Hash
2727
import org.ossreviewtoolkit.model.Identifier
28-
import org.ossreviewtoolkit.model.Issue
2928
import org.ossreviewtoolkit.model.Package
3029
import org.ossreviewtoolkit.model.PackageReference
3130
import org.ossreviewtoolkit.model.Project
@@ -34,8 +33,10 @@ import org.ossreviewtoolkit.model.Scope
3433
import org.ossreviewtoolkit.model.Severity
3534
import org.ossreviewtoolkit.model.VcsInfo
3635
import org.ossreviewtoolkit.model.VcsType
36+
import org.ossreviewtoolkit.model.createAndLogIssue
3737
import org.ossreviewtoolkit.model.fromYaml
3838
import org.ossreviewtoolkit.model.utils.toPurl
39+
import org.ossreviewtoolkit.plugins.packagemanagers.nuget.NuGetFactory
3940
import org.ossreviewtoolkit.utils.ort.DeclaredLicenseProcessor
4041

4142
private const val TYPE = "NuGet"
@@ -93,11 +94,19 @@ private fun NuGetInspector.PackageData.getIdentifierWithNamespace(): Identifier
9394
private fun List<NuGetInspector.PackageData>.toPackageReferences(): Set<PackageReference> =
9495
mapTo(mutableSetOf()) { data ->
9596
val errors = data.errors.map {
96-
Issue(source = TYPE, message = it.lineSequence().first(), severity = Severity.ERROR)
97+
createAndLogIssue(
98+
source = NuGetFactory.descriptor.displayName,
99+
message = it.lineSequence().first(),
100+
severity = Severity.ERROR
101+
)
97102
}
98103

99104
val warnings = data.warnings.map {
100-
Issue(source = TYPE, message = it.lineSequence().first(), severity = Severity.WARNING)
105+
createAndLogIssue(
106+
source = NuGetFactory.descriptor.displayName,
107+
message = it.lineSequence().first(),
108+
severity = Severity.WARNING
109+
)
101110
}
102111

103112
PackageReference(

0 commit comments

Comments
 (0)