Skip to content

Commit 40c7c81

Browse files
Fix compileTestsJava
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
1 parent 638d381 commit 40c7c81

10 files changed

+26
-10
lines changed

plugin/src/test/java/org/opensearch/ml/action/controller/CreateControllerTransportActionTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ public void setup() throws IOException {
149149
actionFilters,
150150
mlIndicesHandler,
151151
client,
152+
Settings.EMPTY,
152153
clusterService,
153154
modelAccessControlHelper,
154155
mlModelCacheHelper,

plugin/src/test/java/org/opensearch/ml/action/controller/DeleteControllerTransportActionTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ public void setup() throws IOException {
147147
transportService,
148148
actionFilters,
149149
client,
150+
Settings.EMPTY,
150151
xContentRegistry,
151152
clusterService,
152153
mlModelManager,

plugin/src/test/java/org/opensearch/ml/action/controller/GetControllerTransportActionTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public void setup() throws IOException {
103103
transportService,
104104
actionFilters,
105105
client,
106+
settings,
106107
xContentRegistry,
107108
clusterService,
108109
mlModelManager,

plugin/src/test/java/org/opensearch/ml/action/controller/UpdateControllerTransportActionTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ public void setup() throws IOException {
151151
transportService,
152152
actionFilters,
153153
client,
154+
Settings.EMPTY,
154155
clusterService,
155156
modelAccessControlHelper,
156157
mlModelCacheHelper,

plugin/src/test/java/org/opensearch/ml/action/model_group/SearchModelGroupTransportActionTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public void setup() {
9797
transportService,
9898
actionFilters,
9999
client,
100+
Settings.EMPTY,
100101
sdkClient,
101102
clusterService,
102103
modelAccessControlHelper,

plugin/src/test/java/org/opensearch/ml/action/models/SearchModelTransportActionTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public class SearchModelTransportActionTests extends OpenSearchTestCase {
114114
public void setup() {
115115
MockitoAnnotations.openMocks(this);
116116
sdkClient = SdkClientFactory.createSdkClient(client, NamedXContentRegistry.EMPTY, Collections.emptyMap());
117-
mlSearchHandler = spy(new MLSearchHandler(client, namedXContentRegistry, modelAccessControlHelper, clusterService));
117+
mlSearchHandler = spy(new MLSearchHandler(client, namedXContentRegistry, modelAccessControlHelper, clusterService, Settings.EMPTY));
118118
searchModelTransportAction = new SearchModelTransportAction(
119119
transportService,
120120
actionFilters,
@@ -184,7 +184,7 @@ public void test_DoExecute_addBackendRoles() throws IOException {
184184
listener.onResponse(searchResponse);
185185
return null;
186186
}).when(client).search(any(), any());
187-
when(modelAccessControlHelper.createSearchSourceBuilder(any())).thenReturn(searchSourceBuilder);
187+
when(modelAccessControlHelper.createSearchSourceBuilder(any(), Settings.EMPTY)).thenReturn(searchSourceBuilder);
188188
searchModelTransportAction.doExecute(null, mlSearchActionRequest, actionListener);
189189
verify(mlSearchHandler).search(sdkClient, mlSearchActionRequest, null, actionListener);
190190
verify(client, times(2)).search(any(), any());
@@ -196,7 +196,7 @@ public void test_DoExecute_addBackendRoles_without_groupIds() {
196196
listener.onResponse(searchResponse);
197197
return null;
198198
}).when(client).search(any(), isA(ActionListener.class));
199-
when(modelAccessControlHelper.createSearchSourceBuilder(any())).thenReturn(searchSourceBuilder);
199+
when(modelAccessControlHelper.createSearchSourceBuilder(any(), Settings.EMPTY)).thenReturn(searchSourceBuilder);
200200
searchModelTransportAction.doExecute(null, mlSearchActionRequest, actionListener);
201201
verify(mlSearchHandler).search(sdkClient, mlSearchActionRequest, null, actionListener);
202202
verify(client, times(2)).search(any(), any());
@@ -208,7 +208,7 @@ public void test_DoExecute_addBackendRoles_exception() {
208208
listener.onFailure(new RuntimeException("runtime exception"));
209209
return null;
210210
}).when(client).search(any(), isA(ActionListener.class));
211-
when(modelAccessControlHelper.createSearchSourceBuilder(any())).thenReturn(searchSourceBuilder);
211+
when(modelAccessControlHelper.createSearchSourceBuilder(any(), Settings.EMPTY)).thenReturn(searchSourceBuilder);
212212
searchModelTransportAction.doExecute(null, mlSearchActionRequest, actionListener);
213213
verify(mlSearchHandler).search(sdkClient, mlSearchActionRequest, null, actionListener);
214214
verify(client, times(1)).search(any(), any());
@@ -281,7 +281,7 @@ public void test_DoExecute_addBackendRoles_boolQuery() throws IOException {
281281
listener.onResponse(searchResponse);
282282
return null;
283283
}).when(client).search(any(), isA(ActionListener.class));
284-
when(modelAccessControlHelper.createSearchSourceBuilder(any())).thenReturn(searchSourceBuilder);
284+
when(modelAccessControlHelper.createSearchSourceBuilder(any(), Settings.EMPTY)).thenReturn(searchSourceBuilder);
285285
searchRequest.source().query(QueryBuilders.boolQuery().must(QueryBuilders.matchQuery("name", "model_IT")));
286286
searchModelTransportAction.doExecute(null, mlSearchActionRequest, actionListener);
287287
verify(mlSearchHandler).search(sdkClient, mlSearchActionRequest, null, actionListener);
@@ -295,7 +295,7 @@ public void test_DoExecute_addBackendRoles_termQuery() throws IOException {
295295
listener.onResponse(searchResponse);
296296
return null;
297297
}).when(client).search(any(), isA(ActionListener.class));
298-
when(modelAccessControlHelper.createSearchSourceBuilder(any())).thenReturn(searchSourceBuilder);
298+
when(modelAccessControlHelper.createSearchSourceBuilder(any(), Settings.EMPTY)).thenReturn(searchSourceBuilder);
299299
searchRequest.source().query(QueryBuilders.termQuery("name", "model_IT"));
300300
searchModelTransportAction.doExecute(null, mlSearchActionRequest, actionListener);
301301
verify(mlSearchHandler).search(sdkClient, mlSearchActionRequest, null, actionListener);
@@ -330,7 +330,7 @@ public void testDoExecute_MultiTenancyEnabled_TenantFilteringEnabled() throws In
330330
return null;
331331
}).when(client).search(any(), any());
332332

333-
when(modelAccessControlHelper.createSearchSourceBuilder(any())).thenReturn(searchSourceBuilder);
333+
when(modelAccessControlHelper.createSearchSourceBuilder(any(), Settings.EMPTY)).thenReturn(searchSourceBuilder);
334334
searchRequest.source().query(QueryBuilders.termQuery("name", "model_IT"));
335335
mlSearchActionRequest = new MLSearchActionRequest(searchRequest, "123456");
336336

plugin/src/test/java/org/opensearch/ml/action/tasks/CancelBatchJobTransportActionTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ public void setup() throws IOException {
140140
transportService,
141141
actionFilters,
142142
client,
143+
settings,
143144
xContentRegistry,
144145
clusterService,
145146
scriptService,

plugin/src/test/java/org/opensearch/ml/action/upload_chunk/MLModelChunkUploaderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public void setup() throws IOException {
117117

118118
threadContext.putTransient(ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "alex|IT,HR|engineering,operations");
119119

120-
mlModelChunkUploader = new MLModelChunkUploader(mlIndicesHandler, client, xContentRegistry, modelAccessControlHelper);
120+
mlModelChunkUploader = new MLModelChunkUploader(mlIndicesHandler, client, settings, xContentRegistry, modelAccessControlHelper);
121121

122122
MLModel mlModel = MLModel
123123
.builder()

plugin/src/test/java/org/opensearch/ml/action/upload_chunk/TransportRegisterModelMetaActionTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public void setup() throws IOException {
8686
actionFilters,
8787
mlModelManager,
8888
client,
89+
settings,
8990
modelAccessControlHelper,
9091
mlModelGroupManager
9192
);

plugin/src/test/java/org/opensearch/ml/helper/ModelAccessControlHelperTests.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,16 @@ public void test_PrivateModelGroupWithDifferentOwner() throws IOException, Inter
346346
CountDownLatch latch = new CountDownLatch(1);
347347
LatchedActionListener<Boolean> latchedActionListener = new LatchedActionListener<>(actionListener, latch);
348348
modelAccessControlHelper
349-
.validateModelGroupAccess(user, mlFeatureEnabledSetting, null, "testGroupID", client, sdkClient, latchedActionListener);
349+
.validateModelGroupAccess(
350+
user,
351+
mlFeatureEnabledSetting,
352+
null,
353+
"testGroupID",
354+
client,
355+
sdkClient,
356+
Settings.EMPTY,
357+
latchedActionListener
358+
);
350359
latch.await(500, TimeUnit.MILLISECONDS);
351360

352361
ArgumentCaptor<Boolean> argumentCaptor = ArgumentCaptor.forClass(Boolean.class);
@@ -461,7 +470,7 @@ public void test_AddUserBackendRolesFilter() {
461470

462471
public void test_CreateSearchSourceBuilder() {
463472
User user = User.parse("owner|IT,HR|myTenant");
464-
assertNotNull(modelAccessControlHelper.createSearchSourceBuilder(user));
473+
assertNotNull(modelAccessControlHelper.createSearchSourceBuilder(user, Settings.EMPTY));
465474
}
466475

467476
private GetResponse modelGroupBuilder(List<String> backendRoles, String access, String owner) throws IOException {

0 commit comments

Comments
 (0)