Enable leak detection in Netty 5 tests

See gh-29310

Author: violetagg

build.gradle

@@ -84,6 +84,10 @@ configure([rootProject] + javaProjects) { project ->
 		systemProperty("java.awt.headless", "true")
 		systemProperty("testGroups", project.properties.get("testGroups"))
 		systemProperty("io.netty.leakDetection.level", "paranoid")
+		systemProperty("io.netty5.leakDetectionLevel", "paranoid")
+		systemProperty("io.netty5.leakDetection.targetRecords", "32")
+		systemProperty("io.netty5.buffer.lifecycleTracingEnabled", "true")
+		systemProperty("io.netty5.buffer.leakDetectionEnabled", "true")
 		jvmArgs(["--add-opens=java.base/java.lang=ALL-UNNAMED",
 				 "--add-opens=java.base/java.util=ALL-UNNAMED"])
 	}

spring-core/src/test/java/org/springframework/core/codec/Netty5BufferDecoderTests.java

@@ -87,7 +87,11 @@ public void decodeToMono() {
 	}
 
 	private Consumer<Buffer> expectByteBuffer(Buffer expected) {
-		return actual -> assertThat(actual).isEqualTo(expected);
+		return actual -> {
+			try (actual; expected) {
+				assertThat(actual).isEqualTo(expected);
+			}
+		};
 	}
 
 }

spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferTests.java

@@ -534,8 +534,12 @@ void asByteBufferIndexLength(DataBufferFactory bufferFactory) {
 		ByteBuffer result = buffer.asByteBuffer(1, 2);
 		assertThat(result.capacity()).isEqualTo(2);
 
-		assumeFalse(bufferFactory instanceof Netty5DataBufferFactory,
-				"Netty 5 does share the internal buffer");
+		boolean isNetty5DataBufferFactory = bufferFactory instanceof Netty5DataBufferFactory;
+		if (isNetty5DataBufferFactory) {
+			DataBufferUtils.release(buffer);
+		}
+
+		assumeFalse(isNetty5DataBufferFactory, "Netty 5 does share the internal buffer");
 
 		buffer.write((byte) 'c');
 		assertThat(result.remaining()).isEqualTo(2);
@@ -774,6 +778,9 @@ void spr16351(DataBufferFactory bufferFactory) {
 
 		assertThat(result).isEqualTo(bytes);
 
+		if (bufferFactory instanceof Netty5DataBufferFactory) {
+			release(slice);
+		}
 		release(buffer);
 	}
 

spring-core/src/testFixtures/java/org/springframework/core/testfixture/codec/AbstractDecoderTests.java

@@ -20,6 +20,7 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
+import io.netty5.buffer.Buffer;
 import org.junit.jupiter.api.Test;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
@@ -209,7 +210,13 @@ protected void testDecodeError(Publisher<DataBuffer> input, ResolvableType outpu
 
 		Flux<DataBuffer> buffer = Mono.from(input).concatWith(Flux.error(new InputException()));
 		assertThatExceptionOfType(InputException.class).isThrownBy(() ->
-				this.decoder.decode(buffer, outputType, mimeType, hints).blockLast(Duration.ofSeconds(5)));
+				this.decoder.decode(buffer, outputType, mimeType, hints)
+						.doOnNext(o -> {
+							if (o instanceof Buffer buf) {
+								buf.close();
+							}
+						})
+						.blockLast(Duration.ofSeconds(5)));
 	}
 
 	/**
@@ -226,7 +233,12 @@ protected void testDecodeError(Publisher<DataBuffer> input, ResolvableType outpu
 	protected void testDecodeCancel(Publisher<DataBuffer> input, ResolvableType outputType,
 			@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
 
-		Flux<?> result = this.decoder.decode(input, outputType, mimeType, hints);
+		Flux<?> result = this.decoder.decode(input, outputType, mimeType, hints)
+				.doOnNext(o -> {
+					if (o instanceof Buffer buf) {
+						buf.close();
+					}
+				});
 		StepVerifier.create(result).expectNextCount(1).thenCancel().verify();
 	}
 

spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java

@@ -21,6 +21,7 @@
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.core.io.buffer.Netty5DataBufferFactory;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
@@ -128,8 +129,15 @@ public String getPayloadAsText(Charset charset) {
 	 * @see DataBufferUtils#retain(DataBuffer)
 	 */
 	public WebSocketMessage retain() {
-		DataBufferUtils.retain(this.payload);
-		return this;
+		if (!(this.nativeMessage instanceof io.netty5.handler.codec.http.websocketx.WebSocketFrame frame) ) {
+			DataBufferUtils.retain(this.payload);
+			return this;
+		}
+		else {
+			io.netty5.handler.codec.http.websocketx.WebSocketFrame newFrame = frame.send().receive();
+			DataBuffer newPayload = ((Netty5DataBufferFactory) this.payload.factory()).wrap(newFrame.binaryData());
+			return new WebSocketMessage(this.type, newPayload, newFrame);
+		}
 	}
 
 	/**

spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/Netty5WebSocketSessionSupport.java

@@ -75,9 +75,8 @@ public Netty5DataBufferFactory bufferFactory() {
 
 
 	protected WebSocketMessage toMessage(WebSocketFrame frame) {
-		WebSocketFrame newFrame = frame.send().receive();
-		DataBuffer payload = bufferFactory().wrap(newFrame.binaryData());
-		return new WebSocketMessage(messageTypes.get(newFrame.getClass()), payload, newFrame);
+		DataBuffer payload = bufferFactory().wrap(frame.binaryData());
+		return new WebSocketMessage(messageTypes.get(frame.getClass()), payload, frame);
 	}
 
 	protected WebSocketFrame toFrame(WebSocketMessage message) {

spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java

@@ -220,7 +220,7 @@ public Mono<Void> handle(WebSocketSession session) {
 			return Mono.deferContextual(contextView -> {
 				String key = ServerWebExchangeContextFilter.EXCHANGE_CONTEXT_ATTRIBUTE;
 				assertThat(contextView.getOrEmpty(key).orElse(null)).isNotNull();
-				return session.send(session.receive().doOnNext(WebSocketMessage::retain));
+				return session.send(session.receive().map(WebSocketMessage::retain));
 			});
 		}
 	}