From d7824c7831eebbce69efeb6ad7331a7512b56070 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 14 Feb 2023 11:00:01 +0100 Subject: [PATCH] Polishing --- .../org/springframework/core/io/buffer/DataBuffer.java | 2 -- .../core/io/buffer/DataBufferUtilsTests.java | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java index 6829c93a9e..870bfd7c57 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java @@ -519,7 +519,6 @@ public interface DataBuffer { * A dedicated iterator type that ensures the lifecycle of iterated * {@link ByteBuffer} elements. This iterator must be used in a * try-with-resources clause or explicitly {@linkplain #close() closed}. - * * @see DataBuffer#readableByteBuffers() * @see DataBuffer#writableByteBuffers() */ @@ -527,7 +526,6 @@ public interface DataBuffer { @Override void close(); - } } diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java index 17c355f2d8..21f6116a51 100644 --- a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java @@ -65,6 +65,7 @@ import static org.mockito.Mockito.mock; class DataBufferUtilsTests extends AbstractDataBufferAllocatingTests { private final Resource resource; + private final Path tempFile; @@ -207,7 +208,7 @@ class DataBufferUtilsTests extends AbstractDataBufferAllocatingTests { .verify(); } - @ParameterizedDataBufferAllocatingTest // gh-22107 + @ParameterizedDataBufferAllocatingTest // gh-22107 void readAsynchronousFileChannelCancelWithoutDemand(DataBufferFactory bufferFactory) throws Exception { super.bufferFactory = bufferFactory; @@ -790,7 +791,6 @@ class DataBufferUtilsTests extends AbstractDataBufferAllocatingTests { .consumeNextWith(stringConsumer("c")) .expectComplete() .verify(Duration.ofSeconds(5)); - } private Answer putByte(int b) { @@ -833,7 +833,7 @@ class DataBufferUtilsTests extends AbstractDataBufferAllocatingTests { .verifyError(DataBufferLimitException.class); } - @Test // gh-26060 + @Test // gh-26060 void joinWithLimitDoesNotOverRelease() { NettyDataBufferFactory bufferFactory = new NettyDataBufferFactory(PooledByteBufAllocator.DEFAULT); byte[] bytes = "foo-bar-baz".getBytes(StandardCharsets.UTF_8); @@ -1006,6 +1006,7 @@ class DataBufferUtilsTests extends AbstractDataBufferAllocatingTests { .verifyComplete(); } + private static class ZeroDemandSubscriber extends BaseSubscriber { @Override