switch documentation to Kotlin's style

scrayosnet · Mar 22, 2024 · 22197eb · 22197eb
1 parent 48962c8
commit 22197eb
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -46,9 +46,6 @@ dependencies {
     testImplementation(libs.mockk)
     testImplementation(libs.bundles.log4j)
     testRuntimeOnly(libs.grpc.netty)
-
-    // integrate the dokka html export plugin
-    dokkaHtmlPlugin(libs.dokka.html)
 }
 
 // configure the kotlin extension

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -25,7 +25,6 @@ kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test" }
 slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
 log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
 log4j-slf4j = { group = "org.apache.logging.log4j", name = "log4j-slf4j-impl", version.ref = "log4j" }
-dokka-html = { group = "org.jetbrains.dokka", name = "kotlin-as-java-plugin", version.ref = "dokka" }
 protoc-core = { group = "com.google.protobuf", name = "protoc", version.ref = "protobuf" }
 protoc-genJava = { group = "io.grpc", name = "protoc-gen-grpc-java", version.ref = "protoc-java" }
 protoc-genKotlin = { group = "io.grpc", name = "protoc-gen-grpc-kotlin", version.ref = "protoc-kotlin" }

diff --git a/src/main/kotlin/net/scrayos/xenos/client/GrpcXenosClient.kt b/src/main/kotlin/net/scrayos/xenos/client/GrpcXenosClient.kt
@@ -73,13 +73,11 @@ class GrpcXenosClient(
         }
     }
 
-    override suspend fun getUuids(names: Collection<String>): Map<String, UuidInfo?> = stub.getUuids(
+    override suspend fun getUuids(names: Collection<String>): Map<String, UuidInfo> = stub.getUuids(
         uuidsRequest {
             usernames.addAll(names)
         },
-    )
-        .toResult()
-        .filter { it.value != null }
+    ).toResult()
 
     override suspend fun getProfile(userId: UUID): ProfileInfo? {
         return try {

diff --git a/src/main/kotlin/net/scrayos/xenos/client/XenosClient.kt b/src/main/kotlin/net/scrayos/xenos/client/XenosClient.kt
@@ -46,7 +46,7 @@ interface XenosClient : AutoCloseable {
      * retrieve or check the results, all keys have to be submitted in [lowercase][String.lowercase]. That warrants that
      * every name will only be present once.
      */
-    suspend fun getUuids(names: Collection<String>): Map<String, UuidInfo?>
+    suspend fun getUuids(names: Collection<String>): Map<String, UuidInfo>
 
     /**
      * Retrieves the [profile][ProfileInfo] for the supplied [userId] from Xenos. The result includes the moment

diff --git a/src/main/kotlin/net/scrayos/xenos/client/data/UuidInfo.kt b/src/main/kotlin/net/scrayos/xenos/client/data/UuidInfo.kt
@@ -40,7 +40,7 @@ internal fun UuidResponse.toResult(): UuidInfo {
  * information that is related to the gRPC origin and is therefore independent of the client implementation, that was
  * used to retrieve the data from Xenos.
  */
-internal fun UuidsResponse.toResult(): Map<String, UuidInfo?> {
+internal fun UuidsResponse.toResult(): Map<String, UuidInfo> {
     return resolvedMap
         .mapValues {
             it.value.toResult()