[Backport 2.x] Keep up with refactors in core -- Strings class (#1812)

opensearch-trigger-bot[bot] · Max Ksyunz · MaxKsyunz · web-flow · commit fa82bae1360e · 2023-07-07T12:42:11.000-07:00
* Updating imports to reflect changes in opensearch core. (#1645) Signed-off-by: MaxKsyunz <maxk@bitquilltech.com> (cherry picked from commit 8e5d766) Signed-off-by: Max Ksyunz <max.ksyunz@improving.com> * Forcing httpclient to 4.5.14 Signed-off-by: Max Ksyunz <max.ksyunz@improving.com> --------- Signed-off-by: MaxKsyunz <maxk@bitquilltech.com> Signed-off-by: Max Ksyunz <max.ksyunz@improving.com> Co-authored-by: Max Ksyunz <maxk@bitquilltech.com> Co-authored-by: Max Ksyunz <max.ksyunz@improving.com>
diff --git a/integ-test/build.gradle b/integ-test/build.gradle
@@ -77,6 +77,7 @@ configurations.all {
     resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
     resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.9.3"
     resolutionStrategy.force "org.apache.httpcomponents:httpcore:4.4.13"
+    resolutionStrategy.force "org.apache.httpcomponents:httpclient:4.5.14"
     resolutionStrategy.force "joda-time:joda-time:2.10.12"
     resolutionStrategy.force "org.slf4j:slf4j-api:1.7.36"
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/RestIntegTestCase.java b/integ-test/src/test/java/org/opensearch/sql/legacy/RestIntegTestCase.java
@@ -6,6 +6,7 @@
 
 package org.opensearch.sql.legacy;
 
+import static org.opensearch.core.common.Strings.isNullOrEmpty;
 import static org.opensearch.sql.legacy.TestUtils.createIndexByRestClient;
 import static org.opensearch.sql.legacy.TestUtils.getAccountIndexMapping;
 import static org.opensearch.sql.legacy.TestUtils.getBankIndexMapping;
@@ -98,7 +99,7 @@ public static void dumpCoverage() {
     // jacoco.dir is set in sqlplugin-coverage.gradle, if it doesn't exist we don't
     // want to collect coverage so we can return early
     String jacocoBuildPath = System.getProperty("jacoco.dir");
-    if (Strings.isNullOrEmpty(jacocoBuildPath)) {
+    if (isNullOrEmpty(jacocoBuildPath)) {
       return;
     }
 
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Paramer.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Paramer.java
@@ -14,7 +14,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.index.query.MatchPhraseQueryBuilder;
 import org.opensearch.index.query.MatchQueryBuilder;
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/PrettyFormatRestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/PrettyFormatRestExecutor.java
@@ -12,7 +12,7 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.Client;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestChannel;
 import org.opensearch.rest.RestStatus;
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java
@@ -31,8 +31,8 @@
 import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
 import org.opensearch.action.search.ClearScrollResponse;
 import org.opensearch.client.Client;
-import org.opensearch.common.Strings;
 import org.opensearch.common.document.DocumentField;
+import org.opensearch.core.common.Strings;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 import org.opensearch.search.aggregations.Aggregation;
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/AggMaker.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/AggMaker.java
@@ -19,10 +19,10 @@
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
 import org.opensearch.common.xcontent.json.JsonXContent;
 import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.geo.search.aggregations.bucket.geogrid.GeoHashGridAggregationBuilder;
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -106,7 +106,7 @@ configurations.all {
     resolutionStrategy.force "joda-time:joda-time:2.10.12"
     resolutionStrategy.force "org.slf4j:slf4j-api:1.7.36"
     resolutionStrategy.force "org.apache.httpcomponents:httpcore:4.4.15"
-    resolutionStrategy.force "org.apache.httpcomponents:httpclient:4.5.13"
+    resolutionStrategy.force "org.apache.httpcomponents:httpclient:4.5.14"
 }
 compileJava {
     options.compilerArgs.addAll(["-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor'])

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ configurations.all {`
`77`	`77`	`resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"`
`78`	`78`	`resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.9.3"`
`79`	`79`	`resolutionStrategy.force "org.apache.httpcomponents:httpcore:4.4.13"`
	`80`	`+ resolutionStrategy.force "org.apache.httpcomponents:httpclient:4.5.14"`
`80`	`81`	`resolutionStrategy.force "joda-time:joda-time:2.10.12"`
`81`	`82`	`resolutionStrategy.force "org.slf4j:slf4j-api:1.7.36"`
`82`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ configurations.all {`
`106`	`106`	`resolutionStrategy.force "joda-time:joda-time:2.10.12"`
`107`	`107`	`resolutionStrategy.force "org.slf4j:slf4j-api:1.7.36"`
`108`	`108`	`resolutionStrategy.force "org.apache.httpcomponents:httpcore:4.4.15"`
`109`		`- resolutionStrategy.force "org.apache.httpcomponents:httpclient:4.5.13"`
	`109`	`+ resolutionStrategy.force "org.apache.httpcomponents:httpclient:4.5.14"`
`110`	`110`	`}`
`111`	`111`	`compileJava {`
`112`	`112`	`options.compilerArgs.addAll(["-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor'])`