Migrate to JSpecify annotations for nullability constraints.

Closes #618
Original pull request: #625

Author: christophstrobl

pom.xml

@@ -45,7 +45,6 @@
 			<version>${querydsl}</version>
 			<optional>true</optional>
 		</dependency>
-
 	</dependencies>
 
 	<build>

src/main/java/org/springframework/data/keyvalue/annotation/package-info.java

@@ -1,6 +1,5 @@
 /**
  * Key-Value annotations for declarative keyspace configuration.
  */
-@org.springframework.lang.NonNullApi
-@org.springframework.lang.NonNullFields
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.keyvalue.annotation;

src/main/java/org/springframework/data/keyvalue/aot/KeyValueRuntimeHints.java

@@ -18,13 +18,13 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.aot.hint.ExecutableMode;
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.aot.hint.TypeReference;
 import org.springframework.data.keyvalue.repository.query.KeyValuePartTreeQuery;
-import org.springframework.lang.Nullable;
 
 /**
  * {@link RuntimeHintsRegistrar} for KeyValue.

src/main/java/org/springframework/data/keyvalue/aot/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Support classes for key-value ahead of time computation
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.data.keyvalue.aot;

src/main/java/org/springframework/data/keyvalue/core/AbstractKeyValueAdapter.java

@@ -18,8 +18,8 @@
 import java.util.Collection;
 import java.util.Comparator;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.keyvalue.core.query.KeyValueQuery;
-import org.springframework.lang.Nullable;
 
 /**
  * Base implementation of {@link KeyValueAdapter} holds {@link QueryEngine} to delegate {@literal find} and
@@ -69,15 +69,13 @@ protected AbstractKeyValueAdapter(@Nullable QueryEngine<? extends KeyValueAdapte
 		return engine;
 	}
 
-	@Nullable
 	@Override
-	public <T> T get(Object id, String keyspace, Class<T> type) {
+	public <T> @Nullable T get(Object id, String keyspace, Class<T> type) {
 		return type.cast(get(id, keyspace));
 	}
 
-	@Nullable
 	@Override
-	public <T> T delete(Object id, String keyspace, Class<T> type) {
+	public <T> @Nullable T delete(Object id, String keyspace, Class<T> type) {
 		return type.cast(delete(id, keyspace));
 	}
 

src/main/java/org/springframework/data/keyvalue/core/CriteriaAccessor.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.data.keyvalue.core;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.keyvalue.core.query.KeyValueQuery;
-import org.springframework.lang.Nullable;
 
 /**
  * Resolves the criteria object from given {@link KeyValueQuery}.

src/main/java/org/springframework/data/keyvalue/core/ForwardingCloseableIterator.java

@@ -17,8 +17,8 @@
 
 import java.util.Iterator;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.util.CloseableIterator;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**

src/main/java/org/springframework/data/keyvalue/core/GeneratingIdAccessor.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.keyvalue.core;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mapping.IdentifierAccessor;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
@@ -55,7 +56,7 @@ class GeneratingIdAccessor implements IdentifierAccessor {
 	}
 
 	@Override
-	public Object getIdentifier() {
+	public @Nullable Object getIdentifier() {
 		return accessor.getProperty(identifierProperty);
 	}
 

src/main/java/org/springframework/data/keyvalue/core/KeyValueAdapter.java

@@ -18,10 +18,10 @@
 import java.util.Collection;
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.data.keyvalue.core.query.KeyValueQuery;
 import org.springframework.data.util.CloseableIterator;
-import org.springframework.lang.Nullable;
 
 /**
  * {@link KeyValueAdapter} unifies access and shields the underlying key/value specific implementation.
@@ -39,7 +39,7 @@ public interface KeyValueAdapter extends DisposableBean {
 	 * @param keyspace must not be {@literal null}.
 	 * @return the item previously associated with the id.
 	 */
-	Object put(Object id, Object item, String keyspace);
+	@Nullable Object put(Object id, Object item, String keyspace);
 
 	/**
 	 * Check if a object with given id exists in keyspace.
@@ -69,8 +69,7 @@ public interface KeyValueAdapter extends DisposableBean {
 	 * @return {@literal null} in case no matching item exists.
 	 * @since 1.1
 	 */
-	@Nullable
-	<T> T get(Object id, String keyspace, Class<T> type);
+	<T> @Nullable T get(Object id, String keyspace, Class<T> type);
 
 	/**
 	 * Delete and return the object with given type and id.
@@ -91,16 +90,15 @@ public interface KeyValueAdapter extends DisposableBean {
 	 * @return {@literal null} if object could not be found
 	 * @since 1.1
 	 */
-	@Nullable
-	<T> T delete(Object id, String keyspace, Class<T> type);
+	<T> @Nullable T delete(Object id, String keyspace, Class<T> type);
 
 	/**
 	 * Get all elements for given keyspace.
 	 *
 	 * @param keyspace must not be {@literal null}.
 	 * @return empty {@link Collection} if nothing found.
 	 */
-	Iterable<?> getAllOf(String keyspace);
+	Iterable<Object> getAllOf(String keyspace);
 
 	/**
 	 * Get all elements for given keyspace.
@@ -132,7 +130,7 @@ default <T> Iterable<T> getAllOf(String keyspace, Class<T> type) {
 	 * @since 2.5
 	 */
 	@SuppressWarnings("unchecked")
-	default <T> CloseableIterator<Map.Entry<Object, T>> entries(String keyspace, Class<T> type) {
+	default <T> CloseableIterator<Map.Entry<Object,T>> entries(String keyspace, Class<T> type) {
 		return (CloseableIterator) entries(keyspace);
 	}
 

src/main/java/org/springframework/data/keyvalue/core/KeyValueCallback.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.keyvalue.core;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Generic callback interface for code that operates on a {@link KeyValueAdapter}. This is particularly useful for