diff --git a/rsocket-core/src/main/java/io/rsocket/loadbalance/WeightedLoadbalanceStrategy.java b/rsocket-core/src/main/java/io/rsocket/loadbalance/WeightedLoadbalanceStrategy.java index e24953cba..682a808bf 100644 --- a/rsocket-core/src/main/java/io/rsocket/loadbalance/WeightedLoadbalanceStrategy.java +++ b/rsocket-core/src/main/java/io/rsocket/loadbalance/WeightedLoadbalanceStrategy.java @@ -214,7 +214,7 @@ public WeightedStats apply(RSocket rSocket) { void init(RSocketConnector connector) { connector.interceptors( registry -> - registry.forRequester( + registry.forRequestsInRequester( (Function) rSocket -> { final WeightedStatsRequestInterceptor interceptor = diff --git a/rsocket-core/src/main/java/io/rsocket/plugins/InitializingInterceptorRegistry.java b/rsocket-core/src/main/java/io/rsocket/plugins/InitializingInterceptorRegistry.java index be0d8278f..2c53fb6b2 100644 --- a/rsocket-core/src/main/java/io/rsocket/plugins/InitializingInterceptorRegistry.java +++ b/rsocket-core/src/main/java/io/rsocket/plugins/InitializingInterceptorRegistry.java @@ -28,12 +28,14 @@ public class InitializingInterceptorRegistry extends InterceptorRegistry { @Nullable public RequestInterceptor initRequesterRequestInterceptor(RSocket rSocketRequester) { - return CompositeRequestInterceptor.create(rSocketRequester, getRequesterRequestInterceptors()); + return CompositeRequestInterceptor.create( + rSocketRequester, getRequestInterceptorsForRequester()); } @Nullable public RequestInterceptor initResponderRequestInterceptor(RSocket rSocketResponder) { - return CompositeRequestInterceptor.create(rSocketResponder, getResponderRequestInterceptors()); + return CompositeRequestInterceptor.create( + rSocketResponder, getRequestInterceptorsForResponder()); } public DuplexConnection initConnection( diff --git a/rsocket-core/src/main/java/io/rsocket/plugins/InterceptorRegistry.java b/rsocket-core/src/main/java/io/rsocket/plugins/InterceptorRegistry.java index 0ccc4cb92..680fb514f 100644 --- a/rsocket-core/src/main/java/io/rsocket/plugins/InterceptorRegistry.java +++ b/rsocket-core/src/main/java/io/rsocket/plugins/InterceptorRegistry.java @@ -48,7 +48,7 @@ public class InterceptorRegistry { * RequestInterceptor} * @since 1.1 */ - public InterceptorRegistry forRequester( + public InterceptorRegistry forRequestsInRequester( Function interceptor) { requesterRequestInterceptors.add(interceptor); return this; @@ -61,7 +61,7 @@ public InterceptorRegistry forRequester( * RequestInterceptor} * @since 1.1 */ - public InterceptorRegistry forResponder( + public InterceptorRegistry forRequestsInResponder( Function interceptor) { responderRequestInterceptors.add(interceptor); return this; @@ -134,11 +134,11 @@ public InterceptorRegistry forConnection(Consumer> getRequesterRequestInterceptors() { + List> getRequestInterceptorsForRequester() { return requesterRequestInterceptors; } - List> getResponderRequestInterceptors() { + List> getRequestInterceptorsForResponder() { return responderRequestInterceptors; } diff --git a/rsocket-core/src/test/java/io/rsocket/plugins/RequestInterceptorTest.java b/rsocket-core/src/test/java/io/rsocket/plugins/RequestInterceptorTest.java index 6f156a380..2bb718ef7 100644 --- a/rsocket-core/src/test/java/io/rsocket/plugins/RequestInterceptorTest.java +++ b/rsocket-core/src/test/java/io/rsocket/plugins/RequestInterceptorTest.java @@ -66,7 +66,7 @@ public Flux requestChannel(Publisher payloads) { RSocketConnector.create() .interceptors( ir -> - ir.forRequester( + ir.forRequestsInRequester( (Function) (__) -> testRequestInterceptor)) .connect(LocalClientTransport.create("test")) @@ -206,7 +206,7 @@ public Flux requestChannel(Publisher payloads) { })) .interceptors( ir -> - ir.forResponder( + ir.forRequestsInResponder( (Function) (__) -> testRequestInterceptor)) .connect(LocalClientTransport.create("test")) @@ -292,7 +292,7 @@ public Flux requestChannel(Publisher payloads) { })) .interceptors( ir -> - ir.forResponder( + ir.forRequestsInResponder( (Function) (__) -> testRequestInterceptor)) .bindNow(LocalServerTransport.create("test")); @@ -400,7 +400,7 @@ void interceptorShouldBeInstalledProperlyOnTheServerResponderSide(boolean errorO })) .interceptors( ir -> - ir.forRequester( + ir.forRequestsInRequester( (Function) (__) -> testRequestInterceptor)) .bindNow(LocalServerTransport.create("test")); @@ -543,7 +543,7 @@ public void dispose() {} RSocketConnector.create() .interceptors( ir -> - ir.forRequester( + ir.forRequestsInRequester( (Function) (__) -> testRequestInterceptor)) .connect(LocalClientTransport.create("test")) @@ -646,13 +646,13 @@ public void dispose() {} RSocketConnector.create() .interceptors( ir -> - ir.forRequester( + ir.forRequestsInRequester( (Function) (__) -> testRequestInterceptor) - .forRequester( + .forRequestsInRequester( (Function) (__) -> testRequestInterceptor1) - .forRequester( + .forRequestsInRequester( (Function) (__) -> testRequestInterceptor2)) .connect(LocalClientTransport.create("test"))