Use Arg.notNull insteadd and return NPE

Author: arturobernalg

httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalAbstractHttpAsyncClient.java

@@ -77,6 +77,7 @@
 import org.apache.hc.core5.io.ModalCloseable;
 import org.apache.hc.core5.net.URIAuthority;
 import org.apache.hc.core5.reactor.DefaultConnectingIOReactor;
+import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.TimeValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -219,15 +220,12 @@ protected <T> Future<T> doExecute(
                 setupContext(clientContext);
 
                 final HttpHost resolvedTarget = target != null ? target : RoutingSupport.determineHost(request);
-                if (resolvedTarget != null) {
-                    if (request.getScheme() == null) {
-                        request.setScheme(resolvedTarget.getSchemeName());
-                    }
-                    if (request.getAuthority() == null) {
-                        request.setAuthority(new URIAuthority(resolvedTarget));
-                    }
-                } else {
-                    throw new IllegalStateException("Unable to determine target host for the request");
+                Args.notNull(resolvedTarget, "Target host for the request");
+                if (request.getScheme() == null) {
+                    request.setScheme(resolvedTarget.getSchemeName());
+                }
+                if (request.getAuthority() == null) {
+                    request.setAuthority(new URIAuthority(resolvedTarget));
                 }
                 final HttpRoute route = determineRoute(
                         resolvedTarget,

httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java

@@ -161,15 +161,12 @@ protected CloseableHttpResponse doExecute(
             setupContext(localcontext);
 
             final HttpHost resolvedTarget = target != null ? target : RoutingSupport.determineHost(request);
-            if (resolvedTarget != null) {
-                if (request.getScheme() == null) {
-                    request.setScheme(resolvedTarget.getSchemeName());
-                }
-                if (request.getAuthority() == null) {
-                    request.setAuthority(new URIAuthority(resolvedTarget));
-                }
-            } else {
-                throw new IllegalStateException("Unable to determine target host for the request");
+            Args.notNull(resolvedTarget, "Target host for the request");
+            if (request.getScheme() == null) {
+                request.setScheme(resolvedTarget.getSchemeName());
+            }
+            if (request.getAuthority() == null) {
+                request.setAuthority(new URIAuthority(resolvedTarget));
             }
             final HttpRoute route = determineRoute(
                     resolvedTarget,

httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalHttpClient.java

@@ -239,7 +239,7 @@ void testClientCloseIOException() throws Exception {
     void testDoExecuteThrowsWhenNoTargetOrHost() {
         final ClassicHttpRequest request = ClassicRequestBuilder.get("/foo").build();
         final HttpClientContext context = HttpClientContext.create();
-        Assertions.assertThrows(IllegalStateException.class, () ->
+        Assertions.assertThrows(NullPointerException.class, () ->
                 client.execute(null, request, context));
     }