From c78c75a2622b4b52d4a7a8a7bf35d08af592f53d Mon Sep 17 00:00:00 2001 From: y9vad9 Date: Fri, 23 Feb 2024 21:37:46 +0100 Subject: [PATCH] fix: rsproto packages --- .../main/kotlin/org/timemates/api/rsocket/RSocketApi.kt | 8 ++++---- .../org/timemates/api/rsocket/auth/AuthInterceptor.kt | 8 ++++---- .../kotlin/org/timemates/api/rsocket/auth/AuthMappers.kt | 2 +- .../kotlin/org/timemates/api/rsocket/internal/AnyExt.kt | 2 +- .../org/timemates/api/rsocket/internal/ApiFailure.kt | 2 +- .../api/rsocket/internal/AuthorizationProvider.kt | 2 +- .../timemates/api/rsocket/internal/RSocketServiceExt.kt | 2 +- .../org/timemates/api/rsocket/timers/TimersMappers.kt | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/RSocketApi.kt b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/RSocketApi.kt index f0af929..d76e458 100644 --- a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/RSocketApi.kt +++ b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/RSocketApi.kt @@ -6,10 +6,10 @@ import io.ktor.server.netty.* import io.ktor.server.routing.* import io.ktor.server.websocket.* import io.rsocket.kotlin.ktor.server.RSocketSupport -import io.timemates.rsproto.server.annotations.ExperimentalInstancesApi -import io.timemates.rsproto.server.annotations.ExperimentalInterceptorsApi -import io.timemates.rsproto.server.instances.protobuf -import io.timemates.rsproto.server.rSocketServer +import org.timemates.rsproto.server.annotations.ExperimentalInstancesApi +import org.timemates.rsproto.server.annotations.ExperimentalInterceptorsApi +import org.timemates.rsproto.server.instances.protobuf +import org.timemates.rsproto.server.rSocketServer import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.protobuf.ProtoBuf import org.timemates.api.rsocket.auth.AuthInterceptor diff --git a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/auth/AuthInterceptor.kt b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/auth/AuthInterceptor.kt index f1db432..a94b92e 100644 --- a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/auth/AuthInterceptor.kt +++ b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/auth/AuthInterceptor.kt @@ -1,9 +1,9 @@ package org.timemates.api.rsocket.auth -import io.timemates.rsproto.metadata.Metadata -import io.timemates.rsproto.server.annotations.ExperimentalInterceptorsApi -import io.timemates.rsproto.server.interceptors.Interceptor -import io.timemates.rsproto.server.interceptors.InterceptorScope +import org.timemates.rsproto.metadata.Metadata +import org.timemates.rsproto.server.annotations.ExperimentalInterceptorsApi +import org.timemates.rsproto.server.interceptors.Interceptor +import org.timemates.rsproto.server.interceptors.InterceptorScope import org.timemates.backend.auth.domain.usecases.GetAuthorizationUseCase import kotlin.coroutines.CoroutineContext diff --git a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/auth/AuthMappers.kt b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/auth/AuthMappers.kt index a7cb466..ef93ba3 100644 --- a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/auth/AuthMappers.kt +++ b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/auth/AuthMappers.kt @@ -1,6 +1,6 @@ package org.timemates.api.rsocket.auth -import io.timemates.rsproto.server.RSocketService +import org.timemates.rsproto.server.RSocketService import org.timemates.api.authorizations.types.Authorization import org.timemates.api.authorizations.types.Metadata import org.timemates.api.rsocket.internal.createOrFail diff --git a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/AnyExt.kt b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/AnyExt.kt index c59df5c..08c4f35 100644 --- a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/AnyExt.kt +++ b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/AnyExt.kt @@ -1,7 +1,7 @@ package org.timemates.api.rsocket.internal import io.rsocket.kotlin.RSocketError -import io.timemates.rsproto.server.RSocketService +import org.timemates.rsproto.server.RSocketService /** * Checks if the given value is not null. If the value is null, it throws a RSocketError.Invalid exception with the message "One of the parameters is null, but should be not null." diff --git a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/ApiFailure.kt b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/ApiFailure.kt index dae955a..6926909 100644 --- a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/ApiFailure.kt +++ b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/ApiFailure.kt @@ -2,7 +2,7 @@ package org.timemates.api.rsocket.internal import io.ktor.http.* import io.rsocket.kotlin.RSocketError -import io.timemates.rsproto.server.RSocketService +import org.timemates.rsproto.server.RSocketService context(RSocketService) internal fun attemptsExceeded(): Nothing = throw ApiFailure.TooManyRequests diff --git a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/AuthorizationProvider.kt b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/AuthorizationProvider.kt index e40d22b..dc4d1e8 100644 --- a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/AuthorizationProvider.kt +++ b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/AuthorizationProvider.kt @@ -1,6 +1,6 @@ package org.timemates.api.rsocket.internal -import io.timemates.rsproto.server.RSocketService +import org.timemates.rsproto.server.RSocketService import kotlinx.coroutines.currentCoroutineContext import org.timemates.api.rsocket.auth.AuthInterceptor import org.timemates.backend.auth.domain.usecases.GetAuthorizationUseCase diff --git a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/RSocketServiceExt.kt b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/RSocketServiceExt.kt index 8428a5e..283a93f 100644 --- a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/RSocketServiceExt.kt +++ b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/internal/RSocketServiceExt.kt @@ -1,7 +1,7 @@ package org.timemates.api.rsocket.internal import io.rsocket.kotlin.RSocketError -import io.timemates.rsproto.server.RSocketService +import org.timemates.rsproto.server.RSocketService import kotlinx.coroutines.currentCoroutineContext import org.timemates.api.rsocket.auth.AuthInterceptor import org.timemates.backend.validation.SafeConstructor diff --git a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/timers/TimersMappers.kt b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/timers/TimersMappers.kt index 9295e2e..f75532c 100644 --- a/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/timers/TimersMappers.kt +++ b/infrastructure/rsocket-api/src/main/kotlin/org/timemates/api/rsocket/timers/TimersMappers.kt @@ -1,6 +1,6 @@ package org.timemates.api.rsocket.timers -import io.timemates.rsproto.server.RSocketService +import org.timemates.rsproto.server.RSocketService import org.timemates.api.rsocket.internal.createOrFail import org.timemates.api.timers.sessions.types.TimerState import org.timemates.api.timers.types.Timer