From 18d3a4f18a71028f91cd71637b4d72bd7f770be8 Mon Sep 17 00:00:00 2001 From: Martin Nonnenmacher Date: Tue, 30 Apr 2019 15:42:05 +0200 Subject: [PATCH] evaluator: Rename `errorSource()` to `issueSource()` Because the helper function is used for creating issues independent of the severity. Signed-off-by: Martin Nonnenmacher --- evaluator/src/main/kotlin/DependencyRule.kt | 2 +- evaluator/src/main/kotlin/PackageRule.kt | 4 ++-- evaluator/src/main/kotlin/Rule.kt | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/evaluator/src/main/kotlin/DependencyRule.kt b/evaluator/src/main/kotlin/DependencyRule.kt index f4f58b71db13..5f45a4610b60 100644 --- a/evaluator/src/main/kotlin/DependencyRule.kt +++ b/evaluator/src/main/kotlin/DependencyRule.kt @@ -67,7 +67,7 @@ class DependencyRule( "Evaluating rule '$name' for dependency '${dependency.id.toCoordinates()}' " + "(project=${project.id.toCoordinates()}, scope=${scope.name}, level=$level)." - override fun errorSource() = + override fun issueSource() = "$name - ${pkg.id.toCoordinates()} (dependency of ${project.id.toCoordinates()} in scope ${scope.name})" /** diff --git a/evaluator/src/main/kotlin/PackageRule.kt b/evaluator/src/main/kotlin/PackageRule.kt index 104d06dbfab5..f73df3e4255b 100644 --- a/evaluator/src/main/kotlin/PackageRule.kt +++ b/evaluator/src/main/kotlin/PackageRule.kt @@ -47,7 +47,7 @@ open class PackageRule( override val description = "Evaluating rule '$name' for package '${pkg.id.toCoordinates()}'." - override fun errorSource() = "$name - ${pkg.id.toCoordinates()}" + override fun issueSource() = "$name - ${pkg.id.toCoordinates()}" override fun runInternal() { licenseRules.forEach { it.evaluate() } @@ -149,7 +149,7 @@ open class PackageRule( override val description = "\tEvaluating license rule '$name' for $licenseSource license '$license'." - override fun errorSource() = "$name - $license ($licenseSource)" + override fun issueSource() = "$name - $license ($licenseSource)" /** * A [RuleMatcher] that checks if the [license] is a valid [SpdxLicense]. diff --git a/evaluator/src/main/kotlin/Rule.kt b/evaluator/src/main/kotlin/Rule.kt index 1cfb17eee6e8..a1757275d4cf 100644 --- a/evaluator/src/main/kotlin/Rule.kt +++ b/evaluator/src/main/kotlin/Rule.kt @@ -100,27 +100,27 @@ abstract class Rule( /** * Return a string to be used as [source][OrtIssue.source] for issues generated in [hint], [warning], and [error]. */ - abstract fun errorSource(): String + abstract fun issueSource(): String /** * Add a [hint][Severity.HINT] to the list of [issues]. */ fun hint(message: String) { - issues += OrtIssue(source = errorSource(), severity = Severity.HINT, message = message) + issues += OrtIssue(source = issueSource(), severity = Severity.HINT, message = message) } /** * Add a [warning][Severity.WARNING] to the list of [issues]. */ fun warning(message: String) { - issues += OrtIssue(source = errorSource(), severity = Severity.WARNING, message = message) + issues += OrtIssue(source = issueSource(), severity = Severity.WARNING, message = message) } /** * Add an [error][Severity.ERROR] to the list of [issues]. */ fun error(message: String) { - issues += OrtIssue(source = errorSource(), severity = Severity.ERROR, message = message) + issues += OrtIssue(source = issueSource(), severity = Severity.ERROR, message = message) } /**