You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2025/11/23 16:06:08 UTC
(cxf) 01/03: Fix flaky SwaggerUiConfigurationTest::testUiRootResourceAddsOAuth2ConfigAsConfigured test case
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8f50aeeb736a9343127b361addccf8227c64431d
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Nov 23 10:53:57 2025 -0500
Fix flaky SwaggerUiConfigurationTest::testUiRootResourceAddsOAuth2ConfigAsConfigured test case
(cherry picked from commit d64b51b391c9de976718ce4359f70ec740c7bc5e)
---
.../org/apache/cxf/jaxrs/swagger/ui/SwaggerUiOAuth2Config.java | 4 ++--
.../jaxrs/description/openapi/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/openapi/SwaggerUiConfigurationTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/SwaggerUiConfigurationTest.java
index ec68a4af2e..5a90418a39 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/SwaggerUiConfigurationTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/SwaggerUiConfigurationTest.java
@@ -22,8 +22,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.json.JsonMapper;
import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
import jakarta.ws.rs.core.MediaType;
@@ -42,7 +40,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;
@@ -165,11 +162,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() + ")"));
}
}