Merge remote-tracking branch 'origin/read-and-propagate-product-use-case-header-to-eis' into read-and-propagate-product-use-case-header-to-eis

Author: timgrein

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/action/InferenceActionRequestTests.java

@@ -58,7 +58,8 @@ public void testParsing() throws IOException {
             }
             """;
         try (var parser = createParser(JsonXContent.jsonXContent, singleInputRequest)) {
-            var request = InferenceAction.Request.parseRequest("model_id", TaskType.SPARSE_EMBEDDING, InferenceContext.empty(), parser).build();
+            var request = InferenceAction.Request.parseRequest("model_id", TaskType.SPARSE_EMBEDDING, InferenceContext.empty(), parser)
+                .build();
             assertThat(request.getInput(), contains("single text input"));
         }
 
@@ -174,7 +175,8 @@ public void testParseRequest_DefaultsInputTypeToIngest() throws IOException {
             }
             """;
         try (var parser = createParser(JsonXContent.jsonXContent, singleInputRequest)) {
-            var request = InferenceAction.Request.parseRequest("model_id", TaskType.SPARSE_EMBEDDING,InferenceContext.empty(), parser).build();
+            var request = InferenceAction.Request.parseRequest("model_id", TaskType.SPARSE_EMBEDDING, InferenceContext.empty(), parser)
+                .build();
             assertThat(request.getInputType(), is(InputType.UNSPECIFIED));
         }
     }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/BaseTransportInferenceAction.java

@@ -149,9 +149,8 @@ protected void doExecute(Task task, Request request, ActionListener<InferenceAct
 
             // TODO: test
             var context = request.getContext();
-            if(Objects.nonNull(context)){
-                threadPool.getThreadContext()
-                    .putHeader(InferencePlugin.X_ELASTIC_PRODUCT_USE_CASE_HTTP_HEADER, context.productUseCase());
+            if (Objects.nonNull(context)) {
+                threadPool.getThreadContext().putHeader(InferencePlugin.X_ELASTIC_PRODUCT_USE_CASE_HTTP_HEADER, context.productUseCase());
             }
 
             var service = serviceRegistry.getService(serviceName).get();

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/elastic/ElasticInferenceServiceRequest.java

@@ -37,11 +37,11 @@ public final HttpRequest createHttpRequest() {
         var productOrigin = metadata.productOrigin();
         var productUseCase = metadata.productUseCase();
 
-        if(Objects.nonNull(productOrigin) && productOrigin.isEmpty() == false){
+        if (Objects.nonNull(productOrigin) && productOrigin.isEmpty() == false) {
             request.setHeader(Task.X_ELASTIC_PRODUCT_ORIGIN_HTTP_HEADER, metadata.productOrigin());
         }
 
-        if(Objects.nonNull(productUseCase) && productUseCase.isEmpty() == false){
+        if (Objects.nonNull(productUseCase) && productUseCase.isEmpty() == false) {
             request.setHeader(X_ELASTIC_PRODUCT_USE_CASE_HTTP_HEADER, metadata.productUseCase());
         }
 

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rest/BaseInferenceAction.java

@@ -77,7 +77,7 @@ private String extractProductUseCase(RestRequest restRequest) {
 
         var productUseCaseHeaders = headers.get(InferencePlugin.X_ELASTIC_PRODUCT_USE_CASE_HTTP_HEADER);
 
-        if(Objects.isNull(productUseCaseHeaders) || productUseCaseHeaders.isEmpty()){
+        if (Objects.isNull(productUseCaseHeaders) || productUseCaseHeaders.isEmpty()) {
             return "";
         }
 

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/elastic/ElasticInferenceServiceRequestTests.java

@@ -79,8 +79,8 @@ public String getInferenceEntityId() {
 
     public static ElasticInferenceServiceRequestMetadata randomElasticInferenceServiceRequestMetadata() {
         return new ElasticInferenceServiceRequestMetadata(
-            randomFrom(new String[]{null, randomAlphaOfLength(10)}),
-            randomFrom(new String[]{null, randomAlphaOfLength(10)})
+            randomFrom(new String[] { null, randomAlphaOfLength(10) }),
+            randomFrom(new String[] { null, randomAlphaOfLength(10) })
         );
     }
 }