Skip to content

Commit 90d56ca

Browse files
dbwiddisdbwiddis
committed
Update hits value getter for Lucene breaking change
Signed-off-by: Daniel Widdis <[email protected]>
1 parent 87372e6 commit 90d56ca

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

‎plugin/src/test/java/org/opensearch/ml/rest/MLCommonsTenantAwareRestTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ protected static void deleteAndWaitForSearch(String tenantId, String restPath, S
223223
Response response = makeRequest(searchRequest, GET, restPath + "_search");
224224
assertOK(response);
225225
SearchResponse searchResponse = searchResponseFromResponse(response);
226-
assertEquals(hits, searchResponse.getHits().getTotalHits().value);
226+
assertEquals(hits, searchResponse.getHits().getTotalHits().value());
227227
}, 20, TimeUnit.SECONDS);
228228
}
229229

‎plugin/src/test/java/org/opensearch/ml/rest/RestMLAgentTenantAwareIT.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,10 @@ public void testAgentCRUD() throws Exception {
212212
assertOK(restResponse);
213213
SearchResponse searchResponse = searchResponseFromResponse(restResponse);
214214
if (multiTenancyEnabled) {
215-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
215+
assertEquals(1, searchResponse.getHits().getTotalHits().value());
216216
assertEquals(tenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
217217
} else {
218-
assertEquals(2, searchResponse.getHits().getTotalHits().value);
218+
assertEquals(2, searchResponse.getHits().getTotalHits().value());
219219
assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
220220
assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD));
221221
}
@@ -227,10 +227,10 @@ public void testAgentCRUD() throws Exception {
227227
assertOK(restResponse);
228228
SearchResponse searchResponse = searchResponseFromResponse(restResponse);
229229
if (multiTenancyEnabled) {
230-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
230+
assertEquals(1, searchResponse.getHits().getTotalHits().value());
231231
assertEquals(otherTenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
232232
} else {
233-
assertEquals(2, searchResponse.getHits().getTotalHits().value);
233+
assertEquals(2, searchResponse.getHits().getTotalHits().value());
234234
assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
235235
assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD));
236236
}
@@ -250,7 +250,7 @@ public void testAgentCRUD() throws Exception {
250250
response = makeRequest(nullTenantMatchAllRequest, GET, AGENTS_PATH + "_search");
251251
assertOK(response);
252252
SearchResponse searchResponse = searchResponseFromResponse(response);
253-
assertEquals(2, searchResponse.getHits().getTotalHits().value);
253+
assertEquals(2, searchResponse.getHits().getTotalHits().value());
254254
assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
255255
assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD));
256256
}

‎plugin/src/test/java/org/opensearch/ml/rest/RestMLConnectorTenantAwareIT.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,10 @@ public void testConnectorCRUD() throws Exception {
182182
assertOK(restResponse);
183183
SearchResponse searchResponse = searchResponseFromResponse(restResponse);
184184
if (multiTenancyEnabled) {
185-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
185+
assertEquals(1, searchResponse.getHits().getTotalHits().value());
186186
assertEquals(tenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
187187
} else {
188-
assertEquals(2, searchResponse.getHits().getTotalHits().value);
188+
assertEquals(2, searchResponse.getHits().getTotalHits().value());
189189
assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
190190
assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD));
191191
}
@@ -197,10 +197,10 @@ public void testConnectorCRUD() throws Exception {
197197
assertOK(restResponse);
198198
SearchResponse searchResponse = searchResponseFromResponse(restResponse);
199199
if (multiTenancyEnabled) {
200-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
200+
assertEquals(1, searchResponse.getHits().getTotalHits().value());
201201
assertEquals(otherTenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
202202
} else {
203-
assertEquals(2, searchResponse.getHits().getTotalHits().value);
203+
assertEquals(2, searchResponse.getHits().getTotalHits().value());
204204
assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
205205
assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD));
206206
}
@@ -220,7 +220,7 @@ public void testConnectorCRUD() throws Exception {
220220
response = makeRequest(nullTenantMatchAllRequest, GET, CONNECTORS_PATH + "_search");
221221
assertOK(response);
222222
SearchResponse searchResponse = searchResponseFromResponse(response);
223-
assertEquals(2, searchResponse.getHits().getTotalHits().value);
223+
assertEquals(2, searchResponse.getHits().getTotalHits().value());
224224
assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
225225
assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD));
226226
}

