Updates for removed PropertyMapper.whenNonNull

Author: spencergibb

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java

@@ -23,6 +23,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Supplier;
 
@@ -906,7 +907,7 @@ public ReactorNettyRequestUpgradeStrategy reactorNettyRequestUpgradeStrategy(
 				WebsocketServerSpec.Builder builder = WebsocketServerSpec.builder();
 				HttpClientProperties.Websocket websocket = httpClientProperties.getWebsocket();
 				PropertyMapper map = PropertyMapper.get();
-				map.from(websocket::getMaxFramePayloadLength).whenNonNull().to(builder::maxFramePayloadLength);
+				map.from(websocket::getMaxFramePayloadLength).when(Objects::nonNull).to(builder::maxFramePayloadLength);
 				map.from(websocket::isProxyPing).to(builder::handlePing);
 				return builder;
 			};

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/config/HttpClientFactory.java

@@ -18,6 +18,7 @@
 
 import java.time.Duration;
 import java.util.List;
+import java.util.Objects;
 
 import io.netty.channel.ChannelOption;
 import reactor.netty.http.HttpProtocol;
@@ -141,7 +142,7 @@ protected ProxyProvider.Builder configureProxyProvider(HttpClientProperties.Prox
 
 		PropertyMapper map = PropertyMapper.get();
 
-		map.from(proxy::getPort).whenNonNull().to(builder::port);
+		map.from(proxy::getPort).when(Objects::nonNull).to(builder::port);
 		map.from(proxy::getUsername).whenHasText().to(builder::username);
 		map.from(proxy::getPassword).whenHasText().to(password -> builder.password(s -> password));
 		map.from(proxy::getNonProxyHostsPattern).whenHasText().to(builder::nonProxyHosts);