[Backport 2.x] Fix compile error due to changes in OpenSearch core (#387

) * Switch from XContentType to MediaType to fix compilation errors (#366) Signed-off-by: Heemin Kim <[email protected]> * Refactor XContentFactory to MediaTypeRegistry (#374) Signed-off-by: Heemin Kim <[email protected]> * Refactor LifecycleComponent package path (#377) Signed-off-by: Heemin Kim <[email protected]> * [Refactor] Strings utility methods to core library (#379) Signed-off-by: Heemin Kim <[email protected]> * Fixed compilation errors after refactoring in core foundation classes (#380) Signed-off-by: Heemin Kim <[email protected]> --------- Signed-off-by: Heemin Kim <[email protected]>
opensearch-project · Aug 17, 2023 · 2d44f03 · 2d44f03
1 parent 7a80ae0
commit 2d44f03
Show file tree

Hide file tree

Showing 42 changed files with 80 additions and 86 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,4 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Documentation
 ### Maintenance
 * Change package for Strings.hasText ([#314](https://github.com/opensearch-project/geospatial/pull/314))
+* Refactor LifecycleComponent package path ([#377](https://github.com/opensearch-project/geospatial/pull/377))
+* [Refactor] Strings utility methods to core library ([#379](https://github.com/opensearch-project/geospatial/pull/379))
+* Fixed compilation errors after refactoring in core foundation classes ([#380](https://github.com/opensearch-project/geospatial/pull/380))
 ### Refactoring
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
@@ -13,11 +13,11 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.StepListener;
 import org.opensearch.action.admin.indices.create.CreateIndexRequest;
 import org.opensearch.client.IndicesAdminClient;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.xcontent.XContentBuilder;
 
 /**

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
@@ -12,14 +12,14 @@
 import lombok.NonNull;
 import lombok.extern.log4j.Log4j2;
 
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.StepListener;
 import org.opensearch.action.ingest.DeletePipelineRequest;
 import org.opensearch.action.ingest.PutPipelineRequest;
 import org.opensearch.client.ClusterAdminClient;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.geospatial.processor.FeatureProcessor;

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
@@ -10,9 +10,9 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.opensearch.action.ActionResponse;
 import org.opensearch.action.bulk.BulkItemResponse;
 import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContentObject;

diff --git a/...in/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONTransportAction.java b/...in/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONTransportAction.java
@@ -14,12 +14,12 @@
 import java.util.Map;
 
 import org.opensearch.ResourceAlreadyExistsException;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.geospatial.GeospatialParser;
 import org.opensearch.geospatial.stats.upload.UploadStats;
 import org.opensearch.rest.RestRequest;

diff --git a/src/main/java/org/opensearch/geospatial/action/upload/geojson/Uploader.java b/src/main/java/org/opensearch/geospatial/action/upload/geojson/Uploader.java
@@ -11,12 +11,12 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.StepListener;
 import org.opensearch.action.bulk.BulkItemResponse;
 import org.opensearch.action.bulk.BulkRequestBuilder;
 import org.opensearch.action.bulk.BulkResponse;
 import org.opensearch.common.collect.MapBuilder;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.geospatial.stats.upload.UploadMetric;
 import org.opensearch.geospatial.stats.upload.UploadStats;
 

diff --git a/src/main/java/org/opensearch/geospatial/ip2geo/action/DeleteDatasourceTransportAction.java b/src/main/java/org/opensearch/geospatial/ip2geo/action/DeleteDatasourceTransportAction.java
@@ -10,11 +10,11 @@
 import lombok.extern.log4j.Log4j2;
 
 import org.opensearch.ResourceNotFoundException;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.action.support.master.AcknowledgedResponse;
 import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.geospatial.annotation.VisibleForTesting;
 import org.opensearch.geospatial.exceptions.ConcurrentModificationException;
 import org.opensearch.geospatial.exceptions.ResourceInUseException;

diff --git a/src/main/java/org/opensearch/geospatial/ip2geo/action/GetDatasourceResponse.java b/src/main/java/org/opensearch/geospatial/ip2geo/action/GetDatasourceResponse.java
@@ -13,8 +13,8 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import org.opensearch.action.ActionResponse;
 import org.opensearch.core.ParseField;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContentObject;

diff --git a/src/main/java/org/opensearch/geospatial/ip2geo/action/GetDatasourceTransportAction.java b/src/main/java/org/opensearch/geospatial/ip2geo/action/GetDatasourceTransportAction.java
@@ -9,10 +9,10 @@
 import java.util.List;
 
 import org.opensearch.OpenSearchException;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.geospatial.annotation.VisibleForTesting;
 import org.opensearch.geospatial.ip2geo.dao.DatasourceDao;
 import org.opensearch.geospatial.ip2geo.jobscheduler.Datasource;

diff --git a/src/main/java/org/opensearch/geospatial/ip2geo/action/PutDatasourceTransportAction.java b/src/main/java/org/opensearch/geospatial/ip2geo/action/PutDatasourceTransportAction.java
@@ -13,13 +13,13 @@
 import lombok.extern.log4j.Log4j2;
 
 import org.opensearch.ResourceAlreadyExistsException;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.StepListener;
 import org.opensearch.action.index.IndexResponse;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.action.support.master.AcknowledgedResponse;
 import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.geospatial.annotation.VisibleForTesting;
 import org.opensearch.geospatial.exceptions.ConcurrentModificationException;
 import org.opensearch.geospatial.ip2geo.common.DatasourceState;

diff --git a/src/main/java/org/opensearch/geospatial/ip2geo/action/RestGetDatasourceHandler.java b/src/main/java/org/opensearch/geospatial/ip2geo/action/RestGetDatasourceHandler.java
@@ -12,7 +12,7 @@
 import java.util.List;
 
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;

diff --git a/src/main/java/org/opensearch/geospatial/ip2geo/action/UpdateDatasourceTransportAction.java b/src/main/java/org/opensearch/geospatial/ip2geo/action/UpdateDatasourceTransportAction.java
@@ -16,11 +16,11 @@
 import lombok.extern.log4j.Log4j2;
 
 import org.opensearch.ResourceNotFoundException;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.action.support.master.AcknowledgedResponse;
 import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.geospatial.exceptions.ConcurrentModificationException;
 import org.opensearch.geospatial.exceptions.IncompatibleDatasourceException;
 import org.opensearch.geospatial.ip2geo.common.DatasourceManifest;

diff --git a/src/main/java/org/opensearch/geospatial/ip2geo/common/Ip2GeoLockService.java b/src/main/java/org/opensearch/geospatial/ip2geo/common/Ip2GeoLockService.java
@@ -16,9 +16,9 @@
 import lombok.extern.log4j.Log4j2;
 
 import org.opensearch.OpenSearchException;
-import org.opensearch.action.ActionListener;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.jobscheduler.spi.LockModel;
 import org.opensearch.jobscheduler.spi.utils.LockService;
 

diff --git a/src/main/java/org/opensearch/geospatial/ip2geo/common/ParameterValidator.java b/src/main/java/org/opensearch/geospatial/ip2geo/common/ParameterValidator.java
@@ -11,7 +11,7 @@
 import java.util.Locale;
 
 import org.apache.commons.lang3.StringUtils;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 
 /**
  * Parameter validator for IP2Geo APIs

diff --git a/src/main/java/org/opensearch/geospatial/ip2geo/dao/DatasourceDao.java b/src/main/java/org/opensearch/geospatial/ip2geo/dao/DatasourceDao.java
@@ -21,7 +21,6 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.ResourceAlreadyExistsException;
 import org.opensearch.ResourceNotFoundException;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.DocWriteRequest;
 import org.opensearch.action.StepListener;
 import org.opensearch.action.admin.indices.create.CreateIndexRequest;
@@ -44,6 +43,7 @@
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentHelper;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.NamedXContentRegistry;

diff --git a/src/main/java/org/opensearch/geospatial/ip2geo/listener/Ip2GeoListener.java b/src/main/java/org/opensearch/geospatial/ip2geo/listener/Ip2GeoListener.java
@@ -16,15 +16,15 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.bulk.BulkResponse;
 import org.opensearch.cluster.ClusterChangedEvent;
 import org.opensearch.cluster.ClusterStateListener;
 import org.opensearch.cluster.RestoreInProgress;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.component.AbstractLifecycleComponent;
 import org.opensearch.common.inject.Inject;
+import org.opensearch.common.lifecycle.AbstractLifecycleComponent;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.geospatial.ip2geo.dao.DatasourceDao;
 import org.opensearch.geospatial.ip2geo.dao.GeoIpDataDao;
 import org.opensearch.geospatial.ip2geo.jobscheduler.Datasource;

diff --git a/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java b/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java
@@ -16,18 +16,18 @@
 import lombok.extern.log4j.Log4j2;
 
 import org.opensearch.action.ActionRequest;
-import org.opensearch.action.ActionResponse;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.collect.MapBuilder;
-import org.opensearch.common.component.LifecycleComponent;
+import org.opensearch.common.lifecycle.LifecycleComponent;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.IndexScopedSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsFilter;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.env.Environment;

diff --git a/...in/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONAction.java b/...in/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONAction.java
@@ -14,8 +14,8 @@
 
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.collect.Tuple;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.geospatial.action.upload.geojson.UploadGeoJSONAction;
 import org.opensearch.geospatial.action.upload.geojson.UploadGeoJSONRequest;
 import org.opensearch.rest.BaseRestHandler;
@@ -84,7 +84,7 @@ public List<Route> routes() {
 
     @Override
     protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) {
-        Tuple<XContentType, BytesReference> sourceTuple = restRequest.contentOrSourceParam();
+        Tuple<MediaType, BytesReference> sourceTuple = restRequest.contentOrSourceParam();
         RestRequest.Method method = restRequest.getHttpRequest().method();
         UploadGeoJSONRequest request = new UploadGeoJSONRequest(method, sourceTuple.v2());
         return channel -> client.execute(UploadGeoJSONAction.INSTANCE, request, new RestToXContentListener<>(channel));

diff --git a/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java b/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java
@@ -101,7 +101,7 @@ protected static Response createPipeline(String name, Optional<String> descripti
         builder.endObject();
 
         Request request = new Request("PUT", buildPipelinePath(name));
-        request.setJsonEntity(org.opensearch.common.Strings.toString(builder));
+        request.setJsonEntity(builder.toString());
         return client().performRequest(request);
     }
 
@@ -118,7 +118,7 @@ protected Response createDatasource(final String name, Map<String, Object> prope
         builder.endObject();
 
         Request request = new Request(PUT, buildDatasourcePath(name));
-        request.setJsonEntity(org.opensearch.common.Strings.toString(builder));
+        request.setJsonEntity(builder.toString());
         return client().performRequest(request);
     }
 
@@ -178,7 +178,7 @@ protected Response updateDatasource(final String name, Map<String, Object> prope
         builder.endObject();
 
         Request request = new Request(PUT, String.join(URL_DELIMITER, buildDatasourcePath(name), SETTINGS));
-        request.setJsonEntity(org.opensearch.common.Strings.toString(builder));
+        request.setJsonEntity(builder.toString());
         return client().performRequest(request);
     }
 
@@ -188,7 +188,7 @@ protected Map<String, Object> simulatePipeline(final String name, List<Object> d
         builder.endObject();
 
         Request request = new Request(GET, String.join(URL_DELIMITER, buildPipelinePath(name), SIMULATE));
-        request.setJsonEntity(org.opensearch.common.Strings.toString(builder));
+        request.setJsonEntity(builder.toString());
         Response response = client().performRequest(request);
         return createParser(XContentType.JSON.xContent(), EntityUtils.toString(response.getEntity())).map();
     }
@@ -199,7 +199,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 = org.opensearch.common.Strings.toString(xContentBuilder);
+        String mapping = xContentBuilder.toString();
         createIndex(name, settings, mapping.substring(1, mapping.length() - 1));
     }
 
@@ -346,7 +346,7 @@ public String buildContentAsString(CheckedConsumer<XContentBuilder, IOException>
         XContentBuilder builder = JsonXContent.contentBuilder().startObject();
         build.accept(builder);
         builder.endObject();
-        return org.opensearch.common.Strings.toString(builder);
+        return builder.toString();
     }
 
     public String buildSearchAggregationsBodyAsString(CheckedConsumer<XContentBuilder, IOException> aggregationsBuilder)

diff --git a/src/test/java/org/opensearch/geospatial/OpenSearchSecureRestTestCase.java b/src/test/java/org/opensearch/geospatial/OpenSearchSecureRestTestCase.java
@@ -29,8 +29,8 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.ThreadContext;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.DeprecationHandler;
+import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.test.rest.OpenSearchRestTestCase;
@@ -129,9 +129,9 @@ protected boolean preserveIndicesUponCompletion() {
     @After
     public void deleteExternalIndices() throws IOException {
         Response response = client().performRequest(new Request("GET", "/_cat/indices?format=json&expand_wildcards=all"));
-        XContentType xContentType = XContentType.fromMediaType(response.getEntity().getContentType().getValue());
+        MediaType mediaType = MediaType.fromMediaType(response.getEntity().getContentType().getValue());
         try (
-            XContentParser parser = xContentType.xContent()
+            XContentParser parser = mediaType.xContent()
                 .createParser(
                     NamedXContentRegistry.EMPTY,
                     DeprecationHandler.THROW_UNSUPPORTED_OPERATION,

diff --git a/src/test/java/org/opensearch/geospatial/action/upload/geojson/IndexManagerTests.java b/src/test/java/org/opensearch/geospatial/action/upload/geojson/IndexManagerTests.java
@@ -16,11 +16,11 @@
 import java.util.stream.IntStream;
 
 import org.opensearch.ResourceAlreadyExistsException;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.StepListener;
 import org.opensearch.action.admin.indices.create.CreateIndexRequest;
 import org.opensearch.action.admin.indices.create.CreateIndexResponse;
 import org.opensearch.client.IndicesAdminClient;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.test.OpenSearchTestCase;
 
 public class IndexManagerTests extends OpenSearchTestCase {

diff --git a/src/test/java/org/opensearch/geospatial/action/upload/geojson/PipelineManagerTests.java b/src/test/java/org/opensearch/geospatial/action/upload/geojson/PipelineManagerTests.java
@@ -11,12 +11,12 @@
 import static org.mockito.Mockito.verify;
 import static org.opensearch.geospatial.GeospatialTestHelper.randomLowerCaseString;
 
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.StepListener;
 import org.opensearch.action.ingest.DeletePipelineRequest;
 import org.opensearch.action.ingest.PutPipelineRequest;
 import org.opensearch.action.support.master.AcknowledgedResponse;
 import org.opensearch.client.ClusterAdminClient;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.test.OpenSearchTestCase;
 
 public class PipelineManagerTests extends OpenSearchTestCase {

diff --git a/...test/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONResponseTests.java b/...test/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONResponseTests.java
@@ -6,8 +6,8 @@
 package org.opensearch.geospatial.action.upload.geojson;
 
 import org.opensearch.action.bulk.BulkResponse;
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.geospatial.GeospatialTestHelper;
 import org.opensearch.test.OpenSearchTestCase;
 

diff --git a/src/test/java/org/opensearch/geospatial/action/upload/geojson/UploaderTests.java b/src/test/java/org/opensearch/geospatial/action/upload/geojson/UploaderTests.java
@@ -22,11 +22,11 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.StepListener;
 import org.opensearch.action.bulk.BulkItemResponse;
 import org.opensearch.action.bulk.BulkRequestBuilder;
 import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.geospatial.GeospatialTestHelper;
 import org.opensearch.geospatial.stats.upload.UploadMetric;
 import org.opensearch.geospatial.stats.upload.UploadStats;