Skip to content

Commit

Permalink
Restore using the class ClusterInfoRequest and ClusterInfoRequestBuil…
Browse files Browse the repository at this point in the history
…der from package 'org.opensearch.action.support.master.info' for subclasses (opensearch-project#4307)

* Restore using the class ClusterInfoRequest and ClusterInfoRequestBuilder from package 'org.opensearch.action.support.master.info' for subclasses

Signed-off-by: Tianli Feng <[email protected]>

* Add changelog

Signed-off-by: Tianli Feng <[email protected]>

Signed-off-by: Tianli Feng <[email protected]>
Co-authored-by: Andrew Ross <[email protected]>
  • Loading branch information
Tianli Feng and andrross committed Aug 29, 2022
1 parent 38372e1 commit 568162c
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
### Fixed
- `opensearch-service.bat start` and `opensearch-service.bat manager` failing to run ([#4289](https://github.com/opensearch-project/OpenSearch/pull/4289))
- PR reference to checkout code for changelog verifier ([#4296](https://github.com/opensearch-project/OpenSearch/pull/4296))
- Restore using the class ClusterInfoRequest and ClusterInfoRequestBuilder from package 'org.opensearch.action.support.master.info' for subclasses ([#4307](https://github.com/opensearch-project/OpenSearch/pull/4307))
- Do not fail replica shard due to primary closure ([#4133](https://github.com/opensearch-project/OpenSearch/pull/4133))

### Security
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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));
}
}

0 comments on commit 568162c

Please sign in to comment.