From 94a1f706c825140ed04bf20a18bfe61bd5861de9 Mon Sep 17 00:00:00 2001
From: Gauthier Roebroeck <gauthier.roebroeck@gmail.com>
Date: Tue, 30 Jun 2020 21:45:38 +0800
Subject: [PATCH] refactor: use ifBlank instead of if isBlank

---
 .../infrastructure/metadata/comicinfo/ComicInfoProvider.kt  | 2 +-
 .../infrastructure/metadata/epub/EpubMetadataProvider.kt    | 6 ++----
 .../org/gotson/komga/interfaces/mvc/IndexController.kt      | 4 +---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicinfo/ComicInfoProvider.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicinfo/ComicInfoProvider.kt
index 3bf005ef3..1403a050f 100644
--- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicinfo/ComicInfoProvider.kt
+++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicinfo/ComicInfoProvider.kt
@@ -56,7 +56,7 @@ class ComicInfoProvider(
         comicInfo.publisher,
         comicInfo.ageRating?.ageRating,
         releaseDate,
-        if (authors.isEmpty()) null else authors,
+        authors.ifEmpty { null },
         SeriesMetadataPatch(
           comicInfo.series,
           comicInfo.series,
diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/epub/EpubMetadataProvider.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/epub/EpubMetadataProvider.kt
index e1cbe2307..a595b8438 100644
--- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/epub/EpubMetadataProvider.kt
+++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/epub/EpubMetadataProvider.kt
@@ -50,8 +50,8 @@ class EpubMetadataProvider(
       val authors = opf.select("metadata > dc|creator")
         .map {
           val name = it.text()
-          val opfRole = it.attr("opf|role").orNull()
-          val id = it.attr("id").orNull()
+          val opfRole = it.attr("opf|role").ifBlank { null }
+          val id = it.attr("id").ifBlank { null }
           val refineRole = creatorRefines[id]
           val role = opfRole ?: refineRole
           Author(name, relators[role] ?: "writer")
@@ -75,8 +75,6 @@ class EpubMetadataProvider(
     return null
   }
 
-  private fun String.orNull() = if (isBlank()) null else this
-
   private fun parseDate(date: String): LocalDate? =
     try {
       LocalDate.parse(date, DateTimeFormatter.ISO_DATE)
diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/mvc/IndexController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/mvc/IndexController.kt
index b40a43abf..dc485bde8 100644
--- a/komga/src/main/kotlin/org/gotson/komga/interfaces/mvc/IndexController.kt
+++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/mvc/IndexController.kt
@@ -9,9 +9,7 @@ import javax.servlet.ServletContext
 class IndexController(
   servletContext: ServletContext
 ) {
-  private val baseUrl: String =
-    if (servletContext.contextPath.isBlank()) "/"
-    else "${servletContext.contextPath}/"
+  private val baseUrl: String = "${servletContext.contextPath}/"
 
   @GetMapping("/")
   fun index(model: Model): String {