From 404ca6c531c92717ffacada42e226ebc89ca4d4c Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:15:53 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20ExposedActorRepository.kt=E3=81=ABu?= =?UTF-8?q?ri=E5=9E=8B=E3=82=92=E5=B0=8E=E5=85=A52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infrastructure/exposed/ActorResultRowMapper.kt | 11 +++++------ .../exposedquery/ExposedUserTimelineQueryService.kt | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/ActorResultRowMapper.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/ActorResultRowMapper.kt index c552c541..d4daa3d4 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/ActorResultRowMapper.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/ActorResultRowMapper.kt @@ -24,7 +24,6 @@ import dev.usbharu.hideout.core.domain.model.support.domain.Domain import dev.usbharu.hideout.core.infrastructure.exposedrepository.Actors import org.jetbrains.exposed.sql.ResultRow import org.springframework.stereotype.Component -import java.net.URI @Component class ActorResultRowMapper : ResultRowMapper { @@ -35,15 +34,15 @@ class ActorResultRowMapper : ResultRowMapper { domain = Domain(resultRow[Actors.domain]), screenName = ActorScreenName(resultRow[Actors.screenName]), description = ActorDescription(resultRow[Actors.description]), - inbox = URI.create(resultRow[Actors.inbox]), - outbox = URI.create(resultRow[Actors.outbox]), - url = URI.create(resultRow[Actors.url]), + inbox = resultRow[Actors.inbox], + outbox = resultRow[Actors.outbox], + url = resultRow[Actors.url], publicKey = ActorPublicKey(resultRow[Actors.publicKey]), privateKey = resultRow[Actors.privateKey]?.let { ActorPrivateKey(it) }, createdAt = resultRow[Actors.createdAt], keyId = ActorKeyId(resultRow[Actors.keyId]), - followersEndpoint = resultRow[Actors.followers]?.let { URI.create(it) }, - followingEndpoint = resultRow[Actors.following]?.let { URI.create(it) }, + followersEndpoint = resultRow[Actors.followers], + followingEndpoint = resultRow[Actors.following], instance = InstanceId(resultRow[Actors.instance]), locked = resultRow[Actors.locked], followersCount = resultRow[Actors.followersCount]?.let { ActorRelationshipCount(it) }, diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/ExposedUserTimelineQueryService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/ExposedUserTimelineQueryService.kt index f24d6ff3..f63a2e53 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/ExposedUserTimelineQueryService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/ExposedUserTimelineQueryService.kt @@ -90,7 +90,7 @@ class ExposedUserTimelineQueryService : UserTimelineQueryService, AbstractReposi name = it[Actors.name], domain = it[Actors.domain], screenName = it[Actors.screenName], - url = URI.create(it[Actors.url]), + url = it[Actors.url], locked = it[Actors.locked], icon = it.getOrNull(iconMedia[Media.url]) ),