fix: URIBuilder.getFirstQueryParam throws exception when query is emp…

…ty. Instead it must return null if named parameter not found
apache · Dec 19, 2023 · c4ec335 · c4ec335
1 parent 030c132
commit c4ec335
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java b/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java
@@ -967,7 +967,7 @@ public List<NameValuePair> getQueryParams() {
      * @since 5.2
      */
     public NameValuePair getFirstQueryParam(final String name) {
-        return queryParams.stream().filter(e -> name.equals(e.getName())).findFirst().orElse(null);
+        return getQueryParams().stream().filter(e -> name.equals(e.getName())).findFirst().orElse(null);
     }
 
     /**

diff --git a/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java b/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java
@@ -399,6 +399,8 @@ public void testGetFirstNamedParameter() throws Exception {
         //
         uribuilder = new URIBuilder("http://localhost:80/?param=some%20other%20stuff&blah=blah&blah=blah2");
         Assertions.assertEquals("blah", uribuilder.getFirstQueryParam("blah").getValue());
+        uribuilder.removeQuery();
+        Assertions.assertNull(uribuilder.getFirstQueryParam("param"));
     }
 
     @Test