Cleanup (#1963)

client/src/main/java/org/asynchttpclient/AsyncHandler.java

@@ -116,7 +116,8 @@ default State onTrailingHeadersReceived(HttpHeaders headers) throws Exception {
      * @return T Value that will be returned by the associated {@link Future}
      * @throws Exception if something wrong happens
      */
-    @Nullable T onCompleted() throws Exception;
+    @Nullable
+    T onCompleted() throws Exception;
 
     /**
      * Notify the callback before hostname resolution

client/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java

@@ -160,7 +160,8 @@ public interface AsyncHttpClientConfig {
      * @return the {@link ThreadFactory} an {@link AsyncHttpClient} use for handling asynchronous response. If no {@link ThreadFactory} has been explicitly
      * provided, this method will return {@code null}
      */
-    @Nullable ThreadFactory getThreadFactory();
+    @Nullable
+    ThreadFactory getThreadFactory();
 
     /**
      * An instance of {@link ProxyServer} used by an {@link AsyncHttpClient}
@@ -174,14 +175,16 @@ public interface AsyncHttpClientConfig {
      *
      * @return an instance of {@link SslContext} used for SSL connection.
      */
-    @Nullable SslContext getSslContext();
+    @Nullable
+    SslContext getSslContext();
 
     /**
      * Return the current {@link Realm}
      *
      * @return the current {@link Realm}
      */
-    @Nullable Realm getRealm();
+    @Nullable
+    Realm getRealm();
 
     /**
      * Return the list of {@link RequestFilter}
@@ -260,12 +263,14 @@ public interface AsyncHttpClientConfig {
     /**
      * @return the array of enabled protocols
      */
-    @Nullable String[] getEnabledProtocols();
+    @Nullable
+    String[] getEnabledProtocols();
 
     /**
      * @return the array of enabled cipher suites
      */
-    @Nullable String[] getEnabledCipherSuites();
+    @Nullable
+    String[] getEnabledCipherSuites();
 
     /**
      * @return if insecure cipher suites must be filtered out (only used when not explicitly passing enabled cipher suites)
@@ -294,7 +299,8 @@ public interface AsyncHttpClientConfig {
 
     int getHandshakeTimeout();
 
-    @Nullable SslEngineFactory getSslEngineFactory();
+    @Nullable
+    SslEngineFactory getSslEngineFactory();
 
     int getChunkedFileChunkSize();
 
@@ -310,23 +316,29 @@ public interface AsyncHttpClientConfig {
 
     Map<ChannelOption<Object>, Object> getChannelOptions();
 
-    @Nullable EventLoopGroup getEventLoopGroup();
+    @Nullable
+    EventLoopGroup getEventLoopGroup();
 
     boolean isUseNativeTransport();
 
     boolean isUseOnlyEpollNativeTransport();
 
-    @Nullable Consumer<Channel> getHttpAdditionalChannelInitializer();
+    @Nullable
+    Consumer<Channel> getHttpAdditionalChannelInitializer();
 
-    @Nullable Consumer<Channel> getWsAdditionalChannelInitializer();
+    @Nullable
+    Consumer<Channel> getWsAdditionalChannelInitializer();
 
     ResponseBodyPartFactory getResponseBodyPartFactory();
 
-    @Nullable ChannelPool getChannelPool();
+    @Nullable
+    ChannelPool getChannelPool();
 
-    @Nullable ConnectionSemaphoreFactory getConnectionSemaphoreFactory();
+    @Nullable
+    ConnectionSemaphoreFactory getConnectionSemaphoreFactory();
 
-    @Nullable Timer getNettyTimer();
+    @Nullable
+    Timer getNettyTimer();
 
     /**
      * @return the duration between tick of {@link HashedWheelTimer}
@@ -358,7 +370,8 @@ public interface AsyncHttpClientConfig {
 
     int getSoRcvBuf();
 
-    @Nullable ByteBufAllocator getAllocator();
+    @Nullable
+    ByteBufAllocator getAllocator();
 
     int getIoThreadsCount();
 

client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClient.java

@@ -24,8 +24,8 @@
 import org.asynchttpclient.channel.ChannelPool;
 import org.asynchttpclient.cookie.CookieEvictionTask;
 import org.asynchttpclient.cookie.CookieStore;
-import org.asynchttpclient.filter.FilterContext;
 import org.asynchttpclient.exception.FilterException;
+import org.asynchttpclient.filter.FilterContext;
 import org.asynchttpclient.filter.RequestFilter;
 import org.asynchttpclient.handler.resumable.ResumableAsyncHandler;
 import org.asynchttpclient.netty.channel.ChannelManager;

client/src/main/java/org/asynchttpclient/HttpResponseBodyPart.java

@@ -16,6 +16,7 @@
 package org.asynchttpclient;
 
 import io.netty.buffer.ByteBuf;
+
 import java.nio.ByteBuffer;
 
 /**

client/src/main/java/org/asynchttpclient/Request.java

@@ -67,12 +67,14 @@ public interface Request {
     /**
      * @return the InetAddress to be used to bypass uri's hostname resolution
      */
-    @Nullable InetAddress getAddress();
+    @Nullable
+    InetAddress getAddress();
 
     /**
      * @return the local address to bind from
      */
-    @Nullable InetAddress getLocalAddress();
+    @Nullable
+    InetAddress getLocalAddress();
 
     /**
      * @return the HTTP headers
@@ -92,32 +94,38 @@ public interface Request {
     /**
      * @return the request's body array of byte arrays (only non-null if it was set this way)
      */
-    @Nullable List<byte[]> getCompositeByteData();
+    @Nullable
+    List<byte[]> getCompositeByteData();
 
     /**
      * @return the request's body string (only non-null if it was set this way)
      */
-    @Nullable String getStringData();
+    @Nullable
+    String getStringData();
 
     /**
      * @return the request's body ByteBuffer (only non-null if it was set this way)
      */
-    @Nullable ByteBuffer getByteBufferData();
+    @Nullable
+    ByteBuffer getByteBufferData();
 
     /**
      * @return the request's body ByteBuf (only non-null if it was set this way)
      */
-    @Nullable ByteBuf getByteBufData();
+    @Nullable
+    ByteBuf getByteBufData();
 
     /**
      * @return the request's body InputStream (only non-null if it was set this way)
      */
-    @Nullable InputStream getStreamData();
+    @Nullable
+    InputStream getStreamData();
 
     /**
      * @return the request's body BodyGenerator (only non-null if it was set this way)
      */
-    @Nullable BodyGenerator getBodyGenerator();
+    @Nullable
+    BodyGenerator getBodyGenerator();
 
     /**
      * @return the request's form parameters
@@ -132,7 +140,8 @@ public interface Request {
     /**
      * @return the virtual host to connect to
      */
-    @Nullable String getVirtualHost();
+    @Nullable
+    String getVirtualHost();
 
     /**
      * @return the query params resolved from the url/uri
@@ -142,22 +151,26 @@ public interface Request {
     /**
      * @return the proxy server to be used to perform this request (overrides the one defined in config)
      */
-    @Nullable ProxyServer getProxyServer();
+    @Nullable
+    ProxyServer getProxyServer();
 
     /**
      * @return the realm to be used to perform this request (overrides the one defined in config)
      */
-    @Nullable Realm getRealm();
+    @Nullable
+    Realm getRealm();
 
     /**
      * @return the file to be uploaded
      */
-    @Nullable File getFile();
+    @Nullable
+    File getFile();
 
     /**
      * @return if this request is to follow redirects. Non null values means "override config value".
      */
-    @Nullable Boolean getFollowRedirect();
+    @Nullable
+    Boolean getFollowRedirect();
 
     /**
      * @return the request timeout. Non zero values means "override config value".
@@ -177,7 +190,8 @@ public interface Request {
     /**
      * @return the charset value used when decoding the request's body.
      */
-    @Nullable Charset getCharset();
+    @Nullable
+    Charset getCharset();
 
     /**
      * @return the strategy to compute ChannelPool's keys

client/src/main/java/org/asynchttpclient/channel/ChannelPool.java

@@ -38,7 +38,8 @@ public interface ChannelPool {
      * @param partitionKey the partition used when invoking offer
      * @return the channel associated with the uri
      */
-    @Nullable Channel poll(Object partitionKey);
+    @Nullable
+    Channel poll(Object partitionKey);
 
     /**
      * Remove all channels from the cache. A channel might have been associated

client/src/main/java/org/asynchttpclient/channel/NoopChannelPool.java

@@ -30,7 +30,6 @@ public enum NoopChannelPool implements ChannelPool {
     INSTANCE;
 
     /**
-     *
      * @return always false since this is a {@link NoopChannelPool}
      */
     @Override
@@ -39,7 +38,6 @@ public boolean offer(Channel channel, Object partitionKey) {
     }
 
     /**
-     *
      * @return always null since this is a {@link NoopChannelPool}
      */
     @Override
@@ -48,7 +46,6 @@ public boolean offer(Channel channel, Object partitionKey) {
     }
 
     /**
-     *
      * @return always false since this is a {@link NoopChannelPool}
      */
     @Override
@@ -57,7 +54,6 @@ public boolean removeAll(Channel channel) {
     }
 
     /**
-     *
      * @return always true since this is a {@link NoopChannelPool}
      */
     @Override
@@ -66,23 +62,20 @@ public boolean isOpen() {
     }
 
     /**
-     *
      * Does nothing since this is a {@link NoopChannelPool}
      */
     @Override
     public void destroy() {
     }
 
     /**
-     *
      * Does nothing since this is a {@link NoopChannelPool}
      */
     @Override
     public void flushPartitions(Predicate<Object> predicate) {
     }
 
     /**
-     *
      * @return always {@link Collections#emptyMap()} since this is a {@link NoopChannelPool}
      */
     @Override

client/src/main/java/org/asynchttpclient/cookie/ThreadSafeCookieStore.java

@@ -229,7 +229,7 @@ private void removeExpired() {
 
         cookieJar.values()
                 .forEach(cookieMap -> removed[0] |= cookieMap.entrySet()
-                .removeIf(v -> hasCookieExpired(v.getValue().cookie, v.getValue().createdAt)));
+                        .removeIf(v -> hasCookieExpired(v.getValue().cookie, v.getValue().createdAt)));
 
         if (removed[0]) {
             cookieJar.entrySet().removeIf(entry -> entry.getValue() == null || entry.getValue().isEmpty());

client/src/main/java/org/asynchttpclient/netty/handler/intercept/ResponseFiltersInterceptor.java

@@ -20,8 +20,8 @@
 import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.HttpResponseStatus;
-import org.asynchttpclient.filter.FilterContext;
 import org.asynchttpclient.exception.FilterException;
+import org.asynchttpclient.filter.FilterContext;
 import org.asynchttpclient.filter.ResponseFilter;
 import org.asynchttpclient.netty.NettyResponseFuture;
 import org.asynchttpclient.netty.request.NettyRequestSender;

client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java

@@ -36,10 +36,10 @@
 import org.asynchttpclient.Realm;
 import org.asynchttpclient.Realm.AuthScheme;
 import org.asynchttpclient.Request;
+import org.asynchttpclient.exception.FilterException;
 import org.asynchttpclient.exception.PoolAlreadyClosedException;
 import org.asynchttpclient.exception.RemotelyClosedException;
 import org.asynchttpclient.filter.FilterContext;
-import org.asynchttpclient.exception.FilterException;
 import org.asynchttpclient.filter.IOExceptionFilter;
 import org.asynchttpclient.handler.TransferCompletionHandler;
 import org.asynchttpclient.netty.NettyResponseFuture;

client/src/main/java/org/asynchttpclient/ntlm/NtlmEngine.java

@@ -1083,7 +1083,8 @@ byte[] getChallenge() {
         /**
          * Retrieve the target
          */
-        @Nullable String getTarget() {
+        @Nullable
+        String getTarget() {
             return target;
         }
 

client/src/main/java/org/asynchttpclient/proxy/ProxyServerSelector.java

@@ -35,5 +35,6 @@ public interface ProxyServerSelector {
      * @param uri The URI to select a proxy server for.
      * @return The proxy server to use, if any.  May return null.
      */
-    @Nullable ProxyServer select(Uri uri);
+    @Nullable
+    ProxyServer select(Uri uri);
 }

client/src/test/java/org/asynchttpclient/AbstractBasicTest.java

@@ -21,9 +21,7 @@
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;