Switch to JSpecify annotations for the model module

Signed-off-by: Eric Bottard <[email protected]>

Author: ericbottard

auto-configurations/models/spring-ai-autoconfigure-model-ollama/src/test/kotlin/org/springframework/ai/model/ollama/autoconfigure/tool/FunctionCallbackContextKotlinIT.kt

@@ -72,7 +72,7 @@ class FunctionCallbackResolverKotlinIT : BaseOllamaIT() {
 
 			logger.info("Response: $response")
 
-			assertThat(response.getResult().output.text).contains("30", "10", "15")
+			assertThat(response.getResult()!!.output.text).contains("30", "10", "15")
 		}
 	}
 
@@ -91,7 +91,7 @@ class FunctionCallbackResolverKotlinIT : BaseOllamaIT() {
 				.build()
 
 			val response = chatModel.call(Prompt(listOf(userMessage), functionOptions));
-			val output = response.getResult().output.text
+			val output = response.getResult()!!.output.text
 
 			logger.info("Response: $output");
 

auto-configurations/models/spring-ai-autoconfigure-model-ollama/src/test/kotlin/org/springframework/ai/model/ollama/autoconfigure/tool/ToolCallbackKotlinIT.kt

@@ -74,7 +74,7 @@ class ToolCallbackKotlinIT : BaseOllamaIT() {
 
 			logger.info("Response: $response")
 
-			assertThat(response.getResult().output.text).contains("30", "10", "15")
+			assertThat(response.getResult()!!.output.text).contains("30", "10", "15")
 		}
 	}
 
@@ -92,7 +92,7 @@ class ToolCallbackKotlinIT : BaseOllamaIT() {
 			val functionOptions = ToolCallingChatOptions.builder().toolNames("weatherInfo").build()
 
 			val response = chatModel.call(Prompt(listOf(userMessage), functionOptions));
-			val output = response.getResult().output.text
+			val output = response.getResult()!!.output.text
 			logger.info("Response: $output");
 
 			assertThat(output).contains("30", "10", "15");

models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/moderation/MistralAiModerationModel.java

@@ -97,7 +97,7 @@ private ModerationResponse convertResponse(ResponseEntity<MistralAiModerationRes
 		var moderationApiResponse = moderationResponseEntity.getBody();
 		if (moderationApiResponse == null) {
 			logger.warn("No moderation response returned for request: {}", mistralAiModerationRequest);
-			return new ModerationResponse(new Generation());
+			return new ModerationResponse(null);
 		}
 
 		List<ModerationResult> moderationResults = new ArrayList<>();

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiAudioTranscriptionModel.java

@@ -125,7 +125,7 @@ public AudioTranscriptionResponse call(AudioTranscriptionPrompt transcriptionPro
 
 			if (transcription == null) {
 				logger.warn("No transcription returned for request: {}", audioResource);
-				return new AudioTranscriptionResponse(null);
+				return new AudioTranscriptionResponse(new AudioTranscription(""));
 			}
 
 			AudioTranscription transcript = new AudioTranscription(transcription.text());
@@ -152,7 +152,7 @@ public AudioTranscriptionResponse call(AudioTranscriptionPrompt transcriptionPro
 
 			if (transcription == null) {
 				logger.warn("No transcription returned for request: {}", audioResource);
-				return new AudioTranscriptionResponse(null);
+				return new AudioTranscriptionResponse(new AudioTranscription(""));
 			}
 
 			AudioTranscription transcript = new AudioTranscription(transcription);

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiModerationModel.java

@@ -107,7 +107,7 @@ private ModerationResponse convertResponse(
 		OpenAiModerationApi.OpenAiModerationResponse moderationApiResponse = moderationResponseEntity.getBody();
 		if (moderationApiResponse == null) {
 			logger.warn("No moderation response returned for request: {}", openAiModerationRequest);
-			return new ModerationResponse(new Generation());
+			return new ModerationResponse(null);
 		}
 
 		List<ModerationResult> moderationResults = new ArrayList<>();

spring-ai-commons/src/main/java/org/springframework/ai/template/NoOpTemplateRenderer.java

@@ -18,6 +18,8 @@
 
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.util.Assert;
 
 /**
@@ -29,7 +31,7 @@
 public class NoOpTemplateRenderer implements TemplateRenderer {
 
 	@Override
-	public String apply(String template, Map<String, Object> variables) {
+	public String apply(String template, Map<String, @Nullable Object> variables) {
 		Assert.hasText(template, "template cannot be null or empty");
 		Assert.notNull(variables, "variables cannot be null");
 		Assert.noNullElements(variables.keySet(), "variables keys cannot be null");

spring-ai-commons/src/main/java/org/springframework/ai/template/TemplateRenderer.java

@@ -19,15 +19,17 @@
 import java.util.Map;
 import java.util.function.BiFunction;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * Renders a template using a given strategy.
  *
  * @author Thomas Vitale
  * @since 1.0.0
  */
-public interface TemplateRenderer extends BiFunction<String, Map<String, Object>, String> {
+public interface TemplateRenderer extends BiFunction<String, Map<String, @Nullable Object>, String> {
 
 	@Override
-	String apply(String template, Map<String, Object> variables);
+	String apply(String template, Map<String, @Nullable Object> variables);
 
 }

spring-ai-model/src/main/java/org/springframework/ai/aot/KnuddelsRuntimeHints.java

@@ -16,14 +16,16 @@
 
 package org.springframework.ai.aot;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.core.io.ClassPathResource;
 
 public class KnuddelsRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
-	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 		hints.resources().registerResource(new ClassPathResource("/com/knuddels/jtokkit/cl100k_base.tiktoken"));
 	}
 

spring-ai-model/src/main/java/org/springframework/ai/aot/SpringAiCoreRuntimeHints.java

@@ -18,6 +18,7 @@
 
 import java.util.Set;
 
+import org.jspecify.annotations.Nullable;
 import org.slf4j.LoggerFactory;
 import org.slf4j.helpers.NOP_FallbackServiceProvider;
 import org.slf4j.helpers.SubstituteServiceProvider;
@@ -38,13 +39,11 @@
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.aot.hint.TypeReference;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
 
 public class SpringAiCoreRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
-	public void registerHints(@NonNull RuntimeHints hints, @Nullable ClassLoader classLoader) {
+	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 
 		var chatTypes = Set.of(AbstractMessage.class, AssistantMessage.class, ToolResponseMessage.class, Message.class,
 				ToolCallback.class, ToolDefinition.class, AssistantMessage.ToolCall.class, MessageType.class,

spring-ai-model/src/main/java/org/springframework/ai/aot/ToolBeanRegistrationAotProcessor.java

@@ -18,6 +18,8 @@
 
 import java.util.stream.Stream;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.ai.tool.annotation.Tool;
 import org.springframework.aot.generate.GenerationContext;
 import org.springframework.aot.hint.MemberCategory;
@@ -27,7 +29,6 @@
 import org.springframework.beans.factory.aot.BeanRegistrationCode;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.core.annotation.MergedAnnotations;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ReflectionUtils;
 
 /**
@@ -40,8 +41,7 @@
 class ToolBeanRegistrationAotProcessor implements BeanRegistrationAotProcessor {
 
 	@Override
-	@Nullable
-	public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
+	@Nullable public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
 		Class<?> beanClass = registeredBean.getBeanClass();
 		MergedAnnotations.Search search = MergedAnnotations
 			.search(org.springframework.core.annotation.MergedAnnotations.SearchStrategy.TYPE_HIERARCHY);