Initial support for JSpecify

ryanjbaxter · ryanjbaxter · commit 00134b9a57bc · 2025-10-30T20:11:39.000-04:00
diff --git a/.mvn/jvm.config b/.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
diff --git a/pom.xml b/pom.xml
@@ -87,6 +87,7 @@
 		<bintray.package>commons</bintray.package>
 		<evictor.version>1.0.0</evictor.version>
 		<bouncycastle-bcprov-jdk18on.version>1.81</bouncycastle-bcprov-jdk18on.version>
+		<jspecify.enabled>true</jspecify.enabled>
 	</properties>
 	<build>
 		<plugins>
diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml
@@ -66,12 +66,12 @@
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.retry</groupId>
-				<artifactId>spring-retry</artifactId>
-				<version>${spring-retry.version}</version>
-			</dependency>
-		</dependencies>
+		<dependency>
+			<groupId>org.springframework.retry</groupId>
+			<artifactId>spring-retry</artifactId>
+			<version>${spring-retry.version}</version>
+		</dependency>
+	</dependencies>
 	</dependencyManagement>
 	<profiles>
 		<profile>
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/package-info.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Spring Cloud service discovery abstractions.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.cloud.client.discovery;
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/package-info.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Spring Cloud load balancer abstractions.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.cloud.client.loadbalancer;
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/package-info.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Spring Cloud client abstractions.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.cloud.client;
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/package-info.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Spring Cloud service registry abstractions.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.cloud.client.serviceregistry;
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/config/CommonsConfigAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/config/CommonsConfigAutoConfiguration.java
@@ -19,10 +19,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.boot.context.properties.source.ConfigurationPropertyName;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 
 /**
@@ -34,7 +35,7 @@ public class CommonsConfigAutoConfiguration {
 
 	@Bean
 	public DefaultsBindHandlerAdvisor defaultsBindHandlerAdvisor(
-			@Nullable DefaultsBindHandlerAdvisor.MappingsProvider[] providers) {
+			DefaultsBindHandlerAdvisor.@Nullable MappingsProvider @Nullable [] providers) {
 		Map<ConfigurationPropertyName, ConfigurationPropertyName> additionalMappings = new HashMap<>();
 		if (!ObjectUtils.isEmpty(providers)) {
 			for (DefaultsBindHandlerAdvisor.MappingsProvider mappingsProvider : providers) {
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/package-info.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Spring Cloud commons utilities and abstractions.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.cloud.commons;
diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/package-info.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Spring Cloud auto-configuration classes.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.cloud.autoconfigure;
diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/package-info.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Spring Cloud bootstrap abstractions.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.cloud.bootstrap;
diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/ClientFactoryObjectProvider.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/ClientFactoryObjectProvider.java
@@ -22,9 +22,10 @@
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.lang.Nullable;
 
 /**
  * Special ObjectProvider that allows the actual ObjectProvider to be resolved later
@@ -54,8 +55,7 @@ public T getObject(Object... args) throws BeansException {
 	}
 
 	@Override
-	@Nullable
-	public T getIfAvailable() throws BeansException {
+	public @Nullable T getIfAvailable() throws BeansException {
 		return delegate().getIfAvailable();
 	}
 
@@ -70,8 +70,7 @@ public void ifAvailable(Consumer<T> dependencyConsumer) throws BeansException {
 	}
 
 	@Override
-	@Nullable
-	public T getIfUnique() throws BeansException {
+	public @Nullable T getIfUnique() throws BeansException {
 		return delegate().getIfUnique();
 	}
 
diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/package-info.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Spring Cloud context abstractions.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.cloud.context;
diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCache.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCache.java
@@ -22,11 +22,11 @@
 import com.stoyanr.evictor.ConcurrentMapWithTimedEviction;
 import com.stoyanr.evictor.map.ConcurrentHashMapWithTimedEviction;
 import com.stoyanr.evictor.scheduler.DelayedTaskEvictionScheduler;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 import org.springframework.cache.support.AbstractValueAdaptingCache;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -107,8 +107,7 @@ public ConcurrentMap<Object, Object> getNativeCache() {
 
 	@SuppressWarnings("unchecked")
 	@Override
-	@Nullable
-	public <T> T get(Object key, Callable<T> valueLoader) {
+	public @Nullable <T> T get(Object key, Callable<T> valueLoader) {
 		return (T) fromStoreValue(cache.computeIfAbsent(key, k -> {
 			try {
 				return toStoreValue(valueLoader.call());
@@ -124,14 +123,12 @@ public void put(Object key, @Nullable Object value, long evictMs) {
 	}
 
 	@Override
-	@Nullable
-	public ValueWrapper putIfAbsent(Object key, @Nullable Object value) {
+	public @Nullable ValueWrapper putIfAbsent(Object key, @Nullable Object value) {
 		Object existing = cache.putIfAbsent(key, toStoreValue(value), evictMs);
 		return toValueWrapper(existing);
 	}
 
-	@Nullable
-	public ValueWrapper putIfAbsent(Object key, @Nullable Object value, long evictMs) {
+	public @Nullable ValueWrapper putIfAbsent(Object key, @Nullable Object value, long evictMs) {
 		Object existing = cache.putIfAbsent(key, toStoreValue(value), evictMs);
 		return toValueWrapper(existing);
 	}
diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheManager.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheManager.java
@@ -28,9 +28,9 @@
 
 import com.stoyanr.evictor.map.ConcurrentHashMapWithTimedEviction;
 import com.stoyanr.evictor.scheduler.DelayedTaskEvictionScheduler;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.cache.Cache;
-import org.springframework.lang.Nullable;
 
 import static org.springframework.cloud.loadbalancer.core.CachingServiceInstanceListSupplier.SERVICE_INSTANCE_CACHE_NAME;
 
@@ -81,8 +81,7 @@ private ScheduledExecutorService aScheduledDaemonThreadExecutor() {
 	}
 
 	@Override
-	@Nullable
-	public Cache getCache(String name) {
+	public @Nullable Cache getCache(String name) {
 		return cacheMap.get(name);
 	}
 
diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/package-info.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Spring Cloud load balancer core abstractions.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.cloud.loadbalancer.core;
diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/package-info.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Spring Cloud load balancer implementation.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.cloud.loadbalancer;
