Skip to content

Commit 05a2dce

Browse files
committed
Fix ClassCastException in blockloader tests
1 parent 1111dce commit 05a2dce

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

server/src/test/java/org/elasticsearch/index/mapper/blockloader/KeywordFieldBlockLoaderTests.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,6 @@ public static Object expectedValue(Map<String, Object> fieldMapping, Object valu
6767
return maybeFoldList(resultList);
6868
}
6969

70-
public static boolean hasDocValues(Map<String, Object> fieldMapping, boolean defaultValue) {
71-
Object value = fieldMapping.getOrDefault("doc_values", defaultValue);
72-
if (value instanceof Boolean b) {
73-
return b;
74-
} else if (value instanceof Map) {
75-
return true;
76-
} else {
77-
throw new IllegalArgumentException("Unexpected value [" + value + "] for mapping parameter [doc_values]");
78-
}
79-
}
80-
8170
private static BytesRef convert(String value, String nullValue, int ignoreAbove) {
8271
if (value == null) {
8372
if (nullValue != null) {

test/framework/src/main/java/org/elasticsearch/index/mapper/BlockLoaderTestCase.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,13 @@ private void processLevel(Map<String, Object> level, String field, ArrayList<Obj
275275
}
276276

277277
public static boolean hasDocValues(Map<String, Object> fieldMapping, boolean defaultValue) {
278-
return (boolean) fieldMapping.getOrDefault("doc_values", defaultValue);
278+
Object value = fieldMapping.getOrDefault("doc_values", defaultValue);
279+
if (value instanceof Boolean b) {
280+
return b;
281+
} else if (value instanceof Map) {
282+
return true;
283+
} else {
284+
throw new IllegalArgumentException("Unexpected value [" + value + "] for mapping parameter [doc_values]");
285+
}
279286
}
280287
}

0 commit comments

Comments
 (0)