This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 950ca446d598ac79194631c4d4453de746768dd1 Author: Andriy Redko <[email protected]> AuthorDate: Sun Nov 23 10:53:57 2025 -0500 Fix flaky SwaggerUiConfigurationTest::testUiRootResourceAddsOAuth2ConfigAsConfigured test case (cherry picked from commit d64b51b391c9de976718ce4359f70ec740c7bc5e) (cherry picked from commit 8f50aeeb736a9343127b361addccf8227c64431d) (cherry picked from commit 87553e92d2ac5b4b7479914930209239c38b966b) # Conflicts: # systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java --- .../org/apache/cxf/jaxrs/swagger/ui/SwaggerUiOAuth2Config.java | 4 ++-- .../systest/jaxrs/description/SwaggerUiConfigurationTest.java | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiOAuth2Config.java b/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiOAuth2Config.java index cf553dd595..0c23b2af87 100644 --- a/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiOAuth2Config.java +++ b/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiOAuth2Config.java @@ -180,7 +180,7 @@ public class SwaggerUiOAuth2Config { private void addListField(StringBuilder json, String name, List<String> value) { if (value != null) { json.append(quote(name)).append(':').append( - value.stream().map(this::quote) + value.stream().map(this::quote).sorted() .collect(Collectors.joining(",", "[", "]")) ).append(','); } @@ -189,7 +189,7 @@ public class SwaggerUiOAuth2Config { private void addMapField(StringBuilder json, String name, Map<String, String> value) { if (value != null) { json.append(quote(name)).append(':').append( - value.entrySet().stream().map(this::entryToString) + value.entrySet().stream().map(this::entryToString).sorted() .collect(Collectors.joining(",", "{", "}")) ).append(','); } diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java index 2d4d3d3c2f..3fa79dd68d 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java @@ -25,8 +25,6 @@ import java.util.Map; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import org.apache.cxf.Bus; @@ -43,7 +41,6 @@ import org.apache.cxf.testutil.common.AbstractServerTestServerBase; import org.junit.BeforeClass; import org.junit.Test; -import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; @@ -166,11 +163,7 @@ public class SwaggerUiConfigurationTest extends AbstractClientServerTestBase { try (Response response = uiClient.get()) { String jsCode = response.readEntity(String.class); - final JsonMapper mapper = JsonMapper.builder() - .defaultPropertyInclusion(JsonInclude.Value.construct(NON_EMPTY, NON_EMPTY)) - .build(); - final String expectedConfigAsJson = mapper.writeValueAsString(OAUTH2_CONFIG); - assertThat(jsCode, containsString("ui.initOAuth(" + expectedConfigAsJson + ")")); + assertThat(jsCode, containsString("ui.initOAuth(" + OAUTH2_CONFIG.toJsonString() + ")")); } }
