Change package for Strings.hasText (#314)

Signed-off-by: Heemin Kim <[email protected]>
opensearch-project · May 19, 2023 · 55e7798 · 55e7798
1 parent 7ee2f13
commit 55e7798
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,4 +21,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 * Exclude lombok generated code from jacoco coverage report ([#268](https://github.com/opensearch-project/geospatial/pull/268))
 ### Documentation
 ### Maintenance
+* Change package for Strings.hasText ([#314](https://github.com/opensearch-project/geospatial/pull/314))
 ### Refactoring
diff --git a/src/main/java/org/opensearch/geospatial/action/upload/geojson/ContentBuilder.java b/src/main/java/org/opensearch/geospatial/action/upload/geojson/ContentBuilder.java
@@ -14,7 +14,7 @@
 import org.opensearch.action.index.IndexRequestBuilder;
 import org.opensearch.action.support.WriteRequest;
 import org.opensearch.client.Client;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.geospatial.GeospatialParser;
 
 /**

diff --git a/...ain/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequestContent.java b/...ain/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequestContent.java
@@ -15,8 +15,8 @@
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 
-import org.opensearch.common.Strings;
 import org.opensearch.core.ParseField;
+import org.opensearch.core.common.Strings;
 import org.opensearch.geospatial.GeospatialParser;
 
 /**

diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadMetric.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadMetric.java
@@ -11,10 +11,10 @@
 
 import lombok.Getter;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
 

diff --git a/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java b/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java
@@ -33,14 +33,14 @@
 import org.opensearch.client.Request;
 import org.opensearch.client.Response;
 import org.opensearch.common.CheckedConsumer;
-import org.opensearch.common.Strings;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.geo.GeoJson;
 import org.opensearch.common.geo.ShapeRelation;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.common.xcontent.json.JsonXContent;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.geometry.Geometry;
 import org.opensearch.geospatial.action.upload.geojson.UploadGeoJSONRequestContent;
@@ -87,7 +87,7 @@ protected static void createPipeline(String name, Optional<String> description,
         builder.endObject();
 
         Request request = new Request("PUT", buildPipelinePath(name));
-        request.setJsonEntity(Strings.toString(builder));
+        request.setJsonEntity(org.opensearch.common.Strings.toString(builder));
         client().performRequest(request);
     }
 
@@ -102,7 +102,7 @@ protected static void createIndex(String name, Settings settings, Map<String, St
             xContentBuilder.startObject(entry.getKey()).field(FIELD_TYPE_KEY, entry.getValue()).endObject();
         }
         xContentBuilder.endObject().endObject();
-        String mapping = Strings.toString(xContentBuilder);
+        String mapping = org.opensearch.common.Strings.toString(xContentBuilder);
         createIndex(name, settings, mapping.substring(1, mapping.length() - 1));
     }
 
@@ -249,7 +249,7 @@ public String buildContentAsString(CheckedConsumer<XContentBuilder, IOException>
         XContentBuilder builder = JsonXContent.contentBuilder().startObject();
         build.accept(builder);
         builder.endObject();
-        return Strings.toString(builder);
+        return org.opensearch.common.Strings.toString(builder);
     }
 
     public String buildSearchAggregationsBodyAsString(CheckedConsumer<XContentBuilder, IOException> aggregationsBuilder)