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

Spring MVC recognizes gRPC streams 

For this to work, a compatible message converter is necessary,
but only available in spring-grpc.

See gh-35401
This commit is contained in:
rstoyanchev 2025-09-02 20:38:59 +01:00
parent 10a288c986
commit 79151a0bc2
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,8 @@ class ReactiveTypeHandler {
private static final MediaType WILDCARD_SUBTYPE_SUFFIXED_BY_NDJSON = MediaType.valueOf("application/*+x-ndjson"); private static final MediaType WILDCARD_SUBTYPE_SUFFIXED_BY_NDJSON = MediaType.valueOf("application/*+x-ndjson");
private static final MediaType APPLICATION_GRPC = MediaType.valueOf("application/grpc");
private static final boolean isContextPropagationPresent = ClassUtils.isPresent( private static final boolean isContextPropagationPresent = ClassUtils.isPresent(
"io.micrometer.context.ContextSnapshot", ReactiveTypeHandler.class.getClassLoader()); "io.micrometer.context.ContextSnapshot", ReactiveTypeHandler.class.getClassLoader());
@ -165,9 +167,14 @@ class ReactiveTypeHandler {
new SseEmitterSubscriber(emitter, this.taskExecutor, taskDecorator).connect(adapter, returnValue); new SseEmitterSubscriber(emitter, this.taskExecutor, taskDecorator).connect(adapter, returnValue);
return emitter; return emitter;
} }
if (mediaTypes.stream().anyMatch(APPLICATION_GRPC::includes)) {
ResponseBodyEmitter emitter = getEmitter(mediaType.orElse(APPLICATION_GRPC));
new BasicEmitterSubscriber(emitter, APPLICATION_GRPC, this.taskExecutor).connect(adapter, returnValue);
return emitter;
}
if (CharSequence.class.isAssignableFrom(elementClass)) { if (CharSequence.class.isAssignableFrom(elementClass)) {
ResponseBodyEmitter emitter = getEmitter(mediaType.orElse(MediaType.TEXT_PLAIN)); ResponseBodyEmitter emitter = getEmitter(mediaType.orElse(MediaType.TEXT_PLAIN));
new TextEmitterSubscriber(emitter, this.taskExecutor).connect(adapter, returnValue); new BasicEmitterSubscriber(emitter, MediaType.TEXT_PLAIN, this.taskExecutor).connect(adapter, returnValue);
return emitter; return emitter;
} }
MediaType streamingResponseType = findConcreteJsonStreamMediaType(mediaTypes); MediaType streamingResponseType = findConcreteJsonStreamMediaType(mediaTypes);
@ -475,15 +482,18 @@ class ReactiveTypeHandler {
} }
private static class TextEmitterSubscriber extends AbstractEmitterSubscriber { private static class BasicEmitterSubscriber extends AbstractEmitterSubscriber {
TextEmitterSubscriber(ResponseBodyEmitter emitter, TaskExecutor executor) { private final MediaType mediaType;
BasicEmitterSubscriber(ResponseBodyEmitter emitter, MediaType mediaType, TaskExecutor executor) {
super(emitter, executor, null); super(emitter, executor, null);
this.mediaType = mediaType;
} }
@Override @Override
protected void send(Object element) throws IOException { protected void send(Object element) throws IOException {
getEmitter().send(element, MediaType.TEXT_PLAIN); getEmitter().send(element, this.mediaType);
} }
} }