Initial support for JSpecify

Author: ryanjbaxter

.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

@@ -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>

spring-cloud-commons/src/main/java/org/springframework/cloud/client/ServiceInstance.java

@@ -19,6 +19,8 @@
 import java.net.URI;
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * Represents an instance of a service in a discovery system.
  *
@@ -30,7 +32,7 @@ public interface ServiceInstance {
 	/**
 	 * @return The unique instance ID as registered.
 	 */
-	default String getInstanceId() {
+	default @Nullable String getInstanceId() {
 		return null;
 	}
 
@@ -67,7 +69,7 @@ default String getInstanceId() {
 	/**
 	 * @return The scheme of the service instance.
 	 */
-	default String getScheme() {
+	default @Nullable String getScheme() {
 		return null;
 	}
 

spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/ManagementServerPortUtils.java

@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.client.discovery;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementServerProperties;
@@ -71,7 +73,7 @@ public static boolean isSame(BeanFactory beanFactory) {
 		return get(beanFactory) == ManagementServerPort.SAME;
 	}
 
-	public static Integer getPort(BeanFactory beanFactory) {
+	public static @Nullable Integer getPort(BeanFactory beanFactory) {
 		if (!hasActuator) {
 			return null;
 		}

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;

spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRetryFactory.java

@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.client.loadbalancer;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.retry.RetryListener;
 import org.springframework.retry.backoff.BackOffPolicy;
 import org.springframework.retry.backoff.NoBackOffPolicy;
@@ -33,7 +35,8 @@ public interface LoadBalancedRetryFactory {
 	 * @param serviceInstanceChooser Used to get the next server from a load balancer.
 	 * @return A retry policy for the service.
 	 */
-	default LoadBalancedRetryPolicy createRetryPolicy(String service, ServiceInstanceChooser serviceInstanceChooser) {
+	default @Nullable LoadBalancedRetryPolicy createRetryPolicy(String service,
+			ServiceInstanceChooser serviceInstanceChooser) {
 		return null;
 	}
 

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;

spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactiveLoadBalancer.java

@@ -18,6 +18,7 @@
 
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 
 import org.springframework.cloud.client.loadbalancer.DefaultRequest;
@@ -54,7 +55,7 @@ default Publisher<Response<T>> choose() { // conflicting name
 
 	interface Factory<T> {
 
-		default LoadBalancerProperties getProperties(String serviceId) {
+		default @Nullable LoadBalancerProperties getProperties(String serviceId) {
 			return null;
 		}
 

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;

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;