File tree Expand file tree Collapse file tree 10 files changed +3
-30
lines changed
build-logic/publish-library-plugin/src/main/kotlin/com/y9vad9/maven/publish
router-core/src/commonMain/kotlin/com.y9vad9.rsocket.router
commonMain/kotlin/com/y9vad9/rsocket/router/test
jvmTest/kotlin/com/y9vad9/rsocket/router/test Expand file tree Collapse file tree 10 files changed +3
-30
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,6 @@ import org.gradle.kotlin.dsl.apply
88import org.gradle.kotlin.dsl.create
99import org.gradle.kotlin.dsl.get
1010import org.gradle.kotlin.dsl.the
11- import java.util.*
1211
1312class DeployPlugin : Plugin <Project > {
1413 override fun apply (target : Project ) {
Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ import com.y9vad9.rsocket.router.annotations.ExperimentalInterceptorsApi
66import com.y9vad9.rsocket.router.annotations.ExperimentalRouterApi
77import com.y9vad9.rsocket.router.interceptors.Preprocessor
88import com.y9vad9.rsocket.router.interceptors.RouteInterceptor
9- import io.rsocket.kotlin.RSocket
109import io.rsocket.kotlin.RSocketError
1110import io.rsocket.kotlin.payload.Payload
1211import kotlinx.coroutines.currentCoroutineContext
@@ -81,11 +80,4 @@ public data class Route internal constructor(
8180}
8281
8382private fun Route.throwInvalidRequestOnRoute (requestType : String ): Nothing =
84- throw RSocketError .Invalid (" No `$requestType ` is registered for `$path ` route." )
85-
86- @OptIn(ExperimentalInterceptorsApi ::class )
87- public class MyRouteInterceptor : RouteInterceptor .Modifier {
88- override fun intercept (route : String , input : Payload ): Payload {
89- return Payload .Empty // just for example
90- }
91- }
83+ throw RSocketError .Invalid (" No `$requestType ` is registered for `$path ` route." )
Original file line number Diff line number Diff line change 11package com.y9vad9.rsocket.router.builders
22
33import com.y9vad9.rsocket.router.annotations.ExperimentalInterceptorsApi
4- import io.rsocket.kotlin.RSocket
5- import io.rsocket.kotlin.payload.Payload
6- import com.y9vad9.rsocket.router.annotations.ExperimentalRouterApi
74import com.y9vad9.rsocket.router.interceptors.builder.RouteInterceptorsBuilder
5+ import io.rsocket.kotlin.payload.Payload
86import kotlinx.coroutines.flow.Flow
97
108/* *
Original file line number Diff line number Diff line change 11package com.y9vad9.rsocket.router.builders.impl
22
3- import io.rsocket.kotlin.RSocket
4- import io.rsocket.kotlin.payload.Payload
53import com.y9vad9.rsocket.router.Route
6- import com.y9vad9.rsocket.router.annotations.ExperimentalRouterApi
74import com.y9vad9.rsocket.router.builders.DeclarableRoutingBuilder
85import com.y9vad9.rsocket.router.interceptors.Preprocessor
96import com.y9vad9.rsocket.router.interceptors.RouteInterceptor
107import com.y9vad9.rsocket.router.interceptors.builder.RouteInterceptorsBuilder
8+ import io.rsocket.kotlin.payload.Payload
119import kotlinx.coroutines.flow.Flow
1210
13- @OptIn(ExperimentalRouterApi ::class )
1411internal class DeclarableRoutingBuilderScopeImpl (
1512 private val path : String ,
1613 private val separator : Char ,
Original file line number Diff line number Diff line change @@ -7,15 +7,13 @@ import com.y9vad9.rsocket.router.builders.RoutingBuilder
77import com.y9vad9.rsocket.router.interceptors.Preprocessor
88import com.y9vad9.rsocket.router.interceptors.RouteInterceptor
99
10- @OptIn(ExperimentalRouterApi ::class )
1110internal class RoutingBuilderScopeImpl (
1211 private val separator : Char ,
1312 private val sharedInterceptors : List <RouteInterceptor >,
1413 private val preprocessors : List <Preprocessor >,
1514) : RoutingBuilder {
1615 private val subRoutes = mutableMapOf<String , Route >()
1716
18- @OptIn(ExperimentalRouterApi ::class )
1917 override fun route (route : String , block : DeclarableRoutingBuilder .() -> Unit ) {
2018 subRoutes + = DeclarableRoutingBuilderScopeImpl (
2119 path = route,
Original file line number Diff line number Diff line change 11package com.y9vad9.rsocket.router.interceptors
22
33import com.y9vad9.rsocket.router.annotations.ExperimentalInterceptorsApi
4- import io.ktor.utils.io.core.*
54import io.rsocket.kotlin.payload.Payload
6- import com.y9vad9.rsocket.router.annotations.ExperimentalRouterApi
75
86/* *
97 * An interceptor for the RSocket library used by Router.
@@ -16,9 +14,6 @@ public sealed interface Interceptor
1614
1715/* *
1816 * This interface represents a preprocessor, which is an interceptor for intercepting requests before the route feature.
19- *
20- * @param T the input type of the preprocessor
21- * @param R the output type of the preprocessor
2217 */
2318@ExperimentalInterceptorsApi
2419public sealed interface Preprocessor : Interceptor {
Original file line number Diff line number Diff line change 11package com.y9vad9.rsocket.router.interceptors.builder
22
33import com.y9vad9.rsocket.router.annotations.ExperimentalInterceptorsApi
4- import com.y9vad9.rsocket.router.annotations.ExperimentalRouterApi
54import com.y9vad9.rsocket.router.interceptors.Preprocessor
65
76@ExperimentalInterceptorsApi
Original file line number Diff line number Diff line change 11package com.y9vad9.rsocket.router.interceptors.builder
22
33import com.y9vad9.rsocket.router.annotations.ExperimentalInterceptorsApi
4- import com.y9vad9.rsocket.router.annotations.ExperimentalRouterApi
54import com.y9vad9.rsocket.router.interceptors.RouteInterceptor
65
76@ExperimentalInterceptorsApi
Original file line number Diff line number Diff line change @@ -3,11 +3,9 @@ package com.y9vad9.rsocket.router.test
33import com.y9vad9.rsocket.router.Route
44import com.y9vad9.rsocket.router.Router
55import com.y9vad9.rsocket.router.annotations.ExperimentalInterceptorsApi
6- import com.y9vad9.rsocket.router.annotations.ExperimentalRouterApi
76import com.y9vad9.rsocket.router.interceptors.Preprocessor
87import com.y9vad9.rsocket.router.interceptors.RouteInterceptor
98import io.ktor.util.reflect.*
10- import io.rsocket.kotlin.RSocket
119import io.rsocket.kotlin.payload.Payload
1210import kotlinx.coroutines.flow.Flow
1311import kotlin.reflect.KClass
@@ -53,7 +51,6 @@ public suspend fun Route.requestStreamOrAssert(payload: Payload): Flow<Payload>
5351}
5452
5553public suspend fun Route.requestChannelOrAssert (
56- rSocket : RSocket ,
5754 initPayload : Payload ,
5855 payloads : Flow <Payload >,
5956): Flow <Payload > = try {
Original file line number Diff line number Diff line change @@ -13,7 +13,6 @@ import kotlin.test.Test
1313import kotlin.test.assertEquals
1414import kotlin.test.assertNotNull
1515
16- @OptIn(ExperimentalRouterApi ::class )
1716class RouterTest {
1817 private class MyInterceptor : RouteInterceptor .CoroutineContext {
1918
You can’t perform that action at this time.
0 commit comments