Commit fffd27b

akhakump911de

authored and

committed

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 fffd27bCopy full SHA for fffd27b

File tree

1 file changed

-8

lines changed

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

1 file changed

-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 number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@`
`49`	`49`	`* @author Matthew T. Adams`
`50`	`50`	`* @author John Blum`
`51`	`51`	`* @author Mark Paluch`
	`52`	`+ * @author Ammar Khaku`
`52`	`53`	`*/`
`53`	`54`	`@Configuration`
`54`	`55`	`@SuppressWarnings("unused")`
`@@ -71,14 +72,11 @@ public CassandraConverter cassandraConverter() {`
`71`	`72`
`72`	`73`	`CqlSession cqlSession = getRequiredSession();`
`73`	`74`
`74`		`- UserTypeResolver userTypeResolver =`
`75`		`- new SimpleUserTypeResolver(cqlSession, CqlIdentifier.fromCql(getKeyspaceName()));`
`76`		`-`
`77`	`75`	`MappingCassandraConverter converter =`
`78`	`76`	`new MappingCassandraConverter(requireBeanOfType(CassandraMappingContext.class));`
`79`	`77`
`80`	`78`	`converter.setCodecRegistry(cqlSession.getContext().getCodecRegistry());`
`81`		`- converter.setUserTypeResolver(userTypeResolver);`
	`79`	`+ converter.setUserTypeResolver(userTypeResolver(cqlSession));`
`82`	`80`	`converter.setCustomConversions(requireBeanOfType(CassandraCustomConversions.class));`
`83`	`81`
`84`	`82`	`return converter;`
`@@ -96,11 +94,8 @@ public CassandraMappingContext cassandraMapping() throws ClassNotFoundException`
`96`	`94`
`97`	`95`	`CqlSession cqlSession = getRequiredSession();`
`98`	`96`
`99`		`- UserTypeResolver userTypeResolver =`
`100`		`- new SimpleUserTypeResolver(cqlSession, CqlIdentifier.fromCql(getKeyspaceName()));`
`101`		`-`
`102`	`97`	`CassandraMappingContext mappingContext =`
`103`		`- new CassandraMappingContext(userTypeResolver, SimpleTupleTypeFactory.DEFAULT);`
	`98`	`+ new CassandraMappingContext(userTypeResolver(cqlSession), SimpleTupleTypeFactory.DEFAULT);`
`104`	`99`
`105`	`100`	`CustomConversions customConversions = requireBeanOfType(CassandraCustomConversions.class);`
`106`	`101`
`@@ -260,4 +255,8 @@ protected KeyspacePopulator keyspacePopulator() {`
`260`	`255`	`protected ByteArrayResource scriptOf(String content) {`
`261`	`256`	`return new ByteArrayResource(content.getBytes());`
`262`	`257`	`}`
	`258`	`+`
	`259`	`+ protected UserTypeResolver userTypeResolver(CqlSession cqlSession) {`
	`260`	`+ return new SimpleUserTypeResolver(cqlSession, CqlIdentifier.fromCql(getKeyspaceName()));`
	`261`	`+ }`
`263`	`262`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit fffd27b

File tree

1 file changed

1 file changed

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

0 commit comments