Added nullable annotations to org.asynchttpclient.filter package (#1875)

Author: Asapin

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

@@ -241,7 +241,7 @@ public <T> ListenableFuture<T> executeRequest(Request request, AsyncHandler<T> h
         if (noRequestFilters) {
             return execute(request, handler);
         } else {
-            FilterContext<T> fc = new FilterContext.FilterContextBuilder<T>().asyncHandler(handler).request(request).build();
+            FilterContext<T> fc = new FilterContext.FilterContextBuilder<>(handler, request).build();
             try {
                 fc = preProcessRequest(fc);
             } catch (Exception e) {

client/src/main/java/org/asynchttpclient/filter/FilterContext.java

@@ -17,6 +17,7 @@
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.HttpResponseStatus;
 import org.asynchttpclient.Request;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 
@@ -64,14 +65,14 @@ public Request getRequest() {
     /**
      * @return the unprocessed response's {@link HttpResponseStatus}
      */
-    public HttpResponseStatus getResponseStatus() {
+    public @Nullable HttpResponseStatus getResponseStatus() {
         return builder.responseStatus;
     }
 
     /**
      * @return the response {@link HttpHeaders}
      */
-    public HttpHeaders getResponseHeaders() {
+    public @Nullable HttpHeaders getResponseHeaders() {
         return builder.headers;
     }
 
@@ -85,19 +86,21 @@ public boolean replayRequest() {
     /**
      * @return the {@link IOException}
      */
-    public IOException getIOException() {
+    public @Nullable IOException getIOException() {
         return builder.ioException;
     }
 
     public static class FilterContextBuilder<T> {
         private AsyncHandler<T> asyncHandler;
         private Request request;
-        private HttpResponseStatus responseStatus;
+        private @Nullable HttpResponseStatus responseStatus;
         private boolean replayRequest;
-        private IOException ioException;
-        private HttpHeaders headers;
+        private @Nullable IOException ioException;
+        private @Nullable HttpHeaders headers;
 
-        public FilterContextBuilder() {
+        public FilterContextBuilder(AsyncHandler<T> asyncHandler, Request request) {
+            this.asyncHandler = asyncHandler;
+            this.request = request;
         }
 
         public FilterContextBuilder(FilterContext<T> clone) {

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

@@ -43,7 +43,7 @@ public boolean exitAfterProcessingFilters(Channel channel,
                                               HttpResponseStatus status,
                                               HttpHeaders responseHeaders) {
 
-        FilterContext fc = new FilterContext.FilterContextBuilder().asyncHandler(handler).request(future.getCurrentRequest()).responseStatus(status)
+        FilterContext fc = new FilterContext.FilterContextBuilder(handler, future.getCurrentRequest()).responseStatus(status)
                 .responseHeaders(responseHeaders).build();
 
         for (ResponseFilter asyncFilter : config.getResponseFilters()) {

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

@@ -501,8 +501,8 @@ public boolean applyIoExceptionFiltersAndReplayRequest(NettyResponseFuture<?> fu
 
         boolean replayed = false;
         @SuppressWarnings({"unchecked", "rawtypes"})
-        FilterContext<?> fc = new FilterContext.FilterContextBuilder().asyncHandler(future.getAsyncHandler())
-                .request(future.getCurrentRequest()).ioException(e).build();
+        FilterContext<?> fc = new FilterContext.FilterContextBuilder(future.getAsyncHandler(), future.getCurrentRequest())
+                .ioException(e).build();
         for (IOExceptionFilter asyncFilter : config.getIoExceptionFilters()) {
             try {
                 fc = asyncFilter.filter(fc);

client/src/test/java/org/asynchttpclient/filter/FilterTest.java

@@ -105,7 +105,7 @@ public void replayResponseFilterTest() throws Exception {
             public <T> FilterContext<T> filter(FilterContext<T> ctx) {
                 if (replay.getAndSet(false)) {
                     org.asynchttpclient.Request request = ctx.getRequest().toBuilder().addHeader("X-Replay", "true").build();
-                    return new FilterContext.FilterContextBuilder<T>().asyncHandler(ctx.getAsyncHandler()).request(request).replayRequest(true).build();
+                    return new FilterContext.FilterContextBuilder<T>(ctx.getAsyncHandler(), request).replayRequest(true).build();
                 }
                 return ctx;
             }
@@ -128,7 +128,7 @@ public void replayStatusCodeResponseFilterTest() throws Exception {
             public <T> FilterContext<T> filter(FilterContext<T> ctx) {
                 if (ctx.getResponseStatus() != null && ctx.getResponseStatus().getStatusCode() == 200 && replay.getAndSet(false)) {
                     org.asynchttpclient.Request request = ctx.getRequest().toBuilder().addHeader("X-Replay", "true").build();
-                    return new FilterContext.FilterContextBuilder<T>().asyncHandler(ctx.getAsyncHandler()).request(request).replayRequest(true).build();
+                    return new FilterContext.FilterContextBuilder<T>(ctx.getAsyncHandler(), request).replayRequest(true).build();
                 }
                 return ctx;
             }
@@ -150,7 +150,7 @@ public void replayHeaderResponseFilterTest() throws Exception {
             public <T> FilterContext<T> filter(FilterContext<T> ctx) {
                 if (ctx.getResponseHeaders() != null && "Pong".equals(ctx.getResponseHeaders().get("Ping")) && replay.getAndSet(false)) {
                     org.asynchttpclient.Request request = ctx.getRequest().toBuilder().addHeader("Ping", "Pong").build();
-                    return new FilterContext.FilterContextBuilder<T>().asyncHandler(ctx.getAsyncHandler()).request(request).replayRequest(true).build();
+                    return new FilterContext.FilterContextBuilder<T>(ctx.getAsyncHandler(), request).replayRequest(true).build();
                 }
                 return ctx;
             }

pom.xml

@@ -231,7 +231,7 @@
                             -Xep:NullablePrimitive:ERROR
                             -Xep:NullOptional:ERROR
                             -XepExcludedPaths:.*/src/test/java/.*
-                            -XepOpt:NullAway:AnnotatedPackages=org.asynchttpclient.channel,org.asynchttpclient.config,org.asynchttpclient.cookie,org.asynchttpclient.exception
+                            -XepOpt:NullAway:AnnotatedPackages=org.asynchttpclient.channel,org.asynchttpclient.config,org.asynchttpclient.cookie,org.asynchttpclient.exception,org.asynchttpclient.filter
                             -XepOpt:NullAway:AcknowledgeRestrictiveAnnotations=true
                             -Xep:NullAway:ERROR
                         </arg>