Skip to content

Commit 34b8a04

Browse files
Revert try/catch blocks
1 parent 2159f54 commit 34b8a04

File tree

1 file changed

+16
-30
lines changed

1 file changed

+16
-30
lines changed

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

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -176,25 +176,17 @@ public void testParamAsIntegerWithNonIntegerParameter() {
176176
public void testContentOrSourceParam() {
177177
Exception e = expectThrows(ElasticsearchParseException.class, () -> contentRestRequest("", emptyMap()).contentOrSourceParam());
178178
assertEquals("request body or source parameter is required", e.getMessage());
179-
try (ReleasableBytesReference ref = contentRestRequest("stuff", emptyMap()).contentOrSourceParam().v2()) {
180-
assertEquals("stuff", ref.utf8ToString());
181-
}
182-
try (
183-
ReleasableBytesReference ref = contentRestRequest(
184-
"stuff",
185-
Map.of("source", "stuff2", "source_content_type", "application/json")
186-
).contentOrSourceParam().v2()
187-
) {
188-
assertEquals("stuff", ref.utf8ToString());
189-
}
190-
try (
191-
ReleasableBytesReference ref = contentRestRequest(
192-
"",
193-
Map.of("source", "{\"foo\": \"stuff\"}", "source_content_type", "application/json")
194-
).contentOrSourceParam().v2()
195-
) {
196-
assertEquals("{\"foo\": \"stuff\"}", ref.utf8ToString());
197-
}
179+
assertEquals(new BytesArray("stuff"), contentRestRequest("stuff", emptyMap()).contentOrSourceParam().v2());
180+
assertEquals(
181+
new BytesArray("stuff"),
182+
contentRestRequest("stuff", Map.of("source", "stuff2", "source_content_type", "application/json")).contentOrSourceParam().v2()
183+
);
184+
assertEquals(
185+
new BytesArray("{\"foo\": \"stuff\"}"),
186+
contentRestRequest("", Map.of("source", "{\"foo\": \"stuff\"}", "source_content_type", "application/json"))
187+
.contentOrSourceParam()
188+
.v2()
189+
);
198190
e = expectThrows(ValidationException.class, () -> contentRestRequest("", Map.of("source", "stuff2")).contentOrSourceParam());
199191
assertThat(e.getMessage(), containsString("source and source_content_type parameters are required"));
200192
}
@@ -309,17 +301,11 @@ public void testMultipleContentTypeHeaders() {
309301
public void testRequiredContent() {
310302
Exception e = expectThrows(ElasticsearchParseException.class, () -> contentRestRequest("", emptyMap()).requiredContent());
311303
assertEquals("request body is required", e.getMessage());
312-
try (ReleasableBytesReference ref = contentRestRequest("stuff", emptyMap()).requiredContent()) {
313-
assertEquals("stuff", ref.utf8ToString());
314-
}
315-
try (
316-
ReleasableBytesReference ref = contentRestRequest(
317-
"stuff",
318-
Map.of("source", "stuff2", "source_content_type", "application/json")
319-
).requiredContent()
320-
) {
321-
assertEquals("stuff", ref.utf8ToString());
322-
}
304+
assertEquals(new BytesArray("stuff"), contentRestRequest("stuff", emptyMap()).requiredContent());
305+
assertEquals(
306+
new BytesArray("stuff"),
307+
contentRestRequest("stuff", Map.of("source", "stuff2", "source_content_type", "application/json")).requiredContent()
308+
);
323309
e = expectThrows(
324310
ElasticsearchParseException.class,
325311
() -> contentRestRequest("", Map.of("source", "{\"foo\": \"stuff\"}", "source_content_type", "application/json"))

0 commit comments

Comments
 (0)