From 72dd582bc68ad5e89a2e351dc3e1185d6bab89a0 Mon Sep 17 00:00:00 2001
From: Aurelien FOUCRET <aurelien.foucret@elastic.co>
Date: Thu, 23 Nov 2023 17:43:02 +0100
Subject: [PATCH] Renamed org.elasticsearch.xpack.ml.ltr package into 
 org.elasticsearch.xpack.ml.inference.ltr

---
 .../main/java/org/elasticsearch/xpack/ml/MachineLearning.java | 4 ++--
 .../xpack/ml/{ => inference}/ltr/FeatureExtractor.java        | 2 +-
 .../ml/{ => inference}/ltr/FieldValueFeatureExtractor.java    | 2 +-
 .../ml/{ => inference}/ltr/InferenceRescorerFeature.java      | 2 +-
 .../xpack/ml/{ => inference}/ltr/LearnToRankRescorer.java     | 2 +-
 .../ml/{ => inference}/ltr/LearnToRankRescorerBuilder.java    | 2 +-
 .../ml/{ => inference}/ltr/LearnToRankRescorerContext.java    | 2 +-
 .../xpack/ml/{ => inference}/ltr/QueryFeatureExtractor.java   | 2 +-
 .../ltr/LearnToRankRescorerBuilderRewriteTests.java           | 2 +-
 .../ltr/LearnToRankRescorerBuilderSerializationTests.java     | 2 +-
 .../ml/{ => inference}/ltr/QueryFeatureExtractorTests.java    | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)
 rename x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/{ => inference}/ltr/FeatureExtractor.java (92%)
 rename x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/{ => inference}/ltr/FieldValueFeatureExtractor.java (97%)
 rename x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/{ => inference}/ltr/InferenceRescorerFeature.java (94%)
 rename x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/{ => inference}/ltr/LearnToRankRescorer.java (99%)
 rename x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/{ => inference}/ltr/LearnToRankRescorerBuilder.java (99%)
 rename x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/{ => inference}/ltr/LearnToRankRescorerContext.java (98%)
 rename x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/{ => inference}/ltr/QueryFeatureExtractor.java (98%)
 rename x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/{ => inference}/ltr/LearnToRankRescorerBuilderRewriteTests.java (99%)
 rename x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/{ => inference}/ltr/LearnToRankRescorerBuilderSerializationTests.java (99%)
 rename x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/{ => inference}/ltr/QueryFeatureExtractorTests.java (99%)

diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java
index 5b139f779abda..538f02b3f9092 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java
@@ -322,6 +322,8 @@
 import org.elasticsearch.xpack.ml.inference.deployment.DeploymentManager;
 import org.elasticsearch.xpack.ml.inference.ingest.InferenceProcessor;
 import org.elasticsearch.xpack.ml.inference.loadingservice.ModelLoadingService;
+import org.elasticsearch.xpack.ml.inference.ltr.InferenceRescorerFeature;
+import org.elasticsearch.xpack.ml.inference.ltr.LearnToRankRescorerBuilder;
 import org.elasticsearch.xpack.ml.inference.modelsize.MlModelSizeNamedXContentProvider;
 import org.elasticsearch.xpack.ml.inference.persistence.TrainedModelProvider;
 import org.elasticsearch.xpack.ml.inference.pytorch.process.BlackHolePyTorchProcess;
@@ -354,8 +356,6 @@
 import org.elasticsearch.xpack.ml.job.process.normalizer.NormalizerProcessFactory;
 import org.elasticsearch.xpack.ml.job.snapshot.upgrader.SnapshotUpgradeTaskExecutor;
 import org.elasticsearch.xpack.ml.job.task.OpenJobPersistentTasksExecutor;
