Prevent NullPointerException when User Defined Type is not found.

boutier · mp911de · commit a465893e7b6b · 2021-01-29T09:46:50.000+01:00
Closes: #1084 Original pull request: #1085 Related ticket: DATACASS-465
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
@@ -444,16 +444,14 @@ private CassandraColumnType createCassandraTypeDescriptor(TypeInformation<?> typ
 	}
 
 	private DataType getUserType(CassandraPersistentEntity<?> persistentEntity, boolean frozen) {
-
 		CqlIdentifier identifier = persistentEntity.getTableName();
-		com.datastax.oss.driver.api.core.type.UserDefinedType userType = userTypeResolver.resolveType(identifier)
-				.copy(frozen);
+		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;
+		return userType.copy(frozen);
 	}
 
 	private Class<?> resolveToJavaType(DataType dataType) {

Original file line number	Diff line number	Diff line change
`@@ -444,16 +444,14 @@ private CassandraColumnType createCassandraTypeDescriptor(TypeInformation<?> typ`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`private DataType getUserType(CassandraPersistentEntity<?> persistentEntity, boolean frozen) {`
`447`		`-`
`448`	`447`	`CqlIdentifier identifier = persistentEntity.getTableName();`
`449`		`- com.datastax.oss.driver.api.core.type.UserDefinedType userType = userTypeResolver.resolveType(identifier)`
`450`		`- .copy(frozen);`
	`448`	`+ com.datastax.oss.driver.api.core.type.UserDefinedType userType = userTypeResolver.resolveType(identifier);`
`451`	`449`
`452`	`450`	`if (userType == null) {`
`453`	`451`	`throw new MappingException(String.format("User type [%s] not found", identifier));`
`454`	`452`	`}`
`455`	`453`
`456`		`- return userType;`
	`454`	`+ return userType.copy(frozen);`
`457`	`455`	`}`
`458`	`456`
`459`	`457`	`private Class<?> resolveToJavaType(DataType dataType) {`