diff --git a/CHANGELOG-3.0.md b/CHANGELOG-3.0.md index 5d16c117d98fa..43e352116e394 100644 --- 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 index 601b53f88baa3..da3d9bc9dcbbd 100644 --- 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 index e97319abe5f98..c90d46808a53b 100644 --- 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 index cd0ecdb30e5fa..72c5be85cdf92 100644 --- 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/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java index 36ca1cb088cb5..e97c0befebd9d 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java +++ b/server/src/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 index 4543c9392e62b..9c5973bd2575e 100644 --- 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> extends MasterNodeRequest +public abstract class AcknowledgedRequest> extends ClusterManagerNodeRequest implements AckedRequest { diff --git a/server/src/main/java/org/opensearch/action/support/clustermanager/AcknowledgedRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/clustermanager/AcknowledgedRequestBuilder.java index ea50774d17d19..fa957f159ec9d 100644 --- a/server/src/main/java/org/opensearch/action/support/clustermanager/AcknowledgedRequestBuilder.java +++ b/server/src/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, Response extends AcknowledgedResponse, - RequestBuilder extends AcknowledgedRequestBuilder> extends MasterNodeOperationRequestBuilder< + RequestBuilder extends AcknowledgedRequestBuilder> extends ClusterManagerNodeOperationRequestBuilder< Request, Response, RequestBuilder> { diff --git a/server/src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java deleted file mode 100644 index 0acbd998a6322..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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. - */ - -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - -package org.opensearch.action.support.master; - -import org.opensearch.action.ActionType; -import org.opensearch.action.support.clustermanager.ClusterManagerNodeOperationRequestBuilder; -import org.opensearch.client.OpenSearchClient; -import org.opensearch.core.action.ActionResponse; - -/** - * Base request builder for cluster-manager node operations - * - * @opensearch.internal - * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link ClusterManagerNodeOperationRequestBuilder} - */ -@Deprecated -public abstract class MasterNodeOperationRequestBuilder< - Request extends MasterNodeRequest, - Response extends ActionResponse, - RequestBuilder extends MasterNodeOperationRequestBuilder> extends - ClusterManagerNodeOperationRequestBuilder { - - protected MasterNodeOperationRequestBuilder(OpenSearchClient client, ActionType action, Request request) { - super(client, action, request); - } -} diff --git a/server/src/main/java/org/opensearch/action/support/master/MasterNodeReadOperationRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/master/MasterNodeReadOperationRequestBuilder.java deleted file mode 100644 index 36a3fc1d2de73..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/MasterNodeReadOperationRequestBuilder.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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. - */ - -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - -package org.opensearch.action.support.master; - -import org.opensearch.action.ActionType; -import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadOperationRequestBuilder; -import org.opensearch.client.OpenSearchClient; -import org.opensearch.core.action.ActionResponse; - -/** - * Base request builder for cluster-manager node read operations that can be executed on the local node as well - * - * @opensearch.internal - * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link ClusterManagerNodeReadOperationRequestBuilder} - */ -@Deprecated -public abstract class MasterNodeReadOperationRequestBuilder< - Request extends MasterNodeReadRequest, - Response extends ActionResponse, - RequestBuilder extends MasterNodeReadOperationRequestBuilder> extends - ClusterManagerNodeReadOperationRequestBuilder { - - protected MasterNodeReadOperationRequestBuilder(OpenSearchClient client, ActionType action, Request request) { - super(client, action, request); - } -} 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 deleted file mode 100644 index ea8f6a6e43cfe..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/MasterNodeReadRequest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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. - */ - -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - -package org.opensearch.action.support.master; - -import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest; -import org.opensearch.core.common.io.stream.StreamInput; - -import java.io.IOException; - -/** - * Base request for cluster-manager based read operations that allows to read the cluster state from the local node if needed - * - * @opensearch.internal - * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link ClusterManagerNodeReadRequest} - */ -@Deprecated -public abstract class MasterNodeReadRequest> extends ClusterManagerNodeReadRequest { - protected MasterNodeReadRequest() {} - - protected MasterNodeReadRequest(StreamInput in) throws IOException { - super(in); - } -} 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 deleted file mode 100644 index cfab63a845f7f..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/MasterNodeRequest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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. - */ - -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - -package org.opensearch.action.support.master; - -import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest; -import org.opensearch.core.common.io.stream.StreamInput; - -import java.io.IOException; - -/** - * A based request for cluster-manager based operation. - * - * @opensearch.internal - * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link ClusterManagerNodeRequest} - */ -@Deprecated -public abstract class MasterNodeRequest> extends ClusterManagerNodeRequest { - - protected MasterNodeRequest() {} - - protected MasterNodeRequest(StreamInput in) throws IOException { - super(in); - } -} 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 deleted file mode 100644 index eec7965bfed02..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * 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. - */ - -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - -package org.opensearch.action.support.master; - -import org.opensearch.action.support.ActionFilters; -import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction; -import org.opensearch.cluster.metadata.IndexNameExpressionResolver; -import org.opensearch.cluster.service.ClusterService; -import org.opensearch.core.action.ActionResponse; -import org.opensearch.core.common.io.stream.Writeable; -import org.opensearch.threadpool.ThreadPool; -import org.opensearch.transport.TransportService; - -/** - * A base class for operations that needs to be performed on the cluster-manager node. - * - * @opensearch.internal - * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link TransportClusterManagerNodeAction} - */ -@Deprecated -public abstract class TransportMasterNodeAction, Response extends ActionResponse> extends - TransportClusterManagerNodeAction { - - protected TransportMasterNodeAction( - String actionName, - TransportService transportService, - ClusterService clusterService, - ThreadPool threadPool, - ActionFilters actionFilters, - Writeable.Reader request, - IndexNameExpressionResolver indexNameExpressionResolver - ) { - super(actionName, true, transportService, clusterService, threadPool, actionFilters, request, indexNameExpressionResolver); - } - - protected TransportMasterNodeAction( - String actionName, - boolean canTripCircuitBreaker, - TransportService transportService, - ClusterService clusterService, - ThreadPool threadPool, - ActionFilters actionFilters, - Writeable.Reader request, - IndexNameExpressionResolver indexNameExpressionResolver - ) { - super( - actionName, - canTripCircuitBreaker, - transportService, - clusterService, - threadPool, - actionFilters, - request, - indexNameExpressionResolver - ); - } - -} diff --git a/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeReadAction.java b/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeReadAction.java deleted file mode 100644 index b95459971737f..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeReadAction.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * 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. - */ - -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - -package org.opensearch.action.support.master; - -import org.opensearch.action.support.ActionFilters; -import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeReadAction; -import org.opensearch.cluster.metadata.IndexNameExpressionResolver; -import org.opensearch.cluster.service.ClusterService; -import org.opensearch.core.action.ActionResponse; -import org.opensearch.core.common.io.stream.Writeable; -import org.opensearch.threadpool.ThreadPool; -import org.opensearch.transport.TransportService; - -/** - * A base class for read operations that needs to be performed on the cluster-manager node. - * Can also be executed on the local node if needed. - * - * @opensearch.internal - * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link TransportClusterManagerNodeReadAction} - */ -@Deprecated -public abstract class TransportMasterNodeReadAction, Response extends ActionResponse> extends - TransportClusterManagerNodeReadAction { - - protected TransportMasterNodeReadAction( - String actionName, - TransportService transportService, - ClusterService clusterService, - ThreadPool threadPool, - ActionFilters actionFilters, - Writeable.Reader request, - IndexNameExpressionResolver indexNameExpressionResolver - ) { - super(actionName, true, transportService, clusterService, threadPool, actionFilters, request, indexNameExpressionResolver); - } - - protected TransportMasterNodeReadAction( - String actionName, - boolean checkSizeLimit, - TransportService transportService, - ClusterService clusterService, - ThreadPool threadPool, - ActionFilters actionFilters, - Writeable.Reader request, - IndexNameExpressionResolver indexNameExpressionResolver - ) { - super( - actionName, - checkSizeLimit, - transportService, - clusterService, - threadPool, - actionFilters, - request, - indexNameExpressionResolver - ); - } - -} diff --git a/server/src/main/java/org/opensearch/action/support/master/info/ClusterInfoRequest.java b/server/src/main/java/org/opensearch/action/support/master/info/ClusterInfoRequest.java deleted file mode 100644 index 0b66e3d932603..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/info/ClusterInfoRequest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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. - */ - -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - -package org.opensearch.action.support.master.info; - -import org.opensearch.core.common.io.stream.StreamInput; - -import java.io.IOException; - -/** - * Transport request for cluster information - * - * @opensearch.internal - */ -public abstract class ClusterInfoRequest> extends - org.opensearch.action.support.clustermanager.info.ClusterInfoRequest { - - public ClusterInfoRequest() {} - - public ClusterInfoRequest(StreamInput in) throws IOException { - super(in); - } - -} diff --git a/server/src/main/java/org/opensearch/action/support/master/info/ClusterInfoRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/master/info/ClusterInfoRequestBuilder.java deleted file mode 100644 index 091413c0df6d7..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/info/ClusterInfoRequestBuilder.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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. - */ - -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - -package org.opensearch.action.support.master.info; - -import org.opensearch.action.ActionType; -import org.opensearch.client.OpenSearchClient; -import org.opensearch.core.action.ActionResponse; - -/** - * Transport request builder for cluster information - * - * @opensearch.internal - */ -public abstract class ClusterInfoRequestBuilder< - Request extends ClusterInfoRequest, - Response extends ActionResponse, - Builder extends ClusterInfoRequestBuilder> extends - org.opensearch.action.support.clustermanager.info.ClusterInfoRequestBuilder { - - protected ClusterInfoRequestBuilder(OpenSearchClient client, ActionType action, Request request) { - super(client, action, request); - } -} diff --git a/server/src/main/java/org/opensearch/action/support/master/info/TransportClusterInfoAction.java b/server/src/main/java/org/opensearch/action/support/master/info/TransportClusterInfoAction.java deleted file mode 100644 index 2653e3a658674..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/info/TransportClusterInfoAction.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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. - */ - -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - -package org.opensearch.action.support.master.info; - -import org.opensearch.action.support.ActionFilters; -import org.opensearch.cluster.metadata.IndexNameExpressionResolver; -import org.opensearch.cluster.service.ClusterService; -import org.opensearch.core.action.ActionResponse; -import org.opensearch.core.common.io.stream.Writeable; -import org.opensearch.threadpool.ThreadPool; -import org.opensearch.transport.TransportService; - -/** - * Perform cluster information action - * - * @opensearch.internal - */ -public abstract class TransportClusterInfoAction, Response extends ActionResponse> extends - org.opensearch.action.support.clustermanager.info.TransportClusterInfoAction { - - public TransportClusterInfoAction( - String actionName, - TransportService transportService, - ClusterService clusterService, - ThreadPool threadPool, - ActionFilters actionFilters, - Writeable.Reader request, - IndexNameExpressionResolver indexNameExpressionResolver - ) { - super(actionName, transportService, clusterService, threadPool, actionFilters, request, indexNameExpressionResolver); - } - -} diff --git a/server/src/main/java/org/opensearch/action/support/master/info/package-info.java b/server/src/main/java/org/opensearch/action/support/master/info/package-info.java deleted file mode 100644 index 8f21383c1b90c..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/info/package-info.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * 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. - */ - -/** - * Master Node Information transport handlers. - * - * As of 2.1, because supporting inclusive language, replaced by {@link org.opensearch.action.support.clustermanager.info} - */ -@Deprecated -package org.opensearch.action.support.master.info; diff --git a/server/src/main/java/org/opensearch/action/support/master/package-info.java b/server/src/main/java/org/opensearch/action/support/master/package-info.java deleted file mode 100644 index 9e90d96986fe1..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/package-info.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * 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. - */ - -/** - * Master Node transport handlers. - * - * As of 2.1, because supporting inclusive language, replaced by {@link org.opensearch.action.support.clustermanager} - */ -@Deprecated -package org.opensearch.action.support.master; 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 deleted file mode 100644 index f0d3db71c27b7..0000000000000 --- a/server/src/test/java/org/opensearch/action/admin/indices/get/GetIndexRequestTests.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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)); - } -}