Add nullability annotations to module/spring-boot-cassandra

See gh-46587

Author: mhalbritter

module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CassandraAutoConfiguration.java

@@ -34,6 +34,7 @@
 import com.datastax.oss.driver.internal.core.config.typesafe.DefaultProgrammaticDriverConfigLoaderBuilder;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -123,8 +124,9 @@ CqlSessionBuilder cassandraSessionBuilder(DriverConfigLoader driverConfigLoader,
 
 	private void configureAuthentication(CqlSessionBuilder builder, CassandraConnectionDetails connectionDetails) {
 		String username = connectionDetails.getUsername();
-		if (username != null) {
-			builder.withAuthCredentials(username, connectionDetails.getPassword());
+		String password = connectionDetails.getPassword();
+		if (username != null && password != null) {
+			builder.withAuthCredentials(username, password);
 		}
 	}
 
@@ -260,7 +262,7 @@ private static final class CassandraDriverOptions {
 
 		private final Map<String, String> options = new LinkedHashMap<>();
 
-		private CassandraDriverOptions add(DriverOption option, String value) {
+		private CassandraDriverOptions add(DriverOption option, @Nullable String value) {
 			String key = createKeyFor(option);
 			this.options.put(key, value);
 			return this;
@@ -298,9 +300,9 @@ static final class PropertiesCassandraConnectionDetails implements CassandraConn
 
 		private final CassandraProperties properties;
 
-		private final SslBundles sslBundles;
+		private final @Nullable SslBundles sslBundles;
 
-		private PropertiesCassandraConnectionDetails(CassandraProperties properties, SslBundles sslBundles) {
+		private PropertiesCassandraConnectionDetails(CassandraProperties properties, @Nullable SslBundles sslBundles) {
 			this.properties = properties;
 			this.sslBundles = sslBundles;
 		}
@@ -313,22 +315,22 @@ public List<Node> getContactPoints() {
 		}
 
 		@Override
-		public String getUsername() {
+		public @Nullable String getUsername() {
 			return this.properties.getUsername();
 		}
 
 		@Override
-		public String getPassword() {
+		public @Nullable String getPassword() {
 			return this.properties.getPassword();
 		}
 
 		@Override
-		public String getLocalDatacenter() {
+		public @Nullable String getLocalDatacenter() {
 			return this.properties.getLocalDatacenter();
 		}
 
 		@Override
-		public SslBundle getSslBundle() {
+		public @Nullable SslBundle getSslBundle() {
 			Ssl ssl = this.properties.getSsl();
 			if (ssl == null || !ssl.isEnabled()) {
 				return null;
@@ -352,7 +354,7 @@ private Node asNode(String contactPoint) {
 			return new Node(contactPoint, this.properties.getPort());
 		}
 
-		private Integer asPort(String value) {
+		private @Nullable Integer asPort(String value) {
 			try {
 				int i = Integer.parseInt(value);
 				return (i > 0 && i < 65535) ? i : null;

module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CassandraConnectionDetails.java

@@ -18,6 +18,8 @@
 
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails;
 import org.springframework.boot.ssl.SslBundle;
 
@@ -41,15 +43,15 @@ public interface CassandraConnectionDetails extends ConnectionDetails {
 	 * Login user of the server.
 	 * @return the login user of the server or {@code null}
 	 */
-	default String getUsername() {
+	default @Nullable String getUsername() {
 		return null;
 	}
 
 	/**
 	 * Login password of the server.
 	 * @return the login password of the server or {@code null}
 	 */
-	default String getPassword() {
+	default @Nullable String getPassword() {
 		return null;
 	}
 
@@ -58,13 +60,13 @@ default String getPassword() {
 	 * datacenter.
 	 * @return the datacenter that is considered "local"
 	 */
-	String getLocalDatacenter();
+	@Nullable String getLocalDatacenter();
 
 	/**
 	 * SSL bundle to use.
 	 * @return the SSL bundle to use
 	 */
-	default SslBundle getSslBundle() {
+	default @Nullable SslBundle getSslBundle() {
 		return null;
 	}