Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fix Netty deprecations from version 4.2 (#2199)

Panos Kalogeropoulos1517c8bd8fe6
diff --git a/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIOServer.java b/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIOServer.java
index 6bda3fe64..dcc373b27 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIOServer.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIOServer.java
@@ -23,7 +23,7 @@ import io.netty.bootstrap.AbstractBootstrap;
import io.netty.channel.*;
import io.netty.channel.group.ChannelGroup;
import io.netty.channel.group.DefaultChannelGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
import io.netty.util.concurrent.GlobalEventExecutor;
import org.openremote.container.Container;
import org.openremote.model.asset.agent.ConnectionStatus;
@@ -86,7 +86,7 @@ public abstract class AbstractNettyIOServer<T, U extends Channel, V extends Abst
if (workerGroup == null) {
// TODO: In Netty 5 you can pass in an executor service; can only pass in thread factory for now
- workerGroup = new NioEventLoopGroup();
+ workerGroup = new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
}
try {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/tcp/TCPIOClient.java b/agent/src/main/java/org/openremote/agent/protocol/tcp/TCPIOClient.java
index 23168f38f..579ef5d23 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/tcp/TCPIOClient.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/tcp/TCPIOClient.java
@@ -20,7 +20,7 @@
package org.openremote.agent.protocol.tcp;
import io.netty.channel.*;
-import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
import io.netty.channel.socket.nio.NioSocketChannel;
import org.openremote.agent.protocol.io.AbstractNettyIOClient;
import org.openremote.agent.protocol.io.IOClient;
@@ -61,7 +61,7 @@ public class TCPIOClient<T> extends AbstractNettyIOClient<T, InetSocketAddress>
@Override
protected EventLoopGroup getWorkerGroup() {
- return new NioEventLoopGroup(1);
+ return new MultiThreadIoEventLoopGroup(1, NioIoHandler.newFactory());
}
@Override
diff --git a/agent/src/main/java/org/openremote/agent/protocol/udp/AbstractUDPServer.java b/agent/src/main/java/org/openremote/agent/protocol/udp/AbstractUDPServer.java
index 555a47926..9aa8c06d8 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/udp/AbstractUDPServer.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/udp/AbstractUDPServer.java
@@ -22,7 +22,7 @@ package org.openremote.agent.protocol.udp;
import io.netty.bootstrap.Bootstrap;
import io.netty.buffer.ByteBuf;
import io.netty.channel.*;
-import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
import io.netty.channel.socket.DatagramChannel;
import io.netty.channel.socket.DatagramPacket;
import io.netty.channel.socket.nio.NioDatagramChannel;
@@ -64,7 +64,7 @@ public abstract class AbstractUDPServer<T> extends AbstractNettyIOServer<T, Data
@Override
protected Bootstrap createAndConfigureBootstrap() {
Bootstrap b = new Bootstrap();
- b.group(new NioEventLoopGroup())
+ b.group(new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory()))
.channel(NioDatagramChannel.class)
.localAddress(localAddress)
.option(ChannelOption.SO_BROADCAST, true);
diff --git a/agent/src/main/java/org/openremote/agent/protocol/udp/UDPIOClient.java b/agent/src/main/java/org/openremote/agent/protocol/udp/UDPIOClient.java
index e858492de..06f9a092d 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/udp/UDPIOClient.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/udp/UDPIOClient.java
@@ -21,7 +21,7 @@ package org.openremote.agent.protocol.udp;
import io.netty.buffer.ByteBuf;
import io.netty.channel.*;
-import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
import io.netty.channel.socket.DatagramPacket;
import io.netty.channel.socket.nio.NioDatagramChannel;
import io.netty.handler.codec.MessageToMessageEncoder;
@@ -106,7 +106,7 @@ public class UDPIOClient<T> extends AbstractNettyIOClient<T, InetSocketAddress>
@Override
protected EventLoopGroup getWorkerGroup() {
- return new NioEventLoopGroup(1);
+ return new MultiThreadIoEventLoopGroup(1, NioIoHandler.newFactory());
}
@Override
diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketIOClient.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketIOClient.java
index 2a27c887f..ac8fe8d11 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketIOClient.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketIOClient.java
@@ -21,7 +21,7 @@ package org.openremote.agent.protocol.websocket;
import io.netty.buffer.ByteBuf;
import io.netty.channel.*;
-import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.handler.codec.MessageToMessageEncoder;
import io.netty.handler.codec.http.*;
@@ -132,7 +132,7 @@ public class WebsocketIOClient<T> extends AbstractNettyIOClient<T, InetSocketAdd
@Override
protected EventLoopGroup getWorkerGroup() {
- return new NioEventLoopGroup(1);
+ return new MultiThreadIoEventLoopGroup(1, NioIoHandler.newFactory());
}
@Override
@@ -198,7 +198,7 @@ public class WebsocketIOClient<T> extends AbstractNettyIOClient<T, InetSocketAdd
channel.pipeline().addLast(
new HttpClientCodec(),
new HttpObjectAggregator(8192),
- WebSocketClientCompressionHandler.INSTANCE,
+ new WebSocketClientCompressionHandler(0),
handler);
channel.pipeline().addLast(new io.netty.handler.codec.MessageToMessageDecoder<WebSocketFrame>() {