Refactor duplicate code in tests

- Add missing Javadoc
- Do not allocate Message objects needlessly
- Reduce String building
- No need to call constructor with the default value, an AtomicBoolean
is false by default.
- Access ArgumentMatchers static methods directly
- Use try-with-resources

Author: garydgregory

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientH2StreamHandler.java

@@ -110,9 +110,9 @@ public void endStream() throws IOException {
         this.exchangeHandler = exchangeHandler;
         this.pushHandlerFactory = pushHandlerFactory;
         this.context = context;
-        this.requestCommitted = new AtomicBoolean(false);
-        this.failed = new AtomicBoolean(false);
-        this.done = new AtomicBoolean(false);
+        this.requestCommitted = new AtomicBoolean();
+        this.failed = new AtomicBoolean();
+        this.done = new AtomicBoolean();
         this.requestState = MessageState.HEADERS;
         this.responseState = MessageState.HEADERS;
     }

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientPushH2StreamHandler.java

@@ -78,8 +78,8 @@ class ClientPushH2StreamHandler implements H2StreamHandler {
         this.connMetrics = connMetrics;
         this.pushHandlerFactory = pushHandlerFactory;
         this.context = context;
-        this.failed = new AtomicBoolean(false);
-        this.done = new AtomicBoolean(false);
+        this.failed = new AtomicBoolean();
+        this.done = new AtomicBoolean();
         this.requestState = MessageState.HEADERS;
         this.responseState = MessageState.HEADERS;
     }

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerH2StreamHandler.java

@@ -137,9 +137,9 @@ public void pushPromise(
         this.connMetrics = connMetrics;
         this.exchangeHandlerFactory = exchangeHandlerFactory;
         this.context = context;
-        this.responseCommitted = new AtomicBoolean(false);
-        this.failed = new AtomicBoolean(false);
-        this.done = new AtomicBoolean(false);
+        this.responseCommitted = new AtomicBoolean();
+        this.failed = new AtomicBoolean();
+        this.done = new AtomicBoolean();
         this.requestState = MessageState.HEADERS;
         this.responseState = MessageState.IDLE;
     }

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerPushH2StreamHandler.java

@@ -105,9 +105,9 @@ public void endStream() throws IOException {
         this.connMetrics = connMetrics;
         this.pushProducer = pushProducer;
         this.context = context;
-        this.responseCommitted = new AtomicBoolean(false);
-        this.failed = new AtomicBoolean(false);
-        this.done = new AtomicBoolean(false);
+        this.responseCommitted = new AtomicBoolean();
+        this.failed = new AtomicBoolean();
+        this.done = new AtomicBoolean();
         this.requestState = MessageState.COMPLETE;
         this.responseState = MessageState.IDLE;
     }

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/CancellableExecution.java

@@ -38,7 +38,7 @@ final class CancellableExecution implements CancellableDependency {
     private final AtomicReference<Cancellable> dependencyRef;
 
     CancellableExecution() {
-        this.cancelled = new AtomicBoolean(false);
+        this.cancelled = new AtomicBoolean();
         this.dependencyRef = new AtomicReference<>();
     }
 

httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestAbstractH2StreamMultiplexer.java

@@ -49,6 +49,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
@@ -139,9 +140,9 @@ void testInputOneFrame() throws Exception {
         Assertions.assertThrows(H2ConnectionException.class, () ->
                 streamMultiplexer.onInput(ByteBuffer.wrap(bytes)));
         Mockito.verify(h2StreamListener).onFrameInput(
-                Mockito.same(streamMultiplexer),
-                Mockito.eq(1),
-                Mockito.any());
+                ArgumentMatchers.same(streamMultiplexer),
+                ArgumentMatchers.eq(1),
+                ArgumentMatchers.any());
 
         Assertions.assertThrows(H2ConnectionException.class, () -> {
             int pos = 0;
@@ -154,9 +155,9 @@ void testInputOneFrame() throws Exception {
             }
 
             Mockito.verify(h2StreamListener).onFrameInput(
-                    Mockito.same(streamMultiplexer),
-                    Mockito.eq(1),
-                    Mockito.any());
+                    ArgumentMatchers.same(streamMultiplexer),
+                    ArgumentMatchers.eq(1),
+                    ArgumentMatchers.any());
         });
     }
 
@@ -190,9 +191,9 @@ void testInputMultipleFrames() throws Exception {
         Assertions.assertThrows(H2ConnectionException.class, () ->
                 streamMultiplexer.onInput(ByteBuffer.wrap(bytes)));
         Mockito.verify(h2StreamListener).onFrameInput(
-                Mockito.same(streamMultiplexer),
-                Mockito.eq(1),
-                Mockito.any());
+                ArgumentMatchers.same(streamMultiplexer),
+                ArgumentMatchers.eq(1),
+                ArgumentMatchers.any());
 
         Assertions.assertThrows(H2ConnectionException.class, () -> {
             int pos = 0;
@@ -205,9 +206,9 @@ void testInputMultipleFrames() throws Exception {
             }
 
             Mockito.verify(h2StreamListener).onFrameInput(
-                    Mockito.same(streamMultiplexer),
-                    Mockito.eq(1),
-                    Mockito.any());
+                    ArgumentMatchers.same(streamMultiplexer),
+                    ArgumentMatchers.eq(1),
+                    ArgumentMatchers.any());
         });
     }
 

httpcore5-reactive/src/main/java/org/apache/hc/core5/reactive/ReactiveDataConsumer.java

@@ -58,7 +58,7 @@ final class ReactiveDataConsumer implements AsyncDataConsumer, Publisher<ByteBuf
     private final AtomicLong requests = new AtomicLong(0);
 
     private final BlockingQueue<ByteBuffer> buffers = new LinkedBlockingQueue<>();
-    private final AtomicBoolean flushInProgress = new AtomicBoolean(false);
+    private final AtomicBoolean flushInProgress = new AtomicBoolean();
     private final AtomicInteger windowScalingIncrement = new AtomicInteger(0);
     private volatile boolean cancelled;
     private volatile boolean completed;

httpcore5-reactive/src/main/java/org/apache/hc/core5/reactive/ReactiveDataProducer.java

@@ -55,7 +55,7 @@ final class ReactiveDataProducer implements AsyncDataProducer, Subscriber<ByteBu
 
     private final AtomicReference<DataStreamChannel> requestChannel = new AtomicReference<>();
     private final AtomicReference<Throwable> exception = new AtomicReference<>();
-    private final AtomicBoolean complete = new AtomicBoolean(false);
+    private final AtomicBoolean complete = new AtomicBoolean();
     private final Publisher<ByteBuffer> publisher;
     private final AtomicReference<Subscription> subscription = new AtomicReference<>();
     private final ArrayDeque<ByteBuffer> buffers = new ArrayDeque<>(); // This field requires synchronization

httpcore5-testing/pom.xml

@@ -70,6 +70,11 @@
       <artifactId>rxjava</artifactId>
       <version>${rxjava3.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents.core5</groupId>
+      <artifactId>httpcore5</artifactId>
+      <classifier>tests</classifier>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>

httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/ClientSessionEndpoint.java

@@ -66,7 +66,7 @@ public final class ClientSessionEndpoint implements ModalCloseable {
     public ClientSessionEndpoint(final IOSession ioSession) {
         super();
         this.ioSession = ioSession;
-        this.closed = new AtomicBoolean(false);
+        this.closed = new AtomicBoolean();
     }
 
     public void execute(final Command command, final Command.Priority priority) {