Skip to content

Commit f2a3d1a

Browse files
Fixing forbidden calls
1 parent f6b2d74 commit f2a3d1a

File tree

1 file changed

+7
-27
lines changed
  • x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/authorization

1 file changed

+7
-27
lines changed

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/authorization/AuthorizationModel.java

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,7 @@ private static AuthorizationResponseEntity.Configuration getConfigurationOrEmpty
150150
return AuthorizationResponseEntity.Configuration.EMPTY;
151151
}
152152

153-
private static Map<String, Object> getChunkingSettingsMap(
154-
AuthorizationResponseEntity.Configuration configuration
155-
) {
153+
private static Map<String, Object> getChunkingSettingsMap(AuthorizationResponseEntity.Configuration configuration) {
156154
return Objects.requireNonNullElse(configuration.chunkingSettings(), new HashMap<>());
157155
}
158156

@@ -181,21 +179,9 @@ private static ElasticInferenceServiceDenseTextEmbeddingsModel createDenseTextEm
181179
}
182180

183181
private static void validateConfigurationForTextEmbedding(AuthorizationResponseEntity.Configuration config) {
184-
validateFieldPresent(
185-
AuthorizationResponseEntity.Configuration.ELEMENT_TYPE,
186-
config.elementType(),
187-
TaskType.TEXT_EMBEDDING
188-
);
189-
validateFieldPresent(
190-
AuthorizationResponseEntity.Configuration.DIMENSIONS,
191-
config.dimensions(),
192-
TaskType.TEXT_EMBEDDING
193-
);
194-
validateFieldPresent(
195-
AuthorizationResponseEntity.Configuration.SIMILARITY,
196-
config.similarity(),
197-
TaskType.TEXT_EMBEDDING
198-
);
182+
validateFieldPresent(AuthorizationResponseEntity.Configuration.ELEMENT_TYPE, config.elementType(), TaskType.TEXT_EMBEDDING);
183+
validateFieldPresent(AuthorizationResponseEntity.Configuration.DIMENSIONS, config.dimensions(), TaskType.TEXT_EMBEDDING);
184+
validateFieldPresent(AuthorizationResponseEntity.Configuration.SIMILARITY, config.similarity(), TaskType.TEXT_EMBEDDING);
199185
}
200186

201187
private static void validateFieldPresent(String field, Object fieldValue, TaskType taskType) {
@@ -206,14 +192,8 @@ private static void validateFieldPresent(String field, Object fieldValue, TaskTy
206192
}
207193
}
208194

209-
private static SimilarityMeasure getSimilarityMeasure(
210-
AuthorizationResponseEntity.Configuration configuration
211-
) {
212-
validateFieldPresent(
213-
AuthorizationResponseEntity.Configuration.SIMILARITY,
214-
configuration.similarity(),
215-
TaskType.TEXT_EMBEDDING
216-
);
195+
private static SimilarityMeasure getSimilarityMeasure(AuthorizationResponseEntity.Configuration configuration) {
196+
validateFieldPresent(AuthorizationResponseEntity.Configuration.SIMILARITY, configuration.similarity(), TaskType.TEXT_EMBEDDING);
217197

218198
return SimilarityMeasure.fromString(configuration.similarity());
219199
}
@@ -288,7 +268,7 @@ public List<ElasticInferenceServiceModel> getEndpoints(Set<String> endpointIds)
288268

289269
@Override
290270
public String toString() {
291-
return String.format("AuthorizationModel{authorizedEndpoints=%s, taskTypes=%s}", authorizedEndpoints, taskTypes);
271+
return Strings.format("AuthorizationModel{authorizedEndpoints=%s, taskTypes=%s}", authorizedEndpoints, taskTypes);
292272
}
293273

294274
@Override

0 commit comments

Comments
 (0)