Merge branch 'main' into spark-application

Signed-off-by: Rupal Mahajan <[email protected]>
opensearch-project · Jul 14, 2023 · d2ff0eb · d2ff0eb
2 parents 191964b + 8c8e08c
commit d2ff0eb
Show file tree

Hide file tree

Showing 78 changed files with 756 additions and 109 deletions.
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/ErrorMessage.java b/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/ErrorMessage.java
@@ -10,7 +10,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import lombok.Getter;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.core.rest.RestStatus;
 
 /**
  * Error Message.

diff --git a/...in/java/org/opensearch/sql/datasources/model/transport/CreateDataSourceActionRequest.java b/...in/java/org/opensearch/sql/datasources/model/transport/CreateDataSourceActionRequest.java
@@ -14,7 +14,7 @@
 import lombok.Getter;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.sql.datasource.model.DataSourceMetadata;
 
 public class CreateDataSourceActionRequest

diff --git a/...n/java/org/opensearch/sql/datasources/model/transport/CreateDataSourceActionResponse.java b/...n/java/org/opensearch/sql/datasources/model/transport/CreateDataSourceActionResponse.java
@@ -11,8 +11,8 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.action.ActionResponse;
-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;
 
 @RequiredArgsConstructor
 public class CreateDataSourceActionResponse

diff --git a/...in/java/org/opensearch/sql/datasources/model/transport/DeleteDataSourceActionRequest.java b/...in/java/org/opensearch/sql/datasources/model/transport/DeleteDataSourceActionRequest.java
@@ -14,7 +14,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 public class DeleteDataSourceActionRequest extends ActionRequest {
 

diff --git a/...n/java/org/opensearch/sql/datasources/model/transport/DeleteDataSourceActionResponse.java b/...n/java/org/opensearch/sql/datasources/model/transport/DeleteDataSourceActionResponse.java
@@ -11,8 +11,8 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.action.ActionResponse;
-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;
 
 @RequiredArgsConstructor
 public class DeleteDataSourceActionResponse extends ActionResponse {

diff --git a/.../main/java/org/opensearch/sql/datasources/model/transport/GetDataSourceActionRequest.java b/.../main/java/org/opensearch/sql/datasources/model/transport/GetDataSourceActionRequest.java
@@ -14,7 +14,7 @@
 import lombok.NoArgsConstructor;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 @NoArgsConstructor
 public class GetDataSourceActionRequest extends ActionRequest {

diff --git a/...main/java/org/opensearch/sql/datasources/model/transport/GetDataSourceActionResponse.java b/...main/java/org/opensearch/sql/datasources/model/transport/GetDataSourceActionResponse.java
@@ -11,8 +11,8 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.action.ActionResponse;
-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;
 
 @RequiredArgsConstructor
 public class GetDataSourceActionResponse extends ActionResponse {

diff --git a/...in/java/org/opensearch/sql/datasources/model/transport/UpdateDataSourceActionRequest.java b/...in/java/org/opensearch/sql/datasources/model/transport/UpdateDataSourceActionRequest.java
@@ -14,7 +14,7 @@
 import lombok.Getter;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.sql.datasource.model.DataSourceMetadata;
 
 public class UpdateDataSourceActionRequest

diff --git a/...n/java/org/opensearch/sql/datasources/model/transport/UpdateDataSourceActionResponse.java b/...n/java/org/opensearch/sql/datasources/model/transport/UpdateDataSourceActionResponse.java
@@ -11,8 +11,8 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.action.ActionResponse;
-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;
 
 @RequiredArgsConstructor
 public class UpdateDataSourceActionResponse

diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryAction.java b/datasources/src/main/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryAction.java
@@ -7,13 +7,13 @@
 
 package org.opensearch.sql.datasources.rest;
 
+import static org.opensearch.core.rest.RestStatus.BAD_REQUEST;
+import static org.opensearch.core.rest.RestStatus.NOT_FOUND;
+import static org.opensearch.core.rest.RestStatus.SERVICE_UNAVAILABLE;
 import static org.opensearch.rest.RestRequest.Method.DELETE;
 import static org.opensearch.rest.RestRequest.Method.GET;
 import static org.opensearch.rest.RestRequest.Method.POST;
 import static org.opensearch.rest.RestRequest.Method.PUT;
-import static org.opensearch.rest.RestStatus.BAD_REQUEST;
-import static org.opensearch.rest.RestStatus.NOT_FOUND;
-import static org.opensearch.rest.RestStatus.SERVICE_UNAVAILABLE;
 
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
@@ -24,11 +24,11 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.ActionListener;
 import org.opensearch.client.node.NodeClient;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestChannel;
 import org.opensearch.rest.RestRequest;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.sql.datasource.model.DataSourceMetadata;
 import org.opensearch.sql.datasources.exceptions.DataSourceNotFoundException;
 import org.opensearch.sql.datasources.exceptions.ErrorMessage;

diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/utils/XContentParserUtils.java b/datasources/src/main/java/org/opensearch/sql/datasources/utils/XContentParserUtils.java
@@ -5,7 +5,7 @@
 
 package org.opensearch.sql.datasources.utils;
 
-import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
+import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/.../java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorageTest.java b/.../java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorageTest.java
@@ -34,10 +34,10 @@
 import org.opensearch.action.update.UpdateResponse;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.core.index.shard.ShardId;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.index.engine.DocumentMissingException;
 import org.opensearch.index.engine.VersionConflictEngineException;
-import org.opensearch.index.shard.ShardId;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 import org.opensearch.sql.datasource.model.DataSourceMetadata;

diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/utils/XContentParserUtilsTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/utils/XContentParserUtilsTest.java
@@ -11,7 +11,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.common.bytes.BytesReference;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.sql.datasource.model.DataSourceMetadata;
 import org.opensearch.sql.datasource.model.DataSourceType;