Support Optional for query parameters in UriBuilder and UriComponentsBuilder

spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java

@@ -21,6 +21,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.MultiValueMap;
@@ -334,6 +335,12 @@ public DefaultUriBuilder queryParam(String name, Object... values) {
 			return this;
 		}
 
+		@Override
+		public DefaultUriBuilder optionalQueryParam(String name, Optional<?> optionalValue) {
+			this.uriComponentsBuilder.optionalQueryParam(name, optionalValue);
+			return this;
+		}
+
 		@Override
 		public DefaultUriBuilder queryParam(String name, @Nullable Collection<?> values) {
 			this.uriComponentsBuilder.queryParam(name, values);

spring-web/src/main/java/org/springframework/web/util/UriBuilder.java

@@ -19,6 +19,7 @@
 import java.net.URI;
 import java.util.Collection;
 import java.util.Map;
+import java.util.Optional;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.MultiValueMap;
@@ -185,6 +186,15 @@ public interface UriBuilder {
 	 */
 	UriBuilder queryParam(String name, Object... values);
 
+	/**
+	 * Append the given query parameter and value if and only if a value is present in the Optional.
+	 * No action will be taken, and the query parameter name will not be added, if the passed Optional is empty.
+	 * @param name the query parameter name
+	 * @param optionalValue an Optional, either empty or holding the query parameter value.
+	 * @return
+	 */
+	UriBuilder optionalQueryParam(String name, Optional<?> optionalValue);
+
 	/**
 	 * Variant of {@link #queryParam(String, Object...)} with a Collection.
 	 * <p><strong>Note: </strong> please, review the Javadoc of

spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java

@@ -27,6 +27,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -708,6 +709,14 @@ public UriComponentsBuilder queryParam(String name, Object... values) {
 		return this;
 	}
 
+	@Override
+	public UriComponentsBuilder optionalQueryParam(String name, Optional<?> optionalValue) {
+		if (optionalValue.isPresent()) {
+			queryParam(name, optionalValue.get());
+		}
+		return this;
+	}
+
 	@Override
 	public UriComponentsBuilder queryParam(String name, @Nullable Collection<?> values) {
 		return queryParam(name, (CollectionUtils.isEmpty(values) ? EMPTY_VALUES : values.toArray()));

spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java

@@ -23,6 +23,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
 
@@ -204,6 +205,18 @@ void fromUriStringQueryParamEncodedAndContainingPlus() {
 		assertThat(uri.toString()).isEqualTo(httpUrl);
 	}
 
+
+	@Test
+	void queryParamAsOptional() {
+		UriComponentsBuilder builder = UriComponentsBuilder.newInstance();
+		UriComponents result = builder.optionalQueryParam("baz", Optional.of("qux")).optionalQueryParam("foo", Optional.empty()).build();
+
+		assertThat(result.getQuery()).isEqualTo("baz=qux");
+		MultiValueMap<String, String> expectedQueryParams = new LinkedMultiValueMap<>(1);
+		expectedQueryParams.add("baz", "qux");
+		assertThat(result.getQueryParams()).isEqualTo(expectedQueryParams);
+	}
+
 	@Test  // SPR-10539
 	void fromUriStringIPv6Host() {
 		UriComponents result = UriComponentsBuilder