Skip to content

Commit fdb2c1d

Browse files
committed
don't call super
1 parent f359acf commit fdb2c1d

25 files changed

+40
-33
lines changed

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ public TransportVersion getMinimalSupportedVersion() {
8484

8585
@Override
8686
public boolean supportsVersion(TransportVersion version) {
87-
return TaskSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS_8_19);
87+
return version.onOrAfter(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS)
88+
|| version.isPatchFrom(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS_8_19);
8889
}
8990

9091
@Override

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ public TransportVersion getMinimalSupportedVersion() {
9595

9696
@Override
9797
public boolean supportsVersion(TransportVersion version) {
98-
return SecretSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
98+
return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED)
99+
|| version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
99100
}
100101

101102
@Override

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,8 @@ public TransportVersion getMinimalSupportedVersion() {
399399

400400
@Override
401401
public boolean supportsVersion(TransportVersion version) {
402-
return ServiceSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
402+
return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED)
403+
|| version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
403404
}
404405

405406
@Override

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ public TransportVersion getMinimalSupportedVersion() {
105105

106106
@Override
107107
public boolean supportsVersion(TransportVersion version) {
108-
return TaskSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
108+
return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED)
109+
|| version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
109110
}
110111

111112
@Override

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ public TransportVersion getMinimalSupportedVersion() {
181181

182182
@Override
183183
public boolean supportsVersion(TransportVersion version) {
184-
return ServiceSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.ML_INFERENCE_DEEPSEEK_8_19);
184+
return version.onOrAfter(TransportVersions.ML_INFERENCE_DEEPSEEK)
185+
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_DEEPSEEK_8_19);
185186
}
186187

187188
@Override

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public TransportVersion getMinimalSupportedVersion() {
210210

211211
@Override
212212
public boolean supportsVersion(TransportVersion version) {
213-
return ServiceSettings.super.supportsVersion(version)
213+
return version.onOrAfter(TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED)
214214
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED_8_19);
215215
}
216216

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public TransportVersion getMinimalSupportedVersion() {
8888

8989
@Override
9090
public boolean supportsVersion(TransportVersion version) {
91-
return ServiceSettings.super.supportsVersion(version)
91+
return version.onOrAfter(TransportVersions.ML_INFERENCE_ELASTIC_RERANK)
9292
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_ELASTIC_RERANK_ADDED_8_19);
9393
}
9494

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public TransportVersion getMinimalSupportedVersion() {
123123

124124
@Override
125125
public boolean supportsVersion(TransportVersion version) {
126-
return ServiceSettings.super.supportsVersion(version)
126+
return version.onOrAfter(TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED)
127127
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED_8_19);
128128
}
129129

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public TransportVersion getMinimalSupportedVersion() {
149149

150150
@Override
151151
public boolean supportsVersion(TransportVersion version) {
152-
return ServiceSettings.super.supportsVersion(version)
152+
return version.onOrAfter(TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED)
153153
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED_8_19);
154154
}
155155

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public TransportVersion getMinimalSupportedVersion() {
120120

121121
@Override
122122
public boolean supportsVersion(TransportVersion version) {
123-
return ServiceSettings.super.supportsVersion(version)
123+
return version.onOrAfter(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED)
124124
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED_8_19);
125125
}
126126

0 commit comments

Comments
 (0)