Fix breaking change caused by opensearch core (opensearch-project#1187)

* Fix breaking change caused by opensearch core Signed-off-by: zane-neo <[email protected]> * Use builder.toString() to get a builder string value and format code Signed-off-by: zane-neo <[email protected]> --------- Signed-off-by: zane-neo <[email protected]>
HenryL27 · Aug 9, 2023 · d3d4122 · d3d4122
1 parent 7bdc5e4
commit d3d4122
Show file tree

Hide file tree

Showing 66 changed files with 129 additions and 196 deletions.
diff --git a/common/src/main/java/org/opensearch/ml/common/MLModelGroup.java b/common/src/main/java/org/opensearch/ml/common/MLModelGroup.java
@@ -14,10 +14,10 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
-import org.opensearch.common.util.CollectionUtils;
 import org.opensearch.commons.authuser.User;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.util.CollectionUtils;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;

diff --git a/common/src/main/java/org/opensearch/ml/common/connector/Connector.java b/common/src/main/java/org/opensearch/ml/common/connector/Connector.java
@@ -19,7 +19,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.commons.text.StringSubstitutor;
-import org.opensearch.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -93,7 +92,7 @@ static Connector fromStream(StreamInput in) throws IOException {
  }
 
  static Connector createConnector(XContentBuilder builder, String connectorProtocol) throws IOException {
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
  return createConnector(jsonStr, connectorProtocol);
  }
 

diff --git a/...on/src/main/java/org/opensearch/ml/common/transport/connector/MLCreateConnectorInput.java b/...on/src/main/java/org/opensearch/ml/common/transport/connector/MLCreateConnectorInput.java
@@ -10,7 +10,7 @@
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
-import org.opensearch.common.util.CollectionUtils;
+import org.opensearch.core.common.util.CollectionUtils;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;

diff --git a/common/src/test/java/org/opensearch/ml/common/TestHelper.java b/common/src/test/java/org/opensearch/ml/common/TestHelper.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.ml.common;
 
-import org.opensearch.common.Strings;
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
 import org.opensearch.common.xcontent.XContentFactory;
@@ -26,15 +25,15 @@ public static <T> void testParse(ToXContentObject obj, Function<XContentParser,
  }
 
  public static <T> void testParse(ToXContentObject obj, Function<XContentParser, T> function, boolean wrapWithObject) throws IOException {
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  if (wrapWithObject) {
  builder.startObject();
  }
  obj.toXContent(builder, ToXContent.EMPTY_PARAMS);
  if (wrapWithObject) {
  builder.endObject();
  }
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
  testParseFromString(obj, jsonStr, function);
  }
 
@@ -46,7 +45,7 @@ public static <T> void testParseFromString(ToXContentObject obj, String jsonStr,
  }
 
  public static String contentObjectToString(ToXContentObject obj) throws IOException {
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  obj.toXContent(builder, ToXContent.EMPTY_PARAMS);
  return xContentBuilderToString(builder);
  }

diff --git a/common/src/test/java/org/opensearch/ml/common/dataframe/BooleanValueTest.java b/common/src/test/java/org/opensearch/ml/common/dataframe/BooleanValueTest.java
@@ -6,9 +6,7 @@
 package org.opensearch.ml.common.dataframe;
 
 import org.junit.Test;
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -29,11 +27,11 @@ public void booleanValue() {
  @Test
  public void testToXContent() throws IOException {
  BooleanValue value = new BooleanValue(true);
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  value.toXContent(builder);
 
  assertNotNull(builder);
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
  assertEquals("{\"column_type\":\"BOOLEAN\",\"value\":true}", jsonStr);
  }
-}
+}
diff --git a/common/src/test/java/org/opensearch/ml/common/dataframe/ColumnMetaTest.java b/common/src/test/java/org/opensearch/ml/common/dataframe/ColumnMetaTest.java
@@ -7,10 +7,8 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.ml.common.TestHelper;
@@ -51,11 +49,11 @@ public void writeToAndReadStream() throws IOException {
 
  @Test
  public void testToXContent() throws IOException {
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  columnMeta.toXContent(builder);
 
  assertNotNull(builder);
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
  assertEquals("{\"name\":\"columnMetaName\",\"column_type\":\"STRING\"}", jsonStr);
  }
 

diff --git a/common/src/test/java/org/opensearch/ml/common/dataframe/DefaultDataFrameTest.java b/common/src/test/java/org/opensearch/ml/common/dataframe/DefaultDataFrameTest.java
@@ -14,11 +14,9 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.ml.common.TestHelper;
@@ -227,13 +225,13 @@ public void select_Exception_InvalidColumn(){
 
  @Test
  public void testToXContent() throws IOException {
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  builder.startObject();
  defaultDataFrame.toXContent(builder);
  builder.endObject();
 
  assertNotNull(builder);
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
  assertEquals("{\"column_metas\":[" +
  "{\"name\":\"c1\",\"column_type\":\"STRING\"}," +
  "{\"name\":\"c2\",\"column_type\":\"INTEGER\"}," +
@@ -274,4 +272,4 @@ public void testParse_WrongExtraField() throws IOException {
  "[{\"column_type\":\"INTEGER\",\"value\":2}]}]}";
  TestHelper.testParseFromString(dataFrame, jsonStr, function);
  }
-}
+}
diff --git a/common/src/test/java/org/opensearch/ml/common/dataframe/DoubleValueTest.java b/common/src/test/java/org/opensearch/ml/common/dataframe/DoubleValueTest.java
@@ -8,10 +8,8 @@
 import java.io.IOException;
 
 import org.junit.Test;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.XContentBuilder;
 
 import static org.junit.Assert.assertEquals;
@@ -47,11 +45,11 @@ public void writeTo() throws IOException {
  @Test
  public void testToXContent() throws IOException {
  DoubleValue doubleValue = new DoubleValue(5.0D);
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  doubleValue.toXContent(builder);
 
  assertNotNull(builder);
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
  assertEquals("{\"column_type\":\"DOUBLE\",\"value\":5.0}", jsonStr);
  }
-}
+}
diff --git a/common/src/test/java/org/opensearch/ml/common/dataframe/FloatValueTest.java b/common/src/test/java/org/opensearch/ml/common/dataframe/FloatValueTest.java
@@ -6,9 +6,7 @@
 package org.opensearch.ml.common.dataframe;
 
 import org.junit.Test;
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -30,11 +28,11 @@ public void floatValue() {
  @Test
  public void testToXContent() throws IOException {
  FloatValue floatValue = new FloatValue(2.1f);
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  floatValue.toXContent(builder);
 
  assertNotNull(builder);
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
  assertEquals("{\"column_type\":\"FLOAT\",\"value\":2.1}", jsonStr);
  }
-}
+}
diff --git a/common/src/test/java/org/opensearch/ml/common/dataframe/IntValueTest.java b/common/src/test/java/org/opensearch/ml/common/dataframe/IntValueTest.java
@@ -6,9 +6,7 @@
 package org.opensearch.ml.common.dataframe;
 
 import org.junit.Test;
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -29,11 +27,11 @@ public void intValue() {
  @Test
  public void testToXContent() throws IOException {
  IntValue intValue = new IntValue(2);
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  intValue.toXContent(builder);
 
  assertNotNull(builder);
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
  assertEquals("{\"column_type\":\"INTEGER\",\"value\":2}", jsonStr);
  }
-}
+}
diff --git a/common/src/test/java/org/opensearch/ml/common/dataframe/LongValueTest.java b/common/src/test/java/org/opensearch/ml/common/dataframe/LongValueTest.java
@@ -6,9 +6,7 @@
 package org.opensearch.ml.common.dataframe;
 
 import org.junit.Test;
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -29,11 +27,11 @@ public void longValue() {
  @Test
  public void testToXContent() throws IOException {
  LongValue longValue = new LongValue((long)2);
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  longValue.toXContent(builder);
 
  assertNotNull(builder);
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
  assertEquals("{\"column_type\":\"LONG\",\"value\":2}", jsonStr);
  }
 }
