Polishing

spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java

@@ -17,7 +17,6 @@
 package org.springframework.http.converter.xml;
 
 import java.io.IOException;
-import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 
 import com.fasterxml.jackson.annotation.JsonView;
@@ -27,11 +26,9 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.MockHttpInputMessage;
 import org.springframework.http.MockHttpOutputMessage;
-import org.springframework.http.converter.AbstractHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJacksonValue;
 
 import static org.hamcrest.CoreMatchers.*;
@@ -128,7 +125,7 @@ public class MappingJackson2XmlHttpMessageConverterTests {
 
 		MappingJacksonValue jacksonValue = new MappingJacksonValue(bean);
 		jacksonValue.setSerializationView(MyJacksonView1.class);
-		this.writeInternal(jacksonValue, outputMessage);
+		this.converter.write(jacksonValue, null, outputMessage);
 
 		String result = outputMessage.getBodyAsString(StandardCharsets.UTF_8);
 		assertThat(result, containsString("<withView1>with</withView1>"));
@@ -185,14 +182,6 @@ public class MappingJackson2XmlHttpMessageConverterTests {
 	}
 
 
-	private void writeInternal(Object object, HttpOutputMessage outputMessage) throws Exception {
-		Method method = AbstractHttpMessageConverter.class.getDeclaredMethod(
-				"writeInternal", Object.class, HttpOutputMessage.class);
-		method.setAccessible(true);
-		method.invoke(this.converter, object, outputMessage);
-	}
-
-
 	public static class MyBean {
 
 		private String string;

spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionTests.java

@@ -87,8 +87,10 @@ public class RouterFunctionTests {
 	@Test
 	public void filter() throws Exception {
 		Mono<String> stringMono = Mono.just("42");
-		HandlerFunction<EntityResponse<Mono<String>>> handlerFunction = request -> EntityResponse.fromPublisher(stringMono, String.class).build();
-		RouterFunction<EntityResponse<Mono<String>>> routerFunction = request -> Mono.just(handlerFunction);
+		HandlerFunction<EntityResponse<Mono<String>>> handlerFunction =
+				request -> EntityResponse.fromPublisher(stringMono, String.class).build();
+		RouterFunction<EntityResponse<Mono<String>>> routerFunction =
+				request -> Mono.just(handlerFunction);
 
 		HandlerFilterFunction<EntityResponse<Mono<String>>, EntityResponse<Mono<Integer>>> filterFunction =
 				(request, next) -> next.handle(request).flatMap(