Skip to content

Commit e08ff71

Browse files
rstoyanchevrstoyanchev
committed
Rename RequestInterceptor registration methods
Signed-off-by: Rossen Stoyanchev <[email protected]>
1 parent be1207b commit e08ff71

4 files changed

Lines changed: 17 additions & 15 deletions

File tree

‎rsocket-core/src/main/java/io/rsocket/loadbalance/WeightedLoadbalanceStrategy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public WeightedStats apply(RSocket rSocket) {
214214
void init(RSocketConnector connector) {
215215
connector.interceptors(
216216
registry ->
217-
registry.forRequester(
217+
registry.forRequestsInRequester(
218218
(Function<RSocket, ? extends RequestInterceptor>)
219219
rSocket -> {
220220
final WeightedStatsRequestInterceptor interceptor =

‎rsocket-core/src/main/java/io/rsocket/plugins/InitializingInterceptorRegistry.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ public class InitializingInterceptorRegistry extends InterceptorRegistry {
2828

2929
@Nullable
3030
public RequestInterceptor initRequesterRequestInterceptor(RSocket rSocketRequester) {
31-
return CompositeRequestInterceptor.create(rSocketRequester, getRequesterRequestInterceptors());
31+
return CompositeRequestInterceptor.create(
32+
rSocketRequester, getRequestInterceptorsForRequester());
3233
}
3334

3435
@Nullable
3536
public RequestInterceptor initResponderRequestInterceptor(RSocket rSocketResponder) {
36-
return CompositeRequestInterceptor.create(rSocketResponder, getResponderRequestInterceptors());
37+
return CompositeRequestInterceptor.create(
38+
rSocketResponder, getRequestInterceptorsForResponder());
3739
}
3840

3941
public DuplexConnection initConnection(

‎rsocket-core/src/main/java/io/rsocket/plugins/InterceptorRegistry.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class InterceptorRegistry {
4848
* RequestInterceptor}
4949
* @since 1.1
5050
*/
51-
public InterceptorRegistry forRequester(
51+
public InterceptorRegistry forRequestsInRequester(
5252
Function<RSocket, ? extends RequestInterceptor> interceptor) {
5353
requesterRequestInterceptors.add(interceptor);
5454
return this;
@@ -61,7 +61,7 @@ public InterceptorRegistry forRequester(
6161
* RequestInterceptor}
6262
* @since 1.1
6363
*/
64-
public InterceptorRegistry forResponder(
64+
public InterceptorRegistry forRequestsInResponder(
6565
Function<RSocket, ? extends RequestInterceptor> interceptor) {
6666
responderRequestInterceptors.add(interceptor);
6767
return this;
@@ -134,11 +134,11 @@ public InterceptorRegistry forConnection(Consumer<List<DuplexConnectionIntercept
134134
return this;
135135
}
136136

137-
List<Function<RSocket, ? extends RequestInterceptor>> getRequesterRequestInterceptors() {
137+
List<Function<RSocket, ? extends RequestInterceptor>> getRequestInterceptorsForRequester() {
138138
return requesterRequestInterceptors;
139139
}
140140

141-
List<Function<RSocket, ? extends RequestInterceptor>> getResponderRequestInterceptors() {
141+
List<Function<RSocket, ? extends RequestInterceptor>> getRequestInterceptorsForResponder() {
142142
return responderRequestInterceptors;
143143
}
144144

‎rsocket-core/src/test/java/io/rsocket/plugins/RequestInterceptorTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
6666
RSocketConnector.create()
6767
.interceptors(
6868
ir ->
69-
ir.forRequester(
69+
ir.forRequestsInRequester(
7070
(Function<RSocket, ? extends RequestInterceptor>)
7171
(__) -> testRequestInterceptor))
7272
.connect(LocalClientTransport.create("test"))
@@ -206,7 +206,7 @@ public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
206206
}))
207207
.interceptors(
208208
ir ->
209-
ir.forResponder(
209+
ir.forRequestsInResponder(
210210
(Function<RSocket, ? extends RequestInterceptor>)
211211
(__) -> testRequestInterceptor))
212212
.connect(LocalClientTransport.create("test"))
@@ -292,7 +292,7 @@ public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
292292
}))
293293
.interceptors(
294294
ir ->
295-
ir.forResponder(
295+
ir.forRequestsInResponder(
296296
(Function<RSocket, ? extends RequestInterceptor>)
297297
(__) -> testRequestInterceptor))
298298
.bindNow(LocalServerTransport.create("test"));
@@ -400,7 +400,7 @@ void interceptorShouldBeInstalledProperlyOnTheServerResponderSide(boolean errorO
400400
}))
401401
.interceptors(
402402
ir ->
403-
ir.forRequester(
403+
ir.forRequestsInRequester(
404404
(Function<RSocket, ? extends RequestInterceptor>)
405405
(__) -> testRequestInterceptor))
406406
.bindNow(LocalServerTransport.create("test"));
@@ -543,7 +543,7 @@ public void dispose() {}
543543
RSocketConnector.create()
544544
.interceptors(
545545
ir ->
546-
ir.forRequester(
546+
ir.forRequestsInRequester(
547547
(Function<RSocket, ? extends RequestInterceptor>)
548548
(__) -> testRequestInterceptor))
549549
.connect(LocalClientTransport.create("test"))
@@ -646,13 +646,13 @@ public void dispose() {}
646646
RSocketConnector.create()
647647
.interceptors(
648648
ir ->
649-
ir.forRequester(
649+
ir.forRequestsInRequester(
650650
(Function<RSocket, ? extends RequestInterceptor>)
651651
(__) -> testRequestInterceptor)
652-
.forRequester(
652+
.forRequestsInRequester(
653653
(Function<RSocket, ? extends RequestInterceptor>)
654654
(__) -> testRequestInterceptor1)
655-
.forRequester(
655+
.forRequestsInRequester(
656656
(Function<RSocket, ? extends RequestInterceptor>)
657657
(__) -> testRequestInterceptor2))
658658
.connect(LocalClientTransport.create("test"))

0 commit comments

Comments
 (0)