Skip to content

Commit a89fdf1

Browse files
fzowlfzowl
committed
Removing warnings
1 parent 3f1a75a commit a89fdf1

File tree

16 files changed

+107
-122
lines changed

16 files changed

+107
-122
lines changed

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/voyageai/VoyageAIRerankResponseEntity.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class VoyageAIRerankResponseEntity {
3535

3636
/**
3737
* Parses the VoyageAI ranked response.
38-
*
3938
* For a request like:
4039
* "model": "rerank-2",
4140
* "query": "What is the capital of the United States?",

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ public static VoyageAIEmbeddingsTaskSettings fromMap(Map<String, Object> map) {
7171
* Creates a new {@link VoyageAIEmbeddingsTaskSettings} by preferring non-null fields from the provided parameters.
7272
* For the input type, preference is given to requestInputType if it is not null and not UNSPECIFIED.
7373
* Then preference is given to the requestTaskSettings and finally to originalSettings even if the value is null.
74-
*
7574
* Similarly, for the truncation field preference is given to requestTaskSettings if it is not null and then to
7675
* originalSettings.
7776
* @param originalSettings the settings stored as part of the inference entity configuration

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/action/voyageai/VoyageAIActionCreatorTests.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.elasticsearch.threadpool.ThreadPool;
2020
import org.elasticsearch.xcontent.XContentType;
2121
import org.elasticsearch.xpack.core.inference.action.InferenceAction;
22-
import org.elasticsearch.xpack.inference.external.action.voyageai.VoyageAIActionCreator;
2322
import org.elasticsearch.xpack.inference.external.http.HttpClientManager;
2423
import org.elasticsearch.xpack.inference.external.http.sender.DocumentsOnlyInput;
2524
import org.elasticsearch.xpack.inference.external.http.sender.HttpRequestSenderTests;
@@ -114,14 +113,14 @@ public void testCreate_VoyageAIEmbeddingsModel() throws IOException {
114113

115114
MatcherAssert.assertThat(result.asMap(), is(buildExpectationFloat(List.of(new float[] { 0.123F, -0.123F }))));
116115
MatcherAssert.assertThat(webServer.requests(), hasSize(1));
117-
assertNull(webServer.requests().get(0).getUri().getQuery());
116+
assertNull(webServer.requests().getFirst().getUri().getQuery());
118117
MatcherAssert.assertThat(
119-
webServer.requests().get(0).getHeader(HttpHeaders.CONTENT_TYPE),
118+
webServer.requests().getFirst().getHeader(HttpHeaders.CONTENT_TYPE),
120119
equalTo(XContentType.JSON.mediaType())
121120
);
122-
MatcherAssert.assertThat(webServer.requests().get(0).getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
121+
MatcherAssert.assertThat(webServer.requests().getFirst().getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
123122

124-
var requestMap = entityAsMap(webServer.requests().get(0).getBody());
123+
var requestMap = entityAsMap(webServer.requests().getFirst().getBody());
125124
MatcherAssert.assertThat(
126125
requestMap,
127126
is(

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/action/voyageai/VoyageAIEmbeddingsActionTests.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -123,18 +123,18 @@ public void testExecute_ReturnsSuccessfulResponse() throws IOException {
123123

124124
MatcherAssert.assertThat(result.asMap(), is(buildExpectationFloat(List.of(new float[] { 0.123F, -0.123F }))));
125125
MatcherAssert.assertThat(webServer.requests(), hasSize(1));
126-
assertNull(webServer.requests().get(0).getUri().getQuery());
126+
assertNull(webServer.requests().getFirst().getUri().getQuery());
127127
MatcherAssert.assertThat(
128-
webServer.requests().get(0).getHeader(HttpHeaders.CONTENT_TYPE),
128+
webServer.requests().getFirst().getHeader(HttpHeaders.CONTENT_TYPE),
129129
equalTo(XContentType.JSON.mediaType())
130130
);
131-
MatcherAssert.assertThat(webServer.requests().get(0).getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
131+
MatcherAssert.assertThat(webServer.requests().getFirst().getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
132132
MatcherAssert.assertThat(
133-
webServer.requests().get(0).getHeader(VoyageAIUtils.REQUEST_SOURCE_HEADER),
133+
webServer.requests().getFirst().getHeader(VoyageAIUtils.REQUEST_SOURCE_HEADER),
134134
equalTo(VoyageAIUtils.ELASTIC_REQUEST_SOURCE)
135135
);
136136

137-
var requestMap = entityAsMap(webServer.requests().get(0).getBody());
137+
var requestMap = entityAsMap(webServer.requests().getFirst().getBody());
138138
MatcherAssert.assertThat(
139139
requestMap,
140140
equalTo(
@@ -192,18 +192,18 @@ public void testExecute_ReturnsSuccessfulResponse_ForInt8ResponseType() throws I
192192

193193
assertEquals(buildExpectationByte(List.of(new byte[] { 0, -1 })), result.asMap());
194194
MatcherAssert.assertThat(webServer.requests(), hasSize(1));
195-
assertNull(webServer.requests().get(0).getUri().getQuery());
195+
assertNull(webServer.requests().getFirst().getUri().getQuery());
196196
MatcherAssert.assertThat(
197-
webServer.requests().get(0).getHeader(HttpHeaders.CONTENT_TYPE),
197+
webServer.requests().getFirst().getHeader(HttpHeaders.CONTENT_TYPE),
198198
equalTo(XContentType.JSON.mediaType())
199199
);
200-
MatcherAssert.assertThat(webServer.requests().get(0).getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
200+
MatcherAssert.assertThat(webServer.requests().getFirst().getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
201201
MatcherAssert.assertThat(
202-
webServer.requests().get(0).getHeader(VoyageAIUtils.REQUEST_SOURCE_HEADER),
202+
webServer.requests().getFirst().getHeader(VoyageAIUtils.REQUEST_SOURCE_HEADER),
203203
equalTo(VoyageAIUtils.ELASTIC_REQUEST_SOURCE)
204204
);
205205

206-
var requestMap = entityAsMap(webServer.requests().get(0).getBody());
206+
var requestMap = entityAsMap(webServer.requests().getFirst().getBody());
207207
MatcherAssert.assertThat(
208208
requestMap,
209209
is(
@@ -261,18 +261,18 @@ public void testExecute_ReturnsSuccessfulResponse_ForBinaryResponseType() throws
261261

262262
assertEquals(buildExpectationBinary(List.of(new byte[] { 0, -1 })), result.asMap());
263263
MatcherAssert.assertThat(webServer.requests(), hasSize(1));
264-
assertNull(webServer.requests().get(0).getUri().getQuery());
264+
assertNull(webServer.requests().getFirst().getUri().getQuery());
265265
MatcherAssert.assertThat(
266-
webServer.requests().get(0).getHeader(HttpHeaders.CONTENT_TYPE),
266+
webServer.requests().getFirst().getHeader(HttpHeaders.CONTENT_TYPE),
267267
equalTo(XContentType.JSON.mediaType())
268268
);
269-
MatcherAssert.assertThat(webServer.requests().get(0).getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
269+
MatcherAssert.assertThat(webServer.requests().getFirst().getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
270270
MatcherAssert.assertThat(
271-
webServer.requests().get(0).getHeader(VoyageAIUtils.REQUEST_SOURCE_HEADER),
271+
webServer.requests().getFirst().getHeader(VoyageAIUtils.REQUEST_SOURCE_HEADER),
272272
equalTo(VoyageAIUtils.ELASTIC_REQUEST_SOURCE)
273273
);
274274

275-
var requestMap = entityAsMap(webServer.requests().get(0).getBody());
275+
var requestMap = entityAsMap(webServer.requests().getFirst().getBody());
276276
MatcherAssert.assertThat(
277277
requestMap,
278278
is(

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/voyageai/VoyageAIEmbeddingsRequestEntityTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.elasticsearch.xcontent.XContentBuilder;
1414
import org.elasticsearch.xcontent.XContentFactory;
1515
import org.elasticsearch.xcontent.XContentType;
16-
import org.elasticsearch.xpack.inference.external.request.voyageai.VoyageAIEmbeddingsRequestEntity;
1716
import org.elasticsearch.xpack.inference.services.voyageai.embeddings.VoyageAIEmbeddingsTaskSettings;
1817
import org.elasticsearch.xpack.inference.services.voyageai.embeddings.VoyageAIEmbeddingsServiceSettings;
1918
import org.hamcrest.MatcherAssert;

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/voyageai/VoyageAIEmbeddingsRequestTests.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import org.elasticsearch.inference.InputType;
1313
import org.elasticsearch.test.ESTestCase;
1414
import org.elasticsearch.xcontent.XContentType;
15-
import org.elasticsearch.xpack.inference.external.request.voyageai.VoyageAIEmbeddingsRequest;
16-
import org.elasticsearch.xpack.inference.external.request.voyageai.VoyageAIUtils;
1715
import org.elasticsearch.xpack.inference.services.voyageai.embeddings.VoyageAIEmbeddingsModel;
1816
import org.elasticsearch.xpack.inference.services.voyageai.embeddings.VoyageAIEmbeddingsModelTests;
1917
import org.elasticsearch.xpack.inference.services.voyageai.embeddings.VoyageAIEmbeddingsTaskSettings;

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/voyageai/VoyageAIRequestTests.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
import org.elasticsearch.test.ESTestCase;
1414
import org.elasticsearch.xcontent.XContentType;
1515
import org.elasticsearch.xpack.inference.external.voyageai.VoyageAIAccount;
16-
import org.elasticsearch.xpack.inference.external.request.voyageai.VoyageAIRequest;
17-
import org.elasticsearch.xpack.inference.external.request.voyageai.VoyageAIUtils;
1816

1917
import java.net.URI;
2018

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/voyageai/VoyageAIRerankRequestEntityTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.elasticsearch.xcontent.XContentBuilder;
1313
import org.elasticsearch.xcontent.XContentFactory;
1414
import org.elasticsearch.xcontent.XContentType;
15-
import org.elasticsearch.xpack.inference.external.request.voyageai.VoyageAIRerankRequestEntity;
1615
import org.elasticsearch.xpack.inference.services.voyageai.rerank.VoyageAIRerankTaskSettings;
1716

1817
import java.io.IOException;

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/voyageai/VoyageAIRerankRequestTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.elasticsearch.core.Nullable;
1313
import org.elasticsearch.test.ESTestCase;
1414
import org.elasticsearch.xcontent.XContentType;
15-
import org.elasticsearch.xpack.inference.external.request.voyageai.VoyageAIRerankRequest;
1615
import org.elasticsearch.xpack.inference.services.voyageai.rerank.VoyageAIRerankModelTests;
1716

1817
import java.io.IOException;

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/voyageai/VoyageAIUtilsTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.xpack.inference.external.request.voyageai;
99

1010
import org.elasticsearch.test.ESTestCase;
11-
import org.elasticsearch.xpack.inference.external.request.voyageai.VoyageAIUtils;
1211

1312
import static org.hamcrest.Matchers.is;
1413

0 commit comments

Comments
 (0)