From 372bd7cb0965b878b8c70df9e6caf4e9e8bdf840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 6 Oct 2026 10:59:48 +0200 Subject: [PATCH] Polish "Apply Jersey endpoint Jackson 2 mapper consistently" See gh-51937 --- .../web/JerseyEndpointIntegrationTests.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/module/spring-boot-jersey/src/test/java/org/springframework/boot/jersey/autoconfigure/actuate/endpoint/web/JerseyEndpointIntegrationTests.java b/module/spring-boot-jersey/src/test/java/org/springframework/boot/jersey/autoconfigure/actuate/endpoint/web/JerseyEndpointIntegrationTests.java index 21be51be187..37913840ad6 100644 --- a/module/spring-boot-jersey/src/test/java/org/springframework/boot/jersey/autoconfigure/actuate/endpoint/web/JerseyEndpointIntegrationTests.java +++ b/module/spring-boot-jersey/src/test/java/org/springframework/boot/jersey/autoconfigure/actuate/endpoint/web/JerseyEndpointIntegrationTests.java @@ -97,8 +97,7 @@ class JerseyEndpointIntegrationTests { new Class[] { EndpointsConfiguration.class, ResourceConfigConfiguration.class, EndpointObjectMapperConfiguration.class }, TomcatServletManagementContextAutoConfiguration.class, ServletManagementContextAutoConfiguration.class) - .withInitializer(new ServerPortInfoApplicationContextInitializer()) - .withPropertyValues("management.server.port=" + (separateManagementPort ? "0" : "")) + .with((runner) -> setUpManagementPort(runner, separateManagementPort)) .run((context) -> { WebServer webServer = context .getSourceApplicationContext(AnnotationConfigServletWebServerApplicationContext.class) @@ -108,10 +107,11 @@ class JerseyEndpointIntegrationTests { ? context.getEnvironment().getProperty("local.management.port", Integer.class) : webServer.getPort(); assertThat(port).isNotNull(); - WebTestClient.bindToServer() + WebTestClient client = WebTestClient.bindToServer() .baseUrl("http://localhost:" + port) - .build() - .get() + .responseTimeout(Duration.ofMinutes(5)) + .build(); + client.get() .uri("/actuator/beans") .exchange() .expectStatus() @@ -124,6 +124,12 @@ class JerseyEndpointIntegrationTests { }); } + private WebApplicationContextRunner setUpManagementPort(WebApplicationContextRunner runner, + boolean separateManagementPort) { + return (separateManagementPort) ? runner.withInitializer(new ServerPortInfoApplicationContextInitializer()) + .withPropertyValues("management.server.port=0") : runner; + } + protected void testJerseyEndpoints(Class[] userConfigurations) { getContextRunner(userConfigurations).run((context) -> { WebServer webServer = context