Enabled NullAway for oauth, proxy and resolver packages (#1876)

Author: Asapin

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

@@ -19,6 +19,7 @@
 import io.netty.handler.codec.http.HttpHeaders;
 import org.asynchttpclient.Realm;
 import org.asynchttpclient.Request;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -36,12 +37,13 @@ public class ProxyServer {
     private final String host;
     private final int port;
     private final int securedPort;
-    private final Realm realm;
+    private final @Nullable Realm realm;
     private final List<String> nonProxyHosts;
     private final ProxyType proxyType;
-    private final Function<Request, HttpHeaders> customHeaders;
+    private final @Nullable Function<Request, HttpHeaders> customHeaders;
 
-    public ProxyServer(String host, int port, int securedPort, Realm realm, List<String> nonProxyHosts, ProxyType proxyType, Function<Request, HttpHeaders> customHeaders) {
+    public ProxyServer(String host, int port, int securedPort, @Nullable Realm realm, List<String> nonProxyHosts, ProxyType proxyType,
+                       @Nullable Function<Request, HttpHeaders> customHeaders) {
         this.host = host;
         this.port = port;
         this.securedPort = securedPort;
@@ -71,15 +73,15 @@ public List<String> getNonProxyHosts() {
         return nonProxyHosts;
     }
 
-    public Realm getRealm() {
+    public @Nullable Realm getRealm() {
         return realm;
     }
 
     public ProxyType getProxyType() {
         return proxyType;
     }
 
-    public Function<Request, HttpHeaders> getCustomHeaders() {
+    public @Nullable Function<Request, HttpHeaders> getCustomHeaders() {
         return customHeaders;
     }
 
@@ -129,10 +131,10 @@ public static class Builder {
         private final String host;
         private final int port;
         private int securedPort;
-        private Realm realm;
-        private List<String> nonProxyHosts;
-        private ProxyType proxyType;
-        private Function<Request, HttpHeaders> customHeaders;
+        private @Nullable Realm realm;
+        private @Nullable List<String> nonProxyHosts;
+        private @Nullable ProxyType proxyType;
+        private @Nullable Function<Request, HttpHeaders> customHeaders;
 
         public Builder(String host, int port) {
             this.host = host;

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

@@ -16,6 +16,7 @@
 package org.asynchttpclient.proxy;
 
 import org.asynchttpclient.uri.Uri;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Selector for a proxy server
@@ -34,5 +35,5 @@ public interface ProxyServerSelector {
      * @param uri The URI to select a proxy server for.
      * @return The proxy server to use, if any.  May return null.
      */
-    ProxyServer select(Uri uri);
+    @Nullable ProxyServer select(Uri uri);
 }

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,org.asynchttpclient.filter
+                            -XepOpt:NullAway:AnnotatedPackages=org.asynchttpclient.channel,org.asynchttpclient.config,org.asynchttpclient.cookie,org.asynchttpclient.exception,org.asynchttpclient.filter,org.asynchttpclient.oauth,org.asynchttpclient.proxy,org.asynchttpclient.resolver
                             -XepOpt:NullAway:AcknowledgeRestrictiveAnnotations=true
                             -Xep:NullAway:ERROR
                         </arg>