Skip to content

Commit 5fc572c

Browse files
committed
Polishing.
Replace duplicated code with method calls. Closes: #1084 Original pull request: #1085 Related ticket: DATACASS-465
1 parent a465893 commit 5fc572c

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

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

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -443,17 +443,6 @@ private CassandraColumnType createCassandraTypeDescriptor(TypeInformation<?> typ
443443
return new DefaultCassandraColumnType(typeInformation, dataType);
444444
}
445445

446-
private DataType getUserType(CassandraPersistentEntity<?> persistentEntity, boolean frozen) {
447-
CqlIdentifier identifier = persistentEntity.getTableName();
448-
com.datastax.oss.driver.api.core.type.UserDefinedType userType = userTypeResolver.resolveType(identifier);
449-
450-
if (userType == null) {
451-
throw new MappingException(String.format("User type [%s] not found", identifier));
452-
}
453-
454-
return userType.copy(frozen);
455-
}
456-
457446
private Class<?> resolveToJavaType(DataType dataType) {
458447
TypeCodec<Object> codec = getCodecRegistry().codecFor(dataType);
459448
return codec.getJavaType().getRawType();
@@ -463,12 +452,20 @@ private CodecRegistry getCodecRegistry() {
463452
return codecRegistry.get();
464453
}
465454

466-
private DataType getUserType(String userTypeName) {
455+
private UserDefinedType getUserType(CassandraPersistentEntity<?> persistentEntity, boolean frozen) {
456+
return getUserType(persistentEntity.getTableName()).copy(frozen);
457+
}
458+
459+
private UserDefinedType getUserType(String userTypeName) {
460+
return getUserType(CqlIdentifier.fromCql(userTypeName));
461+
}
462+
463+
private UserDefinedType getUserType(CqlIdentifier userTypeName) {
467464

468-
UserDefinedType type = userTypeResolver.resolveType(CqlIdentifier.fromCql(userTypeName));
465+
UserDefinedType type = userTypeResolver.resolveType(userTypeName);
469466

470467
if (type == null) {
471-
throw new MappingException(String.format("Cannot resolve UserDefinedType for [%s]", userTypeName));
468+
throw new MappingException(String.format("User type [%s] not found", userTypeName));
472469
}
473470

474471
return type;

0 commit comments

Comments
 (0)