Skip to content

Commit 2dd5f98

Browse files
authored
Update reactor version (#354)
* Update reactor version
1 parent d6dd8c1 commit 2dd5f98

File tree

8 files changed

+23
-20
lines changed

8 files changed

+23
-20
lines changed

cluster/src/test/java/io/scalecube/cluster/membership/MembershipProtocolTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import reactor.core.publisher.ReplayProcessor;
4040
import reactor.core.scheduler.Scheduler;
4141
import reactor.core.scheduler.Schedulers;
42+
import reactor.util.retry.Retry;
4243

4344
public class MembershipProtocolTest extends BaseTest {
4445

@@ -1199,7 +1200,7 @@ private void stop(MembershipProtocolImpl membership) {
11991200

12001201
private Mono<Void> awaitUntil(Runnable assertAction) {
12011202
return Mono.<Void>fromRunnable(assertAction)
1202-
.retryBackoff(Long.MAX_VALUE, Duration.ofMillis(100), Duration.ofSeconds(1));
1203+
.retryWhen(Retry.backoff(Long.MAX_VALUE, Duration.ofMillis(100)));
12031204
}
12041205

12051206
private void assertTrusted(MembershipProtocolImpl membership, Member... expected) {

pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<parent>
@@ -37,7 +39,7 @@
3739

3840
<slf4j.version>1.7.30</slf4j.version>
3941
<log4j.version>2.13.2</log4j.version>
40-
<reactor.version>Dysprosium-SR9</reactor.version>
42+
<reactor.version>2020.0.5</reactor.version>
4143
<jackson.version>2.11.0</jackson.version>
4244

4345
<mockito-junit-jupiter.version>2.27.0</mockito-junit-jupiter.version>

transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/TransportImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import io.scalecube.net.Address;
1515
import io.scalecube.transport.netty.tcp.TcpTransportFactory;
1616
import java.net.InetAddress;
17+
import java.net.InetSocketAddress;
1718
import java.util.Map;
1819
import java.util.Objects;
1920
import java.util.Optional;
@@ -72,8 +73,8 @@ public TransportImpl(MessageCodec messageCodec, Receiver receiver, Sender sender
7273
}
7374

7475
private static Address prepareAddress(DisposableServer server) {
75-
InetAddress address = server.address().getAddress();
76-
int port = server.address().getPort();
76+
InetAddress address = ((InetSocketAddress) server.address()).getAddress();
77+
int port = ((InetSocketAddress) server.address()).getPort();
7778
if (address.isAnyLocalAddress()) {
7879
return Address.create(Address.getLocalIpAddress().getHostAddress(), port);
7980
} else {

transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/tcp/TcpChannelInitializer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ final class TcpChannelInitializer implements BiConsumer<ConnectionObserver, Chan
2525
@Override
2626
public void accept(ConnectionObserver connectionObserver, Channel channel) {
2727
ChannelPipeline pipeline = channel.pipeline();
28-
pipeline.addLast(new LengthFieldPrepender(LENGTH_FIELD_LENGTH));
29-
pipeline.addLast(
28+
pipeline.addFirst(new ExceptionHandler());
29+
pipeline.addFirst(
3030
new LengthFieldBasedFrameDecoder(
3131
maxFrameLength, 0, LENGTH_FIELD_LENGTH, 0, LENGTH_FIELD_LENGTH));
32-
pipeline.addLast(new ExceptionHandler());
32+
pipeline.addFirst(new LengthFieldPrepender(LENGTH_FIELD_LENGTH));
3333
}
3434

3535
@ChannelHandler.Sharable

transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/tcp/TcpReceiver.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.net.InetSocketAddress;
88
import reactor.core.publisher.Mono;
99
import reactor.netty.DisposableServer;
10-
import reactor.netty.channel.BootstrapHandlers;
1110
import reactor.netty.tcp.TcpServer;
1211

1312
final class TcpReceiver implements Receiver {
@@ -42,9 +41,10 @@ private TcpServer newTcpServer(ReceiverContext context) {
4241
.option(ChannelOption.TCP_NODELAY, true)
4342
.option(ChannelOption.SO_KEEPALIVE, true)
4443
.option(ChannelOption.SO_REUSEADDR, true)
45-
.bootstrap(
46-
b ->
47-
BootstrapHandlers.updateConfiguration(
48-
b, "inbound", new TcpChannelInitializer(config.maxFrameLength())));
44+
.doOnChannelInit(
45+
(connectionObserver, channel, remoteAddress) -> {
46+
new TcpChannelInitializer(config.maxFrameLength())
47+
.accept(connectionObserver, channel);
48+
});
4949
}
5050
}

transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/tcp/TcpSender.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import io.scalecube.transport.netty.TransportImpl.SenderContext;
99
import reactor.core.publisher.Mono;
1010
import reactor.netty.Connection;
11-
import reactor.netty.channel.BootstrapHandlers;
1211
import reactor.netty.resources.ConnectionProvider;
1312
import reactor.netty.tcp.TcpClient;
1413

@@ -50,10 +49,10 @@ private TcpClient newTcpClient(SenderContext context, Address address) {
5049
.option(ChannelOption.SO_KEEPALIVE, true)
5150
.option(ChannelOption.SO_REUSEADDR, true)
5251
.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, config.connectTimeout())
53-
.bootstrap(
54-
b ->
55-
BootstrapHandlers.updateConfiguration(
56-
b, "outbound", new TcpChannelInitializer(config.maxFrameLength())));
52+
.doOnChannelInit(
53+
(connectionObserver, channel, remoteAddress) ->
54+
new TcpChannelInitializer(config.maxFrameLength())
55+
.accept(connectionObserver, channel));
5756
return config.isSecured() ? tcpClient.secure() : tcpClient;
5857
}
5958
}

transport-parent/transport-netty/src/test/java/io/scalecube/transport/netty/tcp/TcpTransportTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void testUnresolvedHostConnection() {
4747
try {
4848
Address address = Address.from("wronghost:49255");
4949
Message message = Message.withData("q").build();
50-
client.send(address, message).block(Duration.ofSeconds(5));
50+
client.send(address, message).block(Duration.ofSeconds(20));
5151
fail("fail");
5252
} catch (Exception e) {
5353
assertEquals(

transport-parent/transport-netty/src/test/java/io/scalecube/transport/netty/websocket/WebsocketTransportTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void testUnresolvedHostConnection() {
4747
try {
4848
Address address = Address.from("wronghost:49255");
4949
Message message = Message.withData("q").build();
50-
client.send(address, message).block(Duration.ofSeconds(5));
50+
client.send(address, message).block(Duration.ofSeconds(20));
5151
fail("fail");
5252
} catch (Exception e) {
5353
assertEquals(

0 commit comments

Comments
 (0)