1919import java .util .List ;
2020import java .util .Map ;
2121
22+ import org .junit .jupiter .api .BeforeEach ;
2223import org .junit .jupiter .api .Test ;
24+ import reactor .core .publisher .Flux ;
2325
2426import org .springframework .context .annotation .AnnotationConfigApplicationContext ;
2527import org .springframework .context .annotation .Bean ;
2830import org .springframework .core .MethodParameter ;
2931import org .springframework .core .ReactiveAdapterRegistry ;
3032import org .springframework .core .task .SyncTaskExecutor ;
31- import org .springframework .http .converter .json .MappingJackson2HttpMessageConverter ;
33+ import org .springframework .http .HttpHeaders ;
34+ import org .springframework .http .converter .StringHttpMessageConverter ;
3235import org .springframework .web .accept .ContentNegotiationManager ;
3336import org .springframework .web .context .request .NativeWebRequest ;
3437import org .springframework .web .context .request .ServletWebRequest ;
5154 */
5255public class FragmentRenderingStreamTests {
5356
54- @ Test
55- void streamFragments () throws Exception {
57+ private final MockHttpServletRequest request = new MockHttpServletRequest ();
58+
59+ private final MockHttpServletResponse response = new MockHttpServletResponse ();
60+
61+ private final NativeWebRequest webRequest = new ServletWebRequest (request , response );
62+
63+ private ResponseBodyEmitterReturnValueHandler handler ;
64+
65+
66+ @ BeforeEach
67+ void setUp () {
68+ AsyncWebRequest asyncWebRequest = new StandardServletAsyncWebRequest (this .request , this .response );
69+ WebAsyncUtils .getAsyncManager (this .webRequest ).setAsyncWebRequest (asyncWebRequest );
70+ this .request .setAsyncSupported (true );
5671
5772 AnnotationConfigApplicationContext context =
5873 new AnnotationConfigApplicationContext (ScriptTemplatingConfiguration .class );
@@ -61,44 +76,84 @@ void streamFragments() throws Exception {
6176 ScriptTemplateViewResolver viewResolver = new ScriptTemplateViewResolver (prefix , ".kts" );
6277 viewResolver .setApplicationContext (context );
6378
64- ResponseBodyEmitterReturnValueHandler handler = new ResponseBodyEmitterReturnValueHandler (
65- List .of (new MappingJackson2HttpMessageConverter ()),
79+ this . handler = new ResponseBodyEmitterReturnValueHandler (
80+ List .of (new StringHttpMessageConverter ()),
6681 ReactiveAdapterRegistry .getSharedInstance (), new SyncTaskExecutor (),
6782 new ContentNegotiationManager (),
6883 List .of (viewResolver ), null );
84+ }
6985
70- MockHttpServletRequest request = new MockHttpServletRequest ();
71- MockHttpServletResponse response = new MockHttpServletResponse ();
72- NativeWebRequest webRequest = new ServletWebRequest (request , response );
73-
74- AsyncWebRequest asyncWebRequest = new StandardServletAsyncWebRequest (request , response );
75- WebAsyncUtils .getAsyncManager (webRequest ).setAsyncWebRequest (asyncWebRequest );
76- request .setAsyncSupported (true );
7786
87+ @ Test
88+ void streamWithSseEmitter () throws Exception {
7889 MethodParameter type = on (TestController .class ).resolveReturnType (SseEmitter .class );
90+
7991 SseEmitter emitter = new SseEmitter ();
80- handler .handleReturnValue (emitter , type , new ModelAndViewContainer (), webRequest );
92+ this . handler .handleReturnValue (emitter , type , new ModelAndViewContainer (), webRequest );
8193
82- assertThat (request .isAsyncStarted ()).isTrue ();
83- assertThat (response .getStatus ()).isEqualTo (200 );
94+ assertThat (this . request .isAsyncStarted ()).isTrue ();
95+ assertThat (this . response .getStatus ()).isEqualTo (200 );
8496
8597 ModelAndView mav1 = new ModelAndView ("fragment1" , Map .of ("foo" , "Foo" ));
8698 ModelAndView mav2 = new ModelAndView ("fragment2" , Map .of ("bar" , "Bar" ));
8799
88- emitter .send (SseEmitter .event ().data (mav1 ).data (mav2 ));
100+ emitter .send (SseEmitter .event ().data (mav1 ));
101+ emitter .send (SseEmitter .event ().data (mav2 ));
89102
90- assertThat (response .getContentType ()).isEqualTo ("text/event-stream" );
91- assertThat (response .getContentAsString ()).isEqualTo (("""
92- data:<p>Hello Foo</p>
93- data:<p>Hello Bar</p>
103+ assertThat (this .response .getContentType ()).isEqualTo ("text/event-stream" );
104+ assertThat (this .response .getContentAsString ()).isEqualTo (("""
105+ event:fragment1
106+ data:<p>
107+ data: Hello Foo
108+ data:</p>
109+
110+ event:fragment2
111+ data:<p>
112+ data: Hello Bar
113+ data:</p>
94114
95115 """ ));
96116 }
97117
118+ @ Test
119+ void streamWithFlux () throws Exception {
120+ MethodParameter type = on (TestController .class ).resolveReturnType (Flux .class , ModelAndView .class );
121+
122+ this .request .addHeader (HttpHeaders .ACCEPT , "text/event-stream" );
98123
124+ Flux <ModelAndView > flux = Flux .just (
125+ new ModelAndView ("fragment1" , Map .of ("foo" , "Foo" )),
126+ new ModelAndView ("fragment2" , Map .of ("bar" , "Bar" )));
127+
128+ this .handler .handleReturnValue (flux , type , new ModelAndViewContainer (), webRequest );
129+
130+ assertThat (this .request .isAsyncStarted ()).isTrue ();
131+ assertThat (this .response .getStatus ()).isEqualTo (200 );
132+
133+ assertThat (this .response .getContentType ()).isEqualTo ("text/event-stream" );
134+ assertThat (this .response .getContentAsString ()).isEqualTo (("""
135+ event:fragment1
136+ data:<p>
137+ data: Hello Foo
138+ data:</p>
139+
140+ event:fragment2
141+ data:<p>
142+ data: Hello Bar
143+ data:</p>
144+
145+ """ ));
146+ }
147+
148+
149+ @ SuppressWarnings ({"unused" , "DataFlowIssue" })
99150 private static class TestController {
100151
101- SseEmitter handle () {
152+ SseEmitter handleWithSseEmitter () {
153+ return null ;
154+ }
155+
156+ Flux <ModelAndView > handleWithFlux () {
102157 return null ;
103158 }
104159 }
0 commit comments