Merge pull request #3991 from spring-cloud/nullability-changes-with-maven-profile-enabled

Fixing NullAway changes

Author: ryanjbaxter

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteDefinitionLocator.java

@@ -102,7 +102,7 @@ public Flux<RouteDefinition> getRouteDefinitions() {
 		return serviceInstances.filter(instances -> !instances.isEmpty())
 			.flatMap(Flux::fromIterable)
 			.filter(includePredicate)
-			.collectMap(ServiceInstance::getServiceId)
+			.collectMap(instance -> Objects.requireNonNull(instance.getServiceId()))
 			// remove duplicates
 			.flatMapMany(map -> Flux.fromIterable(map.values()))
 			.map(instance -> {
@@ -181,15 +181,15 @@ private DelegatingServiceInstance(ServiceInstance delegate, DiscoveryLocatorProp
 		}
 
 		@Override
-		public String getServiceId() {
-			if (properties.isLowerCaseServiceId()) {
+		public @Nullable String getServiceId() {
+			if (properties.isLowerCaseServiceId() && delegate.getServiceId() != null) {
 				return delegate.getServiceId().toLowerCase(Locale.ROOT);
 			}
 			return delegate.getServiceId();
 		}
 
 		@Override
-		public String getHost() {
+		public @Nullable String getHost() {
 			return delegate.getHost();
 		}
 
@@ -209,7 +209,7 @@ public URI getUri() {
 		}
 
 		@Override
-		public Map<String, String> getMetadata() {
+		public @Nullable Map<String, String> getMetadata() {
 			return delegate.getMetadata();
 		}
 

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/LoadBalancerServiceInstanceCookieFilter.java

@@ -62,7 +62,10 @@ public LoadBalancerServiceInstanceCookieFilter(
 	@Override
 	public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
 		Response<ServiceInstance> serviceInstanceResponse = exchange.getAttribute(GATEWAY_LOADBALANCER_RESPONSE_ATTR);
-		if (serviceInstanceResponse == null || !serviceInstanceResponse.hasServer()) {
+		if (serviceInstanceResponse == null || serviceInstanceResponse.getServer() == null) {
+			return chain.filter(exchange);
+		}
+		if (!serviceInstanceResponse.hasServer()) {
 			return chain.filter(exchange);
 		}
 		LoadBalancerProperties properties = loadBalancerClientFactory != null
@@ -78,6 +81,8 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
 		}
 		ServerWebExchange newExchange = exchange.mutate().request(exchange.getRequest().mutate().headers((headers) -> {
 			List<String> cookieHeaders = new ArrayList<>(headers.getOrEmpty(HttpHeaders.COOKIE));
+			Objects.requireNonNull(serviceInstanceResponse.getServer(),
+					"ServiceInstanceResponse.getServer must not be null");
 			String serviceInstanceCookie = new HttpCookie(instanceIdCookieName,
 					serviceInstanceResponse.getServer().getInstanceId())
 				.toString();

spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/LoadBalancerFilterFunctions.java

@@ -25,6 +25,7 @@
 import jakarta.servlet.http.Cookie;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.CompletionContext;
@@ -155,12 +156,12 @@ static class DelegatingServiceInstance implements ServiceInstance {
 		}
 
 		@Override
-		public String getServiceId() {
+		public @Nullable String getServiceId() {
 			return delegate.getServiceId();
 		}
 
 		@Override
-		public String getHost() {
+		public @Nullable String getHost() {
 			return delegate.getHost();
 		}
 
@@ -184,7 +185,7 @@ public URI getUri() {
 		}
 
 		@Override
-		public Map<String, String> getMetadata() {
+		public @Nullable Map<String, String> getMetadata() {
 			return delegate.getMetadata();
 		}