diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/UserDefinedTypeBuilder.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/UserDefinedTypeBuilder.java
index 18d895d8e..dfa1a2091 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/UserDefinedTypeBuilder.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/UserDefinedTypeBuilder.java
@@ -15,14 +15,14 @@
  */
 package org.springframework.data.cassandra.support;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
+
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.data.UdtValue;
 import com.datastax.oss.driver.api.core.detach.AttachmentPoint;
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/RowMockUtil.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/RowMockUtil.java
index efbeb47fc..69594229e 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/RowMockUtil.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/RowMockUtil.java
@@ -15,13 +15,15 @@
  */
 package org.springframework.data.cassandra.test.util;
 
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
 
+import org.springframework.lang.NonNull;
 import org.springframework.util.Assert;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
@@ -41,9 +43,6 @@ public class RowMockUtil {
 	/**
 	 * Create a new {@link Row} mock using the given {@code columns}. Each column carries a name, value and data type so
 	 * users of {@link Row} can use most of the methods.
-	 *
-	 * @param columns
-	 * @return
 	 */
 	public static Row newRowMock(Column... columns) {
 
@@ -84,8 +83,8 @@ public class RowMockUtil {
 			return false;
 		});
 
-		when(mockColumnDefinitions.get(anyInt())).thenAnswer(invocation -> {
-			return new ColumnDefinition() {
+		when(mockColumnDefinitions.get(anyInt())).thenAnswer(invocation ->
+			new ColumnDefinition() {
 
 				@Override
 				public boolean isDetached() {
@@ -120,8 +119,7 @@ public class RowMockUtil {
 				public DataType getType() {
 					return columns[(Integer) invocation.getArguments()[0]].type;
 				}
-			};
-		});
+			});
 
 		when(mockRow.getBoolean(anyInt())).thenAnswer(invocation -> columns[(Integer) invocation.getArguments()[0]].value);
 		when(mockRow.getLocalDate(anyInt()))
@@ -146,7 +144,6 @@ public class RowMockUtil {
 	 * @param name must not be empty or {@code null}.
 	 * @param value can be {@literal null}.
 	 * @param type must not be {@literal null}.
-	 * @return
 	 */
 	public static Column column(String name, Object value, DataType type) {