Migrate off deprecated Spring Data Cassandra API.

Configure UserTypeResolver and CodecRegistry on MappingCassandraConverter. Configure on CassandraMappingContext only the simple type holder instead of custom conversions.

Author: mp911de

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java

@@ -80,8 +80,7 @@ public CassandraMappingContext cassandraMapping(BeanFactory beanFactory, Cassand
 		if (!packages.isEmpty()) {
 			context.setInitialEntitySet(CassandraEntityClassScanner.scan(packages));
 		}
-		context.setUserTypeResolver(new SimpleUserTypeResolver(this.session));
-		context.setCustomConversions(conversions);
+		context.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
 		return context;
 	}
 
@@ -90,7 +89,9 @@ public CassandraMappingContext cassandraMapping(BeanFactory beanFactory, Cassand
 	public CassandraConverter cassandraConverter(CassandraMappingContext mapping,
 			CassandraCustomConversions conversions) {
 		MappingCassandraConverter converter = new MappingCassandraConverter(mapping);
+		converter.setCodecRegistry(this.session.getContext().getCodecRegistry());
 		converter.setCustomConversions(conversions);
+		converter.setUserTypeResolver(new SimpleUserTypeResolver(this.session));
 		return converter;
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java

@@ -20,8 +20,11 @@
 import java.util.Set;
 
 import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.context.DriverContext;
+import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.BDDMockito;
 
 import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.cassandra.city.City;
@@ -32,6 +35,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.cassandra.core.CassandraTemplate;
+import org.springframework.data.cassandra.core.convert.CassandraConverter;
 import org.springframework.data.cassandra.core.convert.CassandraCustomConversions;
 import org.springframework.data.cassandra.core.mapping.CassandraMappingContext;
 import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver;
@@ -40,6 +44,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  * Tests for {@link CassandraDataAutoConfiguration}.
@@ -78,8 +83,15 @@ void entityScanShouldSetInitialEntitySet() {
 	@Test
 	void userTypeResolverShouldBeSet() {
 		load();
-		CassandraMappingContext mappingContext = this.context.getBean(CassandraMappingContext.class);
-		assertThat(mappingContext).extracting("userTypeResolver").isInstanceOf(SimpleUserTypeResolver.class);
+		CassandraConverter cassandraConverter = this.context.getBean(CassandraConverter.class);
+		assertThat(cassandraConverter).extracting("userTypeResolver").isInstanceOf(SimpleUserTypeResolver.class);
+	}
+
+	@Test
+	void codecRegistryShouldBeSet() {
+		load();
+		CassandraConverter cassandraConverter = this.context.getBean(CassandraConverter.class);
+		assertThat(BDDMockito.mockingDetails(cassandraConverter.getCodecRegistry()).isMock()).isTrue();
 	}
 
 	@Test
@@ -94,7 +106,6 @@ void customConversions() {
 		load(CustomConversionConfig.class);
 		CassandraTemplate template = this.context.getBean(CassandraTemplate.class);
 		assertThat(template.getConverter().getConversionService().canConvert(Person.class, String.class)).isTrue();
-
 	}
 
 	@Test
@@ -119,7 +130,12 @@ static class TestConfiguration {
 
 		@Bean
 		CqlSession cqlSession() {
-			return mock(CqlSession.class);
+			CodecRegistry codecRegistry = mock(CodecRegistry.class);
+			DriverContext context = mock(DriverContext.class);
+			CqlSession cqlSession = mock(CqlSession.class);
+			when(context.getCodecRegistry()).thenReturn(codecRegistry);
+			when(cqlSession.getContext()).thenReturn(context);
+			return cqlSession;
 		}
 
 	}