Introduce caching for commonly used model computations.

We now cache the outcome for column types, AnnotatedType lookuop by annotation and bypass the conversion service by considering primitive type wrappers in the assignability check.

Closes #1218

Author: mp911de

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

@@ -22,6 +22,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 import java.util.stream.StreamSupport;
 
@@ -76,6 +77,8 @@ class DefaultColumnTypeResolver implements ColumnTypeResolver {
 	private final UserTypeResolver userTypeResolver;
 	private final Supplier<CodecRegistry> codecRegistry;
 	private final Supplier<CustomConversions> customConversions;
+	private final Map<CassandraPersistentProperty, CassandraColumnType> columnTypeCache = new ConcurrentHashMap<>();
+	private final Map<TypeInformation<?>, CassandraColumnType> typeInformationColumnTypeCache = new ConcurrentHashMap<>();
 
 	/**
 	 * Creates a new {@link DefaultColumnTypeResolver}.
@@ -100,6 +103,18 @@ public CassandraColumnType resolve(CassandraPersistentProperty property) {
 
 		Assert.notNull(property, "Property must not be null");
 
+		CassandraColumnType cassandraColumnType = columnTypeCache.get(property);
+		if (cassandraColumnType == null) {
+			// avoid recursive update
+			cassandraColumnType = doResolve(property);
+			columnTypeCache.put(property, cassandraColumnType);
+		}
+
+		return cassandraColumnType;
+	}
+
+	private CassandraColumnType doResolve(CassandraPersistentProperty property) {
+
 		if (property.isAnnotationPresent(CassandraType.class)) {
 
 			CassandraType annotation = property.getRequiredAnnotation(CassandraType.class);
@@ -169,7 +184,17 @@ private boolean isFrozen(AnnotatedType type) {
 	 */
 	@Override
 	public CassandraColumnType resolve(TypeInformation<?> typeInformation) {
-		return resolve(typeInformation, FrozenIndicator.NOT_FROZEN);
+
+		Assert.notNull(typeInformation, "TypeInformation must not be null");
+
+		CassandraColumnType cassandraColumnType = typeInformationColumnTypeCache.get(typeInformation);
+		if (cassandraColumnType == null) {
+			// avoid recursive update
+			cassandraColumnType = resolve(typeInformation, FrozenIndicator.NOT_FROZEN);
+			typeInformationColumnTypeCache.put(typeInformation, cassandraColumnType);
+		}
+
+		return cassandraColumnType;
 	}
 
 	private CassandraColumnType resolve(TypeInformation<?> typeInformation, FrozenIndicator frozen) {

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

@@ -1063,7 +1063,8 @@ protected Object getPotentiallyConvertedSimpleRead(Object value, TypeInformation
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	private Object getPotentiallyConvertedSimpleRead(Object value, @Nullable Class<?> target) {
 
-		if (value == null || target == null || target.isAssignableFrom(value.getClass())) {
+		if (value == null || target == null
+				|| ClassUtils.resolvePrimitiveIfNecessary(target).isAssignableFrom(value.getClass())) {
 			return value;
 		}
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java

@@ -114,7 +114,9 @@ public CqlIdentifier getColumnName() {
 			this.columnName = determineColumnName();
 		}
 
-		Assert.state(this.columnName != null, () -> String.format("Cannot determine column name for %s", this));
+		if (columnName == null) {
+			throw new IllegalStateException(String.format("Cannot determine column name for %s", this));
+		}
 
 		return this.columnName;
 	}

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CachingCassandraPersistentProperty.java

@@ -15,6 +15,12 @@
  */
 package org.springframework.data.cassandra.core.mapping;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedType;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.springframework.data.cassandra.core.cql.Ordering;
 import org.springframework.data.mapping.model.Property;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
@@ -36,6 +42,7 @@ public class CachingCassandraPersistentProperty extends BasicCassandraPersistent
 	private final boolean isPrimaryKeyColumn;
 	private final boolean isEmbedded;
 	private final boolean isStaticColumn;
+	private final Map<Class<? extends Annotation>, Optional<AnnotatedType>> findAnnotatedTypeCache = new ConcurrentHashMap<>();
 
 	public CachingCassandraPersistentProperty(Property property, CassandraPersistentEntity<?> owner,
 			SimpleTypeHolder simpleTypeHolder) {
@@ -106,4 +113,13 @@ public boolean isStaticColumn() {
 	public boolean isEmbedded() {
 		return isEmbedded;
 	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentProperty#findAnnotatedType(Class)
+	 */
+	@Override
+	public AnnotatedType findAnnotatedType(Class<? extends Annotation> annotationType) {
+		return findAnnotatedTypeCache
+				.computeIfAbsent(annotationType, key -> Optional.ofNullable(super.findAnnotatedType(key))).orElse(null);
+	}
 }