Skip to content

Commit def0fbf

Browse files
utilizing semantci_text index version param and removed unwanted override
1 parent a1263a6 commit def0fbf

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/SemanticTextIndexVersionIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.elasticsearch.common.settings.Settings;
1616
import org.elasticsearch.core.TimeValue;
1717
import org.elasticsearch.index.IndexVersion;
18+
import org.elasticsearch.index.IndexVersions;
1819
import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
1920
import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapperTestUtils;
2021
import org.elasticsearch.inference.SimilarityMeasure;
@@ -50,7 +51,6 @@
5051
import static org.hamcrest.Matchers.equalTo;
5152

5253
public class SemanticTextIndexVersionIT extends ESIntegTestCase {
53-
private static final IndexVersion SEMANTIC_TEXT_INTRODUCED_VERSION = IndexVersion.fromId(8512000);
5454
private static final int MAXIMUM_NUMBER_OF_VERSIONS_TO_TEST = 25;
5555
private static final String SPARSE_SEMANTIC_FIELD = "sparse_field";
5656
private static final String DENSE_SEMANTIC_FIELD = "dense_field";
@@ -71,7 +71,7 @@ public void setup() throws Exception {
7171

7272
Set<IndexVersion> availableVersions = IndexVersionUtils.allReleasedVersions()
7373
.stream()
74-
.filter(indexVersion -> indexVersion.after(SEMANTIC_TEXT_INTRODUCED_VERSION))
74+
.filter(indexVersion -> indexVersion.onOrAfter(IndexVersions.SEMANTIC_TEXT_FIELD_TYPE))
7575
.collect(Collectors.toSet());
7676

7777
selectedVersions = randomSubsetOf(Math.min(availableVersions.size(), MAXIMUM_NUMBER_OF_VERSIONS_TO_TEST), availableVersions);

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/LocalStateInferencePlugin.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.xpack.inference;
99

1010
import org.elasticsearch.action.support.MappedActionFilter;
11-
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
1211
import org.elasticsearch.common.settings.Settings;
1312
import org.elasticsearch.index.mapper.Mapper;
1413
import org.elasticsearch.inference.InferenceServiceExtension;
@@ -74,9 +73,4 @@ public Map<String, Highlighter> getHighlighters() {
7473
public Collection<MappedActionFilter> getMappedActionFilters() {
7574
return inferencePlugin.getMappedActionFilters();
7675
}
77-
78-
@Override
79-
public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
80-
return super.getNamedWriteables();
81-
}
8276
}

0 commit comments

Comments
 (0)