Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing and completing contribution

Browse Source 
See gh-24866
This commit is contained in:
Rossen Stoyanchev
2020-05-05 18:15:21 +01:00
parent 3543e47841
commit a7c736915a
10 changed files with 110 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-core/src/main/java/org/springframework/core/codec/ByteBufDecoder.java → spring-core/src/main/java/org/springframework/core/codec/NettyByteBufDecoder.java
View File

@@ -16,8 +16,11 @@
package org.springframework.core.codec;
import java.util.Map;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferUtils;
@@ -26,17 +29,15 @@ import org.springframework.lang.Nullable;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
import java.util.Map;
/**
* Decoder for {@link ByteBuf ByteBufs}.
*
* @author Vladislav Kisel
* @since 5.3
*/
public class ByteBufDecoder extends AbstractDataBufferDecoder<ByteBuf> {
public class NettyByteBufDecoder extends AbstractDataBufferDecoder<ByteBuf> {
public ByteBufDecoder() {
public NettyByteBufDecoder() {
super(MimeTypeUtils.ALL);
}
@@ -51,18 +52,17 @@ public class ByteBufDecoder extends AbstractDataBufferDecoder<ByteBuf> {
public ByteBuf decode(DataBuffer dataBuffer, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
// Copies the dataBuffer if needed only
ByteBuf byteBuf;
if (dataBuffer instanceof NettyDataBuffer) {
byteBuf = ((NettyDataBuffer) dataBuffer).getNativeBuffer();
} else {
byteBuf = Unpooled.wrappedBuffer(dataBuffer.asByteBuffer());
DataBufferUtils.release(dataBuffer);
}
if (logger.isDebugEnabled()) {
logger.debug(Hints.getLogPrefix(hints) + "Read " + byteBuf.readableBytes() + " bytes");
logger.debug(Hints.getLogPrefix(hints) + "Read " + dataBuffer.readableByteCount() + " bytes");
}
if (dataBuffer instanceof NettyDataBuffer) {
return ((NettyDataBuffer) dataBuffer).getNativeBuffer();
}
ByteBuf byteBuf;
byte[] bytes = new byte[dataBuffer.readableByteCount()];
dataBuffer.read(bytes);
byteBuf = Unpooled.wrappedBuffer(bytes);
DataBufferUtils.release(dataBuffer);
return byteBuf;
}

35
spring-core/src/main/java/org/springframework/core/codec/ByteBufEncoder.java → spring-core/src/main/java/org/springframework/core/codec/NettyByteBufEncoder.java
View File

@@ -16,8 +16,12 @@
package org.springframework.core.codec;
import java.util.Map;
import io.netty.buffer.ByteBuf;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferFactory;
@@ -25,9 +29,6 @@ import org.springframework.core.io.buffer.NettyDataBufferFactory;
import org.springframework.lang.Nullable;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
import reactor.core.publisher.Flux;
import java.util.Map;
/**
* Encoder for {@link ByteBuf ByteBufs}.
@@ -35,17 +36,17 @@ import java.util.Map;
* @author Vladislav Kisel
* @since 5.3
*/
public class ByteBufEncoder extends AbstractEncoder<ByteBuf> {
public class NettyByteBufEncoder extends AbstractEncoder<ByteBuf> {
public ByteBufEncoder() {
public NettyByteBufEncoder() {
super(MimeTypeUtils.ALL);
}
@Override
public boolean canEncode(ResolvableType elementType, @Nullable MimeType mimeType) {
Class<?> clazz = elementType.toClass();
return super.canEncode(elementType, mimeType) && ByteBuf.class.isAssignableFrom(clazz);
public boolean canEncode(ResolvableType type, @Nullable MimeType mimeType) {
Class<?> clazz = type.toClass();
return super.canEncode(type, mimeType) && ByteBuf.class.isAssignableFrom(clazz);
}
@Override
@@ -61,18 +62,16 @@ public class ByteBufEncoder extends AbstractEncoder<ByteBuf> {
public DataBuffer encodeValue(ByteBuf byteBuf, DataBufferFactory bufferFactory,
ResolvableType valueType, @Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
DataBuffer dataBuffer;
if (bufferFactory instanceof NettyDataBufferFactory) {
dataBuffer = ((NettyDataBufferFactory) bufferFactory).wrap(byteBuf);
} else {
dataBuffer = bufferFactory.wrap(byteBuf.nioBuffer());
}
if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
String logPrefix = Hints.getLogPrefix(hints);
logger.debug(logPrefix + "Writing " + dataBuffer.readableByteCount() + " bytes");
logger.debug(logPrefix + "Writing " + byteBuf.readableBytes() + " bytes");
}
return dataBuffer;
if (bufferFactory instanceof NettyDataBufferFactory) {
return ((NettyDataBufferFactory) bufferFactory).wrap(byteBuf);
}
byte[] bytes = new byte[byteBuf.readableBytes()];
byteBuf.readBytes(bytes);
byteBuf.release();
return bufferFactory.wrap(bytes);
}
}