From d03abd456cefc17281bcb07699ff51fc275fa7a9 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Tue, 13 Aug 2024 19:31:33 +0200 Subject: [PATCH] refactor(bazel)!: Align create function and parameter naming Signed-off-by: Sebastian Schuberth --- .../kotlin/LocalBazelModuleRegistryService.kt | 2 +- .../kotlin/CompositeBazelModuleRegistryService.kt | 2 +- .../kotlin/MultiBazelModuleRegistryService.kt | 15 +++++++-------- .../kotlin/MultiBazelModuleRegistryServiceTest.kt | 6 +++--- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/clients/bazel-module-registry/src/main/kotlin/LocalBazelModuleRegistryService.kt b/clients/bazel-module-registry/src/main/kotlin/LocalBazelModuleRegistryService.kt index 4c56f6075703..3901c40ecc87 100644 --- a/clients/bazel-module-registry/src/main/kotlin/LocalBazelModuleRegistryService.kt +++ b/clients/bazel-module-registry/src/main/kotlin/LocalBazelModuleRegistryService.kt @@ -43,7 +43,7 @@ class LocalBazelModuleRegistryService(directory: File) : BazelModuleRegistryServ * Create a [LocalBazelModuleRegistryService] if the given [url] points to a local file. In this case, * also replace the placeholder for the workspace by the given [projectDir]. Return *null* for all other URLs. */ - fun createForLocalUrl(url: String, projectDir: File): LocalBazelModuleRegistryService? = + fun create(url: String, projectDir: File): LocalBazelModuleRegistryService? = url.takeIf { it.startsWith(FILE_URL_PREFIX) }?.let { fileUrl -> val directory = fileUrl.removePrefix(FILE_URL_PREFIX) .replace(WORKSPACE_PLACEHOLDER, projectDir.absolutePath) diff --git a/plugins/package-managers/bazel/src/main/kotlin/CompositeBazelModuleRegistryService.kt b/plugins/package-managers/bazel/src/main/kotlin/CompositeBazelModuleRegistryService.kt index ca8538b7770e..5d4313919997 100644 --- a/plugins/package-managers/bazel/src/main/kotlin/CompositeBazelModuleRegistryService.kt +++ b/plugins/package-managers/bazel/src/main/kotlin/CompositeBazelModuleRegistryService.kt @@ -64,7 +64,7 @@ internal class CompositeBazelModuleRegistryService( }.groupByTo(mutableMapOf(), { it.first }) { it.second }.mapValues { it.value.toSet() } val packageNamesForRegistry = packageNamesForServer.mapKeys { (url, _) -> - LocalBazelModuleRegistryService.createForLocalUrl(url, projectDir) + LocalBazelModuleRegistryService.create(url, projectDir) ?: RemoteBazelModuleRegistryService.create(url) } diff --git a/plugins/package-managers/bazel/src/main/kotlin/MultiBazelModuleRegistryService.kt b/plugins/package-managers/bazel/src/main/kotlin/MultiBazelModuleRegistryService.kt index d4928d023344..2ac020297d7c 100644 --- a/plugins/package-managers/bazel/src/main/kotlin/MultiBazelModuleRegistryService.kt +++ b/plugins/package-managers/bazel/src/main/kotlin/MultiBazelModuleRegistryService.kt @@ -40,15 +40,14 @@ internal class MultiBazelModuleRegistryService( ) : BazelModuleRegistryService { companion object { /** - * Create an instance of [MultiBazelModuleRegistryService] for the given [registryUrls]. Based on the URLs, - * concrete [BazelModuleRegistryService] implementations are created. Local registry services use the given - * [projectDir] as workspace. These services are then queried in the order defined by the passed in collection. - * Note that as the last service a remote module registry for the Bazel Central Registry is added that serves - * as a fallback. + * Create an instance of [MultiBazelModuleRegistryService] for the given [urls]. Based on the URLs, concrete + * [BazelModuleRegistryService] implementations are created. Local registry services use the given [projectDir] + * as workspace. These services are then queried in the order defined by the passed in collection. Note that as + * the last service a remote module registry for the Bazel Central Registry is added that serves as a fallback. */ - fun create(registryUrls: Collection, projectDir: File): MultiBazelModuleRegistryService { - val registryServices = registryUrls.mapTo(mutableListOf()) { url -> - LocalBazelModuleRegistryService.createForLocalUrl(url, projectDir) + fun create(urls: Collection, projectDir: File): MultiBazelModuleRegistryService { + val registryServices = urls.mapTo(mutableListOf()) { url -> + LocalBazelModuleRegistryService.create(url, projectDir) ?: RemoteBazelModuleRegistryService.create(url) } diff --git a/plugins/package-managers/bazel/src/test/kotlin/MultiBazelModuleRegistryServiceTest.kt b/plugins/package-managers/bazel/src/test/kotlin/MultiBazelModuleRegistryServiceTest.kt index 00e6d07ae40a..18974fae7f6c 100644 --- a/plugins/package-managers/bazel/src/test/kotlin/MultiBazelModuleRegistryServiceTest.kt +++ b/plugins/package-managers/bazel/src/test/kotlin/MultiBazelModuleRegistryServiceTest.kt @@ -151,13 +151,13 @@ private class MockRegistryServices( val centralRegistry = mockk() every { - LocalBazelModuleRegistryService.createForLocalUrl(any(), projectDir) + LocalBazelModuleRegistryService.create(any(), projectDir) } returns null every { - LocalBazelModuleRegistryService.createForLocalUrl(registryUrls[0], projectDir) + LocalBazelModuleRegistryService.create(registryUrls[0], projectDir) } returns localRegistry1 every { - LocalBazelModuleRegistryService.createForLocalUrl(registryUrls[2], projectDir) + LocalBazelModuleRegistryService.create(registryUrls[2], projectDir) } returns localRegistry2 every { RemoteBazelModuleRegistryService.create(registryUrls[1])