Address feedback

Author: zoewangg

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutor.java

@@ -27,6 +27,7 @@
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.RESPONSE_DATA_READ;
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.STREAMING_COMPLETE_KEY;
 import static software.amazon.awssdk.http.nio.netty.internal.NettyRequestMetrics.measureTimeTaken;
+import static software.amazon.awssdk.http.nio.netty.internal.utils.ChannelUtils.HTTP_STREAMS_HANDLER_NAME;
 import static software.amazon.awssdk.http.nio.netty.internal.utils.ChannelUtils.WRITE_IDLE_STATE_HANDLER_NAME;
 
 import io.netty.buffer.ByteBuf;
@@ -223,7 +224,7 @@ private void configurePipeline() throws IOException {
         if (protocol == Protocol.HTTP2) {
             pipeline.addLast(FlushOnReadHandler.getInstance());
         }
-        pipeline.addLast(new HttpStreamsClientHandler());
+        pipeline.addLast(HTTP_STREAMS_HANDLER_NAME, new HttpStreamsClientHandler());
         pipeline.addLast(ResponseHandler.getInstance());
 
         // It's possible that the channel could become inactive between checking it out from the pool, and adding our response
@@ -272,7 +273,7 @@ private void writeRequest(HttpRequest request) {
                 // Add before HttpStreamsClientHandler so that raw TLS handshake bytes cannot
                 // prematurely remove this one-time handler. See Expect100ContinueReadTimeoutTest.
                 channel.pipeline().addBefore(
-                    channel.pipeline().context(HttpStreamsClientHandler.class).name(), null,
+                    HTTP_STREAMS_HANDLER_NAME, null,
                     new OneTimeReadTimeoutHandler(Duration.ofMillis(context.configuration().readTimeoutMillis())));
             } else {
                 channel.pipeline().addFirst(new ReadTimeoutHandler(context.configuration().readTimeoutMillis(),
@@ -292,11 +293,10 @@ private void removeWriteTimeoutHandlers() {
     private void addWriteTimeoutHandlers() {
         channel.pipeline().addFirst(new WriteTimeoutHandler(context.configuration().writeTimeoutMillis(),
                                                             TimeUnit.MILLISECONDS));
-        String httpStreamsName = channel.pipeline().context(HttpStreamsClientHandler.class).name();
-        channel.pipeline().addBefore(httpStreamsName, WRITE_IDLE_STATE_HANDLER_NAME,
+        channel.pipeline().addBefore(HTTP_STREAMS_HANDLER_NAME, WRITE_IDLE_STATE_HANDLER_NAME,
                                      new IdleStateHandler(0, context.configuration().writeTimeoutMillis(), 0,
                                                           TimeUnit.MILLISECONDS));
-        channel.pipeline().addBefore(httpStreamsName, null,
+        channel.pipeline().addBefore(HTTP_STREAMS_HANDLER_NAME, null,
                                      new WriteIdleTimeoutHandler(context.configuration().writeTimeoutMillis()));
     }
 

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtils.java

@@ -27,6 +27,7 @@
 @SdkInternalApi
 public final class ChannelUtils {
     public static final String WRITE_IDLE_STATE_HANDLER_NAME = "WriteIdleStateHandler";
+    public static final String HTTP_STREAMS_HANDLER_NAME = "HttpStreamsClientHandler";
 
     private ChannelUtils() {
     }

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HandlerRemovingChannelPoolListenerTest.java

@@ -69,11 +69,11 @@ public void setup() throws Exception {
         mockChannel.attr(REQUEST_CONTEXT_KEY).set(requestContext);
         mockChannel.attr(RESPONSE_COMPLETE_KEY).set(true);
 
-        pipeline.addLast(new HttpStreamsClientHandler());
+        pipeline.addLast(ChannelUtils.HTTP_STREAMS_HANDLER_NAME, new HttpStreamsClientHandler());
         pipeline.addLast(ResponseHandler.getInstance());
         pipeline.addLast(new ReadTimeoutHandler(10));
         pipeline.addLast(new WriteTimeoutHandler(10));
-        pipeline.addLast(new IdleStateHandler(0, 10, 0));
+        pipeline.addLast(ChannelUtils.WRITE_IDLE_STATE_HANDLER_NAME, new IdleStateHandler(0, 10, 0));
         pipeline.addLast(new WriteIdleTimeoutHandler(10000));
         handler = HandlerRemovingChannelPoolListener.create();
     }
@@ -111,7 +111,7 @@ public void release_deregisteredOpenChannel_handlerShouldBeRemovedFromChannelPoo
     }
 
     private void assertHandlersRemoved() {
-        assertThat(pipeline.get(HttpStreamsClientHandler.class)).isNull();
+        assertThat(pipeline.get(ChannelUtils.HTTP_STREAMS_HANDLER_NAME)).isNull();
         assertThat(pipeline.get(ResponseHandler.class)).isNull();
         assertThat(pipeline.get(ReadTimeoutHandler.class)).isNull();
         assertThat(pipeline.get(WriteTimeoutHandler.class)).isNull();
@@ -120,11 +120,11 @@ private void assertHandlersRemoved() {
     }
 
     private void assertHandlersNotRemoved() {
-        assertThat(pipeline.get(HttpStreamsClientHandler.class)).isNotNull();
+        assertThat(pipeline.get(ChannelUtils.HTTP_STREAMS_HANDLER_NAME)).isNotNull();
         assertThat(pipeline.get(ResponseHandler.class)).isNotNull();
         assertThat(pipeline.get(ReadTimeoutHandler.class)).isNotNull();
         assertThat(pipeline.get(WriteTimeoutHandler.class)).isNotNull();
-        assertThat(pipeline.get(IdleStateHandler.class)).isNotNull();
+        assertThat(pipeline.get(ChannelUtils.WRITE_IDLE_STATE_HANDLER_NAME)).isNotNull();
         assertThat(pipeline.get(WriteIdleTimeoutHandler.class)).isNotNull();
     }
 }