Properly consider frozen map creation.

We now correctly consider the Frozen annotation when annotating a property to define a frozen<map<…>> type. Previously we only considered frozen key and value components instead of the entire type.

Closes #1148

Author: mp911de

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

@@ -159,8 +159,21 @@ static ColumnType mapOf(ColumnType keyType, ColumnType valueType) {
 	 * @return
 	 */
 	static CassandraColumnType mapOf(CassandraColumnType keyType, CassandraColumnType valueType) {
+		return ColumnType.mapOf(keyType, valueType, false);
+	}
+
+	/**
+	 * Creates a Map {@link CassandraColumnType} given its {@link CassandraColumnType key and value types}.
+	 *
+	 * @param keyType must not be {@literal null}.
+	 * @param valueType must not be {@literal null}.
+	 * @param frozen
+	 * @return
+	 * @since 3.2.4
+	 */
+	static CassandraColumnType mapOf(CassandraColumnType keyType, CassandraColumnType valueType, boolean frozen) {
 		return new DefaultCassandraColumnType(ClassTypeInformation.MAP,
-				() -> DataTypes.mapOf(keyType.getDataType(), valueType.getDataType()), keyType, valueType);
+				() -> DataTypes.mapOf(keyType.getDataType(), valueType.getDataType(), frozen), keyType, valueType);
 	}
 
 	/**

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

@@ -410,7 +410,7 @@ private CassandraColumnType createCassandraTypeDescriptor(TypeInformation<?> typ
 			FrozenIndicator frozenValue = frozen.getFrozen(1);
 
 			return ColumnType.mapOf(resolve(typeInformation.getRequiredComponentType(), frozenKey),
-					resolve(typeInformation.getRequiredMapValueType(), frozenValue));
+					resolve(typeInformation.getRequiredMapValueType(), frozenValue), frozen.isFrozen());
 		}
 
 		CassandraPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(typeInformation);

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/ColumnTypeResolverUnitTests.java

@@ -260,6 +260,18 @@ void setPropertyWithFrozenAnnotationOnElement() {
 				.describedAs("The element type should be frozen").isTrue();
 	}
 
+	@Test // GH-1148
+	void frozenMapProperty() {
+
+		BasicCassandraPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(Person.class);
+
+		DataType dataType = resolver.resolve(entity.getRequiredPersistentProperty("frozenMap")).getDataType();
+
+		assertThat(dataType).isInstanceOf(MapType.class);
+		assertThat(((MapType) dataType).isFrozen()).isTrue();
+		assertThat(dataType.asCql(true, false)).isEqualTo("frozen<map<text, text>>");
+	}
+
 	@Test // DATACASS-465
 	void mapPropertyWithFrozenAnnotationOnKey() {
 
@@ -345,6 +357,8 @@ static class Person {
 		@Frozen Set<String> frozenSet;
 		Set<@Frozen MyUdt> frozenSetContent;
 
+		@Frozen Map<String, String> frozenMap;
+
 		Map<@Frozen MyUdt, MyUdt> frozenMapKey;
 
 		Map<MyUdt, @Frozen MyUdt> frozenMapValue;