From 830206b43ab5eb7877bcb3bf11cc55751407fcbd Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 23 Oct 2023 12:50:25 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E3=83=95=E3=82=A3=E3=82=B0=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/dev/usbharu/hideout/config/Config.kt | 4 ---- .../dev/usbharu/hideout/service/ap/APNoteServiceImplTest.kt | 3 +-- .../hideout/service/ap/APReceiveFollowServiceImplTest.kt | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/dev/usbharu/hideout/config/Config.kt b/src/main/kotlin/dev/usbharu/hideout/config/Config.kt index 45023914..011754f1 100644 --- a/src/main/kotlin/dev/usbharu/hideout/config/Config.kt +++ b/src/main/kotlin/dev/usbharu/hideout/config/Config.kt @@ -1,8 +1,5 @@ package dev.usbharu.hideout.config -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper - @Deprecated("Config is deprecated") object Config { var configData: ConfigData = ConfigData() @@ -12,6 +9,5 @@ object Config { data class ConfigData( val url: String = "", val domain: String = url.substringAfter("://").substringBeforeLast(":"), - val objectMapper: ObjectMapper = jacksonObjectMapper(), val characterLimit: CharacterLimit = CharacterLimit() ) diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APNoteServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/ap/APNoteServiceImplTest.kt index 2543c8e9..1c007f3e 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APNoteServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/service/ap/APNoteServiceImplTest.kt @@ -23,7 +23,6 @@ import org.junit.jupiter.api.Test import org.mockito.Mockito.anyLong import org.mockito.Mockito.eq import org.mockito.kotlin.* -import utils.JsonObjectMapper import utils.JsonObjectMapper.objectMapper import utils.TestApplicationConfig.testApplicationConfig import java.time.Instant @@ -123,7 +122,7 @@ class APNoteServiceImplTest { val mediaQueryService = mock { onBlocking { findByPostId(anyLong()) } doReturn emptyList() } - Config.configData = ConfigData(objectMapper = JsonObjectMapper.objectMapper) + Config.configData = ConfigData() val httpClient = HttpClient( MockEngine { httpRequestData -> assertEquals("https://follower.example.com/inbox", httpRequestData.url.toString()) diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APReceiveFollowServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/ap/APReceiveFollowServiceImplTest.kt index d1d51fa7..e786f016 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APReceiveFollowServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/service/ap/APReceiveFollowServiceImplTest.kt @@ -23,7 +23,6 @@ import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.mockito.ArgumentMatchers.anyString import org.mockito.kotlin.* -import utils.JsonObjectMapper import utils.JsonObjectMapper.objectMapper import utils.TestTransaction import java.time.Instant @@ -80,7 +79,7 @@ class APReceiveFollowServiceImplTest { @Test fun `receiveFollowJob フォロー受付処理のJob`() = runTest { - Config.configData = ConfigData(objectMapper = JsonObjectMapper.objectMapper) + Config.configData = ConfigData() val person = Person( type = emptyList(), name = "follower",