[CI] Auto commit changes from spotless

elasticsearchmachine · elasticsearchmachine · commit 141c1542f546 · 2025-09-03T06:35:45.000Z
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/AmazonBedrockService.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/AmazonBedrockService.java
@@ -34,7 +34,6 @@
 import org.elasticsearch.xpack.inference.chunking.ChunkingSettingsBuilder;
 import org.elasticsearch.xpack.inference.chunking.EmbeddingRequestChunker;
 import org.elasticsearch.xpack.inference.common.amazon.AwsSecretSettings;
-import org.elasticsearch.xpack.inference.external.action.SenderExecutableAction;
 import org.elasticsearch.xpack.inference.external.http.sender.EmbeddingsInput;
 import org.elasticsearch.xpack.inference.external.http.sender.HttpRequestSender;
 import org.elasticsearch.xpack.inference.external.http.sender.InferenceInputs;
@@ -82,7 +81,10 @@ public class AmazonBedrockService extends SenderService {
     private final Sender amazonBedrockSender;
 
     private static final EnumSet<TaskType> supportedTaskTypes = EnumSet.of(
-        TaskType.TEXT_EMBEDDING, TaskType.COMPLETION, TaskType.CHAT_COMPLETION);
+        TaskType.TEXT_EMBEDDING,
+        TaskType.COMPLETION,
+        TaskType.CHAT_COMPLETION
+    );
 
     private static final EnumSet<InputType> VALID_INPUT_TYPE_VALUES = EnumSet.of(
         InputType.INGEST,
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/completion/AmazonBedrockChatCompletionModel.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/completion/AmazonBedrockChatCompletionModel.java
@@ -34,7 +34,6 @@ public static AmazonBedrockChatCompletionModel of(AmazonBedrockChatCompletionMod
         return new AmazonBedrockChatCompletionModel(completionModel, taskSettingsToUse);
     }
 
-
     public static AmazonBedrockChatCompletionModel of(AmazonBedrockChatCompletionModel model, UnifiedCompletionRequest request) {
         if (request.model() == null) {
             return model;
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/request/completion/AmazonBedrockConverseUtils.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/request/completion/AmazonBedrockConverseUtils.java
@@ -7,14 +7,13 @@
 
 package org.elasticsearch.xpack.inference.services.amazonbedrock.request.completion;
 
-import org.elasticsearch.inference.UnifiedCompletionRequest;
-
 import software.amazon.awssdk.services.bedrockruntime.model.ContentBlock;
 import software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration;
 import software.amazon.awssdk.services.bedrockruntime.model.Message;
 
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.Strings;
+import org.elasticsearch.inference.UnifiedCompletionRequest;
 
 import java.util.List;
 import java.util.Optional;
@@ -32,10 +31,12 @@ public static List<Message> getConverseMessageList(List<String> texts) {
 
     public static List<Message> getUnifiedConverseMessageList(List<UnifiedCompletionRequest.Message> messages) {
         return messages.stream()
-            .map(message -> Message.builder().role(message.role())
-                .content(ContentBlock.builder()
-                    .text(message.content().toString())
-                    .build()).build())
+            .map(
+                message -> Message.builder()
+                    .role(message.role())
+                    .content(ContentBlock.builder().text(message.content().toString()).build())
+                    .build()
+            )
             .toList();
     }
 
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/request/completion/AmazonBedrockUnifiedChatCompletionEntityFactory.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/request/completion/AmazonBedrockUnifiedChatCompletionEntityFactory.java
@@ -14,18 +14,23 @@
 
 public class AmazonBedrockUnifiedChatCompletionEntityFactory {
     public static AmazonBedrockUnifiedConverseRequestEntity createEntity(
-        AmazonBedrockChatCompletionModel model, UnifiedCompletionRequest request) {
+        AmazonBedrockChatCompletionModel model,
+        UnifiedCompletionRequest request
+    ) {
         Objects.requireNonNull(model);
         Objects.requireNonNull(request);
         var serviceSettings = model.getServiceSettings();
 
-        var messages = request.messages().stream()
-            .map(message -> new UnifiedCompletionRequest.Message(
-                message.content(),
-                toBedrockRole(message.role()),
-                message.toolCallId(),
-                message.toolCalls()
-            ))
+        var messages = request.messages()
+            .stream()
+            .map(
+                message -> new UnifiedCompletionRequest.Message(
+                    message.content(),
+                    toBedrockRole(message.role()),
+                    message.toolCallId(),
+                    message.toolCalls()
+                )
+            )
             .toList();
 
         switch (serviceSettings.provider()) {
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/request/completion/AmazonBedrockUnifiedChatCompletionRequest.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/request/completion/AmazonBedrockUnifiedChatCompletionRequest.java
@@ -7,15 +7,6 @@
 
 package org.elasticsearch.xpack.inference.services.amazonbedrock.request.completion;
 
-import org.elasticsearch.core.Nullable;
-import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.inference.InferenceServiceResults;
-import org.elasticsearch.inference.TaskType;
-import org.elasticsearch.xpack.inference.services.amazonbedrock.client.AmazonBedrockBaseClient;
-import org.elasticsearch.xpack.inference.services.amazonbedrock.completion.AmazonBedrockChatCompletionModel;
-import org.elasticsearch.xpack.inference.services.amazonbedrock.request.AmazonBedrockRequest;
-import org.elasticsearch.xpack.inference.services.amazonbedrock.response.completion.AmazonBedrockChatCompletionResponseListener;
-
 import software.amazon.awssdk.core.document.Document;
 import software.amazon.awssdk.services.bedrockruntime.model.ConverseStreamRequest;
 import software.amazon.awssdk.services.bedrockruntime.model.SpecificToolChoice;
@@ -25,6 +16,15 @@
 import software.amazon.awssdk.services.bedrockruntime.model.ToolInputSchema;
 import software.amazon.awssdk.services.bedrockruntime.model.ToolSpecification;
 
+import org.elasticsearch.core.Nullable;
+import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.inference.InferenceServiceResults;
+import org.elasticsearch.inference.TaskType;
+import org.elasticsearch.xpack.inference.services.amazonbedrock.client.AmazonBedrockBaseClient;
+import org.elasticsearch.xpack.inference.services.amazonbedrock.completion.AmazonBedrockChatCompletionModel;
+import org.elasticsearch.xpack.inference.services.amazonbedrock.request.AmazonBedrockRequest;
+import org.elasticsearch.xpack.inference.services.amazonbedrock.response.completion.AmazonBedrockChatCompletionResponseListener;
+
 import java.util.Objects;
 import java.util.concurrent.Flow;
 
@@ -57,24 +57,22 @@ public Flow.Publisher<? extends InferenceServiceResults.Result> executeStreamCha
 
         if (requestEntity.tools() != null) {
             requestEntity.tools().forEach(tool -> {
-                converseStreamRequest
-                    .toolConfig(ToolConfiguration.builder()
-                        .tools(Tool.builder()
-                            .toolSpec(ToolSpecification.builder()
-                                .name(tool.function().name())
-                                .description(tool.function().description())
-                                .inputSchema(
-                                    ToolInputSchema.builder()
-                                        .json(Document.fromString(""))
-                                        .build())
-                                .build())
-                            .build())
-                        .toolChoice(ToolChoice.builder()
-                            .tool(SpecificToolChoice.builder()
-                                .name("")
-                                .build())
-                            .build())
-                        .build());
+                converseStreamRequest.toolConfig(
+                    ToolConfiguration.builder()
+                        .tools(
+                            Tool.builder()
+                                .toolSpec(
+                                    ToolSpecification.builder()
+                                        .name(tool.function().name())
+                                        .description(tool.function().description())
+                                        .inputSchema(ToolInputSchema.builder().json(Document.fromString("")).build())
+                                        .build()
+                                )
+                                .build()
+                        )
+                        .toolChoice(ToolChoice.builder().tool(SpecificToolChoice.builder().name("").build()).build())
+                        .build()
+                );
             });
         }
 
@@ -84,8 +82,7 @@ public Flow.Publisher<? extends InferenceServiceResults.Result> executeStreamCha
     }
 
     @Override
-    protected void executeRequest(AmazonBedrockBaseClient client) {
-    }
+    protected void executeRequest(AmazonBedrockBaseClient client) {}
 
     @Override
     public TaskType taskType() {
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/request/completion/AmazonBedrockUnifiedConverseRequestEntity.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/request/completion/AmazonBedrockUnifiedConverseRequestEntity.java
@@ -12,7 +12,7 @@
 
 import java.util.List;
 
-public record AmazonBedrockUnifiedConverseRequestEntity (
+public record AmazonBedrockUnifiedConverseRequestEntity(
     List<UnifiedCompletionRequest.Message> messages,
     @Nullable String model,
     @Nullable Long maxCompletionTokens,
@@ -22,4 +22,3 @@ public record AmazonBedrockUnifiedConverseRequestEntity (
     @Nullable List<UnifiedCompletionRequest.Tool> tools,
     @Nullable Float topP
 ) {}
-
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/amazonbedrock/AmazonBedrockServiceTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/amazonbedrock/AmazonBedrockServiceTests.java
@@ -7,18 +7,6 @@
 
 package org.elasticsearch.xpack.inference.services.amazonbedrock;
 
-import org.elasticsearch.inference.UnifiedCompletionRequest;
-import org.elasticsearch.test.http.MockResponse;
-
-import org.elasticsearch.test.http.MockWebServer;
-import org.elasticsearch.xpack.core.inference.results.UnifiedChatCompletionException;
-import org.elasticsearch.xpack.inference.external.http.HttpClientManager;
-import org.elasticsearch.xpack.inference.external.http.sender.HttpRequestSenderTests;
-import org.elasticsearch.xpack.inference.logging.ThrottlerManager;
-import org.elasticsearch.xpack.inference.services.InferenceEventsAssertion;
-
-import org.elasticsearch.xpack.inference.services.amazonbedrock.client.AmazonBedrockRequestSenderTests;
-
 import software.amazon.awssdk.services.bedrockruntime.model.BedrockRuntimeException;
 
 import org.elasticsearch.ElasticsearchException;
@@ -43,7 +31,10 @@
 import org.elasticsearch.inference.ModelSecrets;
 import org.elasticsearch.inference.SimilarityMeasure;
 import org.elasticsearch.inference.TaskType;
+import org.elasticsearch.inference.UnifiedCompletionRequest;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.test.http.MockResponse;
+import org.elasticsearch.test.http.MockWebServer;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentType;
@@ -53,10 +44,14 @@
 import org.elasticsearch.xpack.core.inference.results.TextEmbeddingFloatResults;
 import org.elasticsearch.xpack.inference.Utils;
 import org.elasticsearch.xpack.inference.common.amazon.AwsSecretSettings;
+import org.elasticsearch.xpack.inference.external.http.HttpClientManager;
 import org.elasticsearch.xpack.inference.external.http.sender.HttpRequestSender;
 import org.elasticsearch.xpack.inference.external.http.sender.Sender;
+import org.elasticsearch.xpack.inference.logging.ThrottlerManager;
+import org.elasticsearch.xpack.inference.services.InferenceEventsAssertion;
 import org.elasticsearch.xpack.inference.services.ServiceComponentsTests;
 import org.elasticsearch.xpack.inference.services.amazonbedrock.client.AmazonBedrockMockRequestSender;
+import org.elasticsearch.xpack.inference.services.amazonbedrock.client.AmazonBedrockRequestSenderTests;
 import org.elasticsearch.xpack.inference.services.amazonbedrock.completion.AmazonBedrockChatCompletionModel;
 import org.elasticsearch.xpack.inference.services.amazonbedrock.completion.AmazonBedrockChatCompletionModelTests;
 import org.elasticsearch.xpack.inference.services.amazonbedrock.completion.AmazonBedrockChatCompletionServiceSettings;
@@ -89,19 +84,15 @@
 import static org.elasticsearch.xpack.inference.chunking.ChunkingSettingsTests.createRandomChunkingSettings;
 import static org.elasticsearch.xpack.inference.chunking.ChunkingSettingsTests.createRandomChunkingSettingsMap;
 import static org.elasticsearch.xpack.inference.common.amazon.AwsSecretSettingsTests.getAmazonBedrockSecretSettingsMap;
-import static org.elasticsearch.xpack.inference.external.http.Utils.getUrl;
 import static org.elasticsearch.xpack.inference.services.ServiceComponentsTests.createWithEmptySettings;
 import static org.elasticsearch.xpack.inference.services.amazonbedrock.AmazonBedrockProviderCapabilities.getProviderDefaultSimilarityMeasure;
-import static org.elasticsearch.xpack.inference.services.amazonbedrock.completion.AmazonBedrockChatCompletionModelTests.createModel;
 import static org.elasticsearch.xpack.inference.services.amazonbedrock.completion.AmazonBedrockChatCompletionServiceSettingsTests.createChatCompletionRequestSettingsMap;
 import static org.elasticsearch.xpack.inference.services.amazonbedrock.completion.AmazonBedrockChatCompletionTaskSettingsTests.getChatCompletionTaskSettingsMap;
 import static org.elasticsearch.xpack.inference.services.amazonbedrock.embeddings.AmazonBedrockEmbeddingsServiceSettingsTests.createEmbeddingsRequestSettingsMap;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ public static AmazonBedrockChatCompletionModel of(AmazonBedrockChatCompletionMod`
`34`	`34`	`return new AmazonBedrockChatCompletionModel(completionModel, taskSettingsToUse);`
`35`	`35`	`}`
`36`	`36`
`37`		`-`
`38`	`37`	`public static AmazonBedrockChatCompletionModel of(AmazonBedrockChatCompletionModel model, UnifiedCompletionRequest request) {`
`39`	`38`	`if (request.model() == null) {`
`40`	`39`	`return model;`