Update tests

Author: alzimmermsft

sdk/clientcore/http-netty4/pom.xml

@@ -56,7 +56,7 @@
       io.clientcore.core.implementation*,io.clientcore.core.models,io.clientcore.core.util,io.clientcore.core.util*
     </javadoc.excludePackageNames>
 
-    <netty.version>4.1.127.Final</netty.version> <!-- {x-version-update;io.netty:netty-common;external_dependency} -->
+    <netty.version>4.2.9.Final</netty.version> <!-- {x-version-update;io.netty:netty-common;external_dependency} -->
   </properties>
 
   <dependencies>
@@ -205,12 +205,6 @@
       <version>2.5.2</version> <!-- {x-version-update;org.conscrypt:conscrypt-openjdk-uber;external_dependency} -->
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>4.11.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

sdk/clientcore/http-netty4/src/main/java/io/clientcore/http/netty4/NettyHttpClientBuilder.java

@@ -15,7 +15,6 @@
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.ssl.SslContext;
@@ -153,11 +152,11 @@ public NettyHttpClientBuilder() {
     /**
      * Sets the event loop group for the Netty client.
      * <p>
-     * By default, if no {@code eventLoopGroup} is configured and no native transports are available (Epoll KQueue)
-     * {@link NioEventLoopGroup} will be used.
+     * By default, if no {@code eventLoopGroup} is configured and no native transports are available (Epoll, KQueue)
+     * {@link io.netty.channel.nio.NioEventLoopGroup} will be used.
      * <p>
      * If native transports are available, the {@link EventLoopGroup} implementation for the native transport will be
-     * chosen over {@link NioEventLoopGroup}.
+     * chosen over {@link io.netty.channel.nio.NioEventLoopGroup}.
      *
      * @param eventLoopGroup The event loop group.
      * @return The updated builder.
@@ -453,6 +452,7 @@ ProxyOptions getProxyOptions() {
         return (proxyOptions == null) ? ProxyOptions.fromConfiguration(buildConfiguration, true) : proxyOptions;
     }
 
+    @SuppressWarnings("deprecation")
     static EventLoopGroup getEventLoopGroupToUse(EventLoopGroup configuredGroup,
         Class<? extends SocketChannel> configuredChannelClass, boolean isEpollAvailable,
         MethodHandle epollEventLoopGroupCreator, boolean isKqueueAvailable, MethodHandle kqueueEventLoopGroupCreator) {
@@ -483,7 +483,7 @@ static EventLoopGroup getEventLoopGroupToUse(EventLoopGroup configuredGroup,
         }
 
         // Fallback to NioEventLoopGroup.
-        return new NioEventLoopGroup(threadFactory);
+        return new io.netty.channel.nio.NioEventLoopGroup(threadFactory);
     }
 
     static Class<? extends SocketChannel> getChannelClass(Class<? extends SocketChannel> configuredChannelClass,

sdk/clientcore/http-netty4/src/test/java/io/clientcore/http/netty4/NettyHttpClientBuilderTests.java

@@ -15,11 +15,8 @@
 import io.netty.bootstrap.BootstrapConfig;
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.epoll.EpollEventLoopGroup;
 import io.netty.channel.epoll.EpollSocketChannel;
-import io.netty.channel.kqueue.KQueueEventLoopGroup;
 import io.netty.channel.kqueue.KQueueSocketChannel;
-import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import org.junit.jupiter.api.Test;
@@ -283,10 +280,12 @@ private static Stream<Configuration> buildWithExplicitConfigurationProxySupplier
      * Tests that a custom {@link io.netty.channel.EventLoopGroup} is properly applied to the Netty client to handle
      * sending and receiving requests and responses.
      */
+    @SuppressWarnings("deprecation")
     @Test
     public void buildEventLoopClient() {
         String expectedThreadName = "testEventLoop";
-        NioEventLoopGroup eventLoopGroup = new NioEventLoopGroup(1, (Runnable r) -> new Thread(r, expectedThreadName));
+        io.netty.channel.nio.NioEventLoopGroup eventLoopGroup
+            = new io.netty.channel.nio.NioEventLoopGroup(1, (Runnable r) -> new Thread(r, expectedThreadName));
 
         NettyHttpClient nettyClient
             = (NettyHttpClient) new NettyHttpClientBuilder().eventLoopGroup(eventLoopGroup).build();
@@ -307,59 +306,64 @@ private static Stream<Arguments> getTimeoutMillisSupplier() {
             Arguments.of(Duration.ofNanos(1), TimeUnit.MILLISECONDS.toMillis(1)));
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     @EnabledOnOs(OS.WINDOWS)
     public void windowsUseNioByDefault() {
         NettyHttpClient nettyHttpClient = (NettyHttpClient) new NettyHttpClientBuilder().build();
 
         BootstrapConfig config = nettyHttpClient.getBootstrap().config();
-        assertInstanceOf(NioEventLoopGroup.class, config.group());
+        assertInstanceOf(io.netty.channel.nio.NioEventLoopGroup.class, config.group());
         assertInstanceOf(NioSocketChannel.class, config.channelFactory().newChannel());
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     @EnabledOnOs(OS.MAC)
     public void macUsesKQueueByDefault() {
         NettyHttpClient nettyHttpClient = (NettyHttpClient) new NettyHttpClientBuilder().build();
 
         BootstrapConfig config = nettyHttpClient.getBootstrap().config();
-        assertInstanceOf(KQueueEventLoopGroup.class, config.group());
+        assertInstanceOf(io.netty.channel.kqueue.KQueueEventLoopGroup.class, config.group());
         assertInstanceOf(KQueueSocketChannel.class, config.channelFactory().newChannel());
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     @EnabledOnOs(OS.MAC)
     public void macUsesNioIfConfigured() {
         NettyHttpClient nettyHttpClient
             = (NettyHttpClient) new NettyHttpClientBuilder().channelClass(NioSocketChannel.class)
-                .eventLoopGroup(new NioEventLoopGroup())
+                .eventLoopGroup(new io.netty.channel.nio.NioEventLoopGroup())
                 .build();
 
         BootstrapConfig config = nettyHttpClient.getBootstrap().config();
-        assertInstanceOf(NioEventLoopGroup.class, config.group());
+        assertInstanceOf(io.netty.channel.nio.NioEventLoopGroup.class, config.group());
         assertInstanceOf(NioSocketChannel.class, config.channelFactory().newChannel());
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     @EnabledOnOs(OS.LINUX)
     public void linuxUsesEpollByDefault() {
         NettyHttpClient nettyHttpClient = (NettyHttpClient) new NettyHttpClientBuilder().build();
 
         BootstrapConfig config = nettyHttpClient.getBootstrap().config();
-        assertInstanceOf(EpollEventLoopGroup.class, config.group());
+        assertInstanceOf(io.netty.channel.epoll.EpollEventLoopGroup.class, config.group());
         assertInstanceOf(EpollSocketChannel.class, config.channelFactory().newChannel());
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     @EnabledOnOs(OS.LINUX)
     public void linuxUsesNioIfConfigured() {
         NettyHttpClient nettyHttpClient
             = (NettyHttpClient) new NettyHttpClientBuilder().channelClass(NioSocketChannel.class)
-                .eventLoopGroup(new NioEventLoopGroup())
+                .eventLoopGroup(new io.netty.channel.nio.NioEventLoopGroup())
                 .build();
 
         BootstrapConfig config = nettyHttpClient.getBootstrap().config();
-        assertInstanceOf(NioEventLoopGroup.class, config.group());
+        assertInstanceOf(io.netty.channel.nio.NioEventLoopGroup.class, config.group());
         assertInstanceOf(NioSocketChannel.class, config.channelFactory().newChannel());
     }
 
@@ -404,11 +408,12 @@ public void testMaximumHttpVersion() throws NoSuchFieldException, IllegalAccessE
         assertEquals(HttpProtocolVersion.HTTP_2, httpVersionField.get(clientv2));
     }
 
+    @SuppressWarnings("deprecation")
     private static Stream<Arguments> getEventLoopGroupToUseSupplier() throws ReflectiveOperationException {
         // Doesn't matter what this is calling, just needs to throw an exception.
         // This will as it doesn't accept the arguments that it will be called with.
-        MethodHandle exceptionCreator
-            = MethodHandles.publicLookup().unreflectConstructor(NioEventLoopGroup.class.getDeclaredConstructor());
+        MethodHandle exceptionCreator = MethodHandles.publicLookup()
+            .unreflectConstructor(io.netty.channel.nio.NioEventLoopGroup.class.getDeclaredConstructor());
 
         // NOTE: This test doesn't use EpollEventLoopGroup or KQueueEventLoopGroup directly, but rather uses different
         // EventLoopGroup classes as the creation of those requires native libraries to be loaded.
@@ -420,8 +425,8 @@ private static Stream<Arguments> getEventLoopGroupToUseSupplier() throws Reflect
             .unreflectConstructor(MockKQueueEventLoopGroup.class.getDeclaredConstructor(ThreadFactory.class));
 
         // EventLoopGroup is configured, use it.
-        Arguments configuredGroup
-            = Arguments.of(NioEventLoopGroup.class, new NioEventLoopGroup(), null, false, null, false, null);
+        Arguments configuredGroup = Arguments.of(io.netty.channel.nio.NioEventLoopGroup.class,
+            new io.netty.channel.nio.NioEventLoopGroup(), null, false, null, false, null);
 
         // Epoll is available and nothing is configured, use EpollEventLoopGroup.
         Arguments epollGroup = Arguments.of(MockEpollEventLoopGroup.class, null, null, true, epollCreator, false, null);
@@ -431,8 +436,8 @@ private static Stream<Arguments> getEventLoopGroupToUseSupplier() throws Reflect
             epollCreator, false, null);
 
         // Epoll is available but throws an exception, use NioEventLoopGroup.
-        Arguments epollExceptionGroup
-            = Arguments.of(NioEventLoopGroup.class, null, null, true, exceptionCreator, false, null);
+        Arguments epollExceptionGroup = Arguments.of(io.netty.channel.nio.NioEventLoopGroup.class, null, null, true,
+            exceptionCreator, false, null);
 
         // KQueue is available and nothing is configured, use KQueueEventLoopGroup.
         Arguments kqueueGroup
@@ -443,8 +448,8 @@ private static Stream<Arguments> getEventLoopGroupToUseSupplier() throws Reflect
             false, null, true, kqueueCreator);
 
         // KQueue is available but throws an exception, use NioEventLoopGroup.
-        Arguments kqueueExceptionGroup
-            = Arguments.of(NioEventLoopGroup.class, null, null, false, null, true, exceptionCreator);
+        Arguments kqueueExceptionGroup = Arguments.of(io.netty.channel.nio.NioEventLoopGroup.class, null, null, false,
+            null, true, exceptionCreator);
 
         // Both Epoll and KQueue are available, use EpollEventLoopGroup.
         Arguments epollAndKqueueGroup
@@ -456,8 +461,8 @@ private static Stream<Arguments> getEventLoopGroupToUseSupplier() throws Reflect
             KQueueSocketChannel.class, true, epollCreator, true, kqueueCreator);
 
         // Both Epoll and KQueue are available but throws an exception, use NioEventLoopGroup.
-        Arguments epollAndKqueueExceptionGroup
-            = Arguments.of(NioEventLoopGroup.class, null, null, true, exceptionCreator, true, exceptionCreator);
+        Arguments epollAndKqueueExceptionGroup = Arguments.of(io.netty.channel.nio.NioEventLoopGroup.class, null, null,
+            true, exceptionCreator, true, exceptionCreator);
 
         // Both Epoll and KQueue are available but channel class is set to EpollSocketChannel, use
         // EpollEventLoopGroup.
@@ -466,21 +471,23 @@ private static Stream<Arguments> getEventLoopGroupToUseSupplier() throws Reflect
 
         // Both Epoll and KQueue are available but channel class is set to NioSocketChannel, use
         // NioEventLoopGroup.
-        Arguments epollAndKqueueChannelNioGroup = Arguments.of(NioEventLoopGroup.class, null, NioSocketChannel.class,
-            true, epollCreator, true, kqueueCreator);
+        Arguments epollAndKqueueChannelNioGroup = Arguments.of(io.netty.channel.nio.NioEventLoopGroup.class, null,
+            NioSocketChannel.class, true, epollCreator, true, kqueueCreator);
 
         return Stream.of(configuredGroup, epollGroup, epollChannelGroup, epollExceptionGroup, kqueueGroup,
             kqueueChannelGroup, kqueueExceptionGroup, epollAndKqueueGroup, epollAndKqueueChannelGroup,
             epollAndKqueueExceptionGroup, epollAndKqueueChannelExceptionGroup, epollAndKqueueChannelNioGroup);
     }
 
-    public static final class MockEpollEventLoopGroup extends NioEventLoopGroup {
+    @SuppressWarnings("deprecation")
+    public static final class MockEpollEventLoopGroup extends io.netty.channel.nio.NioEventLoopGroup {
         public MockEpollEventLoopGroup(ThreadFactory threadFactory) {
             super(threadFactory);
         }
     }
 
-    public static final class MockKQueueEventLoopGroup extends NioEventLoopGroup {
+    @SuppressWarnings("deprecation")
+    public static final class MockKQueueEventLoopGroup extends io.netty.channel.nio.NioEventLoopGroup {
         public MockKQueueEventLoopGroup(ThreadFactory threadFactory) {
             super(threadFactory);
         }
@@ -496,34 +503,38 @@ public void getChannelClass(Class<?> expected, Class<? extends SocketChannel> co
         assertEquals(expected, channelClass);
     }
 
+    @SuppressWarnings("deprecation")
     private static Stream<Arguments> getChannelClassSupplier() {
         // Channel class is configured, use it.
         Arguments configuredChannel = Arguments.of(NioSocketChannel.class, NioSocketChannel.class, null, false, false);
 
         // Epoll is available and EventLoopGroup is EpollEventLoopGroup, use EpollSocketChannel.
-        Arguments epollChannel = Arguments.of(EpollSocketChannel.class, null, EpollEventLoopGroup.class, true, false);
+        Arguments epollChannel = Arguments.of(EpollSocketChannel.class, null,
+            io.netty.channel.epoll.EpollEventLoopGroup.class, true, false);
 
         // KQueue is available and EventLoopGroup is KQueueEventLoopGroup, use KQueueSocketChannel.
-        Arguments kqueueChannel
-            = Arguments.of(KQueueSocketChannel.class, null, KQueueEventLoopGroup.class, false, true);
+        Arguments kqueueChannel = Arguments.of(KQueueSocketChannel.class, null,
+            io.netty.channel.kqueue.KQueueEventLoopGroup.class, false, true);
 
         // Epoll is available and EventLoopGroup is NioEventLoopGroup, use NioSocketChannel.
-        Arguments epollNioChannel = Arguments.of(NioSocketChannel.class, null, NioEventLoopGroup.class, true, false);
+        Arguments epollNioChannel
+            = Arguments.of(NioSocketChannel.class, null, io.netty.channel.nio.NioEventLoopGroup.class, true, false);
 
         // KQueue is available and EventLoopGroup is NioEventLoopGroup, use NioSocketChannel.
-        Arguments kqueueNioChannel = Arguments.of(NioSocketChannel.class, null, NioEventLoopGroup.class, false, true);
+        Arguments kqueueNioChannel
+            = Arguments.of(NioSocketChannel.class, null, io.netty.channel.nio.NioEventLoopGroup.class, false, true);
 
         // Both Epoll and KQueue are available and EventLoopGroup is NioEventLoopGroup, use NioSocketChannel.
         Arguments epollAndKqueueNioChannel
-            = Arguments.of(NioSocketChannel.class, null, NioEventLoopGroup.class, true, true);
+            = Arguments.of(NioSocketChannel.class, null, io.netty.channel.nio.NioEventLoopGroup.class, true, true);
 
         // Both Epoll and KQueue are available and EventLoopGroup is EpollEventLoopGroup, use EpollSocketChannel.
-        Arguments epollAndKqueueEpollChannel
-            = Arguments.of(EpollSocketChannel.class, null, EpollEventLoopGroup.class, true, true);
+        Arguments epollAndKqueueEpollChannel = Arguments.of(EpollSocketChannel.class, null,
+            io.netty.channel.epoll.EpollEventLoopGroup.class, true, true);
 
         // Both Epoll and KQueue are available and EventLoopGroup is KQueueEventLoopGroup, use KQueueSocketChannel.
-        Arguments epollAndKqueueKqueueChannel
-            = Arguments.of(KQueueSocketChannel.class, null, KQueueEventLoopGroup.class, true, true);
+        Arguments epollAndKqueueKqueueChannel = Arguments.of(KQueueSocketChannel.class, null,
+            io.netty.channel.kqueue.KQueueEventLoopGroup.class, true, true);
 
         return Stream.of(configuredChannel, epollChannel, kqueueChannel, epollNioChannel, kqueueNioChannel,
             epollAndKqueueNioChannel, epollAndKqueueEpollChannel, epollAndKqueueKqueueChannel);

sdk/clientcore/http-netty4/src/test/java/io/clientcore/http/netty4/implementation/Netty4ConnectionPoolTests.java

@@ -10,7 +10,6 @@
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.util.concurrent.Future;
 import org.junit.jupiter.api.AfterAll;
@@ -59,11 +58,12 @@ public class Netty4ConnectionPoolTests {
     private static Bootstrap bootstrap;
     private static Netty4ConnectionPoolKey connectionPoolKey;
 
+    @SuppressWarnings("deprecation")
     @BeforeAll
     public static void startTestServerAndEventLoopGroup() {
         server = NettyHttpClientLocalTestServer.getServer();
         server.start();
-        eventLoopGroup = new NioEventLoopGroup(2);
+        eventLoopGroup = new io.netty.channel.nio.NioEventLoopGroup(2);
         bootstrap = new Bootstrap().group(eventLoopGroup).channel(NioSocketChannel.class);
         bootstrap.option(ChannelOption.AUTO_READ, false);
         SocketAddress socketAddress = new InetSocketAddress("localhost", server.getPort());