refactor(backend): remove leftovers and small improvements

Related to #231

backend/src/main/kotlin/com/github/davinkevin/podcastserver/config/JacksonConfig.kt

@@ -1,9 +1,7 @@
 package com.github.davinkevin.podcastserver.config
 
 import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.JsonSerializer
 import com.fasterxml.jackson.databind.SerializationFeature
-import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.kotlinModule

backend/src/main/kotlin/com/github/davinkevin/podcastserver/manager/downloader/FfmpegDownloader.kt

@@ -4,8 +4,8 @@ package com.github.davinkevin.podcastserver.manager.downloader
 import com.github.davinkevin.podcastserver.download.DownloadRepository
 import com.github.davinkevin.podcastserver.entity.Status
 import com.github.davinkevin.podcastserver.messaging.MessagingTemplate
-import com.github.davinkevin.podcastserver.service.ffmpeg.FfmpegService
 import com.github.davinkevin.podcastserver.service.ProcessService
+import com.github.davinkevin.podcastserver.service.ffmpeg.FfmpegService
 import com.github.davinkevin.podcastserver.service.storage.FileStorageService
 import net.bramp.ffmpeg.builder.FFmpegBuilder
 import net.bramp.ffmpeg.progress.ProgressListener

backend/src/main/kotlin/com/github/davinkevin/podcastserver/update/updaters/gulli/GulliUpdaterConfig.kt

@@ -1,9 +1,9 @@
 package com.github.davinkevin.podcastserver.update.updaters.gulli
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.github.davinkevin.podcastserver.service.image.ImageService
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import com.github.davinkevin.podcastserver.service.image.ImageService
 import org.springframework.web.client.RestClient
 
 /**

backend/src/test/kotlin/com/github/davinkevin/podcastserver/config/ClockConfigTest.kt

@@ -1,7 +1,6 @@
 package com.github.davinkevin.podcastserver.config
 
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.beans.factory.annotation.Autowired

backend/src/test/kotlin/com/github/davinkevin/podcastserver/cover/CoverHandlerTest.kt

@@ -3,10 +3,8 @@ package com.github.davinkevin.podcastserver.cover
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
-import org.mockito.kotlin.doNothing
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
-import org.mockito.kotlin.whenever
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration
 import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
@@ -16,7 +14,6 @@ import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Import
 import org.springframework.test.web.reactive.server.WebTestClient
-import reactor.core.publisher.Mono
 import java.time.Clock
 import java.time.OffsetDateTime
 import java.time.ZoneId
@@ -50,7 +47,7 @@ class CoverHandlerTest(
                     /* Then */
                     .expectStatus().isOk
 
-            verify(cover, times(1)).deleteCoversInFileSystemOlderThan(expectedDate)
+            verify(cover).deleteCoversInFileSystemOlderThan(expectedDate)
         }
 
         @Test
@@ -66,7 +63,7 @@ class CoverHandlerTest(
                     /* Then */
                     .expectStatus().isOk
 
-            verify(cover, times(1)).deleteCoversInFileSystemOlderThan(fixedDate.minusDays(365))
+            verify(cover).deleteCoversInFileSystemOlderThan(fixedDate.minusDays(365))
         }
 
 

backend/src/test/kotlin/com/github/davinkevin/podcastserver/cover/CoverServiceTest.kt

@@ -14,10 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.context.annotation.Import
 import org.springframework.test.context.junit.jupiter.SpringExtension
-import reactor.core.publisher.Flux
-import reactor.core.publisher.Mono
-import reactor.kotlin.core.publisher.toFlux
-import reactor.test.StepVerifier
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
 import java.util.UUID.randomUUID
@@ -48,7 +44,7 @@ class CoverServiceTest (
             service.deleteCoversInFileSystemOlderThan(date)
 
             /* Then */
-            verify(cover, times(1)).findCoverOlderThan(date)
+            verify(cover).findCoverOlderThan(date)
             verify(file, never()).deleteCover(any())
         }
 

backend/src/test/kotlin/com/github/davinkevin/podcastserver/download/DownloadHandlerTest.kt

