Skip to content

Commit af5d499

Browse files
akhakump911de
authored andcommitted
Refactor userTypeResolver construction into separate method.
This allows for easy overriding, for example in case you wish to use a different implementation. See #1297
1 parent 7232456 commit af5d499

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
* @author Matthew T. Adams
5252
* @author John Blum
5353
* @author Mark Paluch
54+
* @author Ammar Khaku
5455
*/
5556
@Configuration
5657
@SuppressWarnings("unused")
@@ -72,14 +73,13 @@ public CassandraConverter cassandraConverter() {
7273

7374
CqlSession cqlSession = getRequiredSession();
7475

75-
UserTypeResolver userTypeResolver = new SimpleUserTypeResolver(cqlSession,
76-
CqlIdentifier.fromCql(getKeyspaceName()));
76+
7777

7878
MappingCassandraConverter converter = new MappingCassandraConverter(
7979
requireBeanOfType(CassandraMappingContext.class));
8080

8181
converter.setCodecRegistry(cqlSession.getContext().getCodecRegistry());
82-
converter.setUserTypeResolver(userTypeResolver);
82+
converter.setUserTypeResolver(userTypeResolver(cqlSession));
8383
converter.setCustomConversions(requireBeanOfType(CassandraCustomConversions.class));
8484

8585
return converter;
@@ -118,10 +118,9 @@ public CassandraMappingContext cassandraMappingContext(CassandraManagedTypes cas
118118

119119
CqlSession cqlSession = getRequiredSession();
120120

121-
UserTypeResolver userTypeResolver = new SimpleUserTypeResolver(cqlSession,
122-
CqlIdentifier.fromCql(getKeyspaceName()));
123121

124-
CassandraMappingContext mappingContext = new CassandraMappingContext(userTypeResolver,
122+
123+
CassandraMappingContext mappingContext = new CassandraMappingContext(userTypeResolver(cqlSession),
125124
SimpleTupleTypeFactory.DEFAULT);
126125

127126
CustomConversions customConversions = requireBeanOfType(CassandraCustomConversions.class);
@@ -287,4 +286,8 @@ protected KeyspacePopulator keyspacePopulator() {
287286
protected ByteArrayResource scriptOf(String content) {
288287
return new ByteArrayResource(content.getBytes());
289288
}
289+
290+
protected UserTypeResolver userTypeResolver(CqlSession cqlSession) {
291+
return new SimpleUserTypeResolver(cqlSession, CqlIdentifier.fromCql(getKeyspaceName()));
292+
}
290293
}

0 commit comments

Comments
 (0)