From 49e72821de51cd8d55114ccb056b13d1d73670d0 Mon Sep 17 00:00:00 2001 From: Tianli Feng Date: Wed, 22 Jun 2022 21:51:29 -0700 Subject: [PATCH 1/2] Remove class org.opensearch.action.support.master.AcknowledgedResponse Signed-off-by: Tianli Feng --- .../support/master/AcknowledgedResponse.java | 56 ------------------- 1 file changed, 56 deletions(-) delete mode 100644 server/src/main/java/org/opensearch/action/support/master/AcknowledgedResponse.java diff --git a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedResponse.java b/server/src/main/java/org/opensearch/action/support/master/AcknowledgedResponse.java deleted file mode 100644 index 86ae1c313a8e6..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedResponse.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.common.io.stream.StreamInput; - -import java.io.IOException; - -/** - * A response that indicates that a request has been acknowledged - * - * @opensearch.internal - */ -public class AcknowledgedResponse extends org.opensearch.action.support.clustermanager.AcknowledgedResponse { - - public AcknowledgedResponse(StreamInput in) throws IOException { - super(in); - } - - public AcknowledgedResponse(StreamInput in, boolean readAcknowledged) throws IOException { - super(in, readAcknowledged); - } - - public AcknowledgedResponse(boolean acknowledged) { - super(acknowledged); - } -} From 45620b0446d1a2f5dc5f31c62723789a8b90af39 Mon Sep 17 00:00:00 2001 From: Tianli Feng Date: Thu, 23 Jun 2022 07:45:58 -0700 Subject: [PATCH 2/2] Remove class org.opensearch.action.support.master.AcknowledgedRequest RequestBuilder ShardsAcknowledgedResponse Signed-off-by: Tianli Feng --- .../support/master/AcknowledgedRequest.java | 55 ------------------- .../master/AcknowledgedRequestBuilder.java | 53 ------------------ .../master/ShardsAcknowledgedResponse.java | 50 ----------------- 3 files changed, 158 deletions(-) delete mode 100644 server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequest.java delete mode 100644 server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequestBuilder.java delete mode 100644 server/src/main/java/org/opensearch/action/support/master/ShardsAcknowledgedResponse.java diff --git a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequest.java b/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequest.java deleted file mode 100644 index 857f4dc26a111..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequest.java +++ /dev/null @@ -1,55 +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.common.io.stream.StreamInput; - -import java.io.IOException; - -/** - * Abstract class that allows to mark action requests that support acknowledgements. - * Facilitates consistency across different api. - * - * @opensearch.internal - */ -public abstract class AcknowledgedRequest> extends - org.opensearch.action.support.clustermanager.AcknowledgedRequest { - - protected AcknowledgedRequest() { - super(); - } - - protected AcknowledgedRequest(StreamInput in) throws IOException { - super(in); - } -} diff --git a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequestBuilder.java deleted file mode 100644 index e247734691eca..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequestBuilder.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.ActionType; -import org.opensearch.action.support.clustermanager.AcknowledgedRequest; -import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.OpenSearchClient; - -/** - * Base request builder for cluster-manager node operations that support acknowledgements - * - * @opensearch.internal - */ -public abstract class AcknowledgedRequestBuilder< - Request extends AcknowledgedRequest, - Response extends AcknowledgedResponse, - RequestBuilder extends AcknowledgedRequestBuilder> extends - org.opensearch.action.support.clustermanager.AcknowledgedRequestBuilder { - - protected AcknowledgedRequestBuilder(OpenSearchClient client, ActionType action, Request request) { - super(client, action, request); - } -} diff --git a/server/src/main/java/org/opensearch/action/support/master/ShardsAcknowledgedResponse.java b/server/src/main/java/org/opensearch/action/support/master/ShardsAcknowledgedResponse.java deleted file mode 100644 index ac22c0d4eb542..0000000000000 --- a/server/src/main/java/org/opensearch/action/support/master/ShardsAcknowledgedResponse.java +++ /dev/null @@ -1,50 +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.common.io.stream.StreamInput; - -import java.io.IOException; - -/** - * Transport response for shard acknowledgements - * - * @opensearch.internal - */ -public abstract class ShardsAcknowledgedResponse extends org.opensearch.action.support.clustermanager.ShardsAcknowledgedResponse { - - protected ShardsAcknowledgedResponse(StreamInput in, boolean readShardsAcknowledged) throws IOException { - super(in, readShardsAcknowledged); - } - -}