From 5497416c2d9e30a9517c721eeb39783d4c8ff160 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 8 May 2017 09:10:36 +0200 Subject: [PATCH] Polishing --- ...MappingJackson2XmlHttpMessageConverterTests.java | 13 +------------ .../function/server/RouterFunctionTests.java | 6 ++++-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java index 9ddeef7b5f..4a887b1c87 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java +++ b/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("with")); @@ -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; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionTests.java index 5d7d16cc3c..b281bdd813 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionTests.java +++ b/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 stringMono = Mono.just("42"); - HandlerFunction>> handlerFunction = request -> EntityResponse.fromPublisher(stringMono, String.class).build(); - RouterFunction>> routerFunction = request -> Mono.just(handlerFunction); + HandlerFunction>> handlerFunction = + request -> EntityResponse.fromPublisher(stringMono, String.class).build(); + RouterFunction>> routerFunction = + request -> Mono.just(handlerFunction); HandlerFilterFunction>, EntityResponse>> filterFunction = (request, next) -> next.handle(request).flatMap( -- GitLab