diff --git a/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleEntity.java b/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleEntity.java
index 80f50a20534..32187e216f0 100644
--- a/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleEntity.java
+++ b/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleEntity.java
@@ -16,6 +16,8 @@
 
 package smoketest.data.cassandra;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.data.cassandra.core.mapping.PrimaryKey;
 import org.springframework.data.cassandra.core.mapping.Table;
 
@@ -23,23 +25,23 @@ import org.springframework.data.cassandra.core.mapping.Table;
 public class SampleEntity {
 
 	@PrimaryKey
-	private String id;
+	private @Nullable String id;
 
-	private String description;
+	private @Nullable String description;
 
-	public String getId() {
+	public @Nullable String getId() {
 		return this.id;
 	}
 
-	public void setId(String id) {
+	public void setId(@Nullable String id) {
 		this.id = id;
 	}
 
-	public String getDescription() {
+	public @Nullable String getDescription() {
 		return this.description;
 	}
 
-	public void setDescription(String description) {
+	public void setDescription(@Nullable String description) {
 		this.description = description;
 	}
 
diff --git a/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleService.java b/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleService.java
index 0c557acdb15..19923eac16e 100644
--- a/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleService.java
+++ b/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleService.java
@@ -29,7 +29,11 @@ public class SampleService {
 	}
 
 	public boolean hasRecord(SampleEntity entity) {
-		return this.cassandraTemplate.exists(entity.getId(), SampleEntity.class);
+		String id = entity.getId();
+		if (id == null) {
+			return false;
+		}
+		return this.cassandraTemplate.exists(id, SampleEntity.class);
 	}
 
 }
diff --git a/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/package-info.java b/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/package-info.java
new file mode 100644
index 00000000000..0d0da6632d9
--- /dev/null
+++ b/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@NullMarked
+package smoketest.data.cassandra;
+
+import org.jspecify.annotations.NullMarked;