root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

SPR-13080 SseEventBuilder needs event rather than name

This commit is contained in:
Jasper de Vries 2015-05-28 21:30:31 +02:00 committed by Rossen Stoyanchev
parent 3e74476c11
commit ec4783400c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitter.java
View File

@ -171,7 +171,7 @@ public class SseEmitter extends ResponseBodyEmitter {
@Override @Override
public SseEventBuilder name(String name) { public SseEventBuilder name(String name) {
append("name:").append(name != null ? name : "").append("\n"); append("event:").append(name != null ? name : "").append("\n");
return this; return this;
} }

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandlerTests.java
View File

@ -147,7 +147,7 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
emitter.send(event().comment("a test").name("update").id("1").reconnectTime(5000L).data(bean1).data(bean2)); emitter.send(event().comment("a test").name("update").id("1").reconnectTime(5000L).data(bean1).data(bean2));
assertEquals(":a test\n" + assertEquals(":a test\n" +
"name:update\n" + "event:update\n" +
"id:1\n" + "id:1\n" +
"retry:5000\n" + "retry:5000\n" +
"data:{\"id\":1,\"name\":\"Joe\"}\n" + "data:{\"id\":1,\"name\":\"Joe\"}\n" +

4
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitterTests.java
View File

@ -96,7 +96,7 @@ public class SseEmitterTests {
public void sendEventFull() throws Exception { public void sendEventFull() throws Exception {
this.emitter.send(event().comment("blah").name("test").reconnectTime(5000L).id("1").data("foo")); this.emitter.send(event().comment("blah").name("test").reconnectTime(5000L).id("1").data("foo"));
this.handler.assertSentObjectCount(3); this.handler.assertSentObjectCount(3);
this.handler.assertObject(0, ":blah\nname:test\nretry:5000\nid:1\ndata:", SseEmitter.TEXT_PLAIN); this.handler.assertObject(0, ":blah\nevent:test\nretry:5000\nid:1\ndata:", SseEmitter.TEXT_PLAIN);
this.handler.assertObject(1, "foo"); this.handler.assertObject(1, "foo");
this.handler.assertObject(2, "\n\n", SseEmitter.TEXT_PLAIN); this.handler.assertObject(2, "\n\n", SseEmitter.TEXT_PLAIN);
} }
@ -109,7 +109,7 @@ public class SseEmitterTests {
this.handler.assertObject(1, "foo"); this.handler.assertObject(1, "foo");
this.handler.assertObject(2, "\ndata:", SseEmitter.TEXT_PLAIN); this.handler.assertObject(2, "\ndata:", SseEmitter.TEXT_PLAIN);
this.handler.assertObject(3, "bar"); this.handler.assertObject(3, "bar");
this.handler.assertObject(4, "\nname:test\nretry:5000\nid:1\n\n", SseEmitter.TEXT_PLAIN); this.handler.assertObject(4, "\nevent:test\nretry:5000\nid:1\n\n", SseEmitter.TEXT_PLAIN);
} }