Remove List to CqlVector converters.

Author: mp911de

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

@@ -73,11 +73,9 @@ static Collection<Object> getConvertersToRegister() {
 
 		converters.add(VectorToFloatArrayConverter.INSTANCE);
 		converters.add(VectorToDoubleArrayConverter.INSTANCE);
-		converters.add(VectorToFloatListConverter.INSTANCE);
 
 		converters.add(FloatArrayToVectorConverter.INSTANCE);
 		converters.add(DoubleArrayToVectorConverter.INSTANCE);
-		converters.add(NumberListToVectorConverter.INSTANCE);
 
 		converters.add(VectorToCqlVectorConverter.INSTANCE);
 		converters.add(CqlVectorToVectorConverter.INSTANCE);
@@ -307,17 +305,6 @@ public CqlVector<Float> convert(float[] source) {
 		}
 	}
 
-	@ReadingConverter
-	public enum NumberListToVectorConverter implements Converter<List<Number>, CqlVector<Number>> {
-
-		INSTANCE;
-
-		@Override
-		public CqlVector<Number> convert(List<Number> source) {
-			return CqlVector.newInstance(source);
-		}
-	}
-
 	@ReadingConverter
 	public enum VectorToFloatArrayConverter implements Converter<CqlVector<Number>, float[]> {
 
@@ -348,18 +335,4 @@ public double[] convert(CqlVector<Number> source) {
 		}
 	}
 
-	@ReadingConverter
-	public enum VectorToFloatListConverter implements Converter<CqlVector<Number>, List<Float>> {
-
-		INSTANCE;
-
-		@Override
-		public List<Float> convert(CqlVector<Number> source) {
-			List<Float> values = new ArrayList<>(source.size());
-			for (int i = 0; i < source.size(); i++) {
-				values.add(source.get(i).floatValue());
-			}
-			return values;
-		}
-	}
 }

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

@@ -921,16 +921,14 @@ void shouldUpdateCqlVector() {
 		withVector.id = "foo";
 		withVector.vector = CqlVector.newInstance(1.2f, 1.3f);
 		withVector.array = new float[] { 2.2f, 2.3f };
-		withVector.list = Arrays.asList(3.2f, 3.3f);
 
 		SimpleStatement statement = statementFactory.update(withVector, WriteOptions.empty())
 				.build(ParameterHandling.BY_NAME);
 
-		assertThat(statement.getQuery()).isEqualTo("UPDATE withvector SET vector=:p0, array=:p1, list=:p2 WHERE id=:p3");
+		assertThat(statement.getQuery()).isEqualTo("UPDATE withvector SET vector=:p0, array=:p1 WHERE id=:p2");
 
 		assertThat(statement.getNamedValues().get(CqlIdentifier.fromCql("p0"))).isInstanceOf(CqlVector.class).hasToString("[1.2, 1.3]");
 		assertThat(statement.getNamedValues().get(CqlIdentifier.fromCql("p1"))).isInstanceOf(CqlVector.class).hasToString("[2.2, 2.3]");
-		assertThat(statement.getNamedValues().get(CqlIdentifier.fromCql("p2"))).isInstanceOf(CqlVector.class).hasToString("[3.2, 3.3]");
 	}
 
 	@Test // GH-1504
@@ -990,6 +988,5 @@ static class WithVector {
 
 		@VectorType(dimensions = 12) CqlVector<Number> vector;
 		@VectorType(dimensions = 12) float[] array;
-		@VectorType(dimensions = 12) List<Float> list;
 	}
 }

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

@@ -21,7 +21,6 @@
 
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Currency;
@@ -466,7 +465,7 @@ void shouldConvertPrimaryKeyValues() {
 		assertThat(mappedObject.iterator().next().getPredicate().getValue()).isEqualTo(42L);
 	}
 
-	@Test //
+	@Test // GH-1504
 	void shouldConvertVectorValues() {
 
 		Filter filter = Filter.from(Criteria.where("array").is(new float[] { 1.1f, 2.2f }));
@@ -478,23 +477,13 @@ void shouldConvertVectorValues() {
 		assertThat(mappedObject.iterator().next().getPredicate().getValue()).isEqualTo(new float[] { 1.1f, 2.2f });
 	}
 
-	@Test // GH-1504
-	void shouldConvertVectorValuesFromList() {
-
-		Filter filter = Filter.from(Criteria.where("list").is(Arrays.asList(1.1f, 2.2f)));
-
-		Filter mappedObject = this.queryMapper.getMappedObject(filter,
-				this.mappingContext.getRequiredPersistentEntity(WithVector.class));
-
-		assertThat(mappedObject.iterator().next().getColumnName()).isEqualTo(ColumnName.from("list"));
-		assertThat(mappedObject.iterator().next().getPredicate().getValue()).isEqualTo(CqlVector.newInstance(1.1f, 2.2f));
-	}
 
 	@Test // GH-1504
 	void shouldConvertVectorSelectorFunction() {
 
 		Columns columns = Columns.empty();
-		Columns.FunctionCall similarity = Columns.FunctionCall.from("similarity_cosine", CqlIdentifier.fromCql("array"), Arrays.asList(1.1f, 2.2f));
+		Columns.FunctionCall similarity = Columns.FunctionCall.from("similarity_cosine", CqlIdentifier.fromCql("array"),
+				CqlVector.newInstance(1.1f, 2.2f));
 
 		Query query = Query.empty().columns(columns.select("array", similarity));