From 806755fc1759543bbb0d997679d391afcf30ae14 Mon Sep 17 00:00:00 2001 From: Heemin Kim Date: Thu, 13 Jul 2023 13:58:12 -0700 Subject: [PATCH] Update packages according to a change in OpenSearch core (#353) Signed-off-by: Heemin Kim --- .../java/org/opensearch/geospatial/GeospatialParser.java | 2 +- .../geospatial/action/upload/geojson/PipelineManager.java | 2 +- .../action/upload/geojson/UploadGeoJSONRequest.java | 6 +++--- .../action/upload/geojson/UploadGeoJSONResponse.java | 4 ++-- .../geospatial/index/query/xyshape/XYShapeQueryBuilder.java | 2 +- .../org/opensearch/geospatial/plugin/GeospatialPlugin.java | 2 +- .../rest/action/upload/geojson/RestUploadGeoJSONAction.java | 2 +- .../search/aggregations/bucket/geogrid/GeoHexGrid.java | 2 +- .../bucket/geogrid/GeoHexGridAggregationBuilder.java | 2 +- .../aggregations/bucket/geogrid/GeoHexGridBucket.java | 2 +- .../opensearch/geospatial/stats/upload/UploadMetric.java | 6 +++--- .../org/opensearch/geospatial/stats/upload/UploadStats.java | 6 +++--- .../geospatial/stats/upload/UploadStatsNodeRequest.java | 4 ++-- .../geospatial/stats/upload/UploadStatsNodeResponse.java | 4 ++-- .../geospatial/stats/upload/UploadStatsRequest.java | 2 +- .../geospatial/stats/upload/UploadStatsResponse.java | 6 +++--- .../geospatial/stats/upload/UploadStatsTransportAction.java | 2 +- .../org/opensearch/geospatial/GeospatialParserTests.java | 2 +- .../org/opensearch/geospatial/GeospatialRestTestCase.java | 2 +- .../org/opensearch/geospatial/GeospatialTestHelper.java | 2 +- .../action/upload/geojson/UploadGeoJSONRequestTests.java | 4 ++-- .../geospatial/index/mapper/xypoint/XYPointParserTests.java | 2 +- .../index/query/xyshape/XYShapeQueryBuilderTests.java | 2 +- .../opensearch/geospatial/plugin/GeospatialPluginIT.java | 2 +- .../opensearch/geospatial/processor/FeatureProcessorIT.java | 2 +- .../action/upload/geojson/RestUploadGeoJSONActionIT.java | 2 +- .../geospatial/stats/upload/RestUploadStatsActionIT.java | 2 +- .../geospatial/stats/upload/UploadMetricTests.java | 2 +- .../stats/upload/UploadStatsNodeResponseTests.java | 2 +- .../geospatial/stats/upload/UploadStatsResponseTests.java | 2 +- .../geospatial/stats/upload/UploadStatsTests.java | 2 +- 31 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/main/java/org/opensearch/geospatial/GeospatialParser.java b/src/main/java/org/opensearch/geospatial/GeospatialParser.java index d0d791d097..04c81efde5 100644 --- a/src/main/java/org/opensearch/geospatial/GeospatialParser.java +++ b/src/main/java/org/opensearch/geospatial/GeospatialParser.java @@ -13,9 +13,9 @@ import java.util.Map; import java.util.Objects; -import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.geospatial.geojson.Feature; import org.opensearch.geospatial.geojson.FeatureCollection; diff --git a/src/main/java/org/opensearch/geospatial/action/upload/geojson/PipelineManager.java b/src/main/java/org/opensearch/geospatial/action/upload/geojson/PipelineManager.java index 0913685046..4a48598367 100644 --- a/src/main/java/org/opensearch/geospatial/action/upload/geojson/PipelineManager.java +++ b/src/main/java/org/opensearch/geospatial/action/upload/geojson/PipelineManager.java @@ -18,9 +18,9 @@ import org.opensearch.action.ingest.PutPipelineRequest; import org.opensearch.client.ClusterAdminClient; import org.opensearch.common.UUIDs; -import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.geospatial.processor.FeatureProcessor; import org.opensearch.ingest.Pipeline; diff --git a/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequest.java b/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequest.java index 8bc8df5c58..fc05a2ae4c 100644 --- a/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequest.java +++ b/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequest.java @@ -20,9 +20,9 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; -import org.opensearch.common.bytes.BytesReference; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.io.stream.StreamOutput; +import org.opensearch.core.common.bytes.BytesReference; +import org.opensearch.core.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamOutput; import org.opensearch.rest.RestRequest; @AllArgsConstructor diff --git a/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONResponse.java b/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONResponse.java index 6870753179..f1cd8616f0 100644 --- a/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONResponse.java +++ b/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONResponse.java @@ -13,8 +13,8 @@ import org.opensearch.action.ActionResponse; import org.opensearch.action.bulk.BulkItemResponse; import org.opensearch.action.bulk.BulkResponse; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.io.stream.StreamOutput; +import org.opensearch.core.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamOutput; import org.opensearch.core.xcontent.ToXContentObject; import org.opensearch.core.xcontent.XContentBuilder; diff --git a/src/main/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilder.java b/src/main/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilder.java index 433b361dae..f1221a4ac4 100644 --- a/src/main/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilder.java +++ b/src/main/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilder.java @@ -13,7 +13,7 @@ import org.apache.lucene.search.ConstantScoreQuery; import org.apache.lucene.search.Query; import org.opensearch.common.geo.parsers.ShapeParser; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.core.xcontent.XContentParser; import org.opensearch.geometry.Geometry; diff --git a/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java b/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java index 1d2ab65ca8..085bbf9275 100644 --- a/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java +++ b/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java @@ -17,11 +17,11 @@ import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.collect.MapBuilder; -import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.IndexScopedSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.SettingsFilter; +import org.opensearch.core.common.io.stream.NamedWriteableRegistry; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.env.Environment; import org.opensearch.env.NodeEnvironment; diff --git a/src/main/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONAction.java b/src/main/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONAction.java index 5f211e3138..4e4034d0ce 100644 --- a/src/main/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONAction.java +++ b/src/main/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONAction.java @@ -13,9 +13,9 @@ import java.util.List; import org.opensearch.client.node.NodeClient; -import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.collect.Tuple; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.geospatial.action.upload.geojson.UploadGeoJSONAction; import org.opensearch.geospatial.action.upload.geojson.UploadGeoJSONRequest; import org.opensearch.rest.BaseRestHandler; diff --git a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGrid.java b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGrid.java index 9b336f86da..6199d016fc 100644 --- a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGrid.java +++ b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGrid.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.geo.search.aggregations.bucket.geogrid.BaseGeoGrid; import org.opensearch.geo.search.aggregations.bucket.geogrid.BaseGeoGridBucket; import org.opensearch.search.aggregations.InternalAggregations; diff --git a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridAggregationBuilder.java b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridAggregationBuilder.java index 0a640cf690..018be48e08 100644 --- a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridAggregationBuilder.java +++ b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridAggregationBuilder.java @@ -12,8 +12,8 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.common.geo.GeoBoundingBox; -import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.xcontent.support.XContentMapValues; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.core.xcontent.ObjectParser; import org.opensearch.core.xcontent.XContentParser; import org.opensearch.geo.search.aggregations.bucket.geogrid.GeoGridAggregationBuilder; diff --git a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridBucket.java b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridBucket.java index 29c5b80ae8..40c7bdc95c 100644 --- a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridBucket.java +++ b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridBucket.java @@ -9,7 +9,7 @@ import java.io.IOException; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.geo.search.aggregations.bucket.geogrid.BaseGeoGridBucket; import org.opensearch.geospatial.h3.H3; import org.opensearch.search.aggregations.InternalAggregations; diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadMetric.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadMetric.java index 2dacef5227..9f8b8e58df 100644 --- 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.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.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamOutput; +import org.opensearch.core.common.io.stream.Writeable; import org.opensearch.core.xcontent.ToXContentFragment; import org.opensearch.core.xcontent.XContentBuilder; diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStats.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStats.java index cd4224e978..c2afd22be9 100644 --- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStats.java +++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStats.java @@ -12,10 +12,10 @@ import java.util.Objects; import java.util.Set; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.io.stream.StreamOutput; -import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.metrics.CounterMetric; +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.core.xcontent.ToXContentObject; import org.opensearch.core.xcontent.XContentBuilder; diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeRequest.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeRequest.java index 47abf9ef1e..e18f61957c 100644 --- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeRequest.java +++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeRequest.java @@ -7,8 +7,8 @@ import java.io.IOException; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.io.stream.StreamOutput; +import org.opensearch.core.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamOutput; import org.opensearch.transport.TransportRequest; public class UploadStatsNodeRequest extends TransportRequest { diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponse.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponse.java index 8b6907d7cc..3baa29a194 100644 --- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponse.java +++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponse.java @@ -10,8 +10,8 @@ import org.opensearch.action.support.nodes.BaseNodeResponse; import org.opensearch.cluster.node.DiscoveryNode; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.io.stream.StreamOutput; +import org.opensearch.core.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamOutput; import org.opensearch.core.xcontent.ToXContentObject; import org.opensearch.core.xcontent.XContentBuilder; diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsRequest.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsRequest.java index 9bcacc994c..5c3efa9de7 100644 --- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsRequest.java +++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsRequest.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.opensearch.action.support.nodes.BaseNodesRequest; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; public class UploadStatsRequest extends BaseNodesRequest { diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsResponse.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsResponse.java index a8b9b67459..c8f0fe764b 100644 --- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsResponse.java +++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsResponse.java @@ -14,9 +14,9 @@ import org.opensearch.action.FailedNodeException; import org.opensearch.action.support.nodes.BaseNodesResponse; import org.opensearch.cluster.ClusterName; -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.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamOutput; +import org.opensearch.core.common.io.stream.Writeable; import org.opensearch.core.xcontent.ToXContentObject; import org.opensearch.core.xcontent.XContentBuilder; diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsTransportAction.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsTransportAction.java index 5caa3ac0df..869eecb449 100644 --- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsTransportAction.java +++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsTransportAction.java @@ -13,7 +13,7 @@ import org.opensearch.action.support.nodes.TransportNodesAction; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; diff --git a/src/test/java/org/opensearch/geospatial/GeospatialParserTests.java b/src/test/java/org/opensearch/geospatial/GeospatialParserTests.java index 71c86382a6..d7de97b93e 100644 --- a/src/test/java/org/opensearch/geospatial/GeospatialParserTests.java +++ b/src/test/java/org/opensearch/geospatial/GeospatialParserTests.java @@ -12,7 +12,7 @@ import org.json.JSONArray; import org.json.JSONObject; -import org.opensearch.common.bytes.BytesArray; +import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.geospatial.geojson.Feature; import org.opensearch.test.OpenSearchTestCase; diff --git a/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java b/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java index e787fc7e6b..1e5c1439ab 100644 --- a/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java +++ b/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java @@ -41,6 +41,7 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.core.common.Strings; +import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.geometry.Geometry; import org.opensearch.geospatial.action.upload.geojson.UploadGeoJSONRequestContent; @@ -49,7 +50,6 @@ import org.opensearch.geospatial.processor.FeatureProcessor; import org.opensearch.geospatial.rest.action.upload.geojson.RestUploadGeoJSONAction; import org.opensearch.ingest.Pipeline; -import org.opensearch.rest.RestStatus; public abstract class GeospatialRestTestCase extends OpenSearchSecureRestTestCase { diff --git a/src/test/java/org/opensearch/geospatial/GeospatialTestHelper.java b/src/test/java/org/opensearch/geospatial/GeospatialTestHelper.java index bc3d28a667..9f455a1e8c 100644 --- a/src/test/java/org/opensearch/geospatial/GeospatialTestHelper.java +++ b/src/test/java/org/opensearch/geospatial/GeospatialTestHelper.java @@ -39,11 +39,11 @@ import org.opensearch.common.Randomness; import org.opensearch.common.UUIDs; import org.opensearch.common.collect.Tuple; +import org.opensearch.core.index.shard.ShardId; import org.opensearch.geospatial.action.upload.geojson.ContentBuilder; import org.opensearch.geospatial.action.upload.geojson.UploadGeoJSONRequestContent; import org.opensearch.geospatial.h3.H3; import org.opensearch.geospatial.stats.upload.UploadMetric; -import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.RandomObjects; diff --git a/src/test/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequestTests.java b/src/test/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequestTests.java index d973192a6d..0a591f2c75 100644 --- a/src/test/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequestTests.java +++ b/src/test/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequestTests.java @@ -13,9 +13,9 @@ import java.nio.charset.StandardCharsets; import org.json.JSONObject; -import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.bytes.BytesArray; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.rest.RestRequest; import org.opensearch.test.OpenSearchTestCase; diff --git a/src/test/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointParserTests.java b/src/test/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointParserTests.java index 6f322e9fc9..b7d8c97e9b 100644 --- a/src/test/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointParserTests.java +++ b/src/test/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointParserTests.java @@ -10,8 +10,8 @@ import java.io.IOException; import org.opensearch.OpenSearchParseException; -import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.json.JsonXContent; +import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.core.xcontent.XContentParser; import org.opensearch.test.OpenSearchTestCase; diff --git a/src/test/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilderTests.java b/src/test/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilderTests.java index e128f79721..6010386696 100644 --- a/src/test/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilderTests.java +++ b/src/test/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilderTests.java @@ -28,12 +28,12 @@ import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; import org.opensearch.common.Strings; -import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.geo.GeoJson; import org.opensearch.common.geo.ShapeRelation; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.xcontent.XContentFactory; +import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.core.xcontent.XContentParser; import org.opensearch.geometry.Geometry; diff --git a/src/test/java/org/opensearch/geospatial/plugin/GeospatialPluginIT.java b/src/test/java/org/opensearch/geospatial/plugin/GeospatialPluginIT.java index daf9b913e6..e28372dcb1 100644 --- a/src/test/java/org/opensearch/geospatial/plugin/GeospatialPluginIT.java +++ b/src/test/java/org/opensearch/geospatial/plugin/GeospatialPluginIT.java @@ -8,8 +8,8 @@ import org.apache.hc.core5.http.io.entity.EntityUtils; import org.opensearch.client.Request; import org.opensearch.client.Response; +import org.opensearch.core.rest.RestStatus; import org.opensearch.geospatial.GeospatialRestTestCase; -import org.opensearch.rest.RestStatus; public class GeospatialPluginIT extends GeospatialRestTestCase { diff --git a/src/test/java/org/opensearch/geospatial/processor/FeatureProcessorIT.java b/src/test/java/org/opensearch/geospatial/processor/FeatureProcessorIT.java index 8e256aaed8..585f8628d2 100644 --- a/src/test/java/org/opensearch/geospatial/processor/FeatureProcessorIT.java +++ b/src/test/java/org/opensearch/geospatial/processor/FeatureProcessorIT.java @@ -21,8 +21,8 @@ import org.opensearch.client.Request; import org.opensearch.client.Response; import org.opensearch.common.settings.Settings; +import org.opensearch.core.rest.RestStatus; import org.opensearch.geospatial.GeospatialRestTestCase; -import org.opensearch.rest.RestStatus; public class FeatureProcessorIT extends GeospatialRestTestCase { diff --git a/src/test/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONActionIT.java b/src/test/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONActionIT.java index 53d12c849f..167536e807 100644 --- a/src/test/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONActionIT.java +++ b/src/test/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONActionIT.java @@ -21,8 +21,8 @@ import org.opensearch.client.Response; import org.opensearch.client.ResponseException; import org.opensearch.common.settings.Settings; +import org.opensearch.core.rest.RestStatus; import org.opensearch.geospatial.GeospatialRestTestCase; -import org.opensearch.rest.RestStatus; public class RestUploadGeoJSONActionIT extends GeospatialRestTestCase { diff --git a/src/test/java/org/opensearch/geospatial/stats/upload/RestUploadStatsActionIT.java b/src/test/java/org/opensearch/geospatial/stats/upload/RestUploadStatsActionIT.java index 303e7ccff4..86d4168edf 100644 --- a/src/test/java/org/opensearch/geospatial/stats/upload/RestUploadStatsActionIT.java +++ b/src/test/java/org/opensearch/geospatial/stats/upload/RestUploadStatsActionIT.java @@ -12,8 +12,8 @@ import org.apache.hc.core5.http.io.entity.EntityUtils; import org.opensearch.client.Request; import org.opensearch.client.Response; +import org.opensearch.core.rest.RestStatus; import org.opensearch.geospatial.GeospatialRestTestCase; -import org.opensearch.rest.RestStatus; public class RestUploadStatsActionIT extends GeospatialRestTestCase { diff --git a/src/test/java/org/opensearch/geospatial/stats/upload/UploadMetricTests.java b/src/test/java/org/opensearch/geospatial/stats/upload/UploadMetricTests.java index 4a6599f7e7..c69ca8e36c 100644 --- a/src/test/java/org/opensearch/geospatial/stats/upload/UploadMetricTests.java +++ b/src/test/java/org/opensearch/geospatial/stats/upload/UploadMetricTests.java @@ -13,8 +13,8 @@ import org.opensearch.common.Strings; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.geospatial.GeospatialTestHelper; import org.opensearch.test.OpenSearchTestCase; diff --git a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponseTests.java b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponseTests.java index e453f03bd9..76b9587ec0 100644 --- a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponseTests.java +++ b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponseTests.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.geospatial.GeospatialTestHelper; import org.opensearch.test.OpenSearchTestCase; diff --git a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsResponseTests.java b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsResponseTests.java index ab22bc5dfa..e6fec0aa4f 100644 --- a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsResponseTests.java +++ b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsResponseTests.java @@ -20,8 +20,8 @@ import org.opensearch.cluster.ClusterName; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.xcontent.XContentFactory; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.core.xcontent.ToXContent; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.test.OpenSearchTestCase; diff --git a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsTests.java b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsTests.java index baa4ff7762..4177d5e472 100644 --- a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsTests.java +++ b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsTests.java @@ -15,8 +15,8 @@ import org.opensearch.common.Strings; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.xcontent.XContentFactory; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.core.xcontent.ToXContent; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.geospatial.GeospatialTestHelper;