Spotless

carlosdelest · Dec 22, 2023 · 7f28aba · 7f28aba
1 parent 9bb66e1
commit 7f28aba
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 21 deletions.
diff --git a/...n/src/main/java/org/elasticsearch/xpack/inference/mock/TestInferenceServiceExtension.java b/...n/src/main/java/org/elasticsearch/xpack/inference/mock/TestInferenceServiceExtension.java
@@ -10,6 +10,7 @@
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.inference.results.SparseEmbeddingResults;
 import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -25,7 +26,6 @@
 import org.elasticsearch.inference.TaskType;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.xcontent.XContentBuilder;
-import org.elasticsearch.action.inference.results.SparseEmbeddingResults;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...nce/src/main/java/org/elasticsearch/xpack/inference/InferenceNamedWriteablesProvider.java b/...nce/src/main/java/org/elasticsearch/xpack/inference/InferenceNamedWriteablesProvider.java
@@ -7,16 +7,16 @@
 
 package org.elasticsearch.xpack.inference;
 
+import org.elasticsearch.action.inference.results.LegacyTextEmbeddingResults;
+import org.elasticsearch.action.inference.results.SparseEmbeddingResults;
+import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.inference.EmptyTaskSettings;
 import org.elasticsearch.inference.InferenceResults;
 import org.elasticsearch.inference.InferenceServiceResults;
 import org.elasticsearch.inference.SecretSettings;
 import org.elasticsearch.inference.ServiceSettings;
 import org.elasticsearch.inference.TaskSettings;
-import org.elasticsearch.action.inference.results.LegacyTextEmbeddingResults;
-import org.elasticsearch.action.inference.results.SparseEmbeddingResults;
-import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 import org.elasticsearch.xpack.inference.services.elser.ElserMlNodeServiceSettings;
 import org.elasticsearch.xpack.inference.services.elser.ElserMlNodeTaskSettings;
 import org.elasticsearch.xpack.inference.services.huggingface.HuggingFaceServiceSettings;

diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java
@@ -10,6 +10,7 @@
 import org.apache.lucene.util.SetOnce;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.action.inference.InferenceAction;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -35,7 +36,6 @@
 import org.elasticsearch.xpack.core.action.XPackUsageFeatureAction;
 import org.elasticsearch.xpack.core.inference.action.DeleteInferenceModelAction;
 import org.elasticsearch.xpack.core.inference.action.GetInferenceModelAction;
-import org.elasticsearch.action.inference.InferenceAction;
 import org.elasticsearch.xpack.core.inference.action.PutInferenceModelAction;
 import org.elasticsearch.xpack.inference.action.TransportDeleteInferenceModelAction;
 import org.elasticsearch.xpack.inference.action.TransportGetInferenceModelAction;

