Replicate composite key UDT issue

samueldlightfoot · May 26, 2021 · b68892e · b68892e
1 parent 3c81286
commit b68892e
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/...rg/springframework/data/cassandra/core/convert/MappingCassandraConverterUDTUnitTests.java b/...rg/springframework/data/cassandra/core/convert/MappingCassandraConverterUDTUnitTests.java
@@ -42,16 +42,10 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.ReadOnlyProperty;
 import org.springframework.data.cassandra.core.StatementFactory;
+import org.springframework.data.cassandra.core.cql.PrimaryKeyType;
 import org.springframework.data.cassandra.core.cql.WriteOptions;
 import org.springframework.data.cassandra.core.cql.util.StatementBuilder;
-import org.springframework.data.cassandra.core.mapping.CassandraMappingContext;
-import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity;
-import org.springframework.data.cassandra.core.mapping.CassandraType;
-import org.springframework.data.cassandra.core.mapping.Embedded;
-import org.springframework.data.cassandra.core.mapping.Frozen;
-import org.springframework.data.cassandra.core.mapping.Table;
-import org.springframework.data.cassandra.core.mapping.UserDefinedType;
-import org.springframework.data.cassandra.core.mapping.UserTypeResolver;
+import org.springframework.data.cassandra.core.mapping.*;
 import org.springframework.data.cassandra.support.UserDefinedTypeBuilder;
 import org.springframework.data.cassandra.test.util.RowMockUtil;
 
@@ -242,14 +236,13 @@ void shouldWriteUdtWithCustomConversion() {
 	void shouldWriteUdtWhereWherePrimaryKeyWithCustomConversion() {
 
 		Money money = new Money();
-		money.setCurrency(new Currency("EUR"));
+		money.setKey(new Money.MoneyKey());
+		money.getKey().setCurrency(new Currency("EUR"));
+		money.getKey().setOther("other");
 
 		Where where = new Where();
+		// Will fail with Cannot resolve DataType for com.datastax.oss.driver.api.core.data.UdtValue
 		converter.write(money, where);
-
-		assertThat((UdtValue) where.get(CqlIdentifier.fromCql("currency"))) //
-				.extracting(UdtValue::getFormattedContents) //
-				.isEqualTo("{currency:'EUR'}");
 	}
 
 	@Test // DATACASS-172, DATACASS-400
@@ -582,9 +575,22 @@ private static class Bank {
 	@Data
 	@Table
 	public static class Money {
-		@Id private Currency currency;
+
+		@PrimaryKeyClass
+		@Data
+		public static class MoneyKey {
+			@PrimaryKeyColumn(type = PrimaryKeyType.PARTITIONED)
+			public Currency currency;
+			@PrimaryKeyColumn(type = PrimaryKeyType.CLUSTERED)
+			public String other;
+		}
+
+		@PrimaryKey
+		public MoneyKey key;
+
 	}
 
+
 	@Table
 	@AllArgsConstructor
 	@Getter