spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-22 14:09:25 +00:00
Code Issues Projects Releases Wiki Activity

Polishing in Protobuf support

Browse Source 
See gh-35403
This commit is contained in:
rstoyanchev
2025-10-23 12:16:52 +01:00
parent 7c83892b9b
commit 87607cccff
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufCodecSupport.java
+2 -2
View File
@@ -47,8 +47,8 @@ public abstract class ProtobufCodecSupport {
if (mimeType == null) {
return true;
}
for (MimeType m : MIME_TYPES) {
if (m.isCompatibleWith(mimeType)) {
for (MimeType supportedMimeType : MIME_TYPES) {
if (supportedMimeType.isCompatibleWith(mimeType)) {
return true;
}
}
spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java
+1 -2
View File
@@ -129,8 +129,7 @@ public class ProtobufDecoder extends ProtobufCodecSupport implements Decoder<Mes
public Flux<Message> decode(Publisher<DataBuffer> inputStream, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
MessageDecoderFunction decoderFunction =
new MessageDecoderFunction(elementType, this.maxMessageSize);
MessageDecoderFunction decoderFunction = new MessageDecoderFunction(elementType, this.maxMessageSize);
return Flux.from(inputStream)
.flatMapIterable(decoderFunction)
spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufJsonDecoder.java
+16 -5
View File
@@ -131,12 +131,19 @@ public class ProtobufJsonDecoder implements Decoder<Message> {
}
@Override
public Flux<Message> decode(Publisher<DataBuffer> inputStream, ResolvableType targetType, @Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
return Flux.error(new UnsupportedOperationException("Protobuf decoder does not support Flux, use Mono<List<...>> instead."));
public Flux<Message> decode(
Publisher<DataBuffer> inputStream, ResolvableType targetType, @Nullable MimeType mimeType,
@Nullable Map<String, Object> hints) {
return Flux.error(new UnsupportedOperationException(
"Protobuf decoder does not support Flux, use Mono<List<...>> instead."));
}
@Override
public Message decode(DataBuffer dataBuffer, ResolvableType targetType, @Nullable MimeType mimeType, @Nullable Map<String, Object> hints) throws DecodingException {
public Message decode(
DataBuffer dataBuffer, ResolvableType targetType, @Nullable MimeType mimeType,
@Nullable Map<String, Object> hints) throws DecodingException {
try {
Message.Builder builder = getMessageBuilder(targetType.toClass());
this.parser.merge(new InputStreamReader(dataBuffer.asInputStream()), builder);
@@ -164,10 +171,14 @@ public class ProtobufJsonDecoder implements Decoder<Message> {
}
@Override
public Mono<Message> decodeToMono(Publisher<DataBuffer> inputStream, ResolvableType elementType, @Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
public Mono<Message> decodeToMono(
Publisher<DataBuffer> inputStream, ResolvableType elementType, @Nullable MimeType mimeType,
@Nullable Map<String, Object> hints) {
return DataBufferUtils.join(inputStream, this.maxMessageSize)
.map(dataBuffer -> decode(dataBuffer, elementType, mimeType, hints))
.onErrorMap(DataBufferLimitException.class, exc -> new DecodingException("Could not decode JSON as Protobuf message", exc));
.onErrorMap(DataBufferLimitException.class,
exc -> new DecodingException("Could not decode JSON as Protobuf message", exc));
}
}
spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
+1
View File
@@ -257,6 +257,7 @@ public class ProtobufHttpMessageConverter extends AbstractHttpMessageConverter<M
return true;
}
/**
* Protobuf format support.
*/