[CI] Auto commit changes from spotless

elasticsearchmachine · saikatsarkar056 · commit f7b267d7a6da · 2025-01-28T16:08:45.000-07:00
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferenceNamedWriteablesProvider.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferenceNamedWriteablesProvider.java
@@ -75,13 +75,13 @@
 import org.elasticsearch.xpack.inference.services.huggingface.HuggingFaceServiceSettings;
 import org.elasticsearch.xpack.inference.services.huggingface.elser.HuggingFaceElserServiceSettings;
 import org.elasticsearch.xpack.inference.services.ibmwatsonx.embeddings.IbmWatsonxEmbeddingsServiceSettings;
+import org.elasticsearch.xpack.inference.services.ibmwatsonx.rerank.IbmWatsonxRerankServiceSettings;
+import org.elasticsearch.xpack.inference.services.ibmwatsonx.rerank.IbmWatsonxRerankTaskSettings;
 import org.elasticsearch.xpack.inference.services.jinaai.JinaAIServiceSettings;
 import org.elasticsearch.xpack.inference.services.jinaai.embeddings.JinaAIEmbeddingsServiceSettings;
 import org.elasticsearch.xpack.inference.services.jinaai.embeddings.JinaAIEmbeddingsTaskSettings;
 import org.elasticsearch.xpack.inference.services.jinaai.rerank.JinaAIRerankServiceSettings;
 import org.elasticsearch.xpack.inference.services.jinaai.rerank.JinaAIRerankTaskSettings;
-import org.elasticsearch.xpack.inference.services.ibmwatsonx.rerank.IbmWatsonxRerankServiceSettings;
-import org.elasticsearch.xpack.inference.services.ibmwatsonx.rerank.IbmWatsonxRerankTaskSettings;
 import org.elasticsearch.xpack.inference.services.mistral.embeddings.MistralEmbeddingsServiceSettings;
 import org.elasticsearch.xpack.inference.services.openai.completion.OpenAiChatCompletionServiceSettings;
 import org.elasticsearch.xpack.inference.services.openai.completion.OpenAiChatCompletionTaskSettings;
