Skip to content

Commit ff3b949

Browse files
Remove all try/catch blocks
1 parent 024b252 commit ff3b949

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

server/src/test/java/org/elasticsearch/rest/RestRequestTests.java

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ public void testContentParser() throws IOException {
106106
assertEquals("request body is required", e.getMessage());
107107
e = expectThrows(ElasticsearchParseException.class, () -> contentRestRequest("", singletonMap("source", "{}")).contentParser());
108108
assertEquals("request body is required", e.getMessage());
109-
try (XContentParser parser = contentRestRequest("{}", emptyMap()).contentParser()) {
110-
assertEquals(emptyMap(), parser.map());
111-
}
109+
assertEquals(emptyMap(), contentRestRequest("{}", emptyMap()).contentParser().map());
112110
e = expectThrows(ElasticsearchParseException.class, () -> contentRestRequest("", emptyMap(), emptyMap()).contentParser());
113111
assertEquals("request body is required", e.getMessage());
114112
}
@@ -204,21 +202,12 @@ public void testContentOrSourceParamParser() throws IOException {
204202
() -> contentRestRequest("", emptyMap()).contentOrSourceParamParser()
205203
);
206204
assertEquals("request body or source parameter is required", e.getMessage());
207-
208-
try (XContentParser parser = contentRestRequest("{}", emptyMap()).contentOrSourceParamParser()) {
209-
assertEquals(emptyMap(), parser.map());
210-
}
211-
212-
try (XContentParser parser = contentRestRequest("{}", singletonMap("source", "stuff2")).contentOrSourceParamParser()) {
213-
assertEquals(emptyMap(), parser.map());
214-
}
215-
216-
try (
217-
XContentParser parser = contentRestRequest("", Map.of("source", "{}", "source_content_type", "application/json"))
218-
.contentOrSourceParamParser()
219-
) {
220-
assertEquals(emptyMap(), parser.map());
221-
}
205+
assertEquals(emptyMap(), contentRestRequest("{}", emptyMap()).contentOrSourceParamParser().map());
206+
assertEquals(emptyMap(), contentRestRequest("{}", singletonMap("source", "stuff2")).contentOrSourceParamParser().map());
207+
assertEquals(
208+
emptyMap(),
209+
contentRestRequest("", Map.of("source", "{}", "source_content_type", "application/json")).contentOrSourceParamParser().map()
210+
);
222211
}
223212

224213
public void testWithContentOrSourceParamParserOrNull() throws IOException {

0 commit comments

Comments
 (0)