From ecee43f871cbfb728bba1a54ccd85864b76b1967 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Tue, 18 May 2021 12:05:43 +0200 Subject: [PATCH] DependencyGraphBuilder: Rename two variables from `identifier` to `id` The name `id` is commonly used in the ORT code base. Signed-off-by: Frank Viernau --- .../main/kotlin/managers/utils/DependencyGraphBuilder.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/analyzer/src/main/kotlin/managers/utils/DependencyGraphBuilder.kt b/analyzer/src/main/kotlin/managers/utils/DependencyGraphBuilder.kt index 5706d87b5c499..e2ca05a78cd7f 100644 --- a/analyzer/src/main/kotlin/managers/utils/DependencyGraphBuilder.kt +++ b/analyzer/src/main/kotlin/managers/utils/DependencyGraphBuilder.kt @@ -164,9 +164,9 @@ class DependencyGraphBuilder( * [scopeName]. All the dependencies of this dependency are processed recursively. */ private fun addDependencyToGraph(scopeName: String, dependency: D, transitive: Boolean): DependencyReference { - val identifier = dependencyHandler.identifierFor(dependency) + val id = dependencyHandler.identifierFor(dependency) val issues = dependencyHandler.issuesForDependency(dependency).toMutableList() - val index = updateDependencyMappingAndPackages(identifier, dependency, issues) + val index = updateDependencyMappingAndPackages(id, dependency, issues) val ref = when (val result = findDependencyInGraph(index, dependency)) { is DependencyGraphSearchResult.Found -> result.ref @@ -303,8 +303,8 @@ class DependencyGraphBuilder( * Construct a [Package] for the given [dependency]. Add the new package to the set managed by this object. If this * fails, record a corresponding message in [issues]. */ - private fun updateResolvedPackages(identifier: Identifier, dependency: D, issues: MutableList) { - dependencyHandler.createPackage(identifier, dependency, issues)?.let { resolvedPackages += it } + private fun updateResolvedPackages(id: Identifier, dependency: D, issues: MutableList) { + dependencyHandler.createPackage(id, dependency, issues)?.let { resolvedPackages += it } } /**