-import org.elasticsearch.xpack.ml.ltr.InferenceRescorerFeature;
-import org.elasticsearch.xpack.ml.ltr.LearnToRankRescorerBuilder;
 import org.elasticsearch.xpack.ml.notifications.AnomalyDetectionAuditor;
 import org.elasticsearch.xpack.ml.notifications.DataFrameAnalyticsAuditor;
 import org.elasticsearch.xpack.ml.notifications.InferenceAuditor;
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/FeatureExtractor.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/FeatureExtractor.java
similarity index 92%
rename from x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/FeatureExtractor.java
rename to x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/FeatureExtractor.java
index 648a66e93e3e3..90e462e3dc511 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/FeatureExtractor.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/FeatureExtractor.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.ltr;
+package org.elasticsearch.xpack.ml.inference.ltr;
 
 import org.apache.lucene.index.LeafReaderContext;
 
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/FieldValueFeatureExtractor.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/FieldValueFeatureExtractor.java
similarity index 97%
rename from x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/FieldValueFeatureExtractor.java
rename to x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/FieldValueFeatureExtractor.java
index d444aa6fa2f0f..5a2e3d29df949 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/FieldValueFeatureExtractor.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/FieldValueFeatureExtractor.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.ltr;
+package org.elasticsearch.xpack.ml.inference.ltr;
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.elasticsearch.index.mapper.MappedFieldType;
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/InferenceRescorerFeature.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/InferenceRescorerFeature.java
similarity index 94%
rename from x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/InferenceRescorerFeature.java
rename to x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/InferenceRescorerFeature.java
index 3b3b0df88f919..8a26714c7c06b 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/InferenceRescorerFeature.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/InferenceRescorerFeature.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.ltr;
+package org.elasticsearch.xpack.ml.inference.ltr;
 
 import org.elasticsearch.common.util.FeatureFlag;
 
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorer.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorer.java
similarity index 99%
rename from x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorer.java
rename to x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorer.java
index 6bc886532c2de..dd1df7d8090d6 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorer.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorer.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.ltr;
+package org.elasticsearch.xpack.ml.inference.ltr;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerBuilder.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorerBuilder.java
similarity index 99%
rename from x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerBuilder.java
rename to x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorerBuilder.java
index 80e65391c73da..39dbaa9f1c660 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerBuilder.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorerBuilder.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.ltr;
+package org.elasticsearch.xpack.ml.inference.ltr;
 
 import org.apache.lucene.util.SetOnce;
 import org.elasticsearch.TransportVersion;
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerContext.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorerContext.java
similarity index 98%
rename from x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerContext.java
rename to x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorerContext.java
index ade7db88871a2..844f96208cb35 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerContext.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorerContext.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.ltr;
+package org.elasticsearch.xpack.ml.inference.ltr;
 
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/QueryFeatureExtractor.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/QueryFeatureExtractor.java
similarity index 98%
rename from x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/QueryFeatureExtractor.java
rename to x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/QueryFeatureExtractor.java
index 86a17ec36b09c..bbc377a67ec0b 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/QueryFeatureExtractor.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/QueryFeatureExtractor.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.ltr;
+package org.elasticsearch.xpack.ml.inference.ltr;
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.DisiPriorityQueue;
diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerBuilderRewriteTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorerBuilderRewriteTests.java
similarity index 99%
rename from x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerBuilderRewriteTests.java
rename to x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorerBuilderRewriteTests.java
index c895df748deb0..a847563e88240 100644
--- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerBuilderRewriteTests.java
+++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorerBuilderRewriteTests.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.ltr;
+package org.elasticsearch.xpack.ml.inference.ltr;
 
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.ScoreDoc;
diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerBuilderSerializationTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorerBuilderSerializationTests.java
similarity index 99%
rename from x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerBuilderSerializationTests.java
rename to x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorerBuilderSerializationTests.java
index fcb47d26c6e0d..229157211848c 100644
--- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerBuilderSerializationTests.java
+++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ltr/LearnToRankRescorerBuilderSerializationTests.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.ltr;
+package org.elasticsearch.xpack.ml.inference.ltr;
 
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.ParsingException;
diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/ltr/QueryFeatureExtractorTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ltr/QueryFeatureExtractorTests.java
similarity index 99%
rename from x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/ltr/QueryFeatureExtractorTests.java
rename to x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ltr/QueryFeatureExtractorTests.java
index fd37a80eb6faf..3878ce5dab087 100644
--- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/ltr/QueryFeatureExtractorTests.java
+++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ltr/QueryFeatureExtractorTests.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.ltr;
+package org.elasticsearch.xpack.ml.inference.ltr;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;