Fix upstream refactor changes

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...

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;
 

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;
 
 /**

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 {

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;

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;
 
 /**

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;

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;

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;

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

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

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 {

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

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

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 {
 

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<UploadStatsNodeResponse> implements Writeable, ToXContentObject {
 

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 {

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;

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;
 
 /**

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;

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 {

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;

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;

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;

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;

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;

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;

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 {

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 {

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;
 

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;