diff --git a/common/src/test/java/org/opensearch/ml/common/dataframe/NullValueTest.java b/common/src/test/java/org/opensearch/ml/common/dataframe/NullValueTest.java
@@ -6,9 +6,7 @@
 package org.opensearch.ml.common.dataframe;
 
 import org.junit.Test;
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 
@@ -30,11 +28,11 @@ public void getValue() {
  @Test
  public void testToXContent() throws IOException {
  NullValue value = new NullValue();
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  value.toXContent(builder, ToXContent.EMPTY_PARAMS);
 
  assertNotNull(builder);
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
  assertEquals("{\"column_type\":\"NULL\"}", jsonStr);
  }
-}
+}
diff --git a/common/src/test/java/org/opensearch/ml/common/dataframe/RowTest.java b/common/src/test/java/org/opensearch/ml/common/dataframe/RowTest.java
@@ -13,10 +13,8 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 
@@ -133,11 +131,11 @@ public void select() {
 
  @Test
  public void testToXContent() throws IOException {
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  row.toXContent(builder);
 
  assertNotNull(builder);
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
 
  assertEquals("{\"values\":[{\"column_type\":\"INTEGER\",\"value\":0}]}", jsonStr);
  }
@@ -248,4 +246,4 @@ public void testEquals_SomeTypeNotMatch() {
  assertFalse(row1.equals(row2));
  }
 
-}
+}
diff --git a/common/src/test/java/org/opensearch/ml/common/dataframe/ShortValueTest.java b/common/src/test/java/org/opensearch/ml/common/dataframe/ShortValueTest.java
@@ -6,9 +6,7 @@
 package org.opensearch.ml.common.dataframe;
 
 import org.junit.Test;
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -29,11 +27,11 @@ public void shortValue() {
  @Test
  public void testToXContent() throws IOException {
  ShortValue shortValue = new ShortValue((short)2);
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  shortValue.toXContent(builder);
 
  assertNotNull(builder);
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
  assertEquals("{\"column_type\":\"SHORT\",\"value\":2}", jsonStr);
  }
 }
