Skip to content

Commit 8a4945d

Browse files
authored
Remove package org.opensearch.action.support.master (#17118)
All classes in this package have been deprecated and can be removed for the 3.0 release. Signed-off-by: Andrew Ross <andrross@amazon.com>
1 parent 3032bef commit 8a4945d

19 files changed

+7
-623
lines changed

CHANGELOG-3.0.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
4747
- Remove Version.V_1_ Constants ([#5021](https://github.com/opensearch-project/OpenSearch/pull/5021))
4848
- Remove custom Map, List and Set collection classes ([#6871](https://github.com/opensearch-project/OpenSearch/pull/6871))
4949
- 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))
50-
- Move o.o.action.support.master classes ([#17104](https://github.com/opensearch-project/OpenSearch/pull/17104))
50+
- Remove package org.opensearch.action.support.master ([#4856](https://github.com/opensearch-project/OpenSearch/issues/4856))
5151

5252
### Fixed
5353
- Fix 'org.apache.hc.core5.http.ParseException: Invalid protocol version' under JDK 16+ ([#4827](https://github.com/opensearch-project/OpenSearch/pull/4827))

server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
package org.opensearch.action.admin.indices.get;
3434

3535
import org.opensearch.action.ActionRequestValidationException;
36-
import org.opensearch.action.support.master.info.ClusterInfoRequest;
36+
import org.opensearch.action.support.clustermanager.info.ClusterInfoRequest;
3737
import org.opensearch.common.annotation.PublicApi;
3838
import org.opensearch.common.util.ArrayUtils;
3939
import org.opensearch.core.common.io.stream.StreamInput;

server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexRequestBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
package org.opensearch.action.admin.indices.get;
3434

35-
import org.opensearch.action.support.master.info.ClusterInfoRequestBuilder;
35+
import org.opensearch.action.support.clustermanager.info.ClusterInfoRequestBuilder;
3636
import org.opensearch.client.OpenSearchClient;
3737
import org.opensearch.common.annotation.PublicApi;
3838

server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
package org.opensearch.action.admin.indices.mapping.get;
3434

3535
import org.opensearch.action.ActionRequestValidationException;
36-
import org.opensearch.action.support.master.info.ClusterInfoRequest;
36+
import org.opensearch.action.support.clustermanager.info.ClusterInfoRequest;
3737
import org.opensearch.common.annotation.PublicApi;
3838
import org.opensearch.core.common.io.stream.StreamInput;
3939

server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
package org.opensearch.action.admin.indices.mapping.get;
3434

35-
import org.opensearch.action.support.master.info.ClusterInfoRequestBuilder;
35+
import org.opensearch.action.support.clustermanager.info.ClusterInfoRequestBuilder;
3636
import org.opensearch.client.OpenSearchClient;
3737
import org.opensearch.common.annotation.PublicApi;
3838

server/src/main/java/org/opensearch/action/support/clustermanager/AcknowledgedRequest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
package org.opensearch.action.support.clustermanager;
3333

34-
import org.opensearch.action.support.master.MasterNodeRequest;
3534
import org.opensearch.cluster.ack.AckedRequest;
3635
import org.opensearch.common.unit.TimeValue;
3736
import org.opensearch.core.common.io.stream.StreamInput;
@@ -48,7 +47,7 @@
4847
*
4948
* @opensearch.internal
5049
*/
51-
public abstract class AcknowledgedRequest<Request extends MasterNodeRequest<Request>> extends MasterNodeRequest<Request>
50+
public abstract class AcknowledgedRequest<Request extends ClusterManagerNodeRequest<Request>> extends ClusterManagerNodeRequest<Request>
5251
implements
5352
AckedRequest {
5453

server/src/main/java/org/opensearch/action/support/clustermanager/AcknowledgedRequestBuilder.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
package org.opensearch.action.support.clustermanager;
3333

3434
import org.opensearch.action.ActionType;
35-
import org.opensearch.action.support.master.MasterNodeOperationRequestBuilder;
3635
import org.opensearch.client.OpenSearchClient;
3736
import org.opensearch.common.unit.TimeValue;
3837

@@ -44,7 +43,7 @@
4443
public abstract class AcknowledgedRequestBuilder<
4544
Request extends AcknowledgedRequest<Request>,
4645
Response extends AcknowledgedResponse,
47-
RequestBuilder extends AcknowledgedRequestBuilder<Request, Response, RequestBuilder>> extends MasterNodeOperationRequestBuilder<
46+
RequestBuilder extends AcknowledgedRequestBuilder<Request, Response, RequestBuilder>> extends ClusterManagerNodeOperationRequestBuilder<
4847
Request,
4948
Response,
5049
RequestBuilder> {

server/src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java

-56
This file was deleted.

server/src/main/java/org/opensearch/action/support/master/MasterNodeReadOperationRequestBuilder.java

-56
This file was deleted.

server/src/main/java/org/opensearch/action/support/master/MasterNodeReadRequest.java

-53
This file was deleted.

server/src/main/java/org/opensearch/action/support/master/MasterNodeRequest.java

-54
This file was deleted.

server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java

-88
This file was deleted.

0 commit comments

Comments
 (0)