@@ -368,9 +368,11 @@ private static void addIbmWatsonxNamedWritables(List<NamedWriteableRegistry.Entr
         );
 
         namedWriteables.add(
-            new NamedWriteableRegistry.Entry(ServiceSettings.class,
+            new NamedWriteableRegistry.Entry(
+                ServiceSettings.class,
                 IbmWatsonxRerankServiceSettings.NAME,
-                IbmWatsonxRerankServiceSettings::new)
+                IbmWatsonxRerankServiceSettings::new
+            )
         );
         namedWriteables.add(
             new NamedWriteableRegistry.Entry(TaskSettings.class, IbmWatsonxRerankTaskSettings.NAME, IbmWatsonxRerankTaskSettings::new)
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/action/ibmwatsonx/IbmWatsonxActionCreator.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/action/ibmwatsonx/IbmWatsonxActionCreator.java
@@ -6,6 +6,7 @@
  */
 
 package org.elasticsearch.xpack.inference.external.action.ibmwatsonx;
+
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.xpack.inference.common.Truncator;
 import org.elasticsearch.xpack.inference.external.action.ExecutableAction;
@@ -16,6 +17,7 @@
 import org.elasticsearch.xpack.inference.services.ServiceComponents;
 import org.elasticsearch.xpack.inference.services.ibmwatsonx.embeddings.IbmWatsonxEmbeddingsModel;
 import org.elasticsearch.xpack.inference.services.ibmwatsonx.rerank.IbmWatsonxRerankModel;
+
 import java.util.Map;
 import java.util.Objects;
 
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/sender/IbmWatsonxRerankRequestManager.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/sender/IbmWatsonxRerankRequestManager.java
@@ -17,20 +17,21 @@
 import org.elasticsearch.xpack.inference.external.ibmwatsonx.IbmWatsonxResponseHandler;
 import org.elasticsearch.xpack.inference.external.request.ibmwatsonx.IbmWatsonxRerankRequest;
 import org.elasticsearch.xpack.inference.external.response.ibmwatsonx.IbmWatsonxRankedResponseEntity;
-
 import org.elasticsearch.xpack.inference.services.ibmwatsonx.rerank.IbmWatsonxRerankModel;
 
 import java.util.Objects;
 import java.util.function.Supplier;
 
-
 public class IbmWatsonxRerankRequestManager extends IbmWatsonxRequestManager {
     private static final Logger logger = LogManager.getLogger(IbmWatsonxRerankRequestManager.class);
     private static final ResponseHandler HANDLER = createIbmWatsonxResponseHandler();
 
     private static ResponseHandler createIbmWatsonxResponseHandler() {
-        return new IbmWatsonxResponseHandler("ibm watsonx rerank",
-            (request, response) -> IbmWatsonxRankedResponseEntity.fromResponse(response), false);
+        return new IbmWatsonxResponseHandler(
+            "ibm watsonx rerank",
+            (request, response) -> IbmWatsonxRankedResponseEntity.fromResponse(response),
+            false
+        );
     }
 
     public static IbmWatsonxRerankRequestManager of(IbmWatsonxRerankModel model, ThreadPool threadPool) {
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/ibmwatsonx/IbmWatsonxRerankRequest.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/ibmwatsonx/IbmWatsonxRerankRequest.java
@@ -57,12 +57,14 @@ public HttpRequest createHttpRequest() {
 
         ByteArrayEntity byteEntity = new ByteArrayEntity(
             Strings.toString(
-                new IbmWatsonxRerankRequestEntity(query,
+                new IbmWatsonxRerankRequestEntity(
+                    query,
                     input,
                     taskSettings,
                     model.getServiceSettings().modelId(),
-                    model.getServiceSettings().projectId())).
-                getBytes(StandardCharsets.UTF_8)
+                    model.getServiceSettings().projectId()
+                )
+            ).getBytes(StandardCharsets.UTF_8)
         );
 
         httpPost.setEntity(byteEntity);
@@ -92,15 +94,15 @@ public Request truncate() {
         return this; // TODO?
     }
 
-    public String getQuery(){
+    public String getQuery() {
         return query;
     }
 
-    public List<String> getInput(){
+    public List<String> getInput() {
         return input;
     }
 
-    public IbmWatsonxRerankModel getModel(){
+    public IbmWatsonxRerankModel getModel() {
         return model;
     }
 
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/ibmwatsonx/IbmWatsonxRerankRequestEntity.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/ibmwatsonx/IbmWatsonxRerankRequestEntity.java
@@ -15,8 +15,13 @@
 import java.util.List;
 import java.util.Objects;
 
-public record IbmWatsonxRerankRequestEntity( String query, List<String> inputs, IbmWatsonxRerankTaskSettings taskSettings, String modelId, String projectId)
-    implements ToXContentObject {
+public record IbmWatsonxRerankRequestEntity(
+    String query,
+    List<String> inputs,
+    IbmWatsonxRerankTaskSettings taskSettings,
+    String modelId,
+    String projectId
+) implements ToXContentObject {
 
     private static final String INPUTS_FIELD = "inputs";
     private static final String QUERY_FIELD = "query";
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ibmwatsonx/IbmWatsonxService.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ibmwatsonx/IbmWatsonxService.java
@@ -41,8 +41,8 @@
 import org.elasticsearch.xpack.inference.services.ServiceUtils;
 import org.elasticsearch.xpack.inference.services.ibmwatsonx.embeddings.IbmWatsonxEmbeddingsModel;
 import org.elasticsearch.xpack.inference.services.ibmwatsonx.embeddings.IbmWatsonxEmbeddingsServiceSettings;
-import org.elasticsearch.xpack.inference.services.validation.ModelValidatorBuilder;
 import org.elasticsearch.xpack.inference.services.ibmwatsonx.rerank.IbmWatsonxRerankModel;
+import org.elasticsearch.xpack.inference.services.validation.ModelValidatorBuilder;
 
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -139,13 +139,15 @@ private static IbmWatsonxModel createModel(
                 secretSettings,
                 context
             );
-            case RERANK -> new IbmWatsonxRerankModel(inferenceEntityId,
+            case RERANK -> new IbmWatsonxRerankModel(
+                inferenceEntityId,
                 taskType,
                 NAME,
                 serviceSettings,
                 taskSettings,
                 secretSettings,
-                context);
+                context
+            );
             default -> throw new ElasticsearchStatusException(failureMessage, RestStatus.BAD_REQUEST);
         };
     }
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ibmwatsonx/rerank/IbmWatsonxRerankModel.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ibmwatsonx/rerank/IbmWatsonxRerankModel.java
@@ -28,7 +28,6 @@
 import static org.elasticsearch.xpack.inference.external.request.ibmwatsonx.IbmWatsonxUtils.TEXT;
 import static org.elasticsearch.xpack.inference.external.request.ibmwatsonx.IbmWatsonxUtils.V1;
 
-
 public class IbmWatsonxRerankModel extends IbmWatsonxModel {
     public static IbmWatsonxRerankModel of(IbmWatsonxRerankModel model, Map<String, Object> taskSettings) {
         var requestTaskSettings = IbmWatsonxRerankTaskSettings.fromMap(taskSettings);
@@ -92,13 +91,14 @@ public DefaultSecretSettings getSecretSettings() {
     public URI uri() {
         URI uri;
         try {
-            uri = buildUri(this.getServiceSettings().uri().toString(),this.getServiceSettings().apiVersion());
+            uri = buildUri(this.getServiceSettings().uri().toString(), this.getServiceSettings().apiVersion());
         } catch (URISyntaxException e) {
             throw new RuntimeException(e);
         }
 
         return uri;
     }
+
     /**
      * Accepts a visitor to create an executable action. The returned action will not return documents in the response.
      * @param visitor _
@@ -111,8 +111,6 @@ public ExecutableAction accept(IbmWatsonxActionVisitor visitor, Map<String, Obje
         return visitor.create(this, taskSettings);
     }
 
-
-
     public static URI buildUri(String uri, String apiVersion) throws URISyntaxException {
         return new URIBuilder().setScheme("https")
             .setHost(uri)
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ibmwatsonx/rerank/IbmWatsonxRerankServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ibmwatsonx/rerank/IbmWatsonxRerankServiceSettings.java
@@ -92,11 +92,13 @@ public Integer maxInputTokens() {
         return 10;
     }
 
-    public IbmWatsonxRerankServiceSettings(@Nullable URI uri,
-                                           String apiVersion,
-                                           @Nullable String modelId,
-                                           String projectId,
-                                           @Nullable RateLimitSettings rateLimitSettings) {
+    public IbmWatsonxRerankServiceSettings(
+        @Nullable URI uri,
+        String apiVersion,
+        @Nullable String modelId,
+        String projectId,
+        @Nullable RateLimitSettings rateLimitSettings
+    ) {
         this.uri = uri;
         this.apiVersion = apiVersion;
         this.projectId = projectId;
@@ -168,7 +170,6 @@ protected XContentBuilder toXContentFragmentOfExposedFields(XContentBuilder buil
 
         builder.field(PROJECT_ID, projectId);
 
-
         rateLimitSettings.toXContent(builder, params);
 
         return builder;
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ibmwatsonx/rerank/IbmWatsonxRerankTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ibmwatsonx/rerank/IbmWatsonxRerankTaskSettings.java
@@ -27,7 +27,6 @@
 import static org.elasticsearch.xpack.inference.services.ServiceUtils.extractOptionalBoolean;
 import static org.elasticsearch.xpack.inference.services.ServiceUtils.extractOptionalPositiveInteger;
 
-
 public class IbmWatsonxRerankTaskSettings implements TaskSettings {
 
     public static final String NAME = "ibm_watsonx_rerank_task_settings";
@@ -73,8 +72,10 @@ public static IbmWatsonxRerankTaskSettings fromMap(Map<String, Object> map) {
      * @param requestTaskSettings the settings passed in within the task_settings field of the request
      * @return a constructed {@link IbmWatsonxRerankTaskSettings}
      */
-    public static IbmWatsonxRerankTaskSettings of(IbmWatsonxRerankTaskSettings originalSettings,
-                                                  IbmWatsonxRerankTaskSettings requestTaskSettings) {
+    public static IbmWatsonxRerankTaskSettings of(
+        IbmWatsonxRerankTaskSettings originalSettings,
+        IbmWatsonxRerankTaskSettings requestTaskSettings
+    ) {
         return new IbmWatsonxRerankTaskSettings(
             requestTaskSettings.getTopNDocumentsOnly() != null
                 ? requestTaskSettings.getTopNDocumentsOnly()
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/ibmwatsonx/rerank/IbmWatsonxRerankRequestEntityTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/ibmwatsonx/rerank/IbmWatsonxRerankRequestEntityTests.java
@@ -23,11 +23,13 @@
 public class IbmWatsonxRerankRequestEntityTests extends ESTestCase {
     public void testXContent_Request() throws IOException {
         IbmWatsonxRerankTaskSettings taskSettings = new IbmWatsonxRerankTaskSettings(5, true, 100);
-        var entity = new IbmWatsonxRerankRequestEntity("database",
-            List.of("greenland", "google","john", "mysql","potter", "grammar"),
+        var entity = new IbmWatsonxRerankRequestEntity(
+            "database",
+            List.of("greenland", "google", "john", "mysql", "potter", "grammar"),
             taskSettings,
             "model",
-            "project_id");
+            "project_id"
+        );
 
         XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
         entity.toXContent(builder, null);
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/ibmwatsonx/rerank/IbmWatsonxRerankRequestTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/ibmwatsonx/rerank/IbmWatsonxRerankRequestTests.java
@@ -9,13 +9,10 @@
 
 import org.apache.http.HttpHeaders;
 import org.apache.http.client.methods.HttpPost;
-import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xcontent.XContentType;
-import org.elasticsearch.xpack.inference.external.request.Request;
 import org.elasticsearch.xpack.inference.external.request.ibmwatsonx.IbmWatsonxRerankRequest;
-import org.elasticsearch.xpack.inference.services.ibmwatsonx.embeddings.IbmWatsonxEmbeddingsModelTests;
 import org.elasticsearch.xpack.inference.services.ibmwatsonx.rerank.IbmWatsonxRerankModel;
 import org.elasticsearch.xpack.inference.services.ibmwatsonx.rerank.IbmWatsonxRerankModelTests;
 
@@ -43,7 +40,7 @@ public void testCreateRequest() throws IOException {
         var apiVersion = "2023-05-04";
         var apiKey = "api_key";
         var query = "database";
-        List<String> input = List.of("greenland", "google","john", "mysql","potter", "grammar");
+        List<String> input = List.of("greenland", "google", "john", "mysql", "potter", "grammar");
 
         var request = createRequest(model, projectId, uri, apiVersion, apiKey, query, input);
         var httpRequest = request.createHttpRequest();
@@ -60,20 +57,24 @@ public void testCreateRequest() throws IOException {
             requestMap,
             is(
 
-                Map.of("project_id", "project_id", "model_id", "model", "inputs",
-                    List.of(Map.of("text", "greenland"),
+                Map.of(
+                    "project_id",
+                    "project_id",
+                    "model_id",
+                    "model",
+                    "inputs",
+                    List.of(
+                        Map.of("text", "greenland"),
                         Map.of("text", "google"),
                         Map.of("text", "john"),
                         Map.of("text", "mysql"),
                         Map.of("text", "potter"),
                         Map.of("text", "grammar")
                     ),
-                    "query", "database",
+                    "query",
+                    "database",
                     "parameters",
-                    Map.of("return_options",
-                        Map.of("top_n", 2,
-                            "inputs", true),
-                        "truncate_input_tokens", 100)
+                    Map.of("return_options", Map.of("top_n", 2, "inputs", true), "truncate_input_tokens", 100)
                 )
             )
         );
@@ -90,11 +91,7 @@ public static IbmWatsonxRerankRequest createRequest(
     ) {
         var embeddingsModel = IbmWatsonxRerankModelTests.createModel(model, projectId, uri, apiVersion, apiKey);
 
-        return new IbmWatsonxRerankWithoutAuthRequest(
-            query,
-            input,
-            embeddingsModel
-        );
+        return new IbmWatsonxRerankWithoutAuthRequest(query, input, embeddingsModel);
     }
 
     private static class IbmWatsonxRerankWithoutAuthRequest extends IbmWatsonxRerankRequest {
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/ibmwatsonx/rerank/IbmWatsonxRerankModelTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/ibmwatsonx/rerank/IbmWatsonxRerankModelTests.java
@@ -15,13 +15,7 @@
 import java.net.URI;
 
 public class IbmWatsonxRerankModelTests extends ESTestCase {
-    public static IbmWatsonxRerankModel createModel(
-        String model,
-        String projectId,
-        URI uri,
-        String apiVersion,
-        String apiKey
-    ) {
+    public static IbmWatsonxRerankModel createModel(String model, String projectId, URI uri, String apiVersion, String apiKey) {
         return new IbmWatsonxRerankModel(
             "id",
             TaskType.RERANK,