diff --git a/...ence/src/main/java/org/elasticsearch/xpack/inference/action/TransportInferenceAction.java b/...ence/src/main/java/org/elasticsearch/xpack/inference/action/TransportInferenceAction.java
@@ -9,6 +9,7 @@
 
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.inference.InferenceAction;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.common.inject.Inject;
@@ -19,7 +20,6 @@
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.transport.TransportService;
-import org.elasticsearch.action.inference.InferenceAction;
 import org.elasticsearch.xpack.inference.registry.ModelRegistry;
 
 public class TransportInferenceAction extends HandledTransportAction<InferenceAction.Request, InferenceAction.Response> {

diff --git a/...csearch/xpack/inference/external/response/huggingface/HuggingFaceElserResponseEntity.java b/...csearch/xpack/inference/external/response/huggingface/HuggingFaceElserResponseEntity.java
@@ -7,13 +7,13 @@
 
 package org.elasticsearch.xpack.inference.external.response.huggingface;
 
+import org.elasticsearch.action.inference.results.SparseEmbeddingResults;
 import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
 import org.elasticsearch.common.xcontent.XContentParserUtils;
 import org.elasticsearch.xcontent.XContentFactory;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentParserConfiguration;
 import org.elasticsearch.xcontent.XContentType;
-import org.elasticsearch.action.inference.results.SparseEmbeddingResults;
 import org.elasticsearch.xpack.inference.external.http.HttpResult;
 import org.elasticsearch.xpack.inference.external.request.Request;
 

diff --git a/...ch/xpack/inference/external/response/huggingface/HuggingFaceEmbeddingsResponseEntity.java b/...ch/xpack/inference/external/response/huggingface/HuggingFaceEmbeddingsResponseEntity.java
@@ -7,13 +7,13 @@
 
 package org.elasticsearch.xpack.inference.external.response.huggingface;
 
+import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
 import org.elasticsearch.common.xcontent.XContentParserUtils;
 import org.elasticsearch.xcontent.XContentFactory;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentParserConfiguration;
 import org.elasticsearch.xcontent.XContentType;
-import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 import org.elasticsearch.xpack.inference.external.http.HttpResult;
 import org.elasticsearch.xpack.inference.external.request.Request;
 

diff --git a/...lasticsearch/xpack/inference/external/response/openai/OpenAiEmbeddingsResponseEntity.java b/...lasticsearch/xpack/inference/external/response/openai/OpenAiEmbeddingsResponseEntity.java
@@ -7,13 +7,13 @@
 
 package org.elasticsearch.xpack.inference.external.response.openai;
 
+import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
 import org.elasticsearch.common.xcontent.XContentParserUtils;
 import org.elasticsearch.xcontent.XContentFactory;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentParserConfiguration;
 import org.elasticsearch.xcontent.XContentType;
-import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 import org.elasticsearch.xpack.inference.external.http.HttpResult;
 import org.elasticsearch.xpack.inference.external.request.Request;
 

diff --git a/...n/inference/src/main/java/org/elasticsearch/xpack/inference/rest/RestInferenceAction.java b/...n/inference/src/main/java/org/elasticsearch/xpack/inference/rest/RestInferenceAction.java
@@ -7,11 +7,11 @@
 
 package org.elasticsearch.xpack.inference.rest;
 
+import org.elasticsearch.action.inference.InferenceAction;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.action.RestToXContentListener;
-import org.elasticsearch.action.inference.InferenceAction;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/...ugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ServiceUtils.java b/...ugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ServiceUtils.java
@@ -9,14 +9,14 @@
 
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.settings.SecureString;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.inference.InferenceService;
 import org.elasticsearch.inference.Model;
 import org.elasticsearch.inference.TaskType;
 import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 import org.elasticsearch.xpack.inference.common.SimilarityMeasure;
 
 import java.net.URI;

diff --git a/...ce/src/main/java/org/elasticsearch/xpack/inference/services/elser/ElserMlNodeService.java b/...ce/src/main/java/org/elasticsearch/xpack/inference/services/elser/ElserMlNodeService.java
@@ -11,6 +11,7 @@
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.inference.results.SparseEmbeddingResults;
 import org.elasticsearch.client.internal.OriginSettingClient;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.inference.InferenceService;
@@ -21,7 +22,6 @@
 import org.elasticsearch.inference.TaskType;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.xpack.core.ClientHelper;
-import org.elasticsearch.action.inference.results.SparseEmbeddingResults;
 import org.elasticsearch.xpack.core.ml.action.InferTrainedModelDeploymentAction;
 import org.elasticsearch.xpack.core.ml.action.StartTrainedModelDeploymentAction;
 import org.elasticsearch.xpack.core.ml.inference.trainedmodel.TextExpansionConfigUpdate;

diff --git a/...e/src/test/java/org/elasticsearch/xpack/inference/action/InferenceActionRequestTests.java b/...e/src/test/java/org/elasticsearch/xpack/inference/action/InferenceActionRequestTests.java
@@ -7,12 +7,12 @@
 
 package org.elasticsearch.xpack.inference.action;
 
+import org.elasticsearch.action.inference.InferenceAction;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.inference.TaskType;
 import org.elasticsearch.test.AbstractWireSerializingTestCase;
 import org.elasticsearch.xcontent.json.JsonXContent;
-import org.elasticsearch.action.inference.InferenceAction;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/.../src/test/java/org/elasticsearch/xpack/inference/action/InferenceActionResponseTests.java b/.../src/test/java/org/elasticsearch/xpack/inference/action/InferenceActionResponseTests.java
@@ -8,9 +8,9 @@
 package org.elasticsearch.xpack.inference.action;
 
 import org.elasticsearch.TransportVersion;
+import org.elasticsearch.action.inference.InferenceAction;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.Writeable;
-import org.elasticsearch.action.inference.InferenceAction;
 import org.elasticsearch.xpack.core.ml.AbstractBWCWireSerializationTestCase;
 import org.elasticsearch.xpack.core.ml.inference.MlInferenceNamedXContentProvider;
 import org.elasticsearch.xpack.inference.InferenceNamedWriteablesProvider;

diff --git a/...ch/xpack/inference/external/response/huggingface/HuggingFaceElserResponseEntityTests.java b/...ch/xpack/inference/external/response/huggingface/HuggingFaceElserResponseEntityTests.java
@@ -8,11 +8,11 @@
 package org.elasticsearch.xpack.inference.external.response.huggingface;
 
 import org.apache.http.HttpResponse;
+import org.elasticsearch.action.inference.results.SparseEmbeddingResults;
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xcontent.XContentEOFException;
 import org.elasticsearch.xcontent.XContentParseException;
-import org.elasticsearch.action.inference.results.SparseEmbeddingResults;
 import org.elasticsearch.xpack.inference.external.http.HttpResult;
 import org.elasticsearch.xpack.inference.external.request.Request;
 import org.elasticsearch.xpack.inference.results.SparseEmbeddingResultsTests;

diff --git a/...ack/inference/external/response/huggingface/HuggingFaceEmbeddingsResponseEntityTests.java b/...ack/inference/external/response/huggingface/HuggingFaceEmbeddingsResponseEntityTests.java
@@ -8,9 +8,9 @@
 package org.elasticsearch.xpack.inference.external.response.huggingface;
 
 import org.apache.http.HttpResponse;
+import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.test.ESTestCase;
-import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 import org.elasticsearch.xpack.inference.external.http.HttpResult;
 import org.elasticsearch.xpack.inference.external.request.Request;
 

diff --git a/...csearch/xpack/inference/external/response/openai/OpenAiEmbeddingsResponseEntityTests.java b/...csearch/xpack/inference/external/response/openai/OpenAiEmbeddingsResponseEntityTests.java
@@ -8,9 +8,9 @@
 package org.elasticsearch.xpack.inference.external.response.openai;
 
 import org.apache.http.HttpResponse;
+import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.test.ESTestCase;
-import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 import org.elasticsearch.xpack.inference.external.http.HttpResult;
 import org.elasticsearch.xpack.inference.external.request.Request;
 

diff --git a/.../test/java/org/elasticsearch/xpack/inference/results/LegacyTextEmbeddingResultsTests.java b/.../test/java/org/elasticsearch/xpack/inference/results/LegacyTextEmbeddingResultsTests.java
@@ -7,14 +7,14 @@
 
 package org.elasticsearch.xpack.inference.results;
 
+import org.elasticsearch.action.inference.results.LegacyTextEmbeddingResults;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.test.AbstractWireSerializingTestCase;
 import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentFactory;
 import org.elasticsearch.xcontent.XContentType;
-import org.elasticsearch.action.inference.results.LegacyTextEmbeddingResults;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/.../src/test/java/org/elasticsearch/xpack/inference/results/SparseEmbeddingResultsTests.java b/.../src/test/java/org/elasticsearch/xpack/inference/results/SparseEmbeddingResultsTests.java
@@ -7,11 +7,11 @@
 
 package org.elasticsearch.xpack.inference.results;
 
+import org.elasticsearch.action.inference.results.SparseEmbeddingResults;
+import org.elasticsearch.action.inference.results.TextExpansionResults;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.test.AbstractWireSerializingTestCase;
-import org.elasticsearch.action.inference.results.SparseEmbeddingResults;
-import org.elasticsearch.action.inference.results.TextExpansionResults;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...ce/src/test/java/org/elasticsearch/xpack/inference/results/TextEmbeddingResultsTests.java b/...ce/src/test/java/org/elasticsearch/xpack/inference/results/TextEmbeddingResultsTests.java
@@ -7,10 +7,10 @@
 
 package org.elasticsearch.xpack.inference.results;
 
+import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.test.AbstractWireSerializingTestCase;
-import org.elasticsearch.action.inference.results.TextEmbeddingResults;
 
 import java.io.IOException;
 import java.util.ArrayList;