@@ -18,8 +18,6 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
 import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.context.annotation.Import
 import org.springframework.test.web.reactive.server.WebTestClient
-import reactor.core.publisher.Flux
-import reactor.core.publisher.Mono
 import java.net.URI
 import java.util.*
 
@@ -313,7 +311,7 @@ class DownloadHandlerTest(
                     .expectStatus().isNoContent
                     .expectBody().isEmpty
 
-            verify(idm, times(1)).stopAllDownload()
+            verify(idm).stopAllDownload()
         }
     }
 

backend/src/test/kotlin/com/github/davinkevin/podcastserver/download/downloaders/youtubedl/YoutubeDlDownloaderTest.kt

@@ -122,8 +122,8 @@ class YoutubeDlDownloaderTest(
 
             /* Then */
             await().atMost(5, TimeUnit.SECONDS).untilAsserted {
-                verify(file, times(1)).upload(dItem.item.podcast.title, finalFile)
-                verify(file, times(1)).metadata(dItem.item.podcast.title, finalFile)
+                verify(file).upload(dItem.item.podcast.title, finalFile)
+                verify(file).metadata(dItem.item.podcast.title, finalFile)
             }
         }
 
@@ -221,7 +221,7 @@ class YoutubeDlDownloaderTest(
 
                 /* Then */
                 await().atMost(5, TimeUnit.SECONDS).untilAsserted {
-                    verify(template, times(1)).sendItem(any())
+                    verify(template).sendItem(any())
                 }
             }
         }

backend/src/test/kotlin/com/github/davinkevin/podcastserver/download/downloaders/youtubedl/YoutubeDlServiceTest.kt

@@ -1,6 +1,5 @@
 package com.github.davinkevin.podcastserver.download.downloaders.youtubedl
 
-import org.mockito.kotlin.*
 import com.gitlab.davinkevin.podcastserver.youtubedl.DownloadProgressCallback
 import com.gitlab.davinkevin.podcastserver.youtubedl.YoutubeDL
 import com.gitlab.davinkevin.podcastserver.youtubedl.YoutubeDLRequest
@@ -16,6 +15,7 @@ import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.CsvSource
 import org.junit.jupiter.params.provider.ValueSource
 import org.mockito.Mockito
+import org.mockito.kotlin.*
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.context.annotation.Import

backend/src/test/kotlin/com/github/davinkevin/podcastserver/find/FindServiceTest.kt

@@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.context.annotation.Import
 import org.springframework.test.context.junit.jupiter.SpringExtension
-import reactor.kotlin.core.publisher.toMono
 import java.net.URI
 
 @ExtendWith(SpringExtension::class)

backend/src/test/kotlin/com/github/davinkevin/podcastserver/item/ItemConfigTest.kt

@@ -13,7 +13,6 @@ import org.springframework.boot.context.annotation.UserConfigurations
 import org.springframework.boot.test.context.runner.ApplicationContextRunner
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Primary
-import reactor.core.publisher.Mono
 import java.time.Clock
 import java.time.OffsetDateTime
 import java.time.ZoneId
@@ -39,7 +38,7 @@ class ItemConfigTest {
                     clr.run()
 
 
-                    verify(repo, times(1)).resetItemWithDownloadingState()
+                    verify(repo).resetItemWithDownloadingState()
                 }
     }
 }

backend/src/test/kotlin/com/github/davinkevin/podcastserver/item/ItemRepositoryTest.kt

@@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.jooq.JooqTest
 import org.springframework.context.annotation.Import
 import org.springframework.dao.DataIntegrityViolationException
-import reactor.core.publisher.Flux
 import java.net.URI
 import java.time.OffsetDateTime
 import java.time.OffsetDateTime.now
