Restore using the class ClusterInfoRequest and ClusterInfoRequestBuil…

…der from package 'org.opensearch.action.support.master.info' for subclasses Signed-off-by: Tianli Feng <ftianli@amazon.com>
opensearch-project · Aug 26, 2022 · 3c4d86d · 3c4d86d
1 parent 1bfabed
commit 3c4d86d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexRequest.java
@@ -33,7 +33,7 @@
 package org.opensearch.action.admin.indices.get;
 
 import org.opensearch.action.ActionRequestValidationException;
-import org.opensearch.action.support.clustermanager.info.ClusterInfoRequest;
+import org.opensearch.action.support.master.info.ClusterInfoRequest;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.util.ArrayUtils;

diff --git a/server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexRequestBuilder.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.action.admin.indices.get;
 
-import org.opensearch.action.support.clustermanager.info.ClusterInfoRequestBuilder;
+import org.opensearch.action.support.master.info.ClusterInfoRequestBuilder;
 import org.opensearch.client.OpenSearchClient;
 
 /**

diff --git a/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsRequest.java
@@ -33,7 +33,7 @@
 package org.opensearch.action.admin.indices.mapping.get;
 
 import org.opensearch.action.ActionRequestValidationException;
-import org.opensearch.action.support.clustermanager.info.ClusterInfoRequest;
+import org.opensearch.action.support.master.info.ClusterInfoRequest;
 import org.opensearch.common.io.stream.StreamInput;
 
 import java.io.IOException;

diff --git a/.../main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java b/.../main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.action.admin.indices.mapping.get;
 
-import org.opensearch.action.support.clustermanager.info.ClusterInfoRequestBuilder;
+import org.opensearch.action.support.master.info.ClusterInfoRequestBuilder;
 import org.opensearch.client.OpenSearchClient;
 
 /**

diff --git a/server/src/test/java/org/opensearch/action/admin/indices/get/GetIndexRequestTests.java b/server/src/test/java/org/opensearch/action/admin/indices/get/GetIndexRequestTests.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.action.admin.indices.get;
+
+import org.opensearch.action.support.master.info.ClusterInfoRequest;
+import org.opensearch.test.OpenSearchTestCase;
+
+import static org.hamcrest.Matchers.is;
+
+public class GetIndexRequestTests extends OpenSearchTestCase {
+    public void testGetIndexRequestExtendsClusterInfoRequestOfDeprecatedClassPath() {
+        GetIndexRequest getIndexRequest = new GetIndexRequest().indices("test");
+        assertThat(getIndexRequest instanceof ClusterInfoRequest, is(true));
+    }
+}