Migrate to JSpecify annotations for nullability constraints.

Closes #1549

Author: mp911de

spring-data-cassandra/pom.xml

@@ -227,6 +227,11 @@
 			<artifactId>kotlinx-coroutines-reactor</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.jspecify</groupId>
+			<artifactId>jspecify</artifactId>
+			<version>1.0.0</version>
+		</dependency>
 
 		<dependency>
 			<groupId>io.mockk</groupId>

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraAuthenticationException.java

@@ -28,7 +28,7 @@
  */
 public class CassandraAuthenticationException extends PermissionDeniedDataAccessException {
 
-	@Serial private static final long serialVersionUID = 8556304586797273927L;
+	private static final @Serial long serialVersionUID = 8556304586797273927L;
 
 	private final EndPoint host;
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraConnectionFailureException.java

@@ -31,7 +31,7 @@
  */
 public class CassandraConnectionFailureException extends DataAccessResourceFailureException {
 
-	@Serial private static final long serialVersionUID = 6299912054261646552L;
+	private static final @Serial long serialVersionUID = 6299912054261646552L;
 
 	private final Map<Node, Throwable> messagesByHost;
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInsufficientReplicasAvailableException.java

@@ -26,7 +26,7 @@
  */
 public class CassandraInsufficientReplicasAvailableException extends TransientDataAccessException {
 
-	@Serial private static final long serialVersionUID = 6415130674604814905L;
+	private static final @Serial long serialVersionUID = 6415130674604814905L;
 
 	private int numberRequired;
 	private int numberAlive;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInternalException.java

@@ -26,7 +26,7 @@
  */
 public class CassandraInternalException extends DataAccessException {
 
-	@Serial private static final long serialVersionUID = 433061676465346338L;
+	private static final @Serial long serialVersionUID = 433061676465346338L;
 
 	/**
 	 * Constructor for {@link CassandraInternalException}.

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInvalidConfigurationInQueryException.java

@@ -27,7 +27,7 @@
  */
 public class CassandraInvalidConfigurationInQueryException extends InvalidDataAccessApiUsageException {
 
-	@Serial private static final long serialVersionUID = 4594321191806182918L;
+	private static final @Serial long serialVersionUID = 4594321191806182918L;
 
 	/**
 	 * Constructor for {@link CassandraInvalidConfigurationInQueryException}.

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInvalidQueryException.java

@@ -26,7 +26,7 @@
  */
 public class CassandraInvalidQueryException extends InvalidDataAccessApiUsageException {
 
-	@Serial private static final long serialVersionUID = 4594321191806182918L;
+	private static final @Serial long serialVersionUID = 4594321191806182918L;
 
 	/**
 	 * Constructor for {@link CassandraInvalidQueryException}.

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraKeyspaceExistsException.java

@@ -24,7 +24,7 @@
  */
 public class CassandraKeyspaceExistsException extends CassandraSchemaElementExistsException {
 
-	@Serial private static final long serialVersionUID = 6032967419751410352L;
+	private static final @Serial long serialVersionUID = 6032967419751410352L;
 
 	/**
 	 * Constructor for {@link CassandraKeyspaceExistsException}.
@@ -37,6 +37,7 @@ public CassandraKeyspaceExistsException(String keyspaceName, String msg, Throwab
 		super(keyspaceName, ElementType.KEYSPACE, msg, cause);
 	}
 
+	@SuppressWarnings("NullAway")
 	public String getKeyspaceName() {
 		return getElementName();
 	}

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraManagedTypes.java

@@ -80,4 +80,5 @@ public static CassandraManagedTypes empty() {
 	public void forEach(Consumer<Class<?>> action) {
 		delegate.forEach(action);
 	}
+
 }

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraQuerySyntaxException.java

@@ -26,7 +26,7 @@
  */
 public class CassandraQuerySyntaxException extends InvalidDataAccessApiUsageException {
 
-	@Serial private static final long serialVersionUID = 4398474399882434154L;
+	private static final @Serial long serialVersionUID = 4398474399882434154L;
 
 	/**
 	 * Constructor for {@link CassandraQuerySyntaxException}.

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraReadTimeoutException.java

@@ -27,7 +27,7 @@
  */
 public class CassandraReadTimeoutException extends QueryTimeoutException {
 
-	@Serial private static final long serialVersionUID = -787022307935203387L;
+	private static final @Serial long serialVersionUID = -787022307935203387L;
 
 	private final boolean wasDataPresent;
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraSchemaElementExistsException.java

@@ -17,8 +17,8 @@
 
 import java.io.Serial;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.NonTransientDataAccessException;
-import org.springframework.lang.Nullable;
 
 /**
  * Spring data access exception for when Cassandra schema element being created already exists.
@@ -28,15 +28,15 @@
  */
 public class CassandraSchemaElementExistsException extends NonTransientDataAccessException {
 
-	@Serial private static final long serialVersionUID = 7798361273692300162L;
+	private static final @Serial long serialVersionUID = 7798361273692300162L;
 
 	@Deprecated
 	public enum ElementType {
 		KEYSPACE, TABLE, COLUMN, INDEX
 	}
 
-	private String elementName;
-	private ElementType elementType;
+	private @Nullable String elementName;
+	private @Nullable ElementType elementType;
 
 	/**
 	 * Constructor for {@link CassandraSchemaElementExistsException}.
@@ -65,14 +65,13 @@ public CassandraSchemaElementExistsException(String msg, Throwable cause) {
 	}
 
 	@Deprecated
-	@Nullable
-	public String getElementName() {
+	public @Nullable String getElementName() {
 		return elementName;
 	}
 
 	@Deprecated
-	@Nullable
-	public ElementType getElementType() {
+	public @Nullable ElementType getElementType() {
 		return elementType;
 	}
+
 }

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTableExistsException.java

@@ -24,7 +24,7 @@
  */
 public class CassandraTableExistsException extends CassandraSchemaElementExistsException {
 
-	@Serial private static final long serialVersionUID = 6032967419751410352L;
+	private static final @Serial long serialVersionUID = 6032967419751410352L;
 
 	/**
 	 * Constructor for {@link CassandraTableExistsException}.
@@ -37,6 +37,7 @@ public CassandraTableExistsException(String tableName, String msg, Throwable cau
 		super(tableName, ElementType.TABLE, msg, cause);
 	}
 
+	@SuppressWarnings("NullAway")
 	public String getTableName() {
 		return getElementName();
 	}

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTraceRetrievalException.java

@@ -26,7 +26,7 @@
  */
 public class CassandraTraceRetrievalException extends TransientDataAccessException {
 
-	@Serial private static final long serialVersionUID = -3163557220324700239L;
+	private static final @Serial long serialVersionUID = -3163557220324700239L;
 
 	/**
 	 * Constructor for {@link CassandraTraceRetrievalException}.

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTruncateException.java

@@ -26,7 +26,7 @@
  */
 public class CassandraTruncateException extends TransientDataAccessException {
 
-	@Serial private static final long serialVersionUID = 5730642491362430311L;
+	private static final @Serial long serialVersionUID = 5730642491362430311L;
 
 	/**
 	 * Constructor for {@link CassandraTruncateException}.

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTypeMismatchException.java

@@ -26,7 +26,7 @@
  */
 public class CassandraTypeMismatchException extends TypeMismatchDataAccessException {
 
-	@Serial private static final long serialVersionUID = -7420058975444905629L;
+	private static final @Serial long serialVersionUID = -7420058975444905629L;
 
 	/**
 	 * Constructor for {@link CassandraTypeMismatchException}.

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraUnauthorizedException.java

@@ -26,7 +26,7 @@
  */
 public class CassandraUnauthorizedException extends PermissionDeniedDataAccessException {
 
-	@Serial private static final long serialVersionUID = 4618185356687726647L;
+	private static final @Serial long serialVersionUID = 4618185356687726647L;
 
 	/**
 	 * Constructor for {@link CassandraUnauthorizedException}.

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraUncategorizedException.java

@@ -27,7 +27,7 @@
  */
 public class CassandraUncategorizedException extends UncategorizedDataAccessException {
 
-	@Serial private static final long serialVersionUID = 1029525121238025444L;
+	private static final @Serial long serialVersionUID = 1029525121238025444L;
 
 	/**
 	 * Constructor for {@link CassandraUncategorizedException}.

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraWriteTimeoutException.java

@@ -17,8 +17,8 @@
 
 import java.io.Serial;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.QueryTimeoutException;
-import org.springframework.lang.Nullable;
 
 /**
  * Spring data access exception for a Cassandra write timeout.
@@ -28,7 +28,7 @@
  */
 public class CassandraWriteTimeoutException extends QueryTimeoutException {
 
-	@Serial private static final long serialVersionUID = -4374826375213670718L;
+	private static final @Serial long serialVersionUID = -4374826375213670718L;
 
 	private @Nullable String writeType;
 
@@ -45,8 +45,7 @@ public CassandraWriteTimeoutException(@Nullable String writeType, String msg, Th
 		this.writeType = writeType;
 	}
 
-	@Nullable
-	public String getWriteType() {
+	public @Nullable String getWriteType() {
 		return writeType;
 	}
 }

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/aot/CassandraManagedTypesBeanRegistrationAotProcessor.java

@@ -15,9 +15,9 @@
  */
 package org.springframework.data.cassandra.aot;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.aot.ManagedTypesBeanRegistrationAotProcessor;
 import org.springframework.data.cassandra.CassandraManagedTypes;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 
 /**

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/aot/CassandraRuntimeHints.java

@@ -18,6 +18,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.aop.SpringProxy;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aot.hint.MemberCategory;
@@ -32,7 +33,6 @@
 import org.springframework.data.cassandra.repository.support.SimpleCassandraRepository;
 import org.springframework.data.cassandra.repository.support.SimpleReactiveCassandraRepository;
 import org.springframework.data.util.ReactiveWrappers;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 
 import com.datastax.oss.driver.api.core.CqlSession;
@@ -106,4 +106,5 @@ public void registerHints(org.springframework.aot.hint.RuntimeHints hints, @Null
 			}
 		}
 	}
+
 }

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

@@ -1,7 +1,5 @@
 /**
  * Ahead of Time processing utilities for Spring Data Cassandra.
  */
-@NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.cassandra.aot;
-
-import org.springframework.lang.NonNullApi;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java

@@ -19,6 +19,7 @@
 import java.util.Optional;
 import java.util.Set;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,7 +39,6 @@
 import org.springframework.data.cassandra.core.mapping.UserTypeResolver;
 import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.lang.Nullable;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.CqlSession;
@@ -255,8 +255,7 @@ public SchemaAction getSchemaAction() {
 	 * @return the {@link KeyspacePopulator} or {@code null} if none configured.
 	 * @see org.springframework.data.cassandra.core.cql.session.init.ResourceKeyspacePopulator
 	 */
-	@Nullable
-	protected KeyspacePopulator keyspaceCleaner() {
+	protected @Nullable KeyspacePopulator keyspaceCleaner() {
 		return null;
 	}
 
@@ -266,8 +265,7 @@ protected KeyspacePopulator keyspaceCleaner() {
 	 * @return the {@link KeyspacePopulator} or {@code null} if none configured.
 	 * @see org.springframework.data.cassandra.core.cql.session.init.ResourceKeyspacePopulator
 	 */
-	@Nullable
-	protected KeyspacePopulator keyspacePopulator() {
+	protected @Nullable KeyspacePopulator keyspacePopulator() {
 		return null;
 	}
 
@@ -293,4 +291,5 @@ protected ByteArrayResource scriptOf(String content) {
 	protected UserTypeResolver userTypeResolver(CqlSession cqlSession) {
 		return new SimpleUserTypeResolver(cqlSession, CqlIdentifier.fromCql(getKeyspaceName()));
 	}
+
 }

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractReactiveCassandraConfiguration.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.cassandra.config;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.context.annotation.Bean;
@@ -27,7 +28,6 @@
 import org.springframework.data.cassandra.core.cql.ReactiveCqlTemplate;
 import org.springframework.data.cassandra.core.cql.session.DefaultBridgedReactiveSession;
 import org.springframework.data.cassandra.core.cql.session.DefaultReactiveSessionFactory;
-import org.springframework.lang.Nullable;
 
 /**
  * Extension to {@link AbstractCassandraConfiguration} providing Spring Data Cassandra configuration for Spring Data's
@@ -63,7 +63,7 @@ public ReactiveSession reactiveCassandraSession() {
 	 */
 	@Bean
 	public ReactiveSessionFactory reactiveCassandraSessionFactory() {
-		return new DefaultReactiveSessionFactory(beanFactory.getBean(ReactiveSession.class));
+		return new DefaultReactiveSessionFactory(getBean(ReactiveSession.class));
 	}
 
 	/**
@@ -75,8 +75,7 @@ public ReactiveSessionFactory reactiveCassandraSessionFactory() {
 	 */
 	@Bean
 	public ReactiveCassandraTemplate reactiveCassandraTemplate() {
-		return new ReactiveCassandraTemplate(beanFactory.getBean(ReactiveSessionFactory.class),
-				beanFactory.getBean(CassandraConverter.class));
+		return new ReactiveCassandraTemplate(getBean(ReactiveSessionFactory.class), getBean(CassandraConverter.class));
 	}
 
 	/**
@@ -87,12 +86,22 @@ public ReactiveCassandraTemplate reactiveCassandraTemplate() {
 	 */
 	@Bean
 	public ReactiveCqlTemplate reactiveCqlTemplate() {
-		return new ReactiveCqlTemplate(beanFactory.getBean(ReactiveSessionFactory.class));
+		return new ReactiveCqlTemplate(getBean(ReactiveSessionFactory.class));
 	}
 
 	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		this.beanFactory = beanFactory;
 		super.setBeanFactory(beanFactory);
 	}
+
+	private <T> T getBean(Class<T> requiredType) {
+
+		if (beanFactory == null) {
+			throw new IllegalStateException("BeanFactory must not be null");
+		}
+
+		return beanFactory.getBean(requiredType);
+	}
+
 }