Skip to content

Commit a6846d4

Browse files
authored
Backport ESRestTestCase changes from elastic#70094 to 7.12 branch. (elastic#70299)
1 parent 9aa6dc8 commit a6846d4

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -621,17 +621,16 @@ private void wipeCluster() throws Exception {
621621
}
622622
}
623623
} catch (Exception e) {
624-
logger.info("ignoring exception removing all composable index templates", e);
624+
logger.debug("ignoring exception removing all composable index templates", e);
625625
// We hit a version of ES that doesn't support index templates v2 yet, so it's safe to ignore
626626
}
627627
try {
628628
Request compReq = new Request("GET", "_component_template");
629629
compReq.setOptions(allowTypesRemovalWarnings());
630630
String componentTemplates = EntityUtils.toString(adminClient().performRequest(compReq).getEntity());
631631
Map<String, Object> cTemplates = XContentHelper.convertToMap(JsonXContent.jsonXContent, componentTemplates, false);
632-
@SuppressWarnings("unchecked")
633-
List<String> names = ((List<Map<String, Object>>) cTemplates.get("component_templates")).stream()
634-
.map(ct -> (String) ct.get("name"))
632+
List<String> names = ((List<?>) cTemplates.get("component_templates")).stream()
633+
.map(ct -> (String) ((Map<?, ?>) ct).get("name"))
635634
.collect(Collectors.toList());
636635
for (String componentTemplate : names) {
637636
try {
@@ -644,7 +643,7 @@ private void wipeCluster() throws Exception {
644643
}
645644
}
646645
} catch (Exception e) {
647-
logger.info("ignoring exception removing all component templates", e);
646+
logger.debug("ignoring exception removing all component templates", e);
648647
// We hit a version of ES that doesn't support index templates v2 yet, so it's safe to ignore
649648
}
650649
Request getLegacyTemplatesRequest = new Request("GET", "_template");

0 commit comments

Comments
 (0)