2222import org .elasticsearch .xcontent .XContentParser ;
2323import org .elasticsearch .xcontent .XContentParserConfiguration ;
2424import org .elasticsearch .xcontent .XContentType ;
25+ import org .junit .Assert ;
2526
2627import java .io .IOException ;
2728import java .util .ArrayList ;
@@ -170,7 +171,7 @@ public void testParamAsIntegerWithNonIntegerParameter() {
170171 assertThrows (IllegalArgumentException .class , () -> restRequest .paramAsInteger (parameterKey , defaultValue ));
171172 }
172173
173- public void testContentOrSourceParam () throws IOException {
174+ public void testContentOrSourceParam () {
174175 Exception e = expectThrows (ElasticsearchParseException .class , () -> contentRestRequest ("" , emptyMap ()).contentOrSourceParam ());
175176 assertEquals ("request body or source parameter is required" , e .getMessage ());
176177 assertEquals (new BytesArray ("stuff" ), contentRestRequest ("stuff" , emptyMap ()).contentOrSourceParam ().v2 ());
@@ -188,11 +189,11 @@ public void testContentOrSourceParam() throws IOException {
188189 assertThat (e .getMessage (), containsString ("source and source_content_type parameters are required" ));
189190 }
190191
191- public void testHasContentOrSourceParam () throws IOException {
192- assertEquals ( false , contentRestRequest ("" , emptyMap ()).hasContentOrSourceParam ());
193- assertEquals ( true , contentRestRequest ("stuff" , emptyMap ()).hasContentOrSourceParam ());
194- assertEquals ( true , contentRestRequest ("stuff" , singletonMap ("source" , "stuff2" )).hasContentOrSourceParam ());
195- assertEquals ( true , contentRestRequest ("" , singletonMap ("source" , "stuff" )).hasContentOrSourceParam ());
192+ public void testHasContentOrSourceParam () {
193+ assertFalse ( contentRestRequest ("" , emptyMap ()).hasContentOrSourceParam ());
194+ assertTrue ( contentRestRequest ("stuff" , emptyMap ()).hasContentOrSourceParam ());
195+ assertTrue ( contentRestRequest ("stuff" , singletonMap ("source" , "stuff2" )).hasContentOrSourceParam ());
196+ assertTrue ( contentRestRequest ("" , singletonMap ("source" , "stuff" )).hasContentOrSourceParam ());
196197 }
197198
198199 public void testContentOrSourceParamParser () throws IOException {
@@ -210,7 +211,7 @@ public void testContentOrSourceParamParser() throws IOException {
210211 }
211212
212213 public void testWithContentOrSourceParamParserOrNull () throws IOException {
213- contentRestRequest ("" , emptyMap ()).withContentOrSourceParamParserOrNull (parser -> assertNull ( parser ) );
214+ contentRestRequest ("" , emptyMap ()).withContentOrSourceParamParserOrNull (Assert :: assertNull );
214215 contentRestRequest ("{}" , emptyMap ()).withContentOrSourceParamParserOrNull (parser -> assertEquals (emptyMap (), parser .map ()));
215216 contentRestRequest ("{}" , singletonMap ("source" , "stuff2" )).withContentOrSourceParamParserOrNull (
216217 parser -> assertEquals (emptyMap (), parser .map ())
@@ -307,7 +308,7 @@ public void testRequiredContent() {
307308 public void testIsServerlessRequest () {
308309 RestRequest request1 = contentRestRequest ("content" , new HashMap <>());
309310 request1 .markAsServerlessRequest ();
310- assertEquals (request1 .param (SERVERLESS_REQUEST ), "true" );
311+ assertEquals ("true" , request1 .param (SERVERLESS_REQUEST ));
311312 assertTrue (request1 .isServerlessRequest ());
312313 IllegalArgumentException exception = expectThrows (IllegalArgumentException .class , request1 ::markAsServerlessRequest );
313314 assertThat (exception .getMessage (), is ("The parameter [" + SERVERLESS_REQUEST + "] is already defined." ));
@@ -320,7 +321,7 @@ public void testIsServerlessRequest() {
320321 public void testIsOperatorRequest () {
321322 RestRequest request1 = contentRestRequest ("content" , new HashMap <>());
322323 request1 .markAsOperatorRequest ();
323- assertEquals (request1 .param (OPERATOR_REQUEST ), "true" );
324+ assertEquals ("true" , request1 .param (OPERATOR_REQUEST ));
324325 assertTrue (request1 .isOperatorRequest ());
325326 IllegalArgumentException exception = expectThrows (IllegalArgumentException .class , request1 ::markAsOperatorRequest );
326327 assertThat (exception .getMessage (), is ("The parameter [" + OPERATOR_REQUEST + "] is already defined." ));
0 commit comments