fixup: handle deprecation and fix tests

Signed-off-by: Simon Schrottner <[email protected]>

Author: aepfli

providers/flagd/spec

@@ -8,9 +8,10 @@
 import io.grpc.Status.Code;
 import io.grpc.netty.GrpcSslContexts;
 import io.grpc.netty.NettyChannelBuilder;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
 import io.netty.channel.epoll.Epoll;
 import io.netty.channel.epoll.EpollDomainSocketChannel;
-import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.channel.epoll.EpollIoHandler;
 import io.netty.channel.unix.DomainSocketAddress;
 import io.netty.handler.ssl.SslContextBuilder;
 import java.io.File;
@@ -103,10 +104,9 @@ public static ManagedChannel nettyChannel(final FlagdOptions options) {
             if (!Epoll.isAvailable()) {
                 throw new IllegalStateException("unix socket cannot be used", Epoll.unavailabilityCause());
             }
-
             return NettyChannelBuilder.forAddress(new DomainSocketAddress(options.getSocketPath()))
                     .keepAliveTime(keepAliveMs, TimeUnit.MILLISECONDS)
-                    .eventLoopGroup(new EpollEventLoopGroup())
+                    .eventLoopGroup(new MultiThreadIoEventLoopGroup(EpollIoHandler.newFactory()))
                     .channelType(EpollDomainSocketChannel.class)
                     .usePlaintext()
                     .defaultServiceConfig(SERVICE_CONFIG_WITH_RETRY)

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/common/ChannelBuilder.java

@@ -21,9 +21,11 @@
 import io.grpc.ManagedChannel;
 import io.grpc.netty.GrpcSslContexts;
 import io.grpc.netty.NettyChannelBuilder;
+import io.netty.channel.IoHandlerFactory;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
 import io.netty.channel.epoll.Epoll;
 import io.netty.channel.epoll.EpollDomainSocketChannel;
-import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.channel.epoll.EpollIoHandler;
 import io.netty.channel.unix.DomainSocketAddress;
 import io.netty.handler.ssl.SslContextBuilder;
 import java.io.File;
@@ -44,10 +46,12 @@ class ChannelBuilderTest {
     @EnabledOnOs(OS.LINUX)
     void testNettyChannel_withSocketPath() {
         try (MockedStatic<Epoll> epollMock = mockStatic(Epoll.class);
+                MockedStatic<EpollIoHandler> nativeMock = mockStatic(EpollIoHandler.class);
                 MockedStatic<NettyChannelBuilder> nettyMock = mockStatic(NettyChannelBuilder.class)) {
 
             // Mocks
             epollMock.when(Epoll::isAvailable).thenReturn(true);
+            nativeMock.when(EpollIoHandler::newFactory).thenReturn(mock(IoHandlerFactory.class));
             NettyChannelBuilder mockBuilder = mock(NettyChannelBuilder.class);
             ManagedChannel mockChannel = mock(ManagedChannel.class);
 
@@ -56,7 +60,8 @@ void testNettyChannel_withSocketPath() {
                     .thenReturn(mockBuilder);
 
             when(mockBuilder.keepAliveTime(anyLong(), any(TimeUnit.class))).thenReturn(mockBuilder);
-            when(mockBuilder.eventLoopGroup(any(EpollEventLoopGroup.class))).thenReturn(mockBuilder);
+            when(mockBuilder.eventLoopGroup(any(MultiThreadIoEventLoopGroup.class)))
+                    .thenReturn(mockBuilder);
             when(mockBuilder.channelType(EpollDomainSocketChannel.class)).thenReturn(mockBuilder);
             when(mockBuilder.defaultServiceConfig(any())).thenReturn(mockBuilder);
             when(mockBuilder.maxRetryAttempts(anyInt())).thenReturn(mockBuilder);
@@ -77,7 +82,7 @@ void testNettyChannel_withSocketPath() {
             assertThat(channel).isEqualTo(mockChannel);
             nettyMock.verify(() -> NettyChannelBuilder.forAddress(new DomainSocketAddress("/path/to/socket")));
             verify(mockBuilder).keepAliveTime(1000, TimeUnit.MILLISECONDS);
-            verify(mockBuilder).eventLoopGroup(any(EpollEventLoopGroup.class));
+            verify(mockBuilder).eventLoopGroup(any(MultiThreadIoEventLoopGroup.class));
             verify(mockBuilder).channelType(EpollDomainSocketChannel.class);
             verify(mockBuilder).usePlaintext();
             verify(mockBuilder).build();
@@ -88,10 +93,12 @@ void testNettyChannel_withSocketPath() {
     @EnabledOnOs(OS.LINUX)
     void testNettyChannel_withSocketPath_withRetryPolicy() {
         try (MockedStatic<Epoll> epollMock = mockStatic(Epoll.class);
+                MockedStatic<EpollIoHandler> nativeMock = mockStatic(EpollIoHandler.class);
                 MockedStatic<NettyChannelBuilder> nettyMock = mockStatic(NettyChannelBuilder.class)) {
 
             // Mocks
             epollMock.when(Epoll::isAvailable).thenReturn(true);
+            nativeMock.when(EpollIoHandler::newFactory).thenReturn(mock(IoHandlerFactory.class));
             NettyChannelBuilder mockBuilder = mock(NettyChannelBuilder.class);
             ManagedChannel mockChannel = mock(ManagedChannel.class);
 
@@ -100,7 +107,8 @@ void testNettyChannel_withSocketPath_withRetryPolicy() {
                     .thenReturn(mockBuilder);
 
             when(mockBuilder.keepAliveTime(anyLong(), any(TimeUnit.class))).thenReturn(mockBuilder);
-            when(mockBuilder.eventLoopGroup(any(EpollEventLoopGroup.class))).thenReturn(mockBuilder);
+            when(mockBuilder.eventLoopGroup(any(MultiThreadIoEventLoopGroup.class)))
+                    .thenReturn(mockBuilder);
             when(mockBuilder.channelType(EpollDomainSocketChannel.class)).thenReturn(mockBuilder);
             when(mockBuilder.defaultServiceConfig(ChannelBuilder.SERVICE_CONFIG_WITH_RETRY))
                     .thenReturn(mockBuilder);
@@ -121,7 +129,7 @@ void testNettyChannel_withSocketPath_withRetryPolicy() {
             assertThat(channel).isEqualTo(mockChannel);
             nettyMock.verify(() -> NettyChannelBuilder.forAddress(new DomainSocketAddress("/path/to/socket")));
             verify(mockBuilder).keepAliveTime(1000, TimeUnit.MILLISECONDS);
-            verify(mockBuilder).eventLoopGroup(any(EpollEventLoopGroup.class));
+            verify(mockBuilder).eventLoopGroup(any(MultiThreadIoEventLoopGroup.class));
             verify(mockBuilder).channelType(EpollDomainSocketChannel.class);
             verify(mockBuilder).defaultServiceConfig(ChannelBuilder.SERVICE_CONFIG_WITH_RETRY);
             verify(mockBuilder).usePlaintext();