Fixed compilation errors after recent changes in core (opensearch-pro…

…ject#1031) Signed-off-by: Martin Gaievski <[email protected]> (cherry picked from commit 0a7fc4e)
smortex · Aug 9, 2023 · 0340824 · 0340824
1 parent 038db05
commit 0340824
Show file tree

Hide file tree

Showing 18 changed files with 328 additions and 366 deletions.
diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/knn/bwc/IndexingIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/knn/bwc/IndexingIT.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.knn.bwc;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.knn.index.SpaceType;
 
@@ -96,21 +95,20 @@ public void testKNNIndexCustomMethodFieldMapping() throws Exception {
     // test null parameters
     public void testNullParametersOnUpgrade() throws Exception {
         if (isRunningAgainstOldCluster()) {
-            String mapping = Strings.toString(
-                XContentFactory.jsonBuilder()
-                    .startObject()
-                    .startObject(PROPERTIES)
-                    .startObject(TEST_FIELD)
-                    .field(VECTOR_TYPE, KNN_VECTOR)
-                    .field(DIMENSION, String.valueOf(DIMENSIONS))
-                    .startObject(KNN_METHOD)
-                    .field(NAME, METHOD_HNSW)
-                    .field(PARAMETERS, (String) null)
-                    .endObject()
-                    .endObject()
-                    .endObject()
-                    .endObject()
-            );
+            String mapping = XContentFactory.jsonBuilder()
+                .startObject()
+                .startObject(PROPERTIES)
+                .startObject(TEST_FIELD)
+                .field(VECTOR_TYPE, KNN_VECTOR)
+                .field(DIMENSION, String.valueOf(DIMENSIONS))
+                .startObject(KNN_METHOD)
+                .field(NAME, METHOD_HNSW)
+                .field(PARAMETERS, (String) null)
+                .endObject()
+                .endObject()
+                .endObject()
+                .endObject()
+                .toString();
 
             createKnnIndex(testIndex, getKNNDefaultIndexSettings(), mapping);
         } else {
@@ -121,21 +119,20 @@ public void testNullParametersOnUpgrade() throws Exception {
     // test empty parameters
     public void testEmptyParametersOnUpgrade() throws Exception {
         if (isRunningAgainstOldCluster()) {
-            String mapping = Strings.toString(
-                XContentFactory.jsonBuilder()
-                    .startObject()
-                    .startObject(PROPERTIES)
-                    .startObject(TEST_FIELD)
-                    .field(VECTOR_TYPE, KNN_VECTOR)
-                    .field(DIMENSION, String.valueOf(DIMENSIONS))
-                    .startObject(KNN_METHOD)
-                    .field(NAME, METHOD_HNSW)
-                    .field(PARAMETERS, "")
-                    .endObject()
-                    .endObject()
-                    .endObject()
-                    .endObject()
-            );
+            String mapping = XContentFactory.jsonBuilder()
+                .startObject()
+                .startObject(PROPERTIES)
+                .startObject(TEST_FIELD)
+                .field(VECTOR_TYPE, KNN_VECTOR)
+                .field(DIMENSION, String.valueOf(DIMENSIONS))
+                .startObject(KNN_METHOD)
+                .field(NAME, METHOD_HNSW)
+                .field(PARAMETERS, "")
+                .endObject()
+                .endObject()
+                .endObject()
+                .endObject()
+                .toString();
 
             createKnnIndex(testIndex, getKNNDefaultIndexSettings(), mapping);
         } else {
@@ -146,20 +143,19 @@ public void testEmptyParametersOnUpgrade() throws Exception {
     // test no parameters
     public void testNoParametersOnUpgrade() throws Exception {
         if (isRunningAgainstOldCluster()) {
-            String mapping = Strings.toString(
-                XContentFactory.jsonBuilder()
-                    .startObject()
-                    .startObject(PROPERTIES)
-                    .startObject(TEST_FIELD)
-                    .field(VECTOR_TYPE, KNN_VECTOR)
-                    .field(DIMENSION, String.valueOf(DIMENSIONS))
-                    .startObject(KNN_METHOD)
-                    .field(NAME, METHOD_HNSW)
-                    .endObject()
-                    .endObject()
-                    .endObject()
-                    .endObject()
-            );
+            String mapping = XContentFactory.jsonBuilder()
+                .startObject()
+                .startObject(PROPERTIES)
+                .startObject(TEST_FIELD)
+                .field(VECTOR_TYPE, KNN_VECTOR)
+                .field(DIMENSION, String.valueOf(DIMENSIONS))
+                .startObject(KNN_METHOD)
+                .field(NAME, METHOD_HNSW)
+                .endObject()
+                .endObject()
+                .endObject()
+                .endObject()
+                .toString();
 
             createKnnIndex(testIndex, getKNNDefaultIndexSettings(), mapping);
         } else {

diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/knn/bwc/ModelIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/knn/bwc/ModelIT.java
@@ -11,7 +11,6 @@
 import org.opensearch.client.Request;
 import org.opensearch.client.Response;
 import org.opensearch.client.ResponseException;
-import org.opensearch.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.core.xcontent.XContentParser;
@@ -245,17 +244,16 @@ public void trainKNNModelDefault(String modelId, String trainingIndexName, Strin
 
     // mapping to create index from model
     public String modelIndexMapping(String fieldName, String modelId) throws IOException {
-        return Strings.toString(
-            XContentFactory.jsonBuilder()
-                .startObject()
-                .startObject(PROPERTIES)
-                .startObject(fieldName)
-                .field(VECTOR_TYPE, KNN_VECTOR)
-                .field(MODEL_ID, modelId)
-                .endObject()
-                .endObject()
-                .endObject()
-        );
+        return XContentFactory.jsonBuilder()
+            .startObject()
+            .startObject(PROPERTIES)
+            .startObject(fieldName)
+            .field(VECTOR_TYPE, KNN_VECTOR)
+            .field(MODEL_ID, modelId)
+            .endObject()
+            .endObject()
+            .endObject()
+            .toString();
     }
 
     private ModelMetadata getModelMetadata() {

diff --git a/src/main/java/org/opensearch/knn/index/mapper/MethodFieldMapper.java b/src/main/java/org/opensearch/knn/index/mapper/MethodFieldMapper.java
@@ -7,7 +7,6 @@
 
 import org.apache.lucene.document.FieldType;
 import org.opensearch.common.Explicit;
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.knn.index.KNNMethodContext;
 import org.opensearch.knn.index.util.KNNEngine;
@@ -50,7 +49,7 @@ public class MethodFieldMapper extends KNNVectorFieldMapper {
         try {
             this.fieldType.putAttribute(
                 PARAMETERS,
-                Strings.toString(XContentFactory.jsonBuilder().map(knnEngine.getMethodAsMap(knnMethodContext)))
+                XContentFactory.jsonBuilder().map(knnEngine.getMethodAsMap(knnMethodContext)).toString()
             );
         } catch (IOException ioe) {
             throw new RuntimeException(String.format("Unable to create KNNVectorFieldMapper: %s", ioe));

diff --git a/src/test/java/org/opensearch/knn/index/FaissIT.java b/src/test/java/org/opensearch/knn/index/FaissIT.java
@@ -21,7 +21,6 @@
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.knn.KNNRestTestCase;
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.knn.KNNResult;
 import org.opensearch.knn.TestUtils;
@@ -98,7 +97,7 @@ public void testEndToEnd_fromMethod() throws Exception {
             .endObject();
 
         Map<String, Object> mappingMap = xContentBuilderToMap(builder);
-        String mapping = Strings.toString(builder);
+        String mapping = builder.toString();
 
         createKnnIndex(indexName, mapping);
         assertEquals(new TreeMap<>(mappingMap), new TreeMap<>(getIndexMappingAsMap(indexName)));
@@ -175,7 +174,7 @@ public void testDocUpdate() throws IOException {
             .endObject()
             .endObject();
 
-        String mapping = Strings.toString(builder);
+        String mapping = builder.toString();
         createKnnIndex(indexName, mapping);
 
         Float[] vector = { 6.0f, 6.0f };
@@ -211,7 +210,7 @@ public void testDocDeletion() throws IOException {
             .endObject()
             .endObject();
 
-        String mapping = Strings.toString(builder);
+        String mapping = builder.toString();
         createKnnIndex(indexName, mapping);
 
         Float[] vector = { 6.0f, 6.0f };
@@ -253,17 +252,16 @@ public void testKNNQuery_withModelDifferentCombination_thenSuccess() throws IOEx
         // Create knn index from model
         String fieldName = "test-field-name";
         String indexName = "test-index-name";
-        String indexMapping = Strings.toString(
-            XContentFactory.jsonBuilder()
-                .startObject()
-                .startObject("properties")
-                .startObject(fieldName)
-                .field("type", "knn_vector")
-                .field(MODEL_ID, modelId)
-                .endObject()
-                .endObject()
-                .endObject()
-        );
+        String indexMapping = XContentFactory.jsonBuilder()
+            .startObject()
+            .startObject("properties")
+            .startObject(fieldName)
+            .field("type", "knn_vector")
+            .field(MODEL_ID, modelId)
+            .endObject()
+            .endObject()
+            .endObject()
+            .toString();
 
         createKnnIndex(indexName, getKNNDefaultIndexSettings(), indexMapping);
 
@@ -387,7 +385,7 @@ protected void setupKNNIndexForFilterQuery() throws Exception {
             .endObject()
             .endObject()
             .endObject();
-        final String mapping = Strings.toString(builder);
+        final String mapping = builder.toString();
 
         createKnnIndex(INDEX_NAME, mapping);
 

diff --git a/src/test/java/org/opensearch/knn/index/KNNCreateIndexFromModelTests.java b/src/test/java/org/opensearch/knn/index/KNNCreateIndexFromModelTests.java
@@ -14,7 +14,6 @@
 import com.google.common.collect.ImmutableMap;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.admin.indices.create.CreateIndexRequestBuilder;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.knn.KNNSingleNodeTestCase;
@@ -75,17 +74,16 @@ public void testCreateIndexFromModel() throws IOException, InterruptedException
         String indexName = "test-index";
         String fieldName = "test-field";
 
-        final String mapping = Strings.toString(
-            XContentFactory.jsonBuilder()
-                .startObject()
-                .startObject("properties")
-                .startObject(fieldName)
-                .field("type", "knn_vector")
-                .field("model_id", modelId)
-                .endObject()
-                .endObject()
-                .endObject()
-        );
+        final String mapping = XContentFactory.jsonBuilder()
+            .startObject()
+            .startObject("properties")
+            .startObject(fieldName)
+            .field("type", "knn_vector")
+            .field("model_id", modelId)
+            .endObject()
+            .endObject()
+            .endObject()
+            .toString();
 
         modelDao.put(model, ActionListener.wrap(indexResponse -> {
             CreateIndexRequestBuilder createIndexRequestBuilder = client().admin()

diff --git a/src/test/java/org/opensearch/knn/index/LuceneEngineIT.java b/src/test/java/org/opensearch/knn/index/LuceneEngineIT.java
@@ -16,7 +16,6 @@
 import org.opensearch.client.Request;
 import org.opensearch.client.Response;
 import org.opensearch.client.ResponseException;
-import org.opensearch.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.index.query.QueryBuilders;
@@ -101,7 +100,7 @@ public void testQuery_innerProduct_notSupported() throws Exception {
             .endObject()
             .endObject();
 
-        String mapping = Strings.toString(builder);
+        String mapping = builder.toString();
 
         createIndex(INDEX_NAME, getKNNDefaultIndexSettings());
 
@@ -179,7 +178,7 @@ public void testQuery_multipleEngines() throws IOException {
             .endObject()
             .endObject()
             .endObject();
-        String mapping = Strings.toString(builder);
+        String mapping = builder.toString();
         createKnnIndex(INDEX_NAME, mapping);
 
         for (int i = 0; i < TEST_INDEX_VECTORS.length; i++) {
@@ -219,7 +218,7 @@ public void testAddDoc() throws IOException {
             .endObject();
 
         Map<String, Object> mappingMap = xContentBuilderToMap(builder);
-        String mapping = Strings.toString(builder);
+        String mapping = builder.toString();
 
         createKnnIndex(INDEX_NAME, mapping);
         assertEquals(new TreeMap<>(mappingMap), new TreeMap<>(getIndexMappingAsMap(INDEX_NAME)));
@@ -305,7 +304,7 @@ public void testQuery_filterWithNonLuceneEngine() throws Exception {
             .endObject()
             .endObject();
 
-        String mapping = Strings.toString(builder);
+        String mapping = builder.toString();
         createKnnIndex(INDEX_NAME, mapping);
 
         addKnnDocWithAttributes(
@@ -371,7 +370,7 @@ private void createKnnIndexMappingWithLuceneEngine(int dimension, SpaceType spac
             .endObject()
             .endObject();
 
-        String mapping = Strings.toString(builder);
+        String mapping = builder.toString();
         createKnnIndex(INDEX_NAME, mapping);
     }