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

Change SseEvent#mimeType to SseEvent#mediaType

This commit is contained in:
Sebastien Deleuze 2016-06-24 17:21:01 +02:00
parent e6a0b39df5
commit 3fe87ee225
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-web-reactive/src/main/java/org/springframework/http/codec/SseEventEncoder.java
View File

@ -31,6 +31,7 @@ import org.springframework.core.codec.support.AbstractEncoder;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferFactory;
import org.springframework.core.io.buffer.FlushingDataBuffer;
import org.springframework.http.MediaType;
import org.springframework.util.Assert;
import org.springframework.util.MimeType;
import org.springframework.web.reactive.sse.SseEvent;
@ -87,8 +88,8 @@ public class SseEventEncoder extends AbstractEncoder<Object> {
Object data = event.getData();
Flux<DataBuffer> dataBuffer = Flux.empty();
MimeType mimeType = (event.getMimeType() == null ?
new MimeType("*") : event.getMimeType());
MediaType mediaType = (event.getMediaType() == null ?
MediaType.ALL : event.getMediaType());
if (data != null) {
sb.append("data:");
if (data instanceof String) {
@ -97,13 +98,13 @@ public class SseEventEncoder extends AbstractEncoder<Object> {
else {
Optional<Encoder<?>> encoder = dataEncoders
.stream()
.filter(e -> e.canEncode(ResolvableType.forClass(data.getClass()), mimeType))
.filter(e -> e.canEncode(ResolvableType.forClass(data.getClass()), mediaType))
.findFirst();
if (encoder.isPresent()) {
dataBuffer = ((Encoder<Object>)encoder.get())
.encode(Mono.just(data), bufferFactory,
ResolvableType.forClass(data.getClass()), mimeType)
ResolvableType.forClass(data.getClass()), mediaType)
.concatWith(encodeString("\n", bufferFactory));
}
else {

24
spring-web-reactive/src/main/java/org/springframework/web/reactive/sse/SseEvent.java
View File

@ -16,8 +16,8 @@
package org.springframework.web.reactive.sse;
import org.springframework.http.MediaType;
import org.springframework.http.codec.SseEventEncoder;
import org.springframework.util.MimeType;
/**
* Represent a Server-Sent Event.
@ -27,7 +27,7 @@ import org.springframework.util.MimeType;
*
* @author Sebastien Deleuze
* @see SseEventEncoder
* @see <a href="https://www.w3.org/TR/eventsource/">Server-Sent Events W3C recommandation</a>
* @see <a href="https://www.w3.org/TR/eventsource/">Server-Sent Events W3C recommendation</a>
*/
public class SseEvent {
@ -37,7 +37,7 @@ public class SseEvent {
private Object data;
private MimeType mimeType;
private MediaType mediaType;
private Long reconnectTime;
@ -59,9 +59,9 @@ public class SseEvent {
/**
* Create an instance with the provided {@code data} and {@code mediaType}.
*/
public SseEvent(Object data, MimeType mimeType) {
public SseEvent(Object data, MediaType mediaType) {
this.data = data;
this.mimeType = mimeType;
this.mediaType = mediaType;
}
/**
@ -102,7 +102,7 @@ public class SseEvent {
* - Turn multiline line {@code String} to multiple {@code data} fields
* - Serialize other {@code Object} as JSON
*
* @see #setMimeType(MimeType)
* @see #setMediaType(MediaType)
*/
public void setData(Object data) {
this.data = data;
@ -116,19 +116,19 @@ public class SseEvent {
}
/**
* Set the {@link MimeType} used to serialize the {@code data}.
* Set the {@link MediaType} used to serialize the {@code data}.
* {@link SseEventEncoder} should be configured with the relevant encoder to be
* able to serialize it.
*/
public void setMimeType(MimeType mimeType) {
this.mimeType = mimeType;
public void setMediaType(MediaType mediaType) {
this.mediaType = mediaType;
}
/**
* @see #setMimeType(MimeType)
* @see #setMediaType(MediaType)
*/
public MimeType getMimeType() {
return mimeType;
public MediaType getMediaType() {
return this.mediaType;
}
/**