diff --git a/reactor-netty-http/src/main/resources/META-INF/native-image/io.projectreactor.netty/reactor-netty-http/reflect-config.json b/reactor-netty-http/src/main/resources/META-INF/native-image/io.projectreactor.netty/reactor-netty-http/reflect-config.json index d3775f1317..b1d85028af 100644 --- a/reactor-netty-http/src/main/resources/META-INF/native-image/io.projectreactor.netty/reactor-netty-http/reflect-config.json +++ b/reactor-netty-http/src/main/resources/META-INF/native-image/io.projectreactor.netty/reactor-netty-http/reflect-config.json @@ -285,5 +285,12 @@ }, "name": "reactor.netty.http.server.logging.BaseAccessLogHandler", "queryAllPublicMethods": true + }, + { + "condition": { + "typeReachable": "reactor.netty.http.client.Http2ConnectionLivenessHandler" + }, + "name": "reactor.netty.http.client.Http2ConnectionLivenessHandler", + "queryAllPublicMethods": true } ] \ No newline at end of file diff --git a/reactor-netty-http/src/test/java/reactor/netty/http/client/Http2ConnectionLivenessHandlerTest.java b/reactor-netty-http/src/test/java/reactor/netty/http/client/Http2ConnectionLivenessHandlerTest.java index 5572274326..57d7573d51 100644 --- a/reactor-netty-http/src/test/java/reactor/netty/http/client/Http2ConnectionLivenessHandlerTest.java +++ b/reactor-netty-http/src/test/java/reactor/netty/http/client/Http2ConnectionLivenessHandlerTest.java @@ -246,7 +246,7 @@ void ackPingFrameWithinInterval() { .keepAlive(true) .secure(spec -> spec.sslContext(sslClient)) .http2Settings(builder -> { - builder.pingInterval(Duration.ofMillis(100)); + builder.pingInterval(Duration.ofMillis(300)); }) .get() .uri("/") @@ -254,7 +254,7 @@ void ackPingFrameWithinInterval() { .single() .block(); - Mono.delay(Duration.ofSeconds(1)) + Mono.delay(Duration.ofSeconds(2)) .block(); assertThat(handler.getReceivedPingTimes()).hasSizeGreaterThanOrEqualTo(2); @@ -287,7 +287,7 @@ void connectionRetentionInPoolOnPingFrameAck() { .keepAlive(true) .secure(spec -> spec.sslContext(sslClient)) .http2Settings(builder -> { - builder.pingInterval(Duration.ofMillis(100)); + builder.pingInterval(Duration.ofMillis(300)); }) .get() .uri("/") @@ -295,7 +295,7 @@ void connectionRetentionInPoolOnPingFrameAck() { .single() .block(); - Mono.delay(Duration.ofSeconds(1)) + Mono.delay(Duration.ofSeconds(2)) .block(); assertThat(handler.getReceivedPingTimes()).hasSizeGreaterThanOrEqualTo(2); diff --git a/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java b/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java index 06f6ef2506..409ed485f2 100644 --- a/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java +++ b/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java @@ -630,8 +630,6 @@ void testMaxConnectionPools(boolean withMaxConnectionPools) throws SSLException ConnectionProvider.builder("max-connection-pools").build(); try { - ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(String.class); - SslContext sslServer = SslContextBuilder.forServer(ssc.certificate(), ssc.privateKey()).build(); disposableServer = @@ -653,17 +651,9 @@ void testMaxConnectionPools(boolean withMaxConnectionPools) throws SSLException .expectComplete() .verify(Duration.ofSeconds(5)); - if (withMaxConnectionPools) { - Mockito.verify(spyLogger) - .warn(argumentCaptor.capture(), Mockito.eq(2), Mockito.eq(1)); - assertThat(argumentCaptor.getValue()) - .isEqualTo("Connection pool creation limit exceeded: {} pools created, maximum expected is {}"); - } - else { - Mockito.verify(spyLogger, times(0)) - .warn(Mockito.eq("Connection pool creation limit exceeded: {} pools created, maximum expected is {}"), - Mockito.eq(2), Mockito.eq(1)); - } + Mockito.verify(spyLogger, times(0)) + .warn(Mockito.eq("Connection pool creation limit exceeded: {} pools created, maximum expected is {}"), + Mockito.eq(2), Mockito.eq(1)); } finally { Loggers.resetLoggerFactory(); diff --git a/reactor-netty-http/src/test/java/reactor/netty/resources/PooledConnectionProviderDefaultMetricsTest.java b/reactor-netty-http/src/test/java/reactor/netty/resources/PooledConnectionProviderDefaultMetricsTest.java index b63dff62a7..74ebb039f6 100644 --- a/reactor-netty-http/src/test/java/reactor/netty/resources/PooledConnectionProviderDefaultMetricsTest.java +++ b/reactor-netty-http/src/test/java/reactor/netty/resources/PooledConnectionProviderDefaultMetricsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2024 VMware, Inc. or its affiliates, All Rights Reserved. + * Copyright (c) 2019-2025 VMware, Inc. or its affiliates, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -388,6 +388,8 @@ private void testIssue3060(ConnectionProvider provider) throws Exception { /* https://github.com/reactor/reactor-netty/issues/3519 */ @Test public void testConnectionProviderDisableAllBuiltInMetrics() throws Exception { + REGISTRY.clear(); + disposableServer = createServer() .handle((req, res) -> res.sendString(Mono.just("testConnectionProviderDisableAllBuiltInMetrics")))