Skip to content

Commit 4519d61

Browse files
kderussokderusso
committed
Refactor/rename
1 parent 129efac commit 4519d61

File tree

8 files changed

+25
-25
lines changed

8 files changed

+25
-25
lines changed

‎server/src/main/java/org/elasticsearch/search/rank/feature/RankFeatureShardPhase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.Arrays;
2929
import java.util.Collections;
3030

31-
import static org.elasticsearch.search.rank.feature.RerankSnippetInput.DEFAULT_NUM_SNIPPETS;
31+
import static org.elasticsearch.search.rank.feature.RerankSnippetConfig.DEFAULT_NUM_SNIPPETS;
3232

3333
/**
3434
* The {@code RankFeatureShardPhase} executes the rank feature phase on the shard, iff there is a {@code RankBuilder} that requires it.

‎server/src/main/java/org/elasticsearch/search/rank/feature/RerankSnippetInput.java‎ renamed to ‎server/src/main/java/org/elasticsearch/search/rank/feature/RerankSnippetConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
import java.io.IOException;
1717

18-
public record RerankSnippetInput(Integer numSnippets) implements Writeable {
18+
public record RerankSnippetConfig(Integer numSnippets) implements Writeable {
1919

2020
public static final int DEFAULT_NUM_SNIPPETS = 1;
2121

22-
public RerankSnippetInput(StreamInput in) throws IOException {
22+
public RerankSnippetConfig(StreamInput in) throws IOException {
2323
this(in.readOptionalVInt());
2424
}
2525

‎server/src/main/java/org/elasticsearch/search/rank/feature/SnippetRankInput.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ public class SnippetRankInput implements CustomRankInput {
2121

2222
static final String NAME = "snippets";
2323

24-
private final RerankSnippetInput snippets;
24+
private final RerankSnippetConfig snippets;
2525
private final String inferenceText;
2626
private final int tokenSizeLimit;
2727

28-
public SnippetRankInput(RerankSnippetInput snippets, String inferenceText, int tokenSizeLimit) {
28+
public SnippetRankInput(RerankSnippetConfig snippets, String inferenceText, int tokenSizeLimit) {
2929
this.snippets = snippets;
3030
this.inferenceText = inferenceText;
3131
this.tokenSizeLimit = tokenSizeLimit;
3232
}
3333

3434
public SnippetRankInput(StreamInput in) throws IOException {
35-
this.snippets = new RerankSnippetInput(in);
35+
this.snippets = new RerankSnippetConfig(in);
3636
this.inferenceText = in.readString();
3737
this.tokenSizeLimit = in.readVInt();
3838
}
3939

40-
public RerankSnippetInput snippets() {
40+
public RerankSnippetConfig snippets() {
4141
return snippets;
4242
}
4343

‎server/src/main/java/org/elasticsearch/search/rank/rerank/RerankingRankFeaturePhaseRankShardContext.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.elasticsearch.search.rank.context.RankFeaturePhaseRankShardContext;
2121
import org.elasticsearch.search.rank.feature.RankFeatureDoc;
2222
import org.elasticsearch.search.rank.feature.RankFeatureShardResult;
23-
import org.elasticsearch.search.rank.feature.RerankSnippetInput;
23+
import org.elasticsearch.search.rank.feature.RerankSnippetConfig;
2424
import org.elasticsearch.xcontent.Text;
2525

2626
import java.util.Arrays;
@@ -35,13 +35,13 @@
3535
public class RerankingRankFeaturePhaseRankShardContext extends RankFeaturePhaseRankShardContext {
3636

3737
private static final Logger logger = LogManager.getLogger(RerankingRankFeaturePhaseRankShardContext.class);
38-
private final RerankSnippetInput snippets;
38+
private final RerankSnippetConfig snippets;
3939

4040
public RerankingRankFeaturePhaseRankShardContext(String field) {
4141
this(field, null);
4242
}
4343

44-
public RerankingRankFeaturePhaseRankShardContext(String field, RerankSnippetInput snippets) {
44+
public RerankingRankFeaturePhaseRankShardContext(String field, RerankSnippetConfig snippets) {
4545
super(field);
4646
this.snippets = snippets;
4747
}

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.elasticsearch.search.rank.context.RankFeaturePhaseRankCoordinatorContext;
2424
import org.elasticsearch.search.rank.context.RankFeaturePhaseRankShardContext;
2525
import org.elasticsearch.search.rank.feature.RankFeatureDoc;
26-
import org.elasticsearch.search.rank.feature.RerankSnippetInput;
26+
import org.elasticsearch.search.rank.feature.RerankSnippetConfig;
2727
import org.elasticsearch.search.rank.feature.SnippetRankInput;
2828
import org.elasticsearch.search.rank.rerank.RerankingRankFeaturePhaseRankShardContext;
2929
import org.elasticsearch.xcontent.XContentBuilder;
@@ -70,7 +70,7 @@ public class TextSimilarityRankBuilder extends RankBuilder {
7070
private final String field;
7171
private final Float minScore;
7272
private final boolean failuresAllowed;
73-
private final RerankSnippetInput snippets;
73+
private final RerankSnippetConfig snippets;
7474

7575
public TextSimilarityRankBuilder(
7676
String field,
@@ -79,7 +79,7 @@ public TextSimilarityRankBuilder(
7979
int rankWindowSize,
8080
Float minScore,
8181
boolean failuresAllowed,
82-
RerankSnippetInput snippets
82+
RerankSnippetConfig snippets
8383
) {
8484
super(rankWindowSize);
8585
this.inferenceId = inferenceId;
@@ -104,7 +104,7 @@ public TextSimilarityRankBuilder(StreamInput in) throws IOException {
104104
this.failuresAllowed = false;
105105
}
106106
if (in.getTransportVersion().onOrAfter(TransportVersions.RERANK_SNIPPETS)) {
107-
this.snippets = in.readOptionalWriteable(RerankSnippetInput::new);
107+
this.snippets = in.readOptionalWriteable(RerankSnippetConfig::new);
108108
} else {
109109
this.snippets = null;
110110
}

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankRetrieverBuilder.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.elasticsearch.license.XPackLicenseState;
1515
import org.elasticsearch.search.builder.SearchSourceBuilder;
1616
import org.elasticsearch.search.rank.RankDoc;
17-
import org.elasticsearch.search.rank.feature.RerankSnippetInput;
17+
import org.elasticsearch.search.rank.feature.RerankSnippetConfig;
1818
import org.elasticsearch.search.retriever.CompoundRetrieverBuilder;
1919
import org.elasticsearch.search.retriever.RetrieverBuilder;
2020
import org.elasticsearch.search.retriever.RetrieverParserContext;
@@ -60,7 +60,7 @@ public class TextSimilarityRankRetrieverBuilder extends CompoundRetrieverBuilder
6060
String field = (String) args[3];
6161
int rankWindowSize = args[4] == null ? DEFAULT_RANK_WINDOW_SIZE : (int) args[4];
6262
boolean failuresAllowed = args[5] != null && (Boolean) args[5];
63-
RerankSnippetInput snippets = (RerankSnippetInput) args[6];
63+
RerankSnippetConfig snippets = (RerankSnippetConfig) args[6];
6464

6565
return new TextSimilarityRankRetrieverBuilder(
6666
retrieverBuilder,
@@ -73,10 +73,10 @@ public class TextSimilarityRankRetrieverBuilder extends CompoundRetrieverBuilder
7373
);
7474
});
7575

76-
private static final ConstructingObjectParser<RerankSnippetInput, RetrieverParserContext> SNIPPETS_PARSER =
76+
private static final ConstructingObjectParser<RerankSnippetConfig, RetrieverParserContext> SNIPPETS_PARSER =
7777
new ConstructingObjectParser<>(SNIPPETS_FIELD.getPreferredName(), true, args -> {
7878
Integer numSnippets = (Integer) args[0];
79-
return new RerankSnippetInput(numSnippets);
79+
return new RerankSnippetConfig(numSnippets);
8080
});
8181

8282
static {
@@ -111,7 +111,7 @@ public static TextSimilarityRankRetrieverBuilder fromXContent(
111111
private final String inferenceText;
112112
private final String field;
113113
private final boolean failuresAllowed;
114-
private final RerankSnippetInput snippets;
114+
private final RerankSnippetConfig snippets;
115115

116116
public TextSimilarityRankRetrieverBuilder(
117117
RetrieverBuilder retrieverBuilder,
@@ -120,7 +120,7 @@ public TextSimilarityRankRetrieverBuilder(
120120
String field,
121121
int rankWindowSize,
122122
boolean failuresAllowed,
123-
RerankSnippetInput snippets
123+
RerankSnippetConfig snippets
124124
) {
125125
super(List.of(RetrieverSource.from(retrieverBuilder)), rankWindowSize);
126126
this.inferenceId = inferenceId;
@@ -140,7 +140,7 @@ public TextSimilarityRankRetrieverBuilder(
140140
boolean failuresAllowed,
141141
String retrieverName,
142142
List<QueryBuilder> preFilterQueryBuilders,
143-
RerankSnippetInput snippets
143+
RerankSnippetConfig snippets
144144
) {
145145
super(retrieverSource, rankWindowSize);
146146
if (retrieverSource.size() != 1) {

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankFeaturePhaseRankCoordinatorContextTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.elasticsearch.client.internal.Client;
1111
import org.elasticsearch.inference.TaskType;
1212
import org.elasticsearch.search.rank.feature.RankFeatureDoc;
13-
import org.elasticsearch.search.rank.feature.RerankSnippetInput;
13+
import org.elasticsearch.search.rank.feature.RerankSnippetConfig;
1414
import org.elasticsearch.search.rank.feature.SnippetRankInput;
1515
import org.elasticsearch.test.ESTestCase;
1616
import org.elasticsearch.xpack.core.inference.action.GetInferenceModelAction;
@@ -50,7 +50,7 @@ public class TextSimilarityRankFeaturePhaseRankCoordinatorContextTests extends E
5050
"some query",
5151
0.0f,
5252
false,
53-
new SnippetRankInput(new RerankSnippetInput(2), "some query", 10)
53+
new SnippetRankInput(new RerankSnippetConfig(2), "some query", 10)
5454
);
5555

5656
public void testComputeScores() {

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityTestPlugin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.elasticsearch.search.rank.RankShardResult;
2929
import org.elasticsearch.search.rank.context.RankFeaturePhaseRankCoordinatorContext;
3030
import org.elasticsearch.search.rank.context.RankFeaturePhaseRankShardContext;
31-
import org.elasticsearch.search.rank.feature.RerankSnippetInput;
31+
import org.elasticsearch.search.rank.feature.RerankSnippetConfig;
3232
import org.elasticsearch.search.rank.rerank.AbstractRerankerIT;
3333
import org.elasticsearch.tasks.Task;
3434
import org.elasticsearch.xpack.core.inference.action.GetInferenceModelAction;
@@ -178,7 +178,7 @@ public ThrowingMockRequestActionBasedRankBuilder(
178178
Float minScore,
179179
boolean failuresAllowed,
180180
String throwingType,
181-
RerankSnippetInput snippets
181+
RerankSnippetConfig snippets
182182
) {
183183
super(field, inferenceId, inferenceText, rankWindowSize, minScore, failuresAllowed, snippets);
184184
this.throwingRankBuilderType = AbstractRerankerIT.ThrowingRankBuilderType.valueOf(throwingType);

0 commit comments

Comments
 (0)