Skip to content

Commit 4688901

Browse files
Jan-Kazlouski-elasticJan-Kazlouski-elastic
committed
Removed getFirst() method calls for backport compatibility
1 parent 64c0685 commit 4688901

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/action/HuggingFaceActionCreatorTests.java‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@ public void testExecute_ReturnsSuccessfulResponse_ForElserAction() throws IOExce
115115
);
116116

117117
assertThat(webServer.requests(), hasSize(1));
118-
assertNull(webServer.requests().getFirst().getUri().getQuery());
118+
assertNull(webServer.requests().get(0).getUri().getQuery());
119119
assertThat(
120-
webServer.requests().getFirst().getHeader(HttpHeaders.CONTENT_TYPE),
120+
webServer.requests().get(0).getHeader(HttpHeaders.CONTENT_TYPE),
121121
equalTo(XContentType.JSON.mediaTypeWithoutParameters())
122122
);
123-
assertThat(webServer.requests().getFirst().getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
123+
assertThat(webServer.requests().get(0).getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
124124

125-
var requestMap = entityAsMap(webServer.requests().getFirst().getBody());
125+
var requestMap = entityAsMap(webServer.requests().get(0).getBody());
126126
assertThat(requestMap.size(), is(1));
127127
assertThat(requestMap.get("inputs"), instanceOf(List.class));
128128
var inputList = (List<String>) requestMap.get("inputs");
@@ -181,14 +181,14 @@ public void testSend_FailsFromInvalidResponseFormat_ForElserAction() throws IOEx
181181
);
182182

183183
assertThat(webServer.requests(), hasSize(1));
184-
assertNull(webServer.requests().getFirst().getUri().getQuery());
184+
assertNull(webServer.requests().get(0).getUri().getQuery());
185185
assertThat(
186-
webServer.requests().getFirst().getHeader(HttpHeaders.CONTENT_TYPE),
186+
webServer.requests().get(0).getHeader(HttpHeaders.CONTENT_TYPE),
187187
equalTo(XContentType.JSON.mediaTypeWithoutParameters())
188188
);
189-
assertThat(webServer.requests().getFirst().getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
189+
assertThat(webServer.requests().get(0).getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
190190

191-
var requestMap = entityAsMap(webServer.requests().getFirst().getBody());
191+
var requestMap = entityAsMap(webServer.requests().get(0).getBody());
192192
assertThat(requestMap.size(), is(1));
193193
assertThat(requestMap.get("inputs"), instanceOf(List.class));
194194
var inputList = (List<String>) requestMap.get("inputs");
@@ -231,14 +231,14 @@ public void testExecute_ReturnsSuccessfulResponse_ForEmbeddingsAction() throws I
231231
assertThat(result.asMap(), is(TextEmbeddingFloatResultsTests.buildExpectationFloat(List.of(new float[] { -0.0123F, 0.123F }))));
232232

233233
assertThat(webServer.requests(), hasSize(1));
234-
assertNull(webServer.requests().getFirst().getUri().getQuery());
234+
assertNull(webServer.requests().get(0).getUri().getQuery());
235235
assertThat(
236-
webServer.requests().getFirst().getHeader(HttpHeaders.CONTENT_TYPE),
236+
webServer.requests().get(0).getHeader(HttpHeaders.CONTENT_TYPE),
237237
equalTo(XContentType.JSON.mediaTypeWithoutParameters())
238238
);
239-
assertThat(webServer.requests().getFirst().getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
239+
assertThat(webServer.requests().get(0).getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
240240

241-
var requestMap = entityAsMap(webServer.requests().getFirst().getBody());
241+
var requestMap = entityAsMap(webServer.requests().get(0).getBody());
242242
assertThat(requestMap.size(), is(1));
243243
assertThat(requestMap.get("inputs"), instanceOf(List.class));
244244
var inputList = (List<String>) requestMap.get("inputs");
@@ -295,14 +295,14 @@ public void testSend_FailsFromInvalidResponseFormat_ForEmbeddingsAction() throws
295295
);
296296

297297
assertThat(webServer.requests(), hasSize(1));
298-
assertNull(webServer.requests().getFirst().getUri().getQuery());
298+
assertNull(webServer.requests().get(0).getUri().getQuery());
299299
assertThat(
300-
webServer.requests().getFirst().getHeader(HttpHeaders.CONTENT_TYPE),
300+
webServer.requests().get(0).getHeader(HttpHeaders.CONTENT_TYPE),
301301
equalTo(XContentType.JSON.mediaTypeWithoutParameters())
302302
);
303-
assertThat(webServer.requests().getFirst().getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
303+
assertThat(webServer.requests().get(0).getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
304304

305-
var requestMap = entityAsMap(webServer.requests().getFirst().getBody());
305+
var requestMap = entityAsMap(webServer.requests().get(0).getBody());
306306
assertThat(requestMap.size(), is(1));
307307
assertThat(requestMap.get("inputs"), instanceOf(List.class));
308308
var inputList = (List<String>) requestMap.get("inputs");
@@ -353,14 +353,14 @@ public void testExecute_ReturnsSuccessfulResponse_AfterTruncating() throws IOExc
353353

354354
assertThat(webServer.requests(), hasSize(2));
355355
{
356-
assertNull(webServer.requests().getFirst().getUri().getQuery());
356+
assertNull(webServer.requests().get(0).getUri().getQuery());
357357
assertThat(
358-
webServer.requests().getFirst().getHeader(HttpHeaders.CONTENT_TYPE),
358+
webServer.requests().get(0).getHeader(HttpHeaders.CONTENT_TYPE),
359359
equalTo(XContentType.JSON.mediaTypeWithoutParameters())
360360
);
361-
assertThat(webServer.requests().getFirst().getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
361+
assertThat(webServer.requests().get(0).getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
362362

363-
var initialRequestAsMap = entityAsMap(webServer.requests().getFirst().getBody());
363+
var initialRequestAsMap = entityAsMap(webServer.requests().get(0).getBody());
364364
var initialInputs = initialRequestAsMap.get("inputs");
365365
assertThat(initialInputs, is(List.of("abcd")));
366366
}
@@ -415,14 +415,14 @@ public void testExecute_TruncatesInputBeforeSending() throws IOException {
415415

416416
assertThat(webServer.requests(), hasSize(1));
417417

418-
assertNull(webServer.requests().getFirst().getUri().getQuery());
418+
assertNull(webServer.requests().get(0).getUri().getQuery());
419419
assertThat(
420-
webServer.requests().getFirst().getHeader(HttpHeaders.CONTENT_TYPE),
420+
webServer.requests().get(0).getHeader(HttpHeaders.CONTENT_TYPE),
421421
equalTo(XContentType.JSON.mediaTypeWithoutParameters())
422422
);
423-
assertThat(webServer.requests().getFirst().getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
423+
assertThat(webServer.requests().get(0).getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
424424

425-
var initialRequestAsMap = entityAsMap(webServer.requests().getFirst().getBody());
425+
var initialRequestAsMap = entityAsMap(webServer.requests().get(0).getBody());
426426
var initialInputs = initialRequestAsMap.get("inputs");
427427
assertThat(initialInputs, is(List.of("123")));
428428

@@ -474,14 +474,14 @@ public void testExecute_ReturnsSuccessfulResponse_ForChatCompletionAction() thro
474474
assertThat(result.asMap(), is(buildExpectationCompletion(List.of("Hello there, how may I assist you today?"))));
475475

476476
assertThat(webServer.requests(), hasSize(1));
477-
assertNull(webServer.requests().getFirst().getUri().getQuery());
477+
assertNull(webServer.requests().get(0).getUri().getQuery());
478478
assertThat(
479-
webServer.requests().getFirst().getHeader(HttpHeaders.CONTENT_TYPE),
479+
webServer.requests().get(0).getHeader(HttpHeaders.CONTENT_TYPE),
480480
equalTo(XContentType.JSON.mediaTypeWithoutParameters())
481481
);
482-
assertThat(webServer.requests().getFirst().getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
482+
assertThat(webServer.requests().get(0).getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
483483

484-
var requestMap = entityAsMap(webServer.requests().getFirst().getBody());
484+
var requestMap = entityAsMap(webServer.requests().get(0).getBody());
485485
assertThat(requestMap.size(), is(4));
486486
assertThat(requestMap.get("messages"), is(List.of(Map.of("role", "user", "content", "Hello"))));
487487
assertThat(requestMap.get("model"), is("model"));
@@ -525,14 +525,14 @@ public void testSend_FailsFromInvalidResponseFormat_ForChatCompletionAction() th
525525
);
526526

527527
assertThat(webServer.requests(), hasSize(1));
528-
assertNull(webServer.requests().getFirst().getUri().getQuery());
528+
assertNull(webServer.requests().get(0).getUri().getQuery());
529529
assertThat(
530-
webServer.requests().getFirst().getHeader(HttpHeaders.CONTENT_TYPE),
530+
webServer.requests().get(0).getHeader(HttpHeaders.CONTENT_TYPE),
531531
equalTo(XContentType.JSON.mediaTypeWithoutParameters())
532532
);
533-
assertThat(webServer.requests().getFirst().getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
533+
assertThat(webServer.requests().get(0).getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
534534

535-
var requestMap = entityAsMap(webServer.requests().getFirst().getBody());
535+
var requestMap = entityAsMap(webServer.requests().get(0).getBody());
536536
assertThat(requestMap.size(), is(4));
537537
assertThat(requestMap.get("messages"), is(List.of(Map.of("role", "user", "content", "Hello"))));
538538
assertThat(requestMap.get("model"), is("model"));

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/action/HuggingFaceChatCompletionActionTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public void testExecute_ReturnsSuccessfulResponse() throws IOException {
126126
assertThat(result.asMap(), is(buildExpectationCompletion(List.of("result content"))));
127127
assertThat(webServer.requests(), hasSize(1));
128128

129-
MockRequest request = webServer.requests().getFirst();
129+
MockRequest request = webServer.requests().get(0);
130130

131131
assertNull(request.getUri().getQuery());
132132
assertThat(request.getHeader(HttpHeaders.CONTENT_TYPE), equalTo(XContentType.JSON.mediaTypeWithoutParameters()));

0 commit comments

Comments
 (0)