@@ -286,12 +285,12 @@ class ItemRepositoryTest(
 
                 /* When */
                 val response = repository.deleteById(id)
+
                 /* Then */
                 assertThat(response).isNull()
-                val items = Flux.from(query.select(ITEM.ID).from(ITEM))
-                    .map { it[ITEM.ID] }
-                    .collectList()
-                    .block()
+                val items = query.select(ITEM.ID).from(ITEM)
+                    .fetch { (id) -> id }
+
                 assertThat(items).hasSize(6).contains(
                     fromString("817a4626-6fd2-457e-8d27-69ea5acdc828"),
                     fromString("b721a6b6-896a-48fc-b820-28aeafddbb53"),
@@ -380,9 +379,7 @@ class ItemRepositoryTest(
             repository.updateAsDeleted(ids)
 
             /* Then */
-            val items = Flux.from(query.selectFrom(ITEM).where(ITEM.ID.`in`(ids)))
-                .collectList()
-                .block()
+            val items = query.selectFrom(ITEM).where(ITEM.ID.`in`(ids)).fetch()
             assertThat(items).allSatisfy (Consumer {
                 assertThat(it.status).isEqualTo(ItemStatus.DELETED)
                 assertThat(it.fileName).isNull()

backend/src/test/kotlin/com/github/davinkevin/podcastserver/manager/downloader/DownloaderTest.kt

@@ -94,7 +94,7 @@ class DownloaderTest {
 
             /* Then */
             await().atMost(5, TimeUnit.SECONDS).untilAsserted {
-                verify(downloadRepository, times(1)).updateDownloadItem(information.item)
+                verify(downloadRepository).updateDownloadItem(information.item)
             }
         }
 

backend/src/test/kotlin/com/github/davinkevin/podcastserver/manager/downloader/NoOpDownloaderTest.kt

@@ -64,6 +64,6 @@ class NoOpDownloaderTest {
         noOpDownloader.run()
 
         /* THEN  */
-        verify(idm, times(1)).removeACurrentDownload(any())
+        verify(idm).removeACurrentDownload(any())
     }
 }

backend/src/test/kotlin/com/github/davinkevin/podcastserver/podcast/PodcastHandlerTest.kt

@@ -20,8 +20,6 @@ import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.context.annotation.Import
 import org.springframework.http.MediaType
 import org.springframework.test.web.reactive.server.WebTestClient
-import reactor.core.publisher.Mono
-import reactor.kotlin.core.publisher.toMono
 import java.net.URI
 import java.time.LocalDate
 import java.time.OffsetDateTime

backend/src/test/kotlin/com/github/davinkevin/podcastserver/podcast/PodcastServiceTest.kt

@@ -464,7 +464,7 @@ class PodcastServiceTest(
 
                 /* Then */
                 assertThat(podcastAfterUpdate).isEqualTo(p)
-                verify(tagRepository, times(1)).save(any())
+                verify(tagRepository).save(any())
             }
 
             @Test
@@ -489,7 +489,7 @@ class PodcastServiceTest(
 
                 /* Then */
                 assertThat(podcastAfterUpdate).isEqualTo(p)
-                verify(tagRepository, times(1)).save(any())
+                verify(tagRepository).save(any())
             }
 
             @Test
@@ -724,7 +724,7 @@ class PodcastServiceTest(
             service.deleteById(id)
 
             /* Then */
-            verify(fileService, times(1)).deletePodcast(information)
+            verify(fileService).deletePodcast(information)
         }
 
         @Test

backend/src/test/kotlin/com/github/davinkevin/podcastserver/service/ProcessServiceTest.kt

@@ -1,13 +1,12 @@
 package com.github.davinkevin.podcastserver.service
 
 
-import org.mockito.kotlin.doThrow
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.whenever
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito.verify
-import java.lang.RuntimeException
+import org.mockito.kotlin.doThrow
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 
 /**
  * Created by kevin on 31/03/2016 for Podcast Server

backend/src/test/kotlin/com/github/davinkevin/podcastserver/service/ffmpeg/FfmpegConfigTest.kt

@@ -1,6 +1,5 @@
 package com.github.davinkevin.podcastserver.service.ffmpeg
 
-import com.github.davinkevin.podcastserver.service.ffmpeg.FfmpegConfig
 import com.github.davinkevin.podcastserver.service.properties.ExternalTools
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test

backend/src/test/kotlin/com/github/davinkevin/podcastserver/service/ffmpeg/FfmpegServiceTest.kt

@@ -2,9 +2,6 @@ package com.github.davinkevin.podcastserver.service.ffmpeg
 
 import com.github.davinkevin.podcastserver.utils.custom.ffmpeg.CustomRunProcessFunc
 import com.github.davinkevin.podcastserver.utils.custom.ffmpeg.ProcessListener
-import org.mockito.kotlin.any
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.whenever
 import net.bramp.ffmpeg.FFmpegExecutor
 import net.bramp.ffmpeg.FFprobe
 import net.bramp.ffmpeg.builder.FFmpegBuilder
@@ -21,6 +18,9 @@ import org.junit.jupiter.api.io.TempDir
 import org.mockito.*
 import org.mockito.Mockito.*
 import org.mockito.junit.jupiter.MockitoExtension
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 import java.io.IOException
 import java.nio.file.AccessDeniedException
 import java.nio.file.Files
@@ -56,8 +56,8 @@ class FfmpegServiceTest {
         ffmpegService.concat(output, input1, input2, input3)
 
         /* Then */
-        verify(ffmpegExecutor, times(1)).createJob(executorBuilderCaptor.capture())
-        verify(job, times(1)).run()
+        verify(ffmpegExecutor).createJob(executorBuilderCaptor.capture())
+        verify(job).run()
         assertThat(executorBuilderCaptor.value.build()).contains(
                 "-f", "concat",
                 "-i",

backend/src/test/kotlin/com/github/davinkevin/podcastserver/service/storage/FileStorageConfigTest.kt

@@ -2,10 +2,12 @@ package com.github.davinkevin.podcastserver.service.storage
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
-import org.mockito.kotlin.*
+import org.mockito.kotlin.doNothing
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 import org.springframework.boot.CommandLineRunner
 import org.springframework.boot.test.context.runner.ApplicationContextRunner
-import reactor.core.publisher.Mono
 
 
 const val s3MockBackendPortForConfig = 1235

backend/src/test/kotlin/com/github/davinkevin/podcastserver/update/UpdateHandlerTest.kt

@@ -1,21 +1,18 @@
 package com.github.davinkevin.podcastserver.update
 
-import org.mockito.kotlin.verify
-import org.mockito.kotlin.whenever
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.doNothing
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration
-import org.springframework.boot.autoconfigure.web.reactive.error.ErrorWebFluxAutoConfiguration
 import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
-import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
 import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.context.annotation.Import
 import org.springframework.test.web.reactive.server.WebTestClient
-import reactor.core.publisher.Mono
 import java.util.*
 
 /**

backend/src/test/kotlin/com/github/davinkevin/podcastserver/update/UpdateServiceTest.kt

@@ -28,7 +28,6 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Import
 import org.springframework.core.task.SimpleAsyncTaskExecutor
 import org.springframework.test.context.junit.jupiter.SpringExtension
-import reactor.core.publisher.Mono
 import java.net.URI
 import java.time.*
 import java.util.*

backend/src/test/resources/remote/podcast/rss/rss.appload.with-only-itunes-cover.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom"
-     xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd"
-     xmlns:feedburner="http://rssnamespace.org/feedburner/ext/1.0"
-     xmlns:media="http://search.yahoo.com/mrss/"
-     version="2.0">
+<rss
+        xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd"
+        xmlns:feedburner="http://rssnamespace.org/feedburner/ext/1.0"
+        xmlns:media="http://search.yahoo.com/mrss/"
+        version="2.0">
     <channel>
         <title>AppLoad</title>
         <link>http://www.app-load.com/</link>

backend/src/test/resources/remote/podcast/rss/rss.appload.with-only-rss-cover.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom"
-     xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd"
-     xmlns:feedburner="http://rssnamespace.org/feedburner/ext/1.0"
-     xmlns:media="http://search.yahoo.com/mrss/"
-     version="2.0">
+<rss
+        xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd"
+        xmlns:feedburner="http://rssnamespace.org/feedburner/ext/1.0"
+        xmlns:media="http://search.yahoo.com/mrss/"
+        version="2.0">
     <channel>
         <title>AppLoad</title>
         <link>http://www.app-load.com/</link>