From d164b173738540a888e52d8971ac72c63200287a Mon Sep 17 00:00:00 2001 From: y9vad9 Date: Fri, 23 Feb 2024 22:15:13 +0100 Subject: [PATCH] fix: build --- .../multiplatform-convention.gradle.kts | 3 --- rsocket-engine/build.gradle.kts | 16 ++++++------- .../api/rsocket/authorizations/AuthMappers.kt | 9 +++---- .../commands/ConfigureNewAccountCommand.kt | 10 ++++---- .../commands/ConfirmAuthorizationCommand.kt | 7 +++--- .../GetAuthorizationSessionsCommand.kt | 4 +++- .../commands/RenewAuthorizationCommand.kt | 4 +++- .../commands/StartAuthorizationCommand.kt | 8 +++---- .../common/commands/RSocketCommands.kt | 1 + .../commands/RSocketCommandsBuilderScope.kt | 1 + .../api/rsocket/timers/TimerMappers.kt | 14 +++++------ .../timers/commands/CreateTimerCommand.kt | 10 ++++---- .../timers/commands/EditTimerCommand.kt | 8 +++---- .../timers/commands/GetTimerCommand.kt | 6 ++--- .../timers/commands/GetUserTimersCommand.kt | 6 ++--- .../timers/commands/RemoveTimerCommand.kt | 4 +++- .../commands/GetTimerMembersCommand.kt | 8 +++---- .../commands/KickTimerMemberCommand.kt | 4 +++- .../invites/commands/CreateInviteCommand.kt | 8 +++---- .../invites/commands/GetInvitesCommand.kt | 8 +++---- .../commands/JoinTimerByCodeCommand.kt | 6 ++--- .../invites/commands/RemoveInviteCommand.kt | 8 +++---- .../sessions/commands/GetTimerStateCommand.kt | 4 +++- .../sessions/commands/JoinSessionCommand.kt | 6 ++--- .../sessions/commands/StartSessionCommand.kt | 6 ++--- .../sessions/commands/StopSessionCommand.kt | 6 ++--- .../users/commands/EditEmailCommand.kt | 4 +++- .../users/commands/EditProfileCommand.kt | 10 ++++---- .../rsocket/users/commands/GetUsersCommand.kt | 4 +++- .../authorizations/AuthorizationService.proto | 14 +++++------ .../ConfirmAuthorizationRequest.proto | 2 +- .../requests/CreateProfileRequest.proto | 2 +- .../requests/GetAuthorizationsRequest.proto | 2 +- .../requests/RenewAuthorizationRequest.proto | 2 +- .../requests/StartAuthorizationRequest.proto | 4 ++-- .../authorizations/types/Authorization.proto | 2 +- .../timemates/api/timers/TimersService.proto | 24 +++++++++---------- .../requests/CreateInviteRequest.proto | 2 +- .../invites/requests/GetInvitesRequest.proto | 2 +- .../JoinTimerByInviteCodeRequest.proto | 2 +- .../members/requests/GetMembersRequest.proto | 2 +- .../timers/requests/CreateTimerRequest.proto | 2 +- .../requests/EditTimerInfoRequest.proto | 2 +- .../timers/requests/GetTimersRequest.proto | 2 +- .../timers/requests/RemoveTimerRequest.proto | 2 +- .../sessions/TimerSessionsService.proto | 16 ++++++------- .../GetCurrentTimerSessionRequest.proto | 2 +- .../timemates/api/timers/types/Timer.proto | 2 +- .../timemates/api/users/UsersService.proto | 8 +++---- .../email/types/value/VerificationHash.kt | 2 +- .../sessions/types/value/ApplicationName.kt | 1 + .../sessions/types/value/AuthorizationId.kt | 1 + .../sessions/types/value/ClientIpAddress.kt | 1 + .../sessions/types/value/ClientVersion.kt | 1 + .../sessions/types/value/ConfirmationCode.kt | 1 + .../authorization/types/value/HashValue.kt | 1 + .../sdk/common/pagination/PageToken.kt | 1 + .../timemates/sdk/common/types/value/Count.kt | 1 + .../members/invites/types/value/InviteCode.kt | 1 + .../members/invites/types/value/InviteName.kt | 1 + .../timers/types/value/TimerDescription.kt | 1 + .../sdk/timers/types/value/TimerId.kt | 1 + .../sdk/timers/types/value/TimerName.kt | 1 + .../sdk/users/profile/types/Avatar.kt | 1 + .../users/profile/types/value/EmailAddress.kt | 1 + .../profile/types/value/UserDescription.kt | 1 + .../sdk/users/profile/types/value/UserId.kt | 1 + .../sdk/users/profile/types/value/UserName.kt | 1 + 68 files changed, 171 insertions(+), 138 deletions(-) diff --git a/build-conventions/src/main/kotlin/multiplatform-convention.gradle.kts b/build-conventions/src/main/kotlin/multiplatform-convention.gradle.kts index 78d8b28..6023d20 100644 --- a/build-conventions/src/main/kotlin/multiplatform-convention.gradle.kts +++ b/build-conventions/src/main/kotlin/multiplatform-convention.gradle.kts @@ -6,7 +6,4 @@ kotlin { jvm { jvmToolchain(11) } - js { - browser() - } } \ No newline at end of file diff --git a/rsocket-engine/build.gradle.kts b/rsocket-engine/build.gradle.kts index 0e4e1bb..da0fad0 100644 --- a/rsocket-engine/build.gradle.kts +++ b/rsocket-engine/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id(libs.plugins.conventions.multiplatform.library.get().pluginId) alias(libs.plugins.kotlinx.serialization) - //alias(libs.plugins.timemates.rsproto) + alias(libs.plugins.timemates.rsproto) } kotlin { @@ -23,13 +23,13 @@ dependencies { commonMainImplementation(libs.rsocket.client) } -//rsproto { -// protoSourcePath = "src/main/proto/" -// generationOutputPath = "generated/rsproto/kotlin" -// -// clientGeneration = true -// serverGeneration = false -//} +rsproto { + protoSourcePath = "src/main/proto/" + generationOutputPath = "build/generated/rsproto/kotlin" + + clientGeneration = true + serverGeneration = false +} tasks.withType { useJUnitPlatform() diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/AuthMappers.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/AuthMappers.kt index d20f7af..e34a543 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/AuthMappers.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/AuthMappers.kt @@ -1,5 +1,6 @@ package org.timemates.api.rsocket.authorizations +import io.ktor.utils.io.core.toByteArray import org.timemates.api.authorizations.types.Metadata import org.timemates.sdk.authorization.sessions.types.value.ApplicationName import org.timemates.sdk.authorization.sessions.types.value.ClientIpAddress @@ -21,10 +22,10 @@ internal fun Metadata.sdk(): SdkAuth.Metadata { } internal fun SdkAuth.Metadata.rs(): Metadata { - return Metadata( - clientName = applicationName.string, - clientVersion = clientVersion.double, - ) + return Metadata { + clientName = applicationName.string + clientVersion = this@rs.clientVersion.double + } } internal fun RSAuthorization.sdk(): SdkAuth { diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/ConfigureNewAccountCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/ConfigureNewAccountCommand.kt index 2eca6b7..2bc931c 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/ConfigureNewAccountCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/ConfigureNewAccountCommand.kt @@ -9,11 +9,11 @@ import org.timemates.api.users.requests.CreateProfileRequest as RSCreateProfileR internal object ConfigureNewAccountCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: ConfigureNewAccountRequest): ConfigureNewAccountRequest.Result { return apis.auth.createProfile( - message = RSCreateProfileRequest( - verificationHash = input.verificationHash.string, - name = input.name.string, - description = input.description?.string.orEmpty(), - ) + message = RSCreateProfileRequest { + verificationHash = input.verificationHash.string + name = input.name.string + description = input.description?.string.orEmpty() + } ).let { result -> ConfigureNewAccountRequest.Result( authorization = result.authorization!!.sdk() diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/ConfirmAuthorizationCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/ConfirmAuthorizationCommand.kt index 05e46f0..7782c1d 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/ConfirmAuthorizationCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/ConfirmAuthorizationCommand.kt @@ -9,9 +9,10 @@ import org.timemates.api.authorizations.requests.ConfirmAuthorizationRequest as internal object ConfirmAuthorizationCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: ConfirmAuthorizationRequest): ConfirmAuthorizationRequest.Result { return apis.auth.confirmAuthorization( - message = RSConfirmAuthorizationRequest( - input.verificationHash.string, input.confirmationCode.string - ) + message = RSConfirmAuthorizationRequest { + verificationHash = input.verificationHash.string + confirmationCode = input.confirmationCode.string + } ).let { result -> ConfirmAuthorizationRequest.Result( isNewAccount = result.isNewAccount, diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/GetAuthorizationSessionsCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/GetAuthorizationSessionsCommand.kt index 5ac7466..7f13531 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/GetAuthorizationSessionsCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/GetAuthorizationSessionsCommand.kt @@ -14,7 +14,9 @@ import org.timemates.api.authorizations.requests.GetAuthorizationsRequest as RSG internal object GetAuthorizationSessionsCommand : RSocketCommand> { override suspend fun execute(apis: ApiContainer, input: GetAuthorizationSessionsRequest): Page { return apis.auth.getAuthorizations( - message = RSGetAuthorizationsRequest(input.nextPageToken?.string.orEmpty()), + message = RSGetAuthorizationsRequest { + pageToken = input.nextPageToken?.string.orEmpty() + }, extra = input.accessHash.toExtra(), ).let { result -> Page( diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/RenewAuthorizationCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/RenewAuthorizationCommand.kt index e68ac78..8012bb4 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/RenewAuthorizationCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/RenewAuthorizationCommand.kt @@ -11,7 +11,9 @@ import org.timemates.api.authorizations.requests.RenewAuthorizationRequest as RS internal object RenewAuthorizationCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: RenewAuthorizationRequest): RenewAuthorizationRequest.Result { return apis.auth.renewAuthorization( - message = RSRenewAuthorizationRequest(input.refreshHash.string), + message = RSRenewAuthorizationRequest { + refreshHash = input.refreshHash.string + }, ).let { result -> RenewAuthorizationRequest.Result( authorization = result.authorization!!.sdk() diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/StartAuthorizationCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/StartAuthorizationCommand.kt index 2f34490..037bc67 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/StartAuthorizationCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/authorizations/commands/StartAuthorizationCommand.kt @@ -16,10 +16,10 @@ internal object StartAuthorizationCommand : RSocketCommand StartAuthorizationRequest.Result( verificationHash = VerificationHash.createOrThrow(result.verificationHash), diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/common/commands/RSocketCommands.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/common/commands/RSocketCommands.kt index 07e0e69..f95d6cf 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/common/commands/RSocketCommands.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/common/commands/RSocketCommands.kt @@ -4,6 +4,7 @@ import io.rsocket.kotlin.RSocket import org.timemates.api.rsocket.ApiContainer import org.timemates.sdk.common.types.TimeMatesEntity import org.timemates.sdk.common.types.TimeMatesRequest +import kotlin.jvm.JvmInline /** * An inline class that encapsulates a set of RSocket commands for executing TimeMates requests. diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/common/commands/RSocketCommandsBuilderScope.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/common/commands/RSocketCommandsBuilderScope.kt index 1d5c098..7234cfb 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/common/commands/RSocketCommandsBuilderScope.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/common/commands/RSocketCommandsBuilderScope.kt @@ -2,6 +2,7 @@ package org.timemates.api.rsocket.common.commands import org.timemates.sdk.common.types.TimeMatesEntity import org.timemates.sdk.common.types.TimeMatesRequest +import kotlin.jvm.JvmInline @RSocketCommandsDsl @JvmInline diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/TimerMappers.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/TimerMappers.kt index a9bc1a4..a09f88f 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/TimerMappers.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/TimerMappers.kt @@ -71,13 +71,13 @@ internal fun RSTimer.Settings.sdk(): SdkTimerSettings { } internal fun SdkTimerSettings.rs(): RSTimer.Settings { - return RSTimer.Settings( - workTime = workTime.toInt(DurationUnit.MINUTES), - restTime = restTime.toInt(DurationUnit.MINUTES), - bigRestEnabled = bigRestEnabled, - bigRestTime = bigRestTime.toInt(DurationUnit.MINUTES), - isConfirmationRequired = isConfirmationRequired, - ) + return RSTimer.Settings { + workTime = this@rs.workTime.toInt(DurationUnit.MINUTES) + restTime = this@rs.restTime.toInt(DurationUnit.MINUTES) + bigRestEnabled = this@rs.bigRestEnabled + bigRestTime = this@rs.bigRestTime.toInt(DurationUnit.MINUTES) + isConfirmationRequired = this@rs.isConfirmationRequired + } } internal fun RSInvite.sdk(): SdkInvite { diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/CreateTimerCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/CreateTimerCommand.kt index 39aa6f5..b6c3ab7 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/CreateTimerCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/CreateTimerCommand.kt @@ -12,11 +12,11 @@ import org.timemates.api.timers.requests.CreateTimerRequest as RSCreateTimerRequ internal object CreateTimerCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: CreateTimerRequest): CreateTimerRequest.Result { return apis.timers.createTimer( - message = RSCreateTimerRequest( - name = input.name.string, - description = input.description.string, - settings = input.settings.rs(), - ), + message = RSCreateTimerRequest { + name = input.name.string + description = input.description.string + settings = input.settings.rs() + }, extra = input.accessHash.toExtra(), ).let { result -> CreateTimerRequest.Result(TimerId.createOrThrow(result.timerId)) diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/EditTimerCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/EditTimerCommand.kt index db173a1..2ce9831 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/EditTimerCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/EditTimerCommand.kt @@ -10,10 +10,10 @@ import org.timemates.api.timers.requests.EditTimerRequest as RSEditTimerRequest internal object EditTimerCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: EditTimerRequest): Empty { return apis.timers.editTimer( - message = RSEditTimerRequest( - timerId = input.timerId.long, - name = input.name?.string.orEmpty(), - ), + message = RSEditTimerRequest { + timerId = input.timerId.long + name = input.name?.string.orEmpty() + }, extra = input.accessHash.toExtra(), ).let { _ -> Empty } } diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/GetTimerCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/GetTimerCommand.kt index 96c59eb..462909b 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/GetTimerCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/GetTimerCommand.kt @@ -10,9 +10,9 @@ import org.timemates.api.timers.requests.GetTimerRequest as RSGetTimerRequest internal object GetTimerCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: GetTimerRequest): GetTimerRequest.Result { return apis.timers.getTimer( - message = RSGetTimerRequest( - timerId = input.timerId.long, - ), + message = RSGetTimerRequest { + timerId = input.timerId.long + }, extra = input.accessHash.toExtra(), ).let { result -> GetTimerRequest.Result(result.sdk()) diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/GetUserTimersCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/GetUserTimersCommand.kt index 7110118..452aea0 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/GetUserTimersCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/GetUserTimersCommand.kt @@ -14,9 +14,9 @@ import org.timemates.api.timers.requests.GetTimersRequest as RSGetTimersRequest internal object GetUserTimersCommand : RSocketCommand> { override suspend fun execute(apis: ApiContainer, input: GetUserTimersRequest): Page { return apis.timers.getTimers( - message = RSGetTimersRequest( - nextPageToken = input.pageToken?.string.orEmpty(), - ), + message = RSGetTimersRequest { + nextPageToken = input.pageToken?.string.orEmpty() + }, extra = input.accessHash.toExtra(), ).let { result -> Page( diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/RemoveTimerCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/RemoveTimerCommand.kt index ae25826..48305f9 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/RemoveTimerCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/commands/RemoveTimerCommand.kt @@ -10,7 +10,9 @@ import org.timemates.api.timers.requests.RemoveTimerRequest as RSRemoveTimerRequ internal object RemoveTimerCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: RemoveTimerRequest): Empty { return apis.timers.removeTimer( - message = RSRemoveTimerRequest(input.timerId.long), + message = RSRemoveTimerRequest { + timerId = input.timerId.long + }, extra = input.accessHash.toExtra(), ).let { _ -> Empty } } diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/commands/GetTimerMembersCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/commands/GetTimerMembersCommand.kt index 635d474..ed3fc0d 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/commands/GetTimerMembersCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/commands/GetTimerMembersCommand.kt @@ -14,10 +14,10 @@ import org.timemates.api.timers.members.requests.GetMembersRequest as RSGetMembe internal object GetTimerMembersCommand : RSocketCommand> { override suspend fun execute(apis: ApiContainer, input: GetMembersRequest): Page { return apis.timers.getMembers( - message = RSGetMembersRequest( - timerId = input.timerId.long, - nextPageToken = input.pageToken?.string.orEmpty(), - ), + message = RSGetMembersRequest { + timerId = input.timerId.long + nextPageToken = input.pageToken?.string.orEmpty() + }, extra = input.accessHash.toExtra(), ).let { result -> Page( diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/commands/KickTimerMemberCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/commands/KickTimerMemberCommand.kt index 91eb4f9..2d889eb 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/commands/KickTimerMemberCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/commands/KickTimerMemberCommand.kt @@ -10,7 +10,9 @@ import org.timemates.api.timers.members.requests.KickMemberRequest as RSKickMemb internal object KickTimerMemberCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: KickMemberRequest): Empty { return apis.timers.kickMember( - message = RSKickMemberRequest(timerId = input.timerId.long), + message = RSKickMemberRequest { + timerId = input.timerId.long + }, extra = input.accessHash.toExtra(), ).let { _ -> Empty } } diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/CreateInviteCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/CreateInviteCommand.kt index f9cebe1..cff0f13 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/CreateInviteCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/CreateInviteCommand.kt @@ -11,10 +11,10 @@ import org.timemates.sdk.timers.members.invites.types.value.InviteCode internal object CreateInviteCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: CreateInviteRequest): CreateInviteRequest.Result { return apis.timers.createInvite( - message = InviteMemberRequest( - timerId = input.timerId.long, - maxJoiners = input.maxJoinersCount.int, - ), + message = InviteMemberRequest { + timerId = input.timerId.long + maxJoiners = input.maxJoinersCount.int + }, extra = input.accessHash.toExtra(), ).let { result -> CreateInviteRequest.Result(InviteCode.createOrThrow(result.inviteCode)) diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/GetInvitesCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/GetInvitesCommand.kt index 572b595..c835074 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/GetInvitesCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/GetInvitesCommand.kt @@ -14,10 +14,10 @@ import org.timemates.api.timers.members.invites.requests.GetInvitesRequest as RS internal object GetInvitesCommand : RSocketCommand> { override suspend fun execute(apis: ApiContainer, input: GetInvitesRequest): Page { return apis.timers.getInvites( - message = RSGetInvitesRequest( - timerId = input.timerId.long, - nextPageToken = input.pageToken?.string.orEmpty(), - ), + message = RSGetInvitesRequest { + timerId = input.timerId.long + nextPageToken = input.pageToken?.string.orEmpty() + }, extra = input.accessHash.toExtra(), ).let { result -> Page( diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/JoinTimerByCodeCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/JoinTimerByCodeCommand.kt index fc72c01..189febd 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/JoinTimerByCodeCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/JoinTimerByCodeCommand.kt @@ -12,9 +12,9 @@ import org.timemates.api.timers.requests.JoinTimerByInviteCodeRequest as RSJoinT internal object JoinTimerByCodeCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: JoinTimerByCodeRequest): JoinTimerByCodeRequest.Result { return apis.timers.joinByInvite( - message = RSJoinTimerByInviteCodeRequest( - inviteCode = input.code.string, - ), + message = RSJoinTimerByInviteCodeRequest { + inviteCode = input.code.string + }, extra = input.accessHash.toExtra(), ).let { result -> JoinTimerByCodeRequest.Result(result.timer!!.sdk()) diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/RemoveInviteCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/RemoveInviteCommand.kt index 9133f33..5033e1a 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/RemoveInviteCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/members/invites/commands/RemoveInviteCommand.kt @@ -10,10 +10,10 @@ import org.timemates.api.timers.members.invites.requests.RemoveInviteRequest as internal object RemoveInviteCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: RemoveInviteRequest): Empty { return apis.timers.removeInvite( - message = RSRemoveInviteRequest( - timerId = input.timerId.long, - inviteCode = input.inviteCode.string, - ), + message = RSRemoveInviteRequest { + timerId = input.timerId.long + inviteCode = input.inviteCode.string + }, extra = input.accessHash.toExtra(), ).let { _ -> Empty } } diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/GetTimerStateCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/GetTimerStateCommand.kt index 7316c33..d346421 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/GetTimerStateCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/GetTimerStateCommand.kt @@ -11,7 +11,9 @@ import org.timemates.api.timers.sessions.requests.GetTimerStateRequest as RSGetT internal object GetTimerStateCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: GetTimerStateRequest): GetTimerStateRequest.Result { return apis.timerSessions.getState( - message = RSGetTimerStateRequest(timerId = input.timerId.long), + message = RSGetTimerStateRequest { + timerId = input.timerId.long + }, extra = input.accessHash.toExtra(), ).let { result -> GetTimerStateRequest.Result(result.map { it.sdk() }) diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/JoinSessionCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/JoinSessionCommand.kt index 4c36b87..58bbb24 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/JoinSessionCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/JoinSessionCommand.kt @@ -10,9 +10,9 @@ import org.timemates.api.timers.sessions.requests.JoinTimerSessionRequest as RSJ internal object JoinSessionCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: JoinTimerSessionRequest): Empty { return apis.timerSessions.joinSession( - message = RSJoinTimerSessionRequest( - timerId = input.timerId.long, - ), + message = RSJoinTimerSessionRequest { + timerId = input.timerId.long + }, extra = input.accessHash.toExtra(), ).let { _ -> Empty } } diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/StartSessionCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/StartSessionCommand.kt index ca64146..59ae3df 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/StartSessionCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/StartSessionCommand.kt @@ -10,9 +10,9 @@ import org.timemates.api.timers.sessions.requests.StartTimerRequest as RSStartTi internal object StartSessionCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: StartTimerRequest): Empty { return apis.timerSessions.startTimer( - message = RSStartTimerRequest( - timerId = input.timerId.long, - ), + message = RSStartTimerRequest { + timerId = input.timerId.long + }, extra = input.accessHash.toExtra(), ).let { _ -> Empty } } diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/StopSessionCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/StopSessionCommand.kt index 7f206a5..d577cdb 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/StopSessionCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/timers/sessions/commands/StopSessionCommand.kt @@ -10,9 +10,9 @@ import org.timemates.api.timers.sessions.requests.StopTimerRequest as RSStopTime internal object StopSessionCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: StopTimerRequest): Empty { return apis.timerSessions.stopTimer( - message = RSStopTimerRequest( - timerId = input.timerId.long, - ), + message = RSStopTimerRequest { + timerId = input.timerId.long + }, extra = input.accessHash.toExtra(), ).let { _ -> Empty } } diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/users/commands/EditEmailCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/users/commands/EditEmailCommand.kt index 0b0314f..e9098a0 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/users/commands/EditEmailCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/users/commands/EditEmailCommand.kt @@ -12,7 +12,9 @@ import org.timemates.api.users.requests.EditEmailRequest as RSEditEmailRequest internal object EditEmailCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: EditEmailRequest): Empty { return apis.users.setEmail( - message = RSEditEmailRequest(email = input.newEmail.string), + message = RSEditEmailRequest { + email = input.newEmail.string + }, extra = input.accessHash.toExtra() ).let { _ -> Empty } } diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/users/commands/EditProfileCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/users/commands/EditProfileCommand.kt index 1425f4b..903ce30 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/users/commands/EditProfileCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/users/commands/EditProfileCommand.kt @@ -11,11 +11,11 @@ import org.timemates.api.users.requests.EditUserRequest as RSEditUserRequest internal object EditProfileCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: EditProfileRequest): Empty { return apis.users.setUser( - message = RSEditUserRequest( - gravatarId = (input.avatar as? Avatar.GravatarId)?.string.orEmpty(), - name = input.name?.string.orEmpty(), - description = input.description?.string.orEmpty(), - ), + message = RSEditUserRequest { + gravatarId = (input.avatar as? Avatar.GravatarId)?.string.orEmpty() + name = input.name?.string.orEmpty() + description = input.description?.string.orEmpty() + }, extra = input.accessHash.toExtra(), ).let { _ -> Empty } } diff --git a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/users/commands/GetUsersCommand.kt b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/users/commands/GetUsersCommand.kt index f4a330c..bc40935 100644 --- a/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/users/commands/GetUsersCommand.kt +++ b/rsocket-engine/src/main/kotlin/org/timemates/api/rsocket/users/commands/GetUsersCommand.kt @@ -9,7 +9,9 @@ import org.timemates.api.users.requests.GetUsersRequest as RSGetUsersRequest internal object GetUsersCommand : RSocketCommand { override suspend fun execute(apis: ApiContainer, input: GetUsersRequest): GetUsersRequest.Result { return apis.users.getUsers( - message = RSGetUsersRequest(userId = input.users.map { it.long }), + message = RSGetUsersRequest { + userId = input.users.map { it.long } + }, ).let { result -> GetUsersRequest.Result(result.users.map { it.sdk() }) } diff --git a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/AuthorizationService.proto b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/AuthorizationService.proto index e5d03ea..8d1a942 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/AuthorizationService.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/AuthorizationService.proto @@ -1,12 +1,12 @@ syntax = "proto3"; -import "io/timemates/api/authorizations/requests/StartAuthorizationRequest.proto"; -import "io/timemates/api/authorizations/requests/ConfirmAuthorizationRequest.proto"; -import "io/timemates/api/authorizations/requests/GetAuthorizationsRequest.proto"; -import "io/timemates/api/authorizations/options/OmitAuthorizationOption.proto"; -import "io/timemates/api/authorizations/requests/CreateProfileRequest.proto"; -import "io/timemates/api/authorizations/requests/RenewAuthorizationRequest.proto"; -import "io/timemates/api/authorizations/types/Authorization.proto"; +import "org/timemates/api/authorizations/requests/StartAuthorizationRequest.proto"; +import "org/timemates/api/authorizations/requests/ConfirmAuthorizationRequest.proto"; +import "org/timemates/api/authorizations/requests/GetAuthorizationsRequest.proto"; +import "org/timemates/api/authorizations/options/OmitAuthorizationOption.proto"; +import "org/timemates/api/authorizations/requests/CreateProfileRequest.proto"; +import "org/timemates/api/authorizations/requests/RenewAuthorizationRequest.proto"; +import "org/timemates/api/authorizations/types/Authorization.proto"; import "google/protobuf/empty.proto"; option java_package = "org.timemates.api.authorizations"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/ConfirmAuthorizationRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/ConfirmAuthorizationRequest.proto index 59c2fec..8e153c2 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/ConfirmAuthorizationRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/ConfirmAuthorizationRequest.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -import "io/timemates/api/authorizations/types/Authorization.proto"; +import "org/timemates/api/authorizations/types/Authorization.proto"; option java_package = "org.timemates.api.authorizations.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/CreateProfileRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/CreateProfileRequest.proto index 769e4d0..7d693ea 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/CreateProfileRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/CreateProfileRequest.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "io/timemates/api/authorizations/types/Authorization.proto"; +import "org/timemates/api/authorizations/types/Authorization.proto"; option java_package = "org.timemates.api.users.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/GetAuthorizationsRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/GetAuthorizationsRequest.proto index 8d7756b..c7165d3 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/GetAuthorizationsRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/GetAuthorizationsRequest.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -import "io/timemates/api/authorizations/types/Authorization.proto"; +import "org/timemates/api/authorizations/types/Authorization.proto"; option java_package = "org.timemates.api.authorizations.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/RenewAuthorizationRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/RenewAuthorizationRequest.proto index 791f5bf..4c13cb8 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/RenewAuthorizationRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/RenewAuthorizationRequest.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "io/timemates/api/authorizations/types/Authorization.proto"; +import "org/timemates/api/authorizations/types/Authorization.proto"; option java_package = "org.timemates.api.authorizations.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/StartAuthorizationRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/StartAuthorizationRequest.proto index 71bb397..576d198 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/StartAuthorizationRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/requests/StartAuthorizationRequest.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -import "io/timemates/api/authorizations/types/Authorization.proto"; -import "io/timemates/api/authorizations/types/Metadata.proto"; +import "org/timemates/api/authorizations/types/Authorization.proto"; +import "org/timemates/api/authorizations/types/Metadata.proto"; option java_package = "org.timemates.api.authorizations.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/types/Authorization.proto b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/types/Authorization.proto index f87ee0b..46a5d92 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/authorizations/types/Authorization.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/authorizations/types/Authorization.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "io/timemates/api/authorizations/types/Metadata.proto"; +import "org/timemates/api/authorizations/types/Metadata.proto"; option java_package = "org.timemates.api.authorizations.types"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/timers/TimersService.proto b/rsocket-engine/src/main/proto/org/timemates/api/timers/TimersService.proto index ea6d27e..f6cbac9 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/timers/TimersService.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/timers/TimersService.proto @@ -1,17 +1,17 @@ syntax = "proto3"; -import "io/timemates/api/timers/requests/CreateTimerRequest.proto"; -import "io/timemates/api/timers/requests/EditTimerInfoRequest.proto"; -import "io/timemates/api/timers/requests/RemoveTimerRequest.proto"; -import "io/timemates/api/timers/requests/GetTimerRequest.proto"; -import "io/timemates/api/timers/requests/GetTimersRequest.proto"; -import "io/timemates/api/timers/members/requests/KickMemberRequest.proto"; -import "io/timemates/api/timers/members/requests/GetMembersRequest.proto"; -import "io/timemates/api/timers/members/invites/requests/CreateInviteRequest.proto"; -import "io/timemates/api/timers/members/invites/requests/GetInvitesRequest.proto"; -import "io/timemates/api/timers/members/invites/requests/RemoveInviteRequest.proto"; -import "io/timemates/api/timers/members/invites/requests/JoinTimerByInviteCodeRequest.proto"; -import "io/timemates/api/timers/types/Timer.proto"; +import "org/timemates/api/timers/requests/CreateTimerRequest.proto"; +import "org/timemates/api/timers/requests/EditTimerInfoRequest.proto"; +import "org/timemates/api/timers/requests/RemoveTimerRequest.proto"; +import "org/timemates/api/timers/requests/GetTimerRequest.proto"; +import "org/timemates/api/timers/requests/GetTimersRequest.proto"; +import "org/timemates/api/timers/members/requests/KickMemberRequest.proto"; +import "org/timemates/api/timers/members/requests/GetMembersRequest.proto"; +import "org/timemates/api/timers/members/invites/requests/CreateInviteRequest.proto"; +import "org/timemates/api/timers/members/invites/requests/GetInvitesRequest.proto"; +import "org/timemates/api/timers/members/invites/requests/RemoveInviteRequest.proto"; +import "org/timemates/api/timers/members/invites/requests/JoinTimerByInviteCodeRequest.proto"; +import "org/timemates/api/timers/types/Timer.proto"; import "google/protobuf/empty.proto"; option java_package = "org.timemates.api.timers"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/timers/members/invites/requests/CreateInviteRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/timers/members/invites/requests/CreateInviteRequest.proto index 3180441..1f2617d 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/timers/members/invites/requests/CreateInviteRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/timers/members/invites/requests/CreateInviteRequest.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -import "io/timemates/api/users/types/User.proto"; +import "org/timemates/api/users/types/User.proto"; option java_package = "org.timemates.api.timers.members.invites.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/timers/members/invites/requests/GetInvitesRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/timers/members/invites/requests/GetInvitesRequest.proto index d15a106..b068770 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/timers/members/invites/requests/GetInvitesRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/timers/members/invites/requests/GetInvitesRequest.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "io/timemates/api/timers/members/invites/types/Invite.proto"; +import "org/timemates/api/timers/members/invites/types/Invite.proto"; option java_package = "org.timemates.api.timers.members.invites.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/timers/members/invites/requests/JoinTimerByInviteCodeRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/timers/members/invites/requests/JoinTimerByInviteCodeRequest.proto index 8f7da35..63821c8 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/timers/members/invites/requests/JoinTimerByInviteCodeRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/timers/members/invites/requests/JoinTimerByInviteCodeRequest.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "io/timemates/api/timers/types/Timer.proto"; +import "org/timemates/api/timers/types/Timer.proto"; option java_package = "org.timemates.api.timers.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/timers/members/requests/GetMembersRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/timers/members/requests/GetMembersRequest.proto index f904c3c..1e0d90b 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/timers/members/requests/GetMembersRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/timers/members/requests/GetMembersRequest.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -import "io/timemates/api/users/types/User.proto"; +import "org/timemates/api/users/types/User.proto"; option java_package = "org.timemates.api.timers.members.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/CreateTimerRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/CreateTimerRequest.proto index b3ac833..3539c97 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/CreateTimerRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/CreateTimerRequest.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "io/timemates/api/timers/types/Timer.proto"; +import "org/timemates/api/timers/types/Timer.proto"; option java_package = "org.timemates.api.timers.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/EditTimerInfoRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/EditTimerInfoRequest.proto index 2f46977..4cbe8a3 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/EditTimerInfoRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/EditTimerInfoRequest.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "io/timemates/api/timers/types/Timer.proto"; +import "org/timemates/api/timers/types/Timer.proto"; option java_package = "org.timemates.api.timers.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/GetTimersRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/GetTimersRequest.proto index a8c4b71..210abfc 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/GetTimersRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/GetTimersRequest.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -import "io/timemates/api/timers/types/Timer.proto"; +import "org/timemates/api/timers/types/Timer.proto"; option java_package = "org.timemates.api.timers.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/RemoveTimerRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/RemoveTimerRequest.proto index 6dc4e5c..6b73bb2 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/RemoveTimerRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/timers/requests/RemoveTimerRequest.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "io/timemates/api/timers/types/Timer.proto"; +import "org/timemates/api/timers/types/Timer.proto"; option java_package = "org.timemates.api.timers.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/timers/sessions/TimerSessionsService.proto b/rsocket-engine/src/main/proto/org/timemates/api/timers/sessions/TimerSessionsService.proto index 571bc08..06a14c4 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/timers/sessions/TimerSessionsService.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/timers/sessions/TimerSessionsService.proto @@ -1,14 +1,14 @@ syntax = "proto3"; -import "io/timemates/api/timers/sessions/requests/StartTimerSessionRequest.proto"; -import "io/timemates/api/timers/sessions/requests/StopTimerSessionRequest.proto"; -import "io/timemates/api/timers/sessions/requests/JoinTimerSessionRequest.proto"; -import "io/timemates/api/timers/sessions/requests/ConfirmTimerSessionRequest.proto"; -import "io/timemates/api/timers/sessions/requests/GetTimerStateRequest.proto"; -import "io/timemates/api/timers/sessions/types/TimerState.proto"; +import "org/timemates/api/timers/sessions/requests/StartTimerSessionRequest.proto"; +import "org/timemates/api/timers/sessions/requests/StopTimerSessionRequest.proto"; +import "org/timemates/api/timers/sessions/requests/JoinTimerSessionRequest.proto"; +import "org/timemates/api/timers/sessions/requests/ConfirmTimerSessionRequest.proto"; +import "org/timemates/api/timers/sessions/requests/GetTimerStateRequest.proto"; +import "org/timemates/api/timers/sessions/types/TimerState.proto"; import "google/protobuf/empty.proto"; -import "io/timemates/api/timers/sessions/requests/GetCurrentTimerSessionRequest.proto"; -import "io/timemates/api/timers/types/Timer.proto"; +import "org/timemates/api/timers/sessions/requests/GetCurrentTimerSessionRequest.proto"; +import "org/timemates/api/timers/types/Timer.proto"; option java_package = "org.timemates.api.timers"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/timers/sessions/requests/GetCurrentTimerSessionRequest.proto b/rsocket-engine/src/main/proto/org/timemates/api/timers/sessions/requests/GetCurrentTimerSessionRequest.proto index 5c7fac9..465e287 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/timers/sessions/requests/GetCurrentTimerSessionRequest.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/timers/sessions/requests/GetCurrentTimerSessionRequest.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "io/timemates/api/timers/types/Timer.proto"; +import "org/timemates/api/timers/types/Timer.proto"; option java_package = "org.timemates.api.timers.requests"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/timers/types/Timer.proto b/rsocket-engine/src/main/proto/org/timemates/api/timers/types/Timer.proto index 4bf804d..89ad05b 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/timers/types/Timer.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/timers/types/Timer.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "io/timemates/api/timers/sessions/types/TimerState.proto"; +import "org/timemates/api/timers/sessions/types/TimerState.proto"; option java_package = "org.timemates.api.timers.types"; diff --git a/rsocket-engine/src/main/proto/org/timemates/api/users/UsersService.proto b/rsocket-engine/src/main/proto/org/timemates/api/users/UsersService.proto index 146d14b..392f9e3 100644 --- a/rsocket-engine/src/main/proto/org/timemates/api/users/UsersService.proto +++ b/rsocket-engine/src/main/proto/org/timemates/api/users/UsersService.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -import "io/timemates/api/users/requests/GetUsersRequest.proto"; -import "io/timemates/api/users/requests/EditUserRequest.proto"; -import "io/timemates/api/users/requests/EditEmailRequest.proto"; -import "io/timemates/api/users/types/User.proto"; +import "org/timemates/api/users/requests/GetUsersRequest.proto"; +import "org/timemates/api/users/requests/EditUserRequest.proto"; +import "org/timemates/api/users/requests/EditEmailRequest.proto"; +import "org/timemates/api/users/types/User.proto"; import "google/protobuf/empty.proto"; option java_package = "org.timemates.api.users"; diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/email/types/value/VerificationHash.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/email/types/value/VerificationHash.kt index 197bcb0..71b54b3 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/email/types/value/VerificationHash.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/email/types/value/VerificationHash.kt @@ -2,7 +2,7 @@ package org.timemates.sdk.authorization.email.types.value import org.timemates.sdk.common.constructor.Factory import org.timemates.sdk.common.constructor.CreationFailure - +import kotlin.jvm.JvmInline @JvmInline public value class VerificationHash private constructor(public val string: String) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ApplicationName.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ApplicationName.kt index 8c38975..61818c2 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ApplicationName.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ApplicationName.kt @@ -1,6 +1,7 @@ package org.timemates.sdk.authorization.sessions.types.value import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline @JvmInline public value class ApplicationName private constructor(public val string: String) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/AuthorizationId.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/AuthorizationId.kt index 55c132b..874f83b 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/AuthorizationId.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/AuthorizationId.kt @@ -1,6 +1,7 @@ package org.timemates.sdk.authorization.sessions.types.value import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline @JvmInline public value class AuthorizationId private constructor(public val int: Int) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ClientIpAddress.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ClientIpAddress.kt index 81970fd..6c65b67 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ClientIpAddress.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ClientIpAddress.kt @@ -1,6 +1,7 @@ package org.timemates.sdk.authorization.sessions.types.value import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline @JvmInline public value class ClientIpAddress private constructor(public val string: String) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ClientVersion.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ClientVersion.kt index 2c8ca22..9f542a5 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ClientVersion.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ClientVersion.kt @@ -1,6 +1,7 @@ package org.timemates.sdk.authorization.sessions.types.value import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline @JvmInline public value class ClientVersion private constructor(public val double: Double) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ConfirmationCode.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ConfirmationCode.kt index 1695a4b..b2ead9d 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ConfirmationCode.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/sessions/types/value/ConfirmationCode.kt @@ -2,6 +2,7 @@ package org.timemates.sdk.authorization.sessions.types.value import org.timemates.sdk.common.constructor.CreationFailure import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline @JvmInline public value class ConfirmationCode private constructor(public val string: String) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/types/value/HashValue.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/types/value/HashValue.kt index db35350..e69582d 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/types/value/HashValue.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/authorization/types/value/HashValue.kt @@ -1,6 +1,7 @@ package org.timemates.sdk.authorization.types.value import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline @JvmInline public value class HashValue private constructor(public val string: String) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/common/pagination/PageToken.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/common/pagination/PageToken.kt index e34ec38..b09cf02 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/common/pagination/PageToken.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/common/pagination/PageToken.kt @@ -1,6 +1,7 @@ package org.timemates.sdk.common.pagination import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline /** * A value class representing a page token. diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/common/types/value/Count.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/common/types/value/Count.kt index 7761fcd..76f847a 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/common/types/value/Count.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/common/types/value/Count.kt @@ -2,6 +2,7 @@ package org.timemates.sdk.common.types.value import org.timemates.sdk.common.constructor.CreationFailure import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline @JvmInline public value class Count private constructor(public val int: Int) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/members/invites/types/value/InviteCode.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/members/invites/types/value/InviteCode.kt index 64e8c43..dcd8862 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/members/invites/types/value/InviteCode.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/members/invites/types/value/InviteCode.kt @@ -2,6 +2,7 @@ package org.timemates.sdk.timers.members.invites.types.value import org.timemates.sdk.common.constructor.CreationFailure import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline @JvmInline public value class InviteCode private constructor(public val string: String) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/members/invites/types/value/InviteName.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/members/invites/types/value/InviteName.kt index 746f506..25e9e39 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/members/invites/types/value/InviteName.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/members/invites/types/value/InviteName.kt @@ -2,6 +2,7 @@ package org.timemates.sdk.timers.members.invites.types.value import org.timemates.sdk.common.constructor.CreationFailure import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline @JvmInline public value class InviteName private constructor(public val string: String) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/types/value/TimerDescription.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/types/value/TimerDescription.kt index 7f37120..8b46794 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/types/value/TimerDescription.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/types/value/TimerDescription.kt @@ -2,6 +2,7 @@ package org.timemates.sdk.timers.types.value import org.timemates.sdk.common.constructor.CreationFailure import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline @JvmInline public value class TimerDescription private constructor(public val string: String) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/types/value/TimerId.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/types/value/TimerId.kt index 5ca16b4..03b64d0 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/types/value/TimerId.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/types/value/TimerId.kt @@ -2,6 +2,7 @@ package org.timemates.sdk.timers.types.value import org.timemates.sdk.common.constructor.CreationFailure import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline @JvmInline public value class TimerId private constructor(public val long: Long) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/types/value/TimerName.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/types/value/TimerName.kt index d22b33a..39a0448 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/types/value/TimerName.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/timers/types/value/TimerName.kt @@ -2,6 +2,7 @@ package org.timemates.sdk.timers.types.value import org.timemates.sdk.common.constructor.CreationFailure import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline @JvmInline public value class TimerName private constructor(public val string: String) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/Avatar.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/Avatar.kt index 60186ae..1e225bf 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/Avatar.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/Avatar.kt @@ -2,6 +2,7 @@ package org.timemates.sdk.users.profile.types import org.timemates.sdk.common.constructor.CreationFailure import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline public sealed interface Avatar { @JvmInline diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/EmailAddress.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/EmailAddress.kt index 25fc84e..753c75d 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/EmailAddress.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/EmailAddress.kt @@ -2,6 +2,7 @@ package org.timemates.sdk.users.profile.types.value import org.timemates.sdk.common.constructor.Factory import org.timemates.sdk.common.constructor.CreationFailure +import kotlin.jvm.JvmInline @JvmInline public value class EmailAddress private constructor(public val string: String) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/UserDescription.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/UserDescription.kt index 97b6073..c4a06a4 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/UserDescription.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/UserDescription.kt @@ -4,6 +4,7 @@ import org.timemates.sdk.common.constructor.CreationFailure import org.timemates.sdk.common.constructor.Factory import kotlin.Result.Companion.failure import kotlin.Result.Companion.success +import kotlin.jvm.JvmInline @JvmInline public value class UserDescription private constructor(public val string: String) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/UserId.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/UserId.kt index 8c19867..335116a 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/UserId.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/UserId.kt @@ -2,6 +2,7 @@ package org.timemates.sdk.users.profile.types.value import org.timemates.sdk.common.constructor.CreationFailure import org.timemates.sdk.common.constructor.Factory +import kotlin.jvm.JvmInline @JvmInline public value class UserId private constructor(public val long: Long) { diff --git a/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/UserName.kt b/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/UserName.kt index 6542b8f..fb09621 100644 --- a/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/UserName.kt +++ b/sdk/src/commonMain/kotlin/org/timemates/sdk/users/profile/types/value/UserName.kt @@ -2,6 +2,7 @@ package org.timemates.sdk.users.profile.types.value import org.timemates.sdk.common.constructor.Factory import org.timemates.sdk.common.constructor.CreationFailure +import kotlin.jvm.JvmInline @JvmInline public value class UserName private constructor(public val string: String) {