From 969d0bd08bab519311040649f1b12a70c944d7e1 Mon Sep 17 00:00:00 2001 From: injae-kim Date: Thu, 11 Jan 2024 02:20:12 +0900 Subject: [PATCH 1/2] Set correct limit in DefaultDataBuffer::getNativeBuffer Closes gh-30967 --- .../core/io/buffer/DefaultDataBuffer.java | 5 +- .../io/buffer/DefaultDataBufferTests.java | 55 +++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 spring-core/src/test/java/org/springframework/core/io/buffer/DefaultDataBufferTests.java diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java index 8d9fcda643..60ccb3ffa3 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java @@ -37,6 +37,7 @@ import org.springframework.util.ObjectUtils; * @author Arjen Poutsma * @author Juergen Hoeller * @author Brian Clozel + * @author Injae Kim * @since 5.0 * @see DefaultDataBufferFactory */ @@ -81,12 +82,12 @@ public class DefaultDataBuffer implements DataBuffer { /** * Directly exposes the native {@code ByteBuffer} that this buffer is based * on also updating the {@code ByteBuffer's} position and limit to match - * the current {@link #readPosition()} and {@link #readableByteCount()}. + * the current {@link #readPosition()} and {@link #writePosition()}. * @return the wrapped byte buffer */ public ByteBuffer getNativeBuffer() { this.byteBuffer.position(this.readPosition); - this.byteBuffer.limit(readableByteCount()); + this.byteBuffer.limit(this.writePosition); return this.byteBuffer; } diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/DefaultDataBufferTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/DefaultDataBufferTests.java new file mode 100644 index 0000000000..cab1dcb9d9 --- /dev/null +++ b/spring-core/src/test/java/org/springframework/core/io/buffer/DefaultDataBufferTests.java @@ -0,0 +1,55 @@ +/* + * Copyright 2024-2024 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.core.io.buffer; + +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; + +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.core.io.buffer.DataBufferUtils.release; + +/** + * Tests for {@link DefaultDataBuffer}. + * + * @author Injae Kim + * @since 6.2 + */ +class DefaultDataBufferTests { + + private final DefaultDataBufferFactory bufferFactory = new DefaultDataBufferFactory(); + + @Test // gh-30967 + void getNativeBuffer() { + DefaultDataBuffer buffer = bufferFactory.allocateBuffer(256); + buffer.write("0123456789", StandardCharsets.UTF_8); + + byte[] result = new byte[7]; + buffer.read(result); + assertThat(result).isEqualTo("0123456".getBytes(StandardCharsets.UTF_8)); + + ByteBuffer nativeBuffer = buffer.getNativeBuffer(); + assertThat(nativeBuffer.position()).isEqualTo(7); + assertThat(buffer.readPosition()).isEqualTo(7); + assertThat(nativeBuffer.limit()).isEqualTo(10); + assertThat(buffer.writePosition()).isEqualTo(10); + + release(buffer); + } + +} From 70004e9ad078f6b6fd72fe5b346ad282bc5e8aa6 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Tue, 20 Feb 2024 12:03:23 +0100 Subject: [PATCH 2/2] Polishing external contribution Change position and limit on duplicate, rather than source. See gh-30967 Closes gh-32009 --- .../core/io/buffer/DefaultDataBuffer.java | 13 +++++++------ .../core/io/buffer/DefaultDataBufferTests.java | 17 ++++++++++------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java index 60ccb3ffa3..d463af842a 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java @@ -37,7 +37,6 @@ import org.springframework.util.ObjectUtils; * @author Arjen Poutsma * @author Juergen Hoeller * @author Brian Clozel - * @author Injae Kim * @since 5.0 * @see DefaultDataBufferFactory */ @@ -81,14 +80,16 @@ public class DefaultDataBuffer implements DataBuffer { /** * Directly exposes the native {@code ByteBuffer} that this buffer is based - * on also updating the {@code ByteBuffer's} position and limit to match - * the current {@link #readPosition()} and {@link #writePosition()}. + * on. The {@linkplain ByteBuffer#position() position} of the returned + * {@code ByteBuffer} is set to the {@linkplain #readPosition() read + * position}, and the {@linkplain ByteBuffer#limit()} to the + * {@linkplain #writePosition() write position}. * @return the wrapped byte buffer */ public ByteBuffer getNativeBuffer() { - this.byteBuffer.position(this.readPosition); - this.byteBuffer.limit(this.writePosition); - return this.byteBuffer; + return this.byteBuffer.duplicate() + .position(this.readPosition) + .limit(this.writePosition); } private void setNativeBuffer(ByteBuffer byteBuffer) { diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/DefaultDataBufferTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/DefaultDataBufferTests.java index cab1dcb9d9..c91772af79 100644 --- a/spring-core/src/test/java/org/springframework/core/io/buffer/DefaultDataBufferTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/buffer/DefaultDataBufferTests.java @@ -36,20 +36,23 @@ class DefaultDataBufferTests { @Test // gh-30967 void getNativeBuffer() { - DefaultDataBuffer buffer = bufferFactory.allocateBuffer(256); - buffer.write("0123456789", StandardCharsets.UTF_8); + DefaultDataBuffer dataBuffer = this.bufferFactory.allocateBuffer(256); + dataBuffer.write("0123456789", StandardCharsets.UTF_8); byte[] result = new byte[7]; - buffer.read(result); + dataBuffer.read(result); assertThat(result).isEqualTo("0123456".getBytes(StandardCharsets.UTF_8)); - ByteBuffer nativeBuffer = buffer.getNativeBuffer(); + ByteBuffer nativeBuffer = dataBuffer.getNativeBuffer(); assertThat(nativeBuffer.position()).isEqualTo(7); - assertThat(buffer.readPosition()).isEqualTo(7); + assertThat(dataBuffer.readPosition()).isEqualTo(7); assertThat(nativeBuffer.limit()).isEqualTo(10); - assertThat(buffer.writePosition()).isEqualTo(10); + assertThat(dataBuffer.writePosition()).isEqualTo(10); + assertThat(nativeBuffer.capacity()).isEqualTo(256); + assertThat(dataBuffer.capacity()).isEqualTo(256); - release(buffer); + + release(dataBuffer); } }