‎plugin/src/test/java/org/opensearch/ml/rest/RestMLModelGroupTenantAwareIT.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,10 @@ public void testModelGroupCRUD() throws Exception {
279279
assertOK(response);
280280
SearchResponse searchResponse = searchResponseFromResponse(response);
281281
if (multiTenancyEnabled) {
282-
assertEquals(2, searchResponse.getHits().getTotalHits().value);
282+
assertEquals(2, searchResponse.getHits().getTotalHits().value());
283283
assertEquals(tenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
284284
} else {
285-
assertEquals(3, searchResponse.getHits().getTotalHits().value);
285+
assertEquals(3, searchResponse.getHits().getTotalHits().value());
286286
assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
287287
assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD));
288288
}
@@ -292,10 +292,10 @@ public void testModelGroupCRUD() throws Exception {
292292
assertOK(response);
293293
searchResponse = searchResponseFromResponse(response);
294294
if (multiTenancyEnabled) {
295-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
295+
assertEquals(1, searchResponse.getHits().getTotalHits().value());
296296
assertEquals(otherTenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
297297
} else {
298-
assertEquals(3, searchResponse.getHits().getTotalHits().value);
298+
assertEquals(3, searchResponse.getHits().getTotalHits().value());
299299
assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
300300
assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD));
301301
}
@@ -314,7 +314,7 @@ public void testModelGroupCRUD() throws Exception {
314314
response = makeRequest(nullTenantMatchAllRequest, GET, MODEL_GROUPS_PATH + "_search");
315315
assertOK(response);
316316
searchResponse = searchResponseFromResponse(response);
317-
assertEquals(3, searchResponse.getHits().getTotalHits().value);
317+
assertEquals(3, searchResponse.getHits().getTotalHits().value());
318318
assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
319319
assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD));
320320
}

‎plugin/src/test/java/org/opensearch/ml/rest/RestMLModelTenantAwareIT.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,10 @@ public void testModelCRUD() throws Exception {
226226
assertOK(restResponse);
227227
SearchResponse searchResponse = searchResponseFromResponse(restResponse);
228228
if (multiTenancyEnabled) {
229-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
229+
assertEquals(1, searchResponse.getHits().getTotalHits().value());
230230
assertEquals(tenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
231231
} else {
232-
assertEquals(3, searchResponse.getHits().getTotalHits().value);
232+
assertEquals(3, searchResponse.getHits().getTotalHits().value());
233233
assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
234234
assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD));
235235
}
@@ -241,10 +241,10 @@ public void testModelCRUD() throws Exception {
241241
assertOK(restResponse);
242242
SearchResponse searchResponse = searchResponseFromResponse(restResponse);
243243
if (multiTenancyEnabled) {
244-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
244+
assertEquals(1, searchResponse.getHits().getTotalHits().value());
245245
assertEquals(otherTenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
246246
} else {
247-
assertEquals(3, searchResponse.getHits().getTotalHits().value);
247+
assertEquals(3, searchResponse.getHits().getTotalHits().value());
248248
assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
249249
assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD));
250250
}
@@ -264,7 +264,7 @@ public void testModelCRUD() throws Exception {
264264
response = makeRequest(nullTenantMatchAllRequest, GET, MODELS_PATH + "_search");
265265
assertOK(response);
266266
SearchResponse searchResponse = searchResponseFromResponse(response);
267-
assertEquals(3, searchResponse.getHits().getTotalHits().value);
267+
assertEquals(3, searchResponse.getHits().getTotalHits().value());
268268
assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD));
269269
assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD));
270270
}

0 commit comments

Comments
 (0)