From ff1b78aed276250e00859843954ee4656b252d10 Mon Sep 17 00:00:00 2001 From: Thomas Farr Date: Mon, 3 Jul 2023 16:58:00 +1200 Subject: [PATCH] Fixes Signed-off-by: Thomas Farr --- .../client/opensearch/_types/mapping/KnnVectorMethod.java | 2 ++ .../opensearch/client/opensearch/indices/IndexSettings.java | 2 +- .../client/opensearch/integTest/AbstractKnnIT.java | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorMethod.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorMethod.java index e53d9a5601..5bf4786523 100644 --- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorMethod.java +++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorMethod.java @@ -202,10 +202,12 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { if (this.parameters != null) { generator.writeKey("parameters"); + generator.writeStartObject(); for (Map.Entry item0 : this.parameters.entrySet()) { generator.writeKey(item0.getKey()); item0.getValue().serialize(generator, mapper); } + generator.writeEnd(); } } diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettings.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettings.java index e0ec17254a..14f6697f55 100644 --- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettings.java +++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettings.java @@ -1066,7 +1066,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { } if (this.knnAlgoParamEfSearch != null) { - generator.writeKey("knn.algo_param_ef_search"); + generator.writeKey("knn.algo_param.ef_search"); generator.write(this.knnAlgoParamEfSearch); } diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractKnnIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractKnnIT.java index 29872f437a..b34b67d8ea 100644 --- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractKnnIT.java +++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractKnnIT.java @@ -73,13 +73,17 @@ public void testCanIndexAndSearchKnn() throws Exception { assertEquals(2, hits.size()); assertEquals(5.5f, hits.get(0).source().price, 0.01f); - assertEquals(4.4f, hits.get(1).source().price, 0.01f); + assertEquals(10.3f, hits.get(1).source().price, 0.01f); } private static class Doc { public float[] vector; public float price; + Doc() { + + } + Doc(float[] vector, float price) { this.vector = vector; this.price = price;