From 25fbb12e5b54c65df1b6a5fcd4e02786c2a86ce7 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 21 Nov 2023 17:18:34 +0900 Subject: [PATCH] test: fix test --- src/intTest/resources/application.yml | 2 ++ .../service/common/APResourceResolveServiceImpl.kt | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/intTest/resources/application.yml b/src/intTest/resources/application.yml index 9760e828..258014ca 100644 --- a/src/intTest/resources/application.yml +++ b/src/intTest/resources/application.yml @@ -17,6 +17,8 @@ hideout: secret-key: "" spring: + flyway: + enabled: false datasource: driver-class-name: org.h2.Driver url: "jdbc:h2:mem:test;MODE=POSTGRESQL;DB_CLOSE_DELAY=-1" diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt index 81b7aec3..85099d84 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt @@ -39,9 +39,8 @@ class APResourceResolveServiceImpl( return (cacheManager.getOrWait(key) as APResolveResponse).objects } - private suspend fun runResolve(url: String, singer: User?, clazz: Class): ResolveResponse { - return APResolveResponse(apRequestService.apGet(url, singer, clazz)) - } + private suspend fun runResolve(url: String, singer: User?, clazz: Class): ResolveResponse = + APResolveResponse(apRequestService.apGet(url, singer, clazz)) private fun genCacheKey(url: String, singerId: Long?): String { if (singerId != null) {