Skip to content

Commit d051cd2

Browse files
committed
Fix SemanticTextFieldMapperTests
1 parent 75031e1 commit d051cd2

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextField.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,24 @@ static MinimalServiceSettings parseModelSettingsFromMap(Object node) {
125125
}
126126
}
127127

128+
static ChunkingSettings parseChunkingSettingsFromMap(Object node) {
129+
if (node == null) {
130+
return null;
131+
}
132+
try {
133+
Map<String, Object> map = XContentMapValues.nodeMapValue(node, CHUNKING_SETTINGS_FIELD);
134+
XContentParser parser = new MapXContentParser(
135+
NamedXContentRegistry.EMPTY,
136+
DeprecationHandler.IGNORE_DEPRECATIONS,
137+
map,
138+
XContentType.JSON
139+
);
140+
return ChunkingSettingsBuilder.fromMap(map);
141+
} catch (Exception exc) {
142+
throw new ElasticsearchException(exc);
143+
}
144+
}
145+
128146
@Override
129147
public List<String> originalValues() {
130148
return originalValues != null ? originalValues : Collections.emptyList();

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public static class Builder extends FieldMapper.Builder {
184184
CHUNKING_SETTINGS_FIELD,
185185
true,
186186
() -> null,
187-
(n, c, o) -> ChunkingSettingsBuilder.fromMap((Map<String, Object>) o),
187+
(n, c, o) -> SemanticTextField.parseChunkingSettingsFromMap(o),
188188
mapper -> ((SemanticTextFieldType) mapper.fieldType()).chunkingSettings,
189189
XContentBuilder::field,
190190
Objects::toString

0 commit comments

Comments
 (0)