Replace Micronaut nullability annotations with JSpecify annotations (#243)

Copilot · sdelamo · web-flow · commit 1631f4fa4397 · 2025-12-02T09:58:28.000+01:00
* Initial plan

* Replace Micronaut nullability annotations with JSpecify annotations

Co-authored-by: sdelamo &lt;864788+sdelamo@users.noreply.github.com&gt;

---------

Co-authored-by: copilot-swe-agent[bot] &lt;198982749+Copilot@users.noreply.github.com&gt;
Co-authored-by: sdelamo &lt;864788+sdelamo@users.noreply.github.com&gt;
diff --git a/micronaut-langchain4j-cassandra/src/main/java/io/micronaut/langchain4j/cassandra/memory/CassandraChatMemoryStoreConfiguration.java b/micronaut-langchain4j-cassandra/src/main/java/io/micronaut/langchain4j/cassandra/memory/CassandraChatMemoryStoreConfiguration.java
@@ -16,7 +16,7 @@
 package io.micronaut.langchain4j.cassandra.memory;
 
 import dev.langchain4j.store.memory.chat.cassandra.CassandraChatMemoryStore;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 import io.micronaut.core.util.Toggleable;
 
 /**
diff --git a/micronaut-langchain4j-cassandra/src/main/java/io/micronaut/langchain4j/cassandra/memory/CassandraChatMemoryStoreConfigurationProperties.java b/micronaut-langchain4j-cassandra/src/main/java/io/micronaut/langchain4j/cassandra/memory/CassandraChatMemoryStoreConfigurationProperties.java
@@ -19,7 +19,7 @@
 import io.micronaut.context.annotation.ConfigurationBuilder;
 import io.micronaut.context.annotation.ConfigurationProperties;
 import io.micronaut.core.annotation.Internal;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 
 /**
  * {@link ConfigurationProperties} implementation for {@link CassandraChatMemoryStoreConfiguration}.
diff --git a/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/aiservices/AiServiceCustomizer.java b/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/aiservices/AiServiceCustomizer.java
@@ -15,7 +15,7 @@
  */
 package io.micronaut.langchain4j.aiservices;
 
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 import io.micronaut.langchain4j.annotation.AiService;
 
 /**
diff --git a/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/aiservices/AiServiceDef.java b/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/aiservices/AiServiceDef.java
@@ -15,8 +15,8 @@
  */
 package io.micronaut.langchain4j.aiservices;
 
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.annotation.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import io.micronaut.inject.BeanDefinition;
 import io.micronaut.langchain4j.annotation.AiService;
 import java.util.Set;
diff --git a/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/aiservices/AiServiceFactory.java b/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/aiservices/AiServiceFactory.java
@@ -30,7 +30,7 @@
 import io.micronaut.context.annotation.Bean;
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Parameter;
-import io.micronaut.core.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import io.micronaut.core.type.Argument;
 import io.micronaut.core.util.CollectionUtils;
 import io.micronaut.inject.qualifiers.Qualifiers;
diff --git a/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/embedding/InMemoryEmbeddingStoreConfig.java b/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/embedding/InMemoryEmbeddingStoreConfig.java
@@ -17,7 +17,7 @@
 
 
 import io.micronaut.context.annotation.EachProperty;
-import io.micronaut.core.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import io.micronaut.core.bind.annotation.Bindable;
 import io.micronaut.core.util.StringUtils;
 
diff --git a/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/interceptor/AiServiceInterceptor.java b/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/interceptor/AiServiceInterceptor.java
@@ -21,7 +21,7 @@
 import io.micronaut.aop.MethodInvocationContext;
 import io.micronaut.context.BeanContext;
 import io.micronaut.core.annotation.AnnotationValue;
-import io.micronaut.core.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import io.micronaut.inject.BeanDefinition;
 import io.micronaut.langchain4j.aiservices.AiServiceCustomizer;
 import io.micronaut.langchain4j.aiservices.AiServiceDef;
diff --git a/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/store/memory/chat/MessageWindowChatMemoryConfiguration.java b/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/store/memory/chat/MessageWindowChatMemoryConfiguration.java
@@ -15,7 +15,7 @@
  */
 package io.micronaut.langchain4j.store.memory.chat;
 
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 
 /**
  * Configuration for {@link dev.langchain4j.memory.chat.MessageWindowChatMemory}.
diff --git a/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/store/memory/chat/MessageWindowChatMemoryConfigurationProperties.java b/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/store/memory/chat/MessageWindowChatMemoryConfigurationProperties.java
@@ -17,7 +17,7 @@
 
 import io.micronaut.context.annotation.ConfigurationProperties;
 import io.micronaut.core.annotation.Internal;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Objects;
 
diff --git a/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/store/memory/chat/MessageWindowChatMemoryFactory.java b/micronaut-langchain4j-core/src/main/java/io/micronaut/langchain4j/store/memory/chat/MessageWindowChatMemoryFactory.java
@@ -21,7 +21,7 @@
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Prototype;
 import io.micronaut.core.annotation.Internal;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 
 /**
  * Utility class to obtain instances of {@link MessageWindowChatMemory.Builder}.
diff --git a/micronaut-langchain4j-oci-genai/src/test/java/io/micronaut/langchain4j/ocigenai/OciGenAiTest.java b/micronaut-langchain4j-oci-genai/src/test/java/io/micronaut/langchain4j/ocigenai/OciGenAiTest.java
@@ -20,7 +20,7 @@
 import io.micronaut.context.annotation.Prototype;
 import io.micronaut.context.event.BeanCreatedEvent;
 import io.micronaut.context.event.BeanCreatedEventListener;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 import io.micronaut.http.annotation.Body;
 import io.micronaut.http.annotation.Controller;
 import io.micronaut.http.annotation.Post;
diff --git a/micronaut-langchain4j-processor/src/main/java/io/micronaut/langchain4j/processor/Langchain4jConfigVisitor.java b/micronaut-langchain4j-processor/src/main/java/io/micronaut/langchain4j/processor/Langchain4jConfigVisitor.java
@@ -28,8 +28,8 @@
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.core.annotation.AnnotationValue;
 import io.micronaut.core.annotation.Internal;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.annotation.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import io.micronaut.core.bind.annotation.Bindable;
 import io.micronaut.core.naming.NameUtils;
 import io.micronaut.core.util.ArrayUtils;
diff --git a/micronaut-langchain4j-store-mongodb/src/main/java/io/micronaut/langchain4j/mongodb/atlas/NamedMongoDbAtlasEmbeddingStoreConfig.java b/micronaut-langchain4j-store-mongodb/src/main/java/io/micronaut/langchain4j/mongodb/atlas/NamedMongoDbAtlasEmbeddingStoreConfig.java
@@ -23,7 +23,7 @@
 import io.micronaut.context.annotation.ConfigurationProperties;
 import io.micronaut.context.annotation.EachProperty;
 import io.micronaut.context.annotation.Parameter;
-import io.micronaut.core.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Set;
 
 /**
diff --git a/micronaut-langchain4j-store-neo4j/src/main/java/io/micronaut/langchain4j/neo4j/memory/Neo4jChatMemoryStoreConfiguration.java b/micronaut-langchain4j-store-neo4j/src/main/java/io/micronaut/langchain4j/neo4j/memory/Neo4jChatMemoryStoreConfiguration.java
@@ -16,8 +16,8 @@
 package io.micronaut.langchain4j.neo4j.memory;
 
 import dev.langchain4j.community.store.memory.chat.neo4j.Neo4jChatMemoryStore;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.annotation.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import io.micronaut.core.util.Toggleable;
 
 /**
diff --git a/micronaut-langchain4j-store-neo4j/src/main/java/io/micronaut/langchain4j/neo4j/memory/Neo4jChatMemoryStoreConfigurationProperties.java b/micronaut-langchain4j-store-neo4j/src/main/java/io/micronaut/langchain4j/neo4j/memory/Neo4jChatMemoryStoreConfigurationProperties.java
@@ -19,7 +19,7 @@
 import io.micronaut.context.annotation.ConfigurationBuilder;
 import io.micronaut.context.annotation.ConfigurationProperties;
 import io.micronaut.core.annotation.Internal;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 
 /**
  * {@link ConfigurationProperties} implementation for {@link Neo4jChatMemoryStoreConfiguration}.
diff --git a/micronaut-langchain4j-store-pgvector/src/main/java/io/micronaut/langchain4j/pgvector/PgVectorEmbeddingStoreConfig.java b/micronaut-langchain4j-store-pgvector/src/main/java/io/micronaut/langchain4j/pgvector/PgVectorEmbeddingStoreConfig.java
@@ -18,7 +18,7 @@
 import dev.langchain4j.store.embedding.pgvector.MetadataStorageConfig;
 import io.micronaut.context.annotation.EachProperty;
 import io.micronaut.context.annotation.Parameter;
-import io.micronaut.core.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import javax.sql.DataSource;
 
 /**
diff --git a/micronaut-langchain4j-store-redis/src/main/java/io/micronaut/langchain4j/redis/memory/RedisChatMemoryStoreConfiguration.java b/micronaut-langchain4j-store-redis/src/main/java/io/micronaut/langchain4j/redis/memory/RedisChatMemoryStoreConfiguration.java
@@ -16,7 +16,7 @@
 package io.micronaut.langchain4j.redis.memory;
 
 import dev.langchain4j.community.store.memory.chat.redis.RedisChatMemoryStore;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 import io.micronaut.core.util.Toggleable;
 
 /**
diff --git a/test-suite-utils/src/main/java/io/micronaut/langchain4j/testutils/OllamaTestPropertyProvider.java b/test-suite-utils/src/main/java/io/micronaut/langchain4j/testutils/OllamaTestPropertyProvider.java
@@ -1,7 +1,7 @@
 package io.micronaut.langchain4j.testutils;
 
 import io.micronaut.context.exceptions.ConfigurationException;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 import io.micronaut.test.support.TestPropertyProvider;
 
 import java.util.HashMap;
diff --git a/test-suite/src/test/java/example/micronaut/AssistantWithoutMemoryTest.java b/test-suite/src/test/java/example/micronaut/AssistantWithoutMemoryTest.java
@@ -1,7 +1,7 @@
 package example.micronaut;
 
 import io.micronaut.context.exceptions.ConfigurationException;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 import io.micronaut.langchain4j.testutils.OllamaUtils;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.micronaut.test.support.TestPropertyProvider;
diff --git a/test-suite/src/test/java/example/micronaut/CassandraAssistantWithMemoryTest.java b/test-suite/src/test/java/example/micronaut/CassandraAssistantWithMemoryTest.java
@@ -6,7 +6,7 @@
 import io.micronaut.context.event.BeanCreatedEvent;
 import io.micronaut.context.event.BeanCreatedEventListener;
 import io.micronaut.context.exceptions.ConfigurationException;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.langchain4j.testutils.CassandraUtils;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
diff --git a/test-suite/src/test/java/example/micronaut/MusicianAssistantTest.java b/test-suite/src/test/java/example/micronaut/MusicianAssistantTest.java
@@ -1,7 +1,7 @@
 package example.micronaut;
 
 import io.micronaut.context.exceptions.ConfigurationException;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.micronaut.test.support.TestPropertyProvider;
 import org.junit.jupiter.api.Test;
diff --git a/test-suite/src/test/java/example/micronaut/Neo4jAssistantWithMemoryTest.java b/test-suite/src/test/java/example/micronaut/Neo4jAssistantWithMemoryTest.java
@@ -2,7 +2,7 @@
 
 import io.micronaut.context.annotation.Property;
 import io.micronaut.context.exceptions.ConfigurationException;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.langchain4j.testutils.Neo4jUtils;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
diff --git a/test-suite/src/test/java/example/micronaut/OllamaChatModelBuilderListener.java b/test-suite/src/test/java/example/micronaut/OllamaChatModelBuilderListener.java
@@ -3,7 +3,7 @@
 import dev.langchain4j.model.ollama.OllamaChatModel;
 import io.micronaut.context.event.BeanCreatedEvent;
 import io.micronaut.context.event.BeanCreatedEventListener;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 import jakarta.inject.Singleton;
 
 @Singleton
diff --git a/test-suite/src/test/java/example/micronaut/RedisAssistantWithMemoryTest.java b/test-suite/src/test/java/example/micronaut/RedisAssistantWithMemoryTest.java
@@ -2,7 +2,7 @@
 
 import io.micronaut.context.annotation.Property;
 import io.micronaut.context.exceptions.ConfigurationException;
-import io.micronaut.core.annotation.NonNull;
+import org.jspecify.annotations.NonNull;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.langchain4j.testutils.RedisUtils;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
