Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Replace duplicated code with method calls.

Closes: #1084
Original pull request: #1085
Related ticket: DATACASS-465
This commit is contained in:
Mark Paluch
2021-01-29 09:45:08 +01:00
parent ca9895c6cb
commit ea56f85525
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java
View File

@@ -443,17 +443,6 @@ class DefaultColumnTypeResolver implements ColumnTypeResolver {
return new DefaultCassandraColumnType(typeInformation, dataType);
}
private DataType getUserType(CassandraPersistentEntity<?> persistentEntity, boolean frozen) {
CqlIdentifier identifier = persistentEntity.getTableName();
com.datastax.oss.driver.api.core.type.UserDefinedType userType = userTypeResolver.resolveType(identifier);
if (userType == null) {
throw new MappingException(String.format("User type [%s] not found", identifier));
}
return userType.copy(frozen);
}
private Class<?> resolveToJavaType(DataType dataType) {
TypeCodec<Object> codec = getCodecRegistry().codecFor(dataType);
return codec.getJavaType().getRawType();
@@ -463,12 +452,20 @@ class DefaultColumnTypeResolver implements ColumnTypeResolver {
return codecRegistry.get();
}
private DataType getUserType(String userTypeName) {
private UserDefinedType getUserType(CassandraPersistentEntity<?> persistentEntity, boolean frozen) {
return getUserType(persistentEntity.getTableName()).copy(frozen);
}
UserDefinedType type = userTypeResolver.resolveType(CqlIdentifier.fromCql(userTypeName));
private UserDefinedType getUserType(String userTypeName) {
return getUserType(CqlIdentifier.fromCql(userTypeName));
}
private UserDefinedType getUserType(CqlIdentifier userTypeName) {
UserDefinedType type = userTypeResolver.resolveType(userTypeName);
if (type == null) {
throw new MappingException(String.format("Cannot resolve UserDefinedType for [%s]", userTypeName));
throw new MappingException(String.format("User type [%s] not found", userTypeName));
}
return type;