Remove package org.opensearch.action.support.master

All classes in this package have been deprecated and can be removed for the 3.0 release. Signed-off-by: Andrew Ross <[email protected]>
andrross · Jan 24, 2025 · 71ce880 · 71ce880
1 parent 0d7ac2c
commit 71ce880
Show file tree

Hide file tree

Showing 19 changed files with 8 additions and 603 deletions.
diff --git a/CHANGELOG-3.0.md b/CHANGELOG-3.0.md
@@ -46,7 +46,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Remove Version.V_1_ Constants ([#5021](https://github.com/opensearch-project/OpenSearch/pull/5021))
 - Remove custom Map, List and Set collection classes ([#6871](https://github.com/opensearch-project/OpenSearch/pull/6871))
 - Remove `index.store.hybrid.mmap.extensions` setting in favor of `index.store.hybrid.nio.extensions` setting ([#9392](https://github.com/opensearch-project/OpenSearch/pull/9392))
-- Move o.o.action.support.master classes ([#17104](https://github.com/opensearch-project/OpenSearch/pull/17104))
+- Remove package org.opensearch.action.support.master ([#4856](https://github.com/opensearch-project/OpenSearch/issues/4856))
 
 ### Fixed
 - Fix 'org.apache.hc.core5.http.ParseException: Invalid protocol version' under JDK 16+ ([#4827](https://github.com/opensearch-project/OpenSearch/pull/4827))

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.master.info.ClusterInfoRequest;
+import org.opensearch.action.support.clustermanager.info.ClusterInfoRequest;
 import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.util.ArrayUtils;
 import org.opensearch.core.common.io.stream.StreamInput;

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.master.info.ClusterInfoRequestBuilder;
+import org.opensearch.action.support.clustermanager.info.ClusterInfoRequestBuilder;
 import org.opensearch.client.OpenSearchClient;
 import org.opensearch.common.annotation.PublicApi;
 

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.master.info.ClusterInfoRequest;
+import org.opensearch.action.support.clustermanager.info.ClusterInfoRequest;
 import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 

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.master.info.ClusterInfoRequestBuilder;
+import org.opensearch.action.support.clustermanager.info.ClusterInfoRequestBuilder;
 import org.opensearch.client.OpenSearchClient;
 import org.opensearch.common.annotation.PublicApi;
 

diff --git a/server/src/main/java/org/opensearch/action/support/clustermanager/AcknowledgedRequest.java b/server/src/main/java/org/opensearch/action/support/clustermanager/AcknowledgedRequest.java
@@ -31,7 +31,6 @@
 
 package org.opensearch.action.support.clustermanager;
 
-import org.opensearch.action.support.master.MasterNodeRequest;
 import org.opensearch.cluster.ack.AckedRequest;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -48,7 +47,7 @@
  *
  * @opensearch.internal
  */
-public abstract class AcknowledgedRequest<Request extends MasterNodeRequest<Request>> extends MasterNodeRequest<Request>
+public abstract class AcknowledgedRequest<Request extends ClusterManagerNodeRequest<Request>> extends ClusterManagerNodeRequest<Request>
     implements
         AckedRequest {
 

diff --git a/...rc/main/java/org/opensearch/action/support/clustermanager/AcknowledgedRequestBuilder.java b/...rc/main/java/org/opensearch/action/support/clustermanager/AcknowledgedRequestBuilder.java
@@ -32,7 +32,6 @@
 package org.opensearch.action.support.clustermanager;
 
 import org.opensearch.action.ActionType;
-import org.opensearch.action.support.master.MasterNodeOperationRequestBuilder;
 import org.opensearch.client.OpenSearchClient;
 import org.opensearch.common.unit.TimeValue;
 
@@ -44,7 +43,7 @@
 public abstract class AcknowledgedRequestBuilder<
     Request extends AcknowledgedRequest<Request>,
     Response extends AcknowledgedResponse,
-    RequestBuilder extends AcknowledgedRequestBuilder<Request, Response, RequestBuilder>> extends MasterNodeOperationRequestBuilder<
+    RequestBuilder extends AcknowledgedRequestBuilder<Request, Response, RequestBuilder>> extends ClusterManagerNodeOperationRequestBuilder<
         Request,
         Response,
         RequestBuilder> {

diff --git a/...src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java b/...src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java
diff --git a/...main/java/org/opensearch/action/support/master/MasterNodeReadOperationRequestBuilder.java b/...main/java/org/opensearch/action/support/master/MasterNodeReadOperationRequestBuilder.java
diff --git a/server/src/main/java/org/opensearch/action/support/master/MasterNodeReadRequest.java b/server/src/main/java/org/opensearch/action/support/master/MasterNodeReadRequest.java
diff --git a/server/src/main/java/org/opensearch/action/support/master/MasterNodeRequest.java b/server/src/main/java/org/opensearch/action/support/master/MasterNodeRequest.java
diff --git a/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java b/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java