Skip to content

Commit 63afe87

Browse files
cwperksreta
cwperks
and
reta
authored
Fix compilation issues after upgrade to Lucene 10 (opensearch-project#5053)
Signed-off-by: Craig Perkins <cwperx@amazon.com> Signed-off-by: Andriy Redko <drreta@gmail.com> Co-authored-by: Andriy Redko <drreta@gmail.com>
1 parent 2cb9f7e commit 63afe87

File tree

158 files changed

+238
-229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+238
-229
lines changed

‎.github/workflows/plugin_install.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Plugin Install
33
on: [push, pull_request, workflow_dispatch]
44

55
env:
6-
OPENSEARCH_VERSION: 3.0.0
6+
OPENSEARCH_VERSION: 3.0.0-alpha1
77
PLUGIN_NAME: opensearch-security
88

99
jobs:

‎build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import groovy.json.JsonBuilder
1616

1717
buildscript {
1818
ext {
19-
opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
19+
opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
2020
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
21-
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
21+
buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1")
2222

2323
// 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
2424
version_tokens = opensearch_version.tokenize('-')

‎bwc-test/build.gradle

+8-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ext {
4444

4545
buildscript {
4646
ext {
47-
opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
47+
opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
4848
opensearch_group = "org.opensearch"
4949
common_utils_version = System.getProperty("common_utils.version", '2.9.0.0-SNAPSHOT')
5050
jackson_version = System.getProperty("jackson_version", "2.15.2")
@@ -82,7 +82,7 @@ loggerUsageCheck.enabled = false
8282
testingConventions.enabled = false
8383
validateNebulaPom.enabled = false
8484

85-
String previousVersion = System.getProperty("bwc.version.previous", "2.4.0.0")
85+
String previousVersion = System.getProperty("bwc.version.previous", "2.19.0.0")
8686
String nextVersion = System.getProperty("bwc.version.next", "3.0.0.0")
8787

8888
String bwcVersion = previousVersion
@@ -95,9 +95,13 @@ String nextOpenSearch = extractVersion(nextVersion) + "-SNAPSHOT";
9595

9696
// Extracts the OpenSearch version from a plugin version string, 2.4.0.0 -> 2.4.0.
9797
def String extractVersion(versionStr) {
98-
def versionMatcher = versionStr =~ /(.+?)(\.\d+)$/
98+
def versionMatcher = versionStr =~ /(.+?)(\.\d+)(-(alpha|beta|rc)\d+)?$/
9999
versionMatcher.find()
100-
return versionMatcher.group(1)
100+
if (versionMatcher.group(3) != null) { /* there is a qualifier */
101+
return versionMatcher.group(1) + versionMatcher.group(3)
102+
} else {
103+
return versionMatcher.group(1)
104+
}
101105
}
102106

103107
2.times {i ->

‎src/integrationTest/java/org/opensearch/security/CrossClusterSearchTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import org.opensearch.action.search.SearchRequest;
2525
import org.opensearch.action.search.SearchResponse;
26-
import org.opensearch.client.Client;
2726
import org.opensearch.client.RestHighLevelClient;
2827
import org.opensearch.test.framework.TestSecurityConfig.Role;
2928
import org.opensearch.test.framework.TestSecurityConfig.User;
@@ -32,6 +31,7 @@
3231
import org.opensearch.test.framework.cluster.LocalCluster;
3332
import org.opensearch.test.framework.cluster.SearchRequestFactory;
3433
import org.opensearch.test.framework.cluster.TestRestClient;
34+
import org.opensearch.transport.client.Client;
3535

3636
import static org.hamcrest.MatcherAssert.assertThat;
3737
import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE;

‎src/integrationTest/java/org/opensearch/security/DlsIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
import org.opensearch.action.get.MultiGetResponse;
3434
import org.opensearch.action.search.SearchRequest;
3535
import org.opensearch.action.search.SearchResponse;
36-
import org.opensearch.client.Client;
3736
import org.opensearch.client.RestHighLevelClient;
3837
import org.opensearch.index.query.QueryBuilders;
3938
import org.opensearch.search.aggregations.Aggregation;
4039
import org.opensearch.search.aggregations.metrics.ParsedAvg;
4140
import org.opensearch.test.framework.TestSecurityConfig;
4241
import org.opensearch.test.framework.cluster.ClusterManager;
4342
import org.opensearch.test.framework.cluster.LocalCluster;
43+
import org.opensearch.transport.client.Client;
4444

4545
import static org.hamcrest.MatcherAssert.assertThat;
4646
import static org.hamcrest.Matchers.equalTo;

‎src/integrationTest/java/org/opensearch/security/DoNotFailOnForbiddenTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.opensearch.action.search.SearchRequest;
3636
import org.opensearch.action.search.SearchResponse;
3737
import org.opensearch.action.search.SearchScrollRequest;
38-
import org.opensearch.client.Client;
3938
import org.opensearch.client.Request;
4039
import org.opensearch.client.Response;
4140
import org.opensearch.client.RestHighLevelClient;
@@ -46,6 +45,7 @@
4645
import org.opensearch.test.framework.cluster.LocalCluster;
4746
import org.opensearch.test.framework.cluster.TestRestClient;
4847
import org.opensearch.test.framework.cluster.TestRestClient.HttpResponse;
48+
import org.opensearch.transport.client.Client;
4949

5050
import static org.apache.http.HttpStatus.SC_CREATED;
5151
import static org.hamcrest.MatcherAssert.assertThat;

‎src/integrationTest/java/org/opensearch/security/FlsAndFieldMaskingTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.opensearch.action.search.SearchRequest;
4545
import org.opensearch.action.search.SearchResponse;
4646
import org.opensearch.action.search.SearchScrollRequest;
47-
import org.opensearch.client.Client;
4847
import org.opensearch.client.RestHighLevelClient;
4948
import org.opensearch.index.mapper.SourceFieldMapper;
5049
import org.opensearch.index.mapper.size.SizeFieldMapper;
@@ -61,6 +60,7 @@
6160
import org.opensearch.test.framework.cluster.LocalCluster;
6261
import org.opensearch.test.framework.cluster.TestRestClient;
6362
import org.opensearch.test.framework.log.LogsRule;
63+
import org.opensearch.transport.client.Client;
6464

6565
import static org.apache.http.HttpStatus.SC_OK;
6666
import static org.hamcrest.MatcherAssert.assertThat;

‎src/integrationTest/java/org/opensearch/security/IndexOperationsHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import org.opensearch.action.admin.indices.create.CreateIndexRequest;
1717
import org.opensearch.action.admin.indices.create.CreateIndexResponse;
1818
import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest;
19-
import org.opensearch.client.Client;
2019
import org.opensearch.cluster.metadata.IndexMetadata;
2120
import org.opensearch.common.settings.Settings;
2221
import org.opensearch.test.framework.cluster.LocalCluster;
22+
import org.opensearch.transport.client.Client;
2323

2424
import static org.hamcrest.MatcherAssert.assertThat;
2525
import static org.hamcrest.Matchers.is;

‎src/integrationTest/java/org/opensearch/security/PointInTimeOperationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.opensearch.action.search.GetAllPitNodesResponse;
3030
import org.opensearch.action.search.SearchRequest;
3131
import org.opensearch.action.search.SearchResponse;
32-
import org.opensearch.client.Client;
3332
import org.opensearch.client.RestHighLevelClient;
3433
import org.opensearch.common.unit.TimeValue;
3534
import org.opensearch.search.builder.PointInTimeBuilder;
@@ -39,6 +38,7 @@
3938
import org.opensearch.test.framework.cluster.LocalCluster;
4039
import org.opensearch.test.framework.cluster.TestRestClient;
4140
import org.opensearch.test.framework.cluster.TestRestClient.HttpResponse;
41+
import org.opensearch.transport.client.Client;
4242

4343
import static org.hamcrest.MatcherAssert.assertThat;
4444
import static org.opensearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions.Type.ADD;

‎src/integrationTest/java/org/opensearch/security/ResourceFocusedTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
import org.junit.runner.RunWith;
3434

3535
import org.opensearch.action.index.IndexRequest;
36-
import org.opensearch.client.Client;
3736
import org.opensearch.test.framework.AsyncActions;
3837
import org.opensearch.test.framework.TestSecurityConfig;
3938
import org.opensearch.test.framework.TestSecurityConfig.User;
4039
import org.opensearch.test.framework.cluster.ClusterManager;
4140
import org.opensearch.test.framework.cluster.LocalCluster;
4241
import org.opensearch.test.framework.cluster.TestRestClient;
42+
import org.opensearch.transport.client.Client;
4343

4444
import static org.hamcrest.MatcherAssert.assertThat;
4545
import static org.hamcrest.Matchers.equalTo;

‎src/integrationTest/java/org/opensearch/security/SearchOperationTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@
6969
import org.opensearch.action.search.SearchScrollRequest;
7070
import org.opensearch.action.update.UpdateRequest;
7171
import org.opensearch.action.update.UpdateResponse;
72-
import org.opensearch.client.Client;
73-
import org.opensearch.client.ClusterAdminClient;
74-
import org.opensearch.client.IndicesAdminClient;
7572
import org.opensearch.client.RestHighLevelClient;
7673
import org.opensearch.client.core.CountRequest;
7774
import org.opensearch.client.indices.CloseIndexRequest;
@@ -107,6 +104,9 @@
107104
import org.opensearch.test.framework.audit.AuditLogsRule;
108105
import org.opensearch.test.framework.cluster.ClusterManager;
109106
import org.opensearch.test.framework.cluster.LocalCluster;
107+
import org.opensearch.transport.client.Client;
108+
import org.opensearch.transport.client.ClusterAdminClient;
109+
import org.opensearch.transport.client.IndicesAdminClient;
110110

111111
import static org.hamcrest.MatcherAssert.assertThat;
112112
import static org.hamcrest.Matchers.allOf;

‎src/integrationTest/java/org/opensearch/security/SecurityConfigurationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.junit.rules.TemporaryFolder;
2929
import org.junit.runner.RunWith;
3030

31-
import org.opensearch.client.Client;
3231
import org.opensearch.security.securityconf.impl.CType;
3332
import org.opensearch.test.framework.AsyncActions;
3433
import org.opensearch.test.framework.TestSecurityConfig.Role;
@@ -38,6 +37,7 @@
3837
import org.opensearch.test.framework.cluster.LocalCluster;
3938
import org.opensearch.test.framework.cluster.TestRestClient;
4039
import org.opensearch.test.framework.cluster.TestRestClient.HttpResponse;
40+
import org.opensearch.transport.client.Client;
4141

4242
import static org.hamcrest.MatcherAssert.assertThat;
4343
import static org.hamcrest.Matchers.anyOf;

‎src/integrationTest/java/org/opensearch/security/SnapshotSteps.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public SnapshotSteps(RestHighLevelClient restHighLevelClient) {
4242
}
4343

4444
// CS-SUPPRESS-SINGLE: RegexpSingleline It is not possible to use phrase "cluster manager" instead of master here
45-
public org.opensearch.action.support.master.AcknowledgedResponse createSnapshotRepository(
45+
public org.opensearch.action.support.clustermanager.AcknowledgedResponse createSnapshotRepository(
4646
String repositoryName,
4747
String snapshotDirPath,
4848
String type
@@ -78,14 +78,15 @@ public int waitForSnapshotCreation(String repositoryName, String snapshotName) {
7878
}
7979

8080
// CS-SUPPRESS-SINGLE: RegexpSingleline It is not possible to use phrase "cluster manager" instead of master here
81-
public org.opensearch.action.support.master.AcknowledgedResponse deleteSnapshotRepository(String repositoryName) throws IOException {
81+
public org.opensearch.action.support.clustermanager.AcknowledgedResponse deleteSnapshotRepository(String repositoryName)
82+
throws IOException {
8283
// CS-ENFORCE-SINGLE
8384
DeleteRepositoryRequest request = new DeleteRepositoryRequest(repositoryName);
8485
return snapshotClient.deleteRepository(request, DEFAULT);
8586
}
8687

8788
// CS-SUPPRESS-SINGLE: RegexpSingleline It is not possible to use phrase "cluster manager" instead of master here
88-
public org.opensearch.action.support.master.AcknowledgedResponse deleteSnapshot(String repositoryName, String snapshotName)
89+
public org.opensearch.action.support.clustermanager.AcknowledgedResponse deleteSnapshot(String repositoryName, String snapshotName)
8990
throws IOException {
9091
// CS-ENFORCE-SINGLE
9192
return snapshotClient.delete(new DeleteSnapshotRequest(repositoryName, snapshotName), DEFAULT);

‎src/integrationTest/java/org/opensearch/security/StoredFieldsTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import org.junit.runner.RunWith;
1919

2020
import org.opensearch.action.admin.indices.create.CreateIndexResponse;
21-
import org.opensearch.client.Client;
2221
import org.opensearch.test.framework.TestSecurityConfig;
2322
import org.opensearch.test.framework.cluster.ClusterManager;
2423
import org.opensearch.test.framework.cluster.LocalCluster;
2524
import org.opensearch.test.framework.cluster.TestRestClient;
25+
import org.opensearch.transport.client.Client;
2626

2727
import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE;
2828
import static org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AUTHC_HTTPBASIC_INTERNAL;

‎src/integrationTest/java/org/opensearch/security/http/ExtendedProxyAuthenticationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.junit.Test;
2222
import org.junit.runner.RunWith;
2323

24-
import org.opensearch.client.Client;
2524
import org.opensearch.test.framework.TestSecurityConfig.AuthcDomain;
2625
import org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AuthenticationBackend;
2726
import org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.HttpAuthenticator;
@@ -31,6 +30,7 @@
3130
import org.opensearch.test.framework.cluster.TestRestClient;
3231
import org.opensearch.test.framework.cluster.TestRestClient.HttpResponse;
3332
import org.opensearch.test.framework.cluster.TestRestClientConfiguration;
33+
import org.opensearch.transport.client.Client;
3434

3535
import static org.hamcrest.MatcherAssert.assertThat;
3636
import static org.hamcrest.Matchers.containsInAnyOrder;

‎src/integrationTest/java/org/opensearch/security/http/JwtAuthenticationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import org.opensearch.action.search.SearchRequest;
2828
import org.opensearch.action.search.SearchResponse;
29-
import org.opensearch.client.Client;
3029
import org.opensearch.client.RestHighLevelClient;
3130
import org.opensearch.test.framework.JwtConfigBuilder;
3231
import org.opensearch.test.framework.TestSecurityConfig;
@@ -36,6 +35,7 @@
3635
import org.opensearch.test.framework.cluster.TestRestClient;
3736
import org.opensearch.test.framework.cluster.TestRestClient.HttpResponse;
3837
import org.opensearch.test.framework.log.LogsRule;
38+
import org.opensearch.transport.client.Client;
3939

4040
import io.jsonwebtoken.SignatureAlgorithm;
4141
import io.jsonwebtoken.security.Keys;

‎src/integrationTest/java/org/opensearch/security/http/LdapTlsAuthenticationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import org.opensearch.action.search.SearchRequest;
2626
import org.opensearch.action.search.SearchResponse;
27-
import org.opensearch.client.Client;
2827
import org.opensearch.client.RestHighLevelClient;
2928
import org.opensearch.test.framework.AuthorizationBackend;
3029
import org.opensearch.test.framework.AuthzDomain;
@@ -43,6 +42,7 @@
4342
import org.opensearch.test.framework.cluster.TestRestClient.HttpResponse;
4443
import org.opensearch.test.framework.ldap.EmbeddedLDAPServer;
4544
import org.opensearch.test.framework.log.LogsRule;
45+
import org.opensearch.transport.client.Client;
4646

4747
import static org.hamcrest.MatcherAssert.assertThat;
4848
import static org.hamcrest.Matchers.contains;

‎src/integrationTest/java/org/opensearch/security/systemindex/sampleplugin/IndexDocumentIntoSystemIndexAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
// CS-SUPPRESS-SINGLE: RegexpSingleline It is not possible to use phrase "cluster manager" instead of master here
1414
import org.opensearch.action.ActionType;
15-
import org.opensearch.action.support.master.AcknowledgedResponse;
15+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
1616
// CS-ENFORCE-SINGLE
1717

1818
public class IndexDocumentIntoSystemIndexAction extends ActionType<AcknowledgedResponse> {

‎src/integrationTest/java/org/opensearch/security/systemindex/sampleplugin/RestBulkIndexDocumentIntoMixOfSystemIndexAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
import org.opensearch.action.bulk.BulkRequestBuilder;
1717
import org.opensearch.action.index.IndexRequest;
1818
import org.opensearch.action.support.WriteRequest;
19-
import org.opensearch.client.Client;
20-
import org.opensearch.client.node.NodeClient;
2119
import org.opensearch.core.action.ActionListener;
2220
import org.opensearch.core.rest.RestStatus;
2321
import org.opensearch.core.xcontent.ToXContent;
2422
import org.opensearch.rest.BaseRestHandler;
2523
import org.opensearch.rest.BytesRestResponse;
2624
import org.opensearch.rest.RestChannel;
2725
import org.opensearch.rest.RestRequest;
26+
import org.opensearch.transport.client.Client;
27+
import org.opensearch.transport.client.node.NodeClient;
2828

2929
import static java.util.Collections.singletonList;
3030
import static org.opensearch.rest.RestRequest.Method.PUT;

‎src/integrationTest/java/org/opensearch/security/systemindex/sampleplugin/RestBulkIndexDocumentIntoSystemIndexAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import org.opensearch.action.bulk.BulkRequestBuilder;
1818
import org.opensearch.action.index.IndexRequest;
1919
import org.opensearch.action.support.WriteRequest;
20-
import org.opensearch.client.Client;
21-
import org.opensearch.client.node.NodeClient;
2220
import org.opensearch.common.xcontent.XContentType;
2321
import org.opensearch.core.action.ActionListener;
2422
import org.opensearch.core.rest.RestStatus;
@@ -27,6 +25,8 @@
2725
import org.opensearch.rest.BytesRestResponse;
2826
import org.opensearch.rest.RestChannel;
2927
import org.opensearch.rest.RestRequest;
28+
import org.opensearch.transport.client.Client;
29+
import org.opensearch.transport.client.node.NodeClient;
3030

3131
import static java.util.Collections.singletonList;
3232
import static org.opensearch.rest.RestRequest.Method.PUT;

‎src/integrationTest/java/org/opensearch/security/systemindex/sampleplugin/RestGetOnSystemIndexAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
import java.util.List;
1414

1515
import org.opensearch.action.get.GetRequest;
16-
import org.opensearch.client.node.NodeClient;
1716
import org.opensearch.core.action.ActionListener;
1817
import org.opensearch.core.rest.RestStatus;
1918
import org.opensearch.core.xcontent.ToXContent;
2019
import org.opensearch.rest.BaseRestHandler;
2120
import org.opensearch.rest.BytesRestResponse;
2221
import org.opensearch.rest.RestChannel;
2322
import org.opensearch.rest.RestRequest;
23+
import org.opensearch.transport.client.node.NodeClient;
2424

2525
import static java.util.Collections.singletonList;
2626
import static org.opensearch.rest.RestRequest.Method.GET;

‎src/integrationTest/java/org/opensearch/security/systemindex/sampleplugin/RestIndexDocumentIntoSystemIndexAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
import java.util.List;
1414

15-
import org.opensearch.client.Client;
16-
import org.opensearch.client.node.NodeClient;
1715
import org.opensearch.rest.BaseRestHandler;
1816
import org.opensearch.rest.RestRequest;
1917
import org.opensearch.rest.action.RestToXContentListener;
18+
import org.opensearch.transport.client.Client;
19+
import org.opensearch.transport.client.node.NodeClient;
2020

2121
import static java.util.Collections.singletonList;
2222
import static org.opensearch.rest.RestRequest.Method.PUT;

‎src/integrationTest/java/org/opensearch/security/systemindex/sampleplugin/RestRunClusterHealthAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
import java.util.List;
1414

15-
import org.opensearch.client.Client;
16-
import org.opensearch.client.node.NodeClient;
1715
import org.opensearch.rest.BaseRestHandler;
1816
import org.opensearch.rest.RestRequest;
1917
import org.opensearch.rest.action.RestToXContentListener;
18+
import org.opensearch.transport.client.Client;
19+
import org.opensearch.transport.client.node.NodeClient;
2020

2121
import static java.util.Collections.singletonList;
2222
import static org.opensearch.rest.RestRequest.Method.GET;

‎src/integrationTest/java/org/opensearch/security/systemindex/sampleplugin/RestSearchOnSystemIndexAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import java.util.List;
1414

1515
import org.opensearch.action.search.SearchRequest;
16-
import org.opensearch.client.node.NodeClient;
1716
import org.opensearch.core.action.ActionListener;
1817
import org.opensearch.core.rest.RestStatus;
1918
import org.opensearch.core.xcontent.ToXContent;
@@ -23,6 +22,7 @@
2322
import org.opensearch.rest.RestChannel;
2423
import org.opensearch.rest.RestRequest;
2524
import org.opensearch.search.builder.SearchSourceBuilder;
25+
import org.opensearch.transport.client.node.NodeClient;
2626

2727
import static java.util.Collections.singletonList;
2828
import static org.opensearch.rest.RestRequest.Method.GET;

0 commit comments

Comments
 (0)