Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8b75b8f

Browse files
author
Dave Syer
committed
Only support async: and use sse:data as sse lambda name
1 parent 1489bfe commit 8b75b8f

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public String layout(Model model) {
107107
@RequestMapping(path = "/sse", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
108108
public String sse(Model model) {
109109
model.addAttribute("time", new Date());
110-
model.addAttribute("async.message",
110+
model.addAttribute("async:message",
111111
Flux.just("<span>Hello</span>", "<span>World</span>")
112112
.delayElements(Duration.ofMillis(10)));
113113
model.addAttribute("title", "Hello App");
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
{{#async.message}}
1+
{{#async:message}}
22
event: message
3-
{{#ssedata}}
3+
{{#sse:data}}
44
<h2>Title</h2>
55
{{{.}}}
6-
{{/ssedata}}
7-
{{/async.message}}
6+
{{/sse:data}}
7+
{{/async:message}}

‎spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3038,23 +3038,23 @@ There are some special features of the `MustacheView` that make it suitable for
30383038

30393039
===== Progressive Rendering
30403040

3041-
A model element of type `Publisher` will be left in the model (instead of expanding it before the view is rendered), if its name starts with "async." or "async:". The `View` is then rendered and flushed to the HTTP response as soon as each element is published. Browsers are really good at rendering partially complete HTML, so the flux elements will most likely be visible to the user as soon as they are available. This is useful for rendering the "main" content of a page if it is a list or a table, for instance.
3041+
A model element of type `Publisher` will be left in the model (instead of expanding it before the view is rendered), if its name starts with "async:". The `View` is then rendered and flushed to the HTTP response as soon as each element is published. Browsers are really good at rendering partially complete HTML, so the flux elements will most likely be visible to the user as soon as they are available. This is useful for rendering the "main" content of a page if it is a list or a table, for instance.
30423042

30433043
===== Sserver Sent Event (SSE) Support
30443044

3045-
To render a `View` with content type `text/event-stream` you need a model element of type `Publisher`, and also a template that includes that element (probably starts and ends with it). There is a convenience Lambda (`ssedata`) added to the model for you that prepends every line with `data:` - you can use it if you wish to simplify the rendering of the data elements. Two new lines are added after each item in `{{#ssedata}}`. E.g. with an element called `flux.events` of type `Flux<Event>`:
3045+
To render a `View` with content type `text/event-stream` you need a model element of type `Publisher`, and also a template that includes that element (probably starts and ends with it). There is a convenience Lambda (`ssedata`) added to the model for you that prepends every line with `data:` - you can use it if you wish to simplify the rendering of the data elements. Two new lines are added after each item in `{{#sse:data}}`. E.g. with an element called `async:events` of type `Flux<Event>`:
30463046

30473047
```
3048-
{{#async.events}}
3048+
{{#async:events}}
30493049
event: message
30503050
id: {{id}}
3051-
{{#ssedata}}
3051+
{{#sse:data}}
30523052
<div>
30533053
<span>Name: {{name}}<span>
30543054
<span>Value: {{value}}<span>
30553055
</div>
3056-
{{/ssedata}}
3057-
{{/async.events}}
3056+
{{/sse:data}}
3057+
{{/async:events}}
30583058
```
30593059

30603060
the output will be

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ protected Mono<Void> renderInternal(Map<String, Object> model, MediaType content
114114
Map<String, Object> map;
115115
if (sse) {
116116
map = new HashMap<>(model);
117-
map.put("ssedata", new SseLambda());
117+
map.put("sse:data", new SseLambda());
118118
}
119119
else {
120120
map = model;
@@ -151,7 +151,7 @@ private Template compile(Resource resource) {
151151
protected Mono<Void> resolveAsyncAttributes(Map<String, Object> model) {
152152
Map<String, Object> result = new HashMap<>();
153153
for (String key : model.keySet()) {
154-
if (!key.startsWith("async.") && !key.startsWith("async:")) {
154+
if (!key.startsWith("async:")) {
155155
result.put(key, model.get(key));
156156
}
157157
else {

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void viewResolvesSseManual() {
9090
view.setUrl(this.templateUrl + "/sse.html");
9191
view.setCharset(StandardCharsets.UTF_8.displayName());
9292
view.setApplicationContext(this.context);
93-
view.render(Collections.singletonMap("async.value", Flux.just("World", "Spring")),
93+
view.render(Collections.singletonMap("async:value", Flux.just("World", "Spring")),
9494
MediaType.TEXT_EVENT_STREAM, this.exchange).block(Duration.ofSeconds(30));
9595
assertThat(this.exchange.getResponse().getBodyAsString()
9696
.block(Duration.ofSeconds(30))).isEqualTo(
@@ -106,7 +106,7 @@ public void viewResolvesSseData() {
106106
view.setUrl(this.templateUrl + "/ssedata.html");
107107
view.setCharset(StandardCharsets.UTF_8.displayName());
108108
view.setApplicationContext(this.context);
109-
view.render(Collections.singletonMap("async.value", Flux.just("World", "Spring")),
109+
view.render(Collections.singletonMap("async:value", Flux.just("World", "Spring")),
110110
MediaType.TEXT_EVENT_STREAM, this.exchange)
111111
.block(Duration.ofSeconds(300));
112112
assertThat(this.exchange.getResponse().getBodyAsString()
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{{#async.value}}
1+
{{#async:value}}
22
event: message
33
data: {{.}}
44

55

6-
{{/async.value}}
6+
{{/async:value}}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{{#async.value}}
1+
{{#async:value}}
22
event: message
3-
{{#ssedata}}
3+
{{#sse:data}}
44
{{.}}
5-
{{/ssedata}}
6-
{{/async.value}}
5+
{{/sse:data}}
6+
{{/async:value}}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /