Skip to content

Commit fffd27b

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 c33addd commit fffd27b

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
* @author Matthew T. Adams
5050
* @author John Blum
5151
* @author Mark Paluch
52+
* @author Ammar Khaku
5253
*/
5354
@Configuration
5455
@SuppressWarnings("unused")
@@ -71,14 +72,11 @@ public CassandraConverter cassandraConverter() {
7172

7273
CqlSession cqlSession = getRequiredSession();
7374

74-
UserTypeResolver userTypeResolver =
75-
new SimpleUserTypeResolver(cqlSession, CqlIdentifier.fromCql(getKeyspaceName()));
76-
7775
MappingCassandraConverter converter =
7876
new MappingCassandraConverter(requireBeanOfType(CassandraMappingContext.class));
7977

8078
converter.setCodecRegistry(cqlSession.getContext().getCodecRegistry());
81-
converter.setUserTypeResolver(userTypeResolver);
79+
converter.setUserTypeResolver(userTypeResolver(cqlSession));
8280
converter.setCustomConversions(requireBeanOfType(CassandraCustomConversions.class));
8381

8482
return converter;
@@ -96,11 +94,8 @@ public CassandraMappingContext cassandraMapping() throws ClassNotFoundException
9694

9795
CqlSession cqlSession = getRequiredSession();
9896

99-
UserTypeResolver userTypeResolver =
100-
new SimpleUserTypeResolver(cqlSession, CqlIdentifier.fromCql(getKeyspaceName()));
101-
10297
CassandraMappingContext mappingContext =
103-
new CassandraMappingContext(userTypeResolver, SimpleTupleTypeFactory.DEFAULT);
98+
new CassandraMappingContext(userTypeResolver(cqlSession), SimpleTupleTypeFactory.DEFAULT);
10499

105100
CustomConversions customConversions = requireBeanOfType(CassandraCustomConversions.class);
106101

@@ -260,4 +255,8 @@ protected KeyspacePopulator keyspacePopulator() {
260255
protected ByteArrayResource scriptOf(String content) {
261256
return new ByteArrayResource(content.getBytes());
262257
}
258+
259+
protected UserTypeResolver userTypeResolver(CqlSession cqlSession) {
260+
return new SimpleUserTypeResolver(cqlSession, CqlIdentifier.fromCql(getKeyspaceName()));
261+
}
263262
}

0 commit comments

Comments
 (0)