Initial support for JSpecify

.mvn/jvm.config

@@ -1 +1,11 @@
--Xmx1024m -XX:CICompilerCount=1 -XX:TieredStopAtLevel=1 -Djava.security.egd=file:/dev/./urandom
+-Xmx1024m -XX:CICompilerCount=1 -XX:TieredStopAtLevel=1 -Djava.security.egd=file:/dev/./urandom
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED

pom.xml

@@ -62,6 +62,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<jspecify.enabled>true</jspecify.enabled>
 		<bucket4j.version>8.15.0</bucket4j.version>
 		<blockhound.version>1.0.8.RELEASE</blockhound.version>
 		<java.version>17</java.version>

spring-cloud-gateway-sample/src/main/kotlin/org/springframework/cloud/gateway/sample/AdditionalRoutes.kt

@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration
 open class AdditionalRoutes {
 
     @Value("\${test.uri:http://httpbin.org:80}")
-    var uri: String? = null
+    var uri: String = ""
 
     @Bean
     open fun additionalRouteLocator(builder: RouteLocatorBuilder) = builder.routes {

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: package javadoc.
+ */
+@NullMarked
+package org.springframework.cloud.gateway.discovery;
+
+import org.jspecify.annotations.NullMarked;

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/event/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: package javadoc.
+ */
+@NullMarked
+package org.springframework.cloud.gateway.event;
+
+import org.jspecify.annotations.NullMarked;

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/cors/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: package javadoc.
+ */
+@NullMarked
+package org.springframework.cloud.gateway.filter.cors;
+
+import org.jspecify.annotations.NullMarked;

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

@@ -334,7 +334,7 @@ public String getDownloadOptionsHeaderValue() {
 		}
 
 		public void setDownloadOptionsHeaderValue(String downloadOptionHeaderValue) {
-			this.downloadOptionsHeaderValue = downloadOptionsHeaderValue;
+			this.downloadOptionsHeaderValue = downloadOptionHeaderValue;
 		}
 
 		public String getPermittedCrossDomainPoliciesHeaderValue() {

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/factory/cache/LocalResponseCacheUtils.java

@@ -33,6 +33,7 @@ public final class LocalResponseCacheUtils {
 	private LocalResponseCacheUtils() {
 	}
 
+	@SuppressWarnings("MisleadingEscapedSpace")
 	public static boolean isNoCacheRequest(ServerHttpRequest request) {
 		String cacheControl = request.getHeaders().getCacheControl();
 		return StringUtils.hasText(cacheControl) && cacheControl.matches(".*(\s|,|^)no-cache(\\s|,|$).*");

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/factory/cache/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: package javadoc.
+ */
+@NullMarked
+package org.springframework.cloud.gateway.filter.factory.cache;
+
+import org.jspecify.annotations.NullMarked;

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/factory/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: package javadoc.
+ */
+@NullMarked
+package org.springframework.cloud.gateway.filter.factory;
+
+import org.jspecify.annotations.NullMarked;

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/factory/rewrite/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: package javadoc.
+ */
+@NullMarked
+package org.springframework.cloud.gateway.filter.factory.rewrite;
+
+import org.jspecify.annotations.NullMarked;

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

@@ -18,6 +18,7 @@
 
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Mono;
 import reactor.netty.http.client.HttpClientResponse;
 import reactor.netty.http.server.HttpServerResponse;
@@ -30,8 +31,8 @@
 
 public interface TrailerHeadersFilter {
 
-	static Mono<HttpHeaders> filter(List<HttpHeadersFilter> filters, ServerWebExchange exchange,
-			HttpClientResponse response) {
+	static Mono<HttpHeaders> filter(@Nullable List<HttpHeadersFilter> filters, ServerWebExchange exchange,
+			@Nullable HttpClientResponse response) {
 		if (response == null) {
 			return Mono.empty();
 		}
@@ -43,7 +44,7 @@ static Mono<HttpHeaders> filter(List<HttpHeadersFilter> filters, ServerWebExchan
 		return filter(filters, headers, exchange);
 	}
 
-	private static Mono<HttpHeaders> filter(List<HttpHeadersFilter> filters, Mono<HttpHeaders> input,
+	private static Mono<HttpHeaders> filter(@Nullable List<HttpHeadersFilter> filters, Mono<HttpHeaders> input,
 			ServerWebExchange exchange) {
 
 		Mono<HttpHeaders> filtered = input;
@@ -84,6 +85,6 @@ private static Mono<HttpHeaders> filter(List<HttpHeadersFilter> filters, Mono<Ht
 	 * @param exchange a {@link ServerWebExchange} that should be filtered
 	 * @return filtered Http Headers
 	 */
-	HttpHeaders trailers(HttpHeaders input, ServerWebExchange exchange);
+	HttpHeaders trailers(@Nullable HttpHeaders input, ServerWebExchange exchange);
 
 }

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

@@ -32,7 +32,6 @@
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.core.type.AnnotatedTypeMetadata;
-import org.springframework.lang.NonNull;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -46,7 +45,7 @@ public interface TrustedProxies {
 
 	boolean isTrusted(String host);
 
-	static TrustedProxies from(@NonNull String trustedProxies) {
+	static TrustedProxies from(String trustedProxies) {
 		Assert.hasText(trustedProxies, "trustedProxies must not be empty");
 		Pattern pattern = Pattern.compile(trustedProxies);
 		return value -> pattern.matcher(value).matches();

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/headers/observation/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: package javadoc.
+ */
+@NullMarked
+package org.springframework.cloud.gateway.filter.headers.observation;
+
+import org.jspecify.annotations.NullMarked;

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/headers/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: package javadoc.
+ */
+@NullMarked
+package org.springframework.cloud.gateway.filter.headers;
+
+import org.jspecify.annotations.NullMarked;

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: package javadoc.
+ */
+@NullMarked
+package org.springframework.cloud.gateway.filter;
+
+import org.jspecify.annotations.NullMarked;

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/ratelimit/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: package javadoc.
+ */
+@NullMarked
+package org.springframework.cloud.gateway.filter.ratelimit;
+
+import org.jspecify.annotations.NullMarked;

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/handler/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: package javadoc.
+ */
+@NullMarked
+package org.springframework.cloud.gateway.handler;
+
+import org.jspecify.annotations.NullMarked;

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/handler/predicate/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: package javadoc.
+ */
+@NullMarked
+package org.springframework.cloud.gateway.handler.predicate;
+
+import org.jspecify.annotations.NullMarked;