From 5fc572cb25115a612a3c9e11594793f577d79bd7 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 29 Jan 2021 09:45:08 +0100 Subject: [PATCH] Polishing. Replace duplicated code with method calls. Closes: #1084 Original pull request: #1085 Related ticket: DATACASS-465 --- .../convert/DefaultColumnTypeResolver.java | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java index 5da115952..0846fbd7b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java @@ -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 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;