From fade919be643b59e46cd9de9c2286f557994436b Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Tue, 28 May 2024 20:57:27 +0200 Subject: [PATCH] Polishing. --- .../index/MappingBuilderIntegrationTests.java | 3 +-- .../knn/KnnSearchIntegrationTests.java | 24 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java index 1d37f007a..e4bf6e48d 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java @@ -909,8 +909,7 @@ public abstract class MappingBuilderIntegrationTests extends MappingContextBaseT @Nullable @Id private String id; - @Field(type = FieldType.Dense_Vector, dims = 42, knnSimilarity = KnnSimilarity.COSINE) - private double[] denseVector; + @Field(type = FieldType.Dense_Vector, dims = 42, knnSimilarity = KnnSimilarity.COSINE) private double[] denseVector; } @Mapping(aliases = { diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/knn/KnnSearchIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/knn/KnnSearchIntegrationTests.java index 1def46cd8..e780e24aa 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/knn/KnnSearchIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/knn/KnnSearchIntegrationTests.java @@ -27,7 +27,12 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.annotation.Id; import org.springframework.data.domain.Pageable; -import org.springframework.data.elasticsearch.annotations.*; +import org.springframework.data.elasticsearch.annotations.Document; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; +import org.springframework.data.elasticsearch.annotations.KnnAlgorithmType; +import org.springframework.data.elasticsearch.annotations.KnnIndexOptions; +import org.springframework.data.elasticsearch.annotations.KnnSimilarity; import org.springframework.data.elasticsearch.client.elc.NativeQuery; import org.springframework.data.elasticsearch.client.elc.NativeQueryBuilder; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; @@ -71,7 +76,7 @@ public abstract class KnnSearchIntegrationTests { entity.setMessage("top" + (i + 1)); // The generated vector is always in the first quadrant, from the x-axis direction to the y-axis direction - float[] vector = new float[] {1.0f - i * increment, increment}; + float[] vector = new float[] { 1.0f - i * increment, increment }; entity.setVector(vector); entities.add(entity); } @@ -127,27 +132,24 @@ public abstract class KnnSearchIntegrationTests { assertThat(vectorEntities.get(0).getMessage()).isEqualTo("top10"); } - public interface VectorEntityRepository extends ElasticsearchRepository { - } + public interface VectorEntityRepository extends ElasticsearchRepository {} @Document(indexName = "#{@indexNameProvider.indexName()}") static class VectorEntity { @Nullable - @Id - private String id; + @Id private String id; @Nullable - @Field(type = Keyword) - private String message; + @Field(type = Keyword) private String message; // TODO: `elementType = FieldElementType.FLOAT,` is to be added here later // TODO: element_type can not be set here, because it's left out in elasticsearch-specification - // TODO: the issue is fixed in https://github.com/elastic/elasticsearch-java/pull/800, but still not released in 8.13.x + // TODO: the issue is fixed in https://github.com/elastic/elasticsearch-java/pull/800, but still not released in + // 8.13.x // TODO: will be fixed later by either upgrading to 8.14.0 or a newer 8.13.x @Field(type = FieldType.Dense_Vector, dims = 2, knnIndexOptions = @KnnIndexOptions(type = KnnAlgorithmType.HNSW, m = 16, efConstruction = 100), - knnSimilarity = KnnSimilarity.COSINE) - private float[] vector; + knnSimilarity = KnnSimilarity.COSINE) private float[] vector; @Nullable public String getId() {