diff --git a/common/src/test/java/org/opensearch/ml/common/dataframe/StringValueTest.java b/common/src/test/java/org/opensearch/ml/common/dataframe/StringValueTest.java
@@ -6,9 +6,7 @@
 package org.opensearch.ml.common.dataframe;
 
 import org.junit.Test;
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 
@@ -34,11 +32,11 @@ public void stringValue_NullPointerException() {
  @Test
  public void testToXContent() throws IOException {
  StringValue value = new StringValue("str");
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  value.toXContent(builder, ToXContent.EMPTY_PARAMS);
 
  assertNotNull(builder);
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
  assertEquals("{\"column_type\":\"STRING\",\"value\":\"str\"}", jsonStr);
  }
-}
+}
diff --git a/common/src/test/java/org/opensearch/ml/common/input/MLInputTest.java b/common/src/test/java/org/opensearch/ml/common/input/MLInputTest.java
@@ -10,7 +10,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.common.settings.Settings;
@@ -150,10 +149,10 @@ public void parse_TextEmbedding_NullResultFilter() throws IOException {
 
  private void testParse(FunctionName algorithm, MLInputDataset inputDataset, String expectedInputStr, Consumer<MLInput> verify) throws IOException {
  MLInput input = MLInput.builder().inputDataset(inputDataset).algorithm(algorithm).build();
- XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+ XContentBuilder builder = XContentFactory.jsonBuilder();
  input.toXContent(builder, ToXContent.EMPTY_PARAMS);
  assertNotNull(builder);
- String jsonStr = Strings.toString(builder);
+ String jsonStr = builder.toString();
  assertEquals(expectedInputStr, jsonStr);
 
  XContentParser parser = XContentType.JSON.xContent().createParser(new NamedXContentRegistry(new SearchModule(Settings.EMPTY,