Skip to content

Commit e30b0be

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent d5b43b1 commit e30b0be

File tree

2 files changed

+60
-60
lines changed

2 files changed

+60
-60
lines changed

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/response/elastic/ElasticInferenceServiceAuthorizationResponseEntityTests.java

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,19 @@
1717

1818
import static org.hamcrest.Matchers.is;
1919

20-
2120
public class ElasticInferenceServiceAuthorizationResponseEntityTests extends ESTestCase {
2221

2322
public void testParseAllFields() throws IOException {
2423
String json = """
25-
{
26-
"models": [
27-
{
28-
"model_name": "test_model",
29-
"task_types": ["embedding/text/sparse", "chat/completion"]
30-
}
31-
]
32-
}
33-
""";
24+
{
25+
"models": [
26+
{
27+
"model_name": "test_model",
28+
"task_types": ["embedding/text/sparse", "chat/completion"]
29+
}
30+
]
31+
}
32+
""";
3433

3534
try (var parser = createParser(JsonXContent.jsonXContent, json)) {
3635
var entity = ElasticInferenceServiceAuthorizationResponseEntity.PARSER.apply(parser, null);
@@ -47,13 +46,12 @@ public void testParseAllFields() throws IOException {
4746
}
4847
}
4948

50-
5149
public void testParsing_EmptyModels() throws IOException {
5250
String json = """
53-
{
54-
"models": []
55-
}
56-
""";
51+
{
52+
"models": []
53+
}
54+
""";
5755

5856
try (var parser = createParser(JsonXContent.jsonXContent, json)) {
5957
var entity = ElasticInferenceServiceAuthorizationResponseEntity.PARSER.apply(parser, null);

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandlerTests.java

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ public void testGetAuthorization_ReturnsAValidResponse() throws IOException {
185185
verifyNoMoreInteractions(logger);
186186
}
187187
}
188+
188189
@SuppressWarnings("unchecked")
189190
public void testGetAuthorization_OnResponseCalledOnce() throws IllegalStateException {
190191
var senderFactory = HttpRequestSenderTests.createSenderFactory(threadPool, clientManager);
@@ -195,15 +196,15 @@ public void testGetAuthorization_OnResponseCalledOnce() throws IllegalStateExcep
195196
ActionListener<ElasticInferenceServiceAuthorization> listener = mock(ActionListener.class);
196197

197198
String responseJson = """
198-
{
199-
"models": [
200-
{
201-
"model_name": "model-a",
202-
"task_types": ["embedding/text/sparse", "chat/completion"]
203-
}
204-
]
205-
}
206-
""";
199+
{
200+
"models": [
201+
{
202+
"model_name": "model-a",
203+
"task_types": ["embedding/text/sparse", "chat/completion"]
204+
}
205+
]
206+
}
207+
""";
207208

208209
webServer.enqueue(new MockResponse().setResponseCode(200).setBody(responseJson));
209210

@@ -214,45 +215,46 @@ public void testGetAuthorization_OnResponseCalledOnce() throws IllegalStateExcep
214215
verifyNoMoreInteractions(logger);
215216
}
216217

217-
public void testGetAuthorization_InvalidResponse() throws IOException {
218-
var senderFactory = HttpRequestSenderTests.createSenderFactory(threadPool, clientManager);
219-
var eisGatewayUrl = getUrl(webServer);
220-
var logger = mock(Logger.class);
221-
var authHandler = new ElasticInferenceServiceAuthorizationHandler(eisGatewayUrl, threadPool, logger);
218+
public void testGetAuthorization_InvalidResponse() throws IOException {
219+
var senderFactory = HttpRequestSenderTests.createSenderFactory(threadPool, clientManager);
220+
var eisGatewayUrl = getUrl(webServer);
221+
var logger = mock(Logger.class);
222+
var authHandler = new ElasticInferenceServiceAuthorizationHandler(eisGatewayUrl, threadPool, logger);
222223

223-
try (var sender = senderFactory.createSender()) {
224-
String responseJson = """
225-
{
226-
"completion": [
227-
{
228-
"result": "some result 1"
229-
},
230-
{
231-
"result": "some result 2"
232-
}
233-
]
234-
}
235-
""";
224+
try (var sender = senderFactory.createSender()) {
225+
String responseJson = """
226+
{
227+
"completion": [
228+
{
229+
"result": "some result 1"
230+
},
231+
{
232+
"result": "some result 2"
233+
}
234+
]
235+
}
236+
""";
236237

237-
webServer.enqueue(new MockResponse().setResponseCode(200).setBody(responseJson));
238+
webServer.enqueue(new MockResponse().setResponseCode(200).setBody(responseJson));
238239

239-
PlainActionFuture<ElasticInferenceServiceAuthorization> listener = new PlainActionFuture<>();
240-
authHandler.getAuthorization(listener, sender);
241-
242-
var authResponse = listener.actionGet(TIMEOUT);
243-
assertTrue(authResponse.enabledTaskTypes().isEmpty());
244-
assertFalse(authResponse.isEnabled());
245-
246-
var loggerArgsCaptor = ArgumentCaptor.forClass(String.class);
247-
verify(logger).warn(loggerArgsCaptor.capture());
248-
var message = loggerArgsCaptor.getValue();
249-
assertThat(
250-
message,
251-
is(
252-
"Failed to retrieve the authorization information from the Elastic Inference Service."
253-
+ " Received an invalid response type: InferenceServiceResults"
254-
));
255-
}
240+
PlainActionFuture<ElasticInferenceServiceAuthorization> listener = new PlainActionFuture<>();
241+
authHandler.getAuthorization(listener, sender);
242+
243+
var authResponse = listener.actionGet(TIMEOUT);
244+
assertTrue(authResponse.enabledTaskTypes().isEmpty());
245+
assertFalse(authResponse.isEnabled());
246+
247+
var loggerArgsCaptor = ArgumentCaptor.forClass(String.class);
248+
verify(logger).warn(loggerArgsCaptor.capture());
249+
var message = loggerArgsCaptor.getValue();
250+
assertThat(
251+
message,
252+
is(
253+
"Failed to retrieve the authorization information from the Elastic Inference Service."
254+
+ " Received an invalid response type: InferenceServiceResults"
255+
)
256+
);
257+
}
256258

257259
}
258260

0 commit comments

Comments
 (0)