From 80ba3e5cd0cba856e6f7d1cc8e3013ec1a97421c Mon Sep 17 00:00:00 2001 From: Vijayan Balasubramanian Date: Tue, 21 Feb 2023 17:31:35 -0800 Subject: [PATCH] Fix upstream refactor changes XContent is moved from common to core Signed-off-by: Vijayan Balasubramanian --- .../geospatial/action/upload/geojson/IndexManager.java | 2 +- .../geospatial/action/upload/geojson/PipelineManager.java | 2 +- .../upload/geojson/UploadGeoJSONRequestContent.java | 2 +- .../action/upload/geojson/UploadGeoJSONResponse.java | 4 ++-- .../geospatial/index/mapper/xypoint/XYPoint.java | 4 ++-- .../geospatial/index/mapper/xypoint/XYPointParser.java | 8 ++++---- .../index/query/xyshape/XYShapeQueryBuilder.java | 4 ++-- .../opensearch/geospatial/plugin/GeospatialPlugin.java | 2 +- .../bucket/geogrid/GeoHexGridAggregationBuilder.java | 4 ++-- .../aggregations/bucket/geogrid/ParsedGeoHexGrid.java | 4 ++-- .../bucket/geogrid/ParsedGeoHexGridBucket.java | 2 +- .../geospatial/stats/upload/TotalUploadStats.java | 4 ++-- .../opensearch/geospatial/stats/upload/UploadMetric.java | 4 ++-- .../opensearch/geospatial/stats/upload/UploadStats.java | 4 ++-- .../geospatial/stats/upload/UploadStatsNodeResponse.java | 4 ++-- .../geospatial/stats/upload/UploadStatsResponse.java | 4 ++-- .../geospatial/stats/upload/UploadStatsService.java | 4 ++-- .../org/opensearch/geospatial/GeospatialRestTestCase.java | 4 ++-- .../geospatial/OpenSearchSecureRestTestCase.java | 6 +++--- .../index/mapper/xypoint/XYPointFieldMapperTests.java | 2 +- .../index/mapper/xypoint/XYPointParserTests.java | 4 ++-- .../index/mapper/xyshape/XYShapeFieldMapperTests.java | 2 +- .../index/query/xyshape/XYShapeQueryBuilderTests.java | 4 ++-- .../geospatial/index/query/xyshape/XYShapeQueryIT.java | 2 +- .../aggregations/bucket/geogrid/GeoHexAggregationIT.java | 6 +++--- .../bucket/geogrid/GeoHexGridParserTests.java | 4 ++-- .../aggregations/bucket/geogrid/GeoHexGridTests.java | 6 +++--- .../geospatial/stats/upload/TotalUploadStatsTests.java | 4 ++-- .../geospatial/stats/upload/UploadStatsResponseTests.java | 4 ++-- .../geospatial/stats/upload/UploadStatsServiceTests.java | 4 ++-- .../geospatial/stats/upload/UploadStatsTests.java | 4 ++-- 31 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/main/java/org/opensearch/geospatial/action/upload/geojson/IndexManager.java b/src/main/java/org/opensearch/geospatial/action/upload/geojson/IndexManager.java index 96bc0252..2ea24878 100644 --- a/src/main/java/org/opensearch/geospatial/action/upload/geojson/IndexManager.java +++ b/src/main/java/org/opensearch/geospatial/action/upload/geojson/IndexManager.java @@ -17,8 +17,8 @@ import org.opensearch.action.StepListener; import org.opensearch.action.admin.indices.create.CreateIndexRequest; import org.opensearch.client.IndicesAdminClient; -import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; +import org.opensearch.core.xcontent.XContentBuilder; /** * IndexManager is responsible for managing index operations like create, delete, etc... 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 d0df6c89..09136850 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 @@ -19,9 +19,9 @@ import org.opensearch.client.ClusterAdminClient; import org.opensearch.common.UUIDs; import org.opensearch.common.bytes.BytesReference; -import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; +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/UploadGeoJSONRequestContent.java b/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequestContent.java index f5a7e7ef..0bcde2ab 100644 --- a/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequestContent.java +++ b/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequestContent.java @@ -15,8 +15,8 @@ import lombok.AccessLevel; import lombok.AllArgsConstructor; -import org.opensearch.common.ParseField; import org.opensearch.common.Strings; +import org.opensearch.core.ParseField; import org.opensearch.geospatial.GeospatialParser; /** 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 868312eb..68707531 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 @@ -15,8 +15,8 @@ import org.opensearch.action.bulk.BulkResponse; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.opensearch.common.xcontent.ToXContentObject; -import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.ToXContentObject; +import org.opensearch.core.xcontent.XContentBuilder; //UploadGeoJSONResponse represents UploadGeoJSONRequest's Response public class UploadGeoJSONResponse extends ActionResponse implements ToXContentObject { diff --git a/src/main/java/org/opensearch/geospatial/index/mapper/xypoint/XYPoint.java b/src/main/java/org/opensearch/geospatial/index/mapper/xypoint/XYPoint.java index cc06be1d..6b771271 100644 --- a/src/main/java/org/opensearch/geospatial/index/mapper/xypoint/XYPoint.java +++ b/src/main/java/org/opensearch/geospatial/index/mapper/xypoint/XYPoint.java @@ -16,8 +16,8 @@ import lombok.NoArgsConstructor; import org.opensearch.OpenSearchParseException; -import org.opensearch.common.xcontent.ToXContentFragment; -import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.ToXContentFragment; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.geometry.Geometry; import org.opensearch.geometry.Point; import org.opensearch.geometry.ShapeType; diff --git a/src/main/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointParser.java b/src/main/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointParser.java index cffcf2c5..19653e0e 100644 --- a/src/main/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointParser.java +++ b/src/main/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointParser.java @@ -13,10 +13,10 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.common.xcontent.LoggingDeprecationHandler; -import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.opensearch.common.xcontent.XContentParser; -import org.opensearch.common.xcontent.XContentSubParser; -import org.opensearch.common.xcontent.support.MapXContentParser; +import org.opensearch.core.xcontent.MapXContentParser; +import org.opensearch.core.xcontent.NamedXContentRegistry; +import org.opensearch.core.xcontent.XContentParser; +import org.opensearch.core.xcontent.XContentSubParser; import org.opensearch.geometry.ShapeType; /** 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 e6c40fe4..433b361d 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 @@ -14,8 +14,8 @@ import org.apache.lucene.search.Query; import org.opensearch.common.geo.parsers.ShapeParser; import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.xcontent.XContentBuilder; -import org.opensearch.common.xcontent.XContentParser; +import org.opensearch.core.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.XContentParser; import org.opensearch.geometry.Geometry; import org.opensearch.geospatial.index.mapper.xyshape.XYShapeQueryable; import org.opensearch.index.mapper.MappedFieldType; diff --git a/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java b/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java index 56349622..1d2ab65c 100644 --- a/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java +++ b/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java @@ -22,7 +22,7 @@ import org.opensearch.common.settings.IndexScopedSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.SettingsFilter; -import org.opensearch.common.xcontent.NamedXContentRegistry; +import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.env.Environment; import org.opensearch.env.NodeEnvironment; import org.opensearch.geospatial.action.upload.geojson.UploadGeoJSONAction; 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 78e2777e..0a640cf6 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 @@ -13,9 +13,9 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.common.geo.GeoBoundingBox; import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.xcontent.ObjectParser; -import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.support.XContentMapValues; +import org.opensearch.core.xcontent.ObjectParser; +import org.opensearch.core.xcontent.XContentParser; import org.opensearch.geo.search.aggregations.bucket.geogrid.GeoGridAggregationBuilder; import org.opensearch.geo.search.aggregations.bucket.geogrid.GeoGridAggregatorSupplier; import org.opensearch.index.query.QueryShardContext; diff --git a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/ParsedGeoHexGrid.java b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/ParsedGeoHexGrid.java index 7e0dcda2..cb74dba0 100644 --- a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/ParsedGeoHexGrid.java +++ b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/ParsedGeoHexGrid.java @@ -9,8 +9,8 @@ import lombok.NoArgsConstructor; -import org.opensearch.common.xcontent.ObjectParser; -import org.opensearch.common.xcontent.XContentParser; +import org.opensearch.core.xcontent.ObjectParser; +import org.opensearch.core.xcontent.XContentParser; import org.opensearch.geo.search.aggregations.bucket.geogrid.ParsedGeoGrid; @NoArgsConstructor diff --git a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/ParsedGeoHexGridBucket.java b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/ParsedGeoHexGridBucket.java index 9b409f69..8fc885cb 100644 --- a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/ParsedGeoHexGridBucket.java +++ b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/ParsedGeoHexGridBucket.java @@ -10,7 +10,7 @@ import lombok.NoArgsConstructor; import org.opensearch.common.geo.GeoPoint; -import org.opensearch.common.xcontent.XContentParser; +import org.opensearch.core.xcontent.XContentParser; import org.opensearch.geo.search.aggregations.bucket.geogrid.ParsedGeoGridBucket; @NoArgsConstructor diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/TotalUploadStats.java b/src/main/java/org/opensearch/geospatial/stats/upload/TotalUploadStats.java index 466aee9a..d6427754 100644 --- a/src/main/java/org/opensearch/geospatial/stats/upload/TotalUploadStats.java +++ b/src/main/java/org/opensearch/geospatial/stats/upload/TotalUploadStats.java @@ -11,8 +11,8 @@ import java.util.Objects; import java.util.function.Function; -import org.opensearch.common.xcontent.ToXContentObject; -import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.ToXContentObject; +import org.opensearch.core.xcontent.XContentBuilder; // Holder to construct summary of Upload API Stats across all Nodes public final class TotalUploadStats implements ToXContentObject { 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 d3cbd534..0b744590 100644 --- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadMetric.java +++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadMetric.java @@ -15,8 +15,8 @@ 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.xcontent.ToXContentFragment; -import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.ToXContentFragment; +import org.opensearch.core.xcontent.XContentBuilder; /** * UploadMetric stores metric for an upload API 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 1fe855e4..cd4224e9 100644 --- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStats.java +++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStats.java @@ -16,8 +16,8 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.metrics.CounterMetric; -import org.opensearch.common.xcontent.ToXContentObject; -import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.ToXContentObject; +import org.opensearch.core.xcontent.XContentBuilder; /** * Contains the total upload stats 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 c5801cd9..8b6907d7 100644 --- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponse.java +++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponse.java @@ -12,8 +12,8 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.opensearch.common.xcontent.ToXContentObject; -import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.ToXContentObject; +import org.opensearch.core.xcontent.XContentBuilder; public class UploadStatsNodeResponse extends BaseNodeResponse implements ToXContentObject { 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 fd870193..a8b9b674 100644 --- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsResponse.java +++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsResponse.java @@ -17,8 +17,8 @@ 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.xcontent.ToXContentObject; -import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.ToXContentObject; +import org.opensearch.core.xcontent.XContentBuilder; public class UploadStatsResponse extends BaseNodesResponse implements Writeable, ToXContentObject { diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsService.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsService.java index 4657526b..95717edb 100644 --- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsService.java +++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsService.java @@ -13,8 +13,8 @@ import java.util.Objects; import java.util.stream.Collectors; -import org.opensearch.common.xcontent.ToXContentFragment; -import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.ToXContentFragment; +import org.opensearch.core.xcontent.XContentBuilder; // Service to calculate summary of upload stats and generate XContent for UploadStatsResponse public class UploadStatsService implements ToXContentFragment { diff --git a/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java b/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java index ce8367e1..4ca9cfec 100644 --- a/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java +++ b/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java @@ -6,7 +6,7 @@ package org.opensearch.geospatial; import static java.util.stream.Collectors.joining; -import static org.opensearch.common.xcontent.ToXContent.EMPTY_PARAMS; +import static org.opensearch.core.xcontent.ToXContent.EMPTY_PARAMS; import static org.opensearch.geospatial.GeospatialObjectBuilder.buildProperties; import static org.opensearch.geospatial.GeospatialObjectBuilder.randomGeoJSONFeature; import static org.opensearch.geospatial.GeospatialTestHelper.randomLowerCaseString; @@ -38,10 +38,10 @@ import org.opensearch.common.geo.GeoJson; import org.opensearch.common.geo.ShapeRelation; import org.opensearch.common.settings.Settings; -import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.geometry.Geometry; import org.opensearch.geospatial.action.upload.geojson.UploadGeoJSONRequestContent; import org.opensearch.geospatial.index.mapper.xyshape.XYShapeFieldMapper; diff --git a/src/test/java/org/opensearch/geospatial/OpenSearchSecureRestTestCase.java b/src/test/java/org/opensearch/geospatial/OpenSearchSecureRestTestCase.java index 59667296..83a07f4a 100644 --- a/src/test/java/org/opensearch/geospatial/OpenSearchSecureRestTestCase.java +++ b/src/test/java/org/opensearch/geospatial/OpenSearchSecureRestTestCase.java @@ -39,10 +39,10 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ThreadContext; -import org.opensearch.common.xcontent.DeprecationHandler; -import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.xcontent.DeprecationHandler; +import org.opensearch.core.xcontent.NamedXContentRegistry; +import org.opensearch.core.xcontent.XContentParser; import org.opensearch.test.rest.OpenSearchRestTestCase; /** diff --git a/src/test/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointFieldMapperTests.java b/src/test/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointFieldMapperTests.java index 37369572..53e5540a 100644 --- a/src/test/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointFieldMapperTests.java +++ b/src/test/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointFieldMapperTests.java @@ -11,7 +11,7 @@ import java.util.Set; import org.apache.lucene.index.IndexableField; -import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.geospatial.GeospatialTestHelper; import org.opensearch.geospatial.plugin.GeospatialPlugin; import org.opensearch.index.mapper.AbstractPointGeometryFieldMapper; 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 b0f1e2a8..6f322e9f 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 @@ -11,9 +11,9 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.common.bytes.BytesReference; -import org.opensearch.common.xcontent.XContentBuilder; -import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; +import org.opensearch.core.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.XContentParser; import org.opensearch.test.OpenSearchTestCase; public class XYPointParserTests extends OpenSearchTestCase { diff --git a/src/test/java/org/opensearch/geospatial/index/mapper/xyshape/XYShapeFieldMapperTests.java b/src/test/java/org/opensearch/geospatial/index/mapper/xyshape/XYShapeFieldMapperTests.java index 34bba616..f02c5268 100644 --- a/src/test/java/org/opensearch/geospatial/index/mapper/xyshape/XYShapeFieldMapperTests.java +++ b/src/test/java/org/opensearch/geospatial/index/mapper/xyshape/XYShapeFieldMapperTests.java @@ -14,7 +14,7 @@ import org.apache.lucene.index.IndexableField; import org.opensearch.common.geo.GeoShapeType; import org.opensearch.common.geo.builders.ShapeBuilder; -import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.geospatial.GeospatialTestHelper; import org.opensearch.geospatial.plugin.GeospatialPlugin; import org.opensearch.index.mapper.AbstractShapeGeometryFieldMapper; 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 4277f451..e128f797 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 @@ -33,9 +33,9 @@ import org.opensearch.common.geo.GeoJson; import org.opensearch.common.geo.ShapeRelation; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; -import org.opensearch.common.xcontent.XContentParser; +import org.opensearch.core.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.XContentParser; import org.opensearch.geometry.Geometry; import org.opensearch.geometry.ShapeType; import org.opensearch.geospatial.index.common.xyshape.ShapeObjectBuilder; diff --git a/src/test/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryIT.java b/src/test/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryIT.java index f1fc9189..7d126707 100644 --- a/src/test/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryIT.java +++ b/src/test/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryIT.java @@ -6,7 +6,7 @@ package org.opensearch.geospatial.index.query.xyshape; import static org.hamcrest.Matchers.equalTo; -import static org.opensearch.common.xcontent.ToXContent.EMPTY_PARAMS; +import static org.opensearch.core.xcontent.ToXContent.EMPTY_PARAMS; import static org.opensearch.geospatial.GeospatialTestHelper.randomLowerCaseString; import static org.opensearch.index.query.AbstractGeometryQueryBuilder.DEFAULT_SHAPE_FIELD_NAME; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; diff --git a/src/test/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexAggregationIT.java b/src/test/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexAggregationIT.java index 2efdea17..9926d049 100644 --- a/src/test/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexAggregationIT.java +++ b/src/test/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexAggregationIT.java @@ -24,10 +24,10 @@ import org.hamcrest.MatcherAssert; import org.opensearch.client.ResponseException; import org.opensearch.cluster.ClusterModule; -import org.opensearch.common.ParseField; import org.opensearch.common.settings.Settings; -import org.opensearch.common.xcontent.ContextParser; -import org.opensearch.common.xcontent.NamedXContentRegistry; +import org.opensearch.core.ParseField; +import org.opensearch.core.xcontent.ContextParser; +import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.geometry.Point; import org.opensearch.geospatial.GeospatialRestTestCase; import org.opensearch.geospatial.h3.H3; diff --git a/src/test/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridParserTests.java b/src/test/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridParserTests.java index fe836563..109455a9 100644 --- a/src/test/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridParserTests.java +++ b/src/test/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridParserTests.java @@ -15,9 +15,9 @@ import java.util.Locale; import org.hamcrest.MatcherAssert; -import org.opensearch.common.xcontent.XContentParseException; -import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; +import org.opensearch.core.xcontent.XContentParseException; +import org.opensearch.core.xcontent.XContentParser; import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.Rectangle; import org.opensearch.geospatial.h3.H3; diff --git a/src/test/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridTests.java b/src/test/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridTests.java index 32a248ab..9d4257ae 100644 --- a/src/test/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridTests.java +++ b/src/test/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridTests.java @@ -15,9 +15,9 @@ import org.apache.lucene.index.IndexWriter; import org.hamcrest.MatcherAssert; -import org.opensearch.common.ParseField; -import org.opensearch.common.xcontent.ContextParser; -import org.opensearch.common.xcontent.NamedXContentRegistry; +import org.opensearch.core.ParseField; +import org.opensearch.core.xcontent.ContextParser; +import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.geo.search.aggregations.bucket.geogrid.BaseGeoGrid; import org.opensearch.geo.search.aggregations.bucket.geogrid.BaseGeoGridBucket; import org.opensearch.geo.search.aggregations.bucket.geogrid.GeoGrid; diff --git a/src/test/java/org/opensearch/geospatial/stats/upload/TotalUploadStatsTests.java b/src/test/java/org/opensearch/geospatial/stats/upload/TotalUploadStatsTests.java index fe51feb0..021ff88b 100644 --- a/src/test/java/org/opensearch/geospatial/stats/upload/TotalUploadStatsTests.java +++ b/src/test/java/org/opensearch/geospatial/stats/upload/TotalUploadStatsTests.java @@ -13,10 +13,10 @@ import java.util.List; import org.opensearch.common.Strings; -import org.opensearch.common.xcontent.ToXContent; -import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.xcontent.ToXContent; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.test.OpenSearchTestCase; public class TotalUploadStatsTests extends 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 34077149..ab22bc5d 100644 --- a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsResponseTests.java +++ b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsResponseTests.java @@ -21,9 +21,9 @@ import org.opensearch.common.Strings; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.xcontent.ToXContent; -import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; +import org.opensearch.core.xcontent.ToXContent; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.test.OpenSearchTestCase; public class UploadStatsResponseTests extends OpenSearchTestCase { diff --git a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsServiceTests.java b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsServiceTests.java index b82e6b39..e0583a70 100644 --- a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsServiceTests.java +++ b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsServiceTests.java @@ -16,8 +16,8 @@ import java.util.Map; import org.opensearch.common.Strings; -import org.opensearch.common.xcontent.ToXContent; -import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.ToXContent; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.geospatial.GeospatialTestHelper; 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 273e5f96..baa4ff77 100644 --- a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsTests.java +++ b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsTests.java @@ -16,9 +16,9 @@ import org.opensearch.common.Strings; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.xcontent.ToXContent; -import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; +import org.opensearch.core.xcontent.ToXContent; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.geospatial.GeospatialTestHelper; import org.opensearch.test.OpenSearchTestCase;