Apply feedback related to sync

gabriel-farache · gabriel-farache · commit 95315e85b03d · 2025-06-05T15:27:07.000+02:00
Signed-off-by: gabriel-farache &lt;gfarache@redhat.com&gt;
diff --git a/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapperTest.java b/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapperTest.java
@@ -104,7 +104,7 @@ void verifyOneOfDiscriminatorGeneration() throws java.net.URISyntaxException, Fi
         final CompilationUnit compilationUnit = StaticJavaParser.parse(classWithDiscriminator.orElseThrow());
         assertThat(compilationUnit.findFirst(ClassOrInterfaceDeclaration.class)
                 .flatMap(first -> first.getAnnotationByClass(com.fasterxml.jackson.annotation.JsonSubTypes.class)))
-                .isNotPresent();
+                        .isNotPresent();
     }
 
     /**
diff --git a/client/integration-tests/auth-provider/src/test/java/io/quarkiverse/openapi/generator/it/auth/KeycloakServiceMock.java b/client/integration-tests/auth-provider/src/test/java/io/quarkiverse/openapi/generator/it/auth/KeycloakServiceMock.java
@@ -35,13 +35,13 @@ public class KeycloakServiceMock implements QuarkusTestResourceLifecycleManager
 
     public static final String AUTH_REQUEST_BODY = "grant_type=client_credentials";
 
-    private WireMockServer wireMockServer;
+    private static final ThreadLocal<WireMockServer> wireMockServer = new ThreadLocal<>();
 
     @Override
     public Map<String, String> start() {
-        wireMockServer = new WireMockServer(options().dynamicPort());
-        wireMockServer.start();
-        configureFor(wireMockServer.port());
+        wireMockServer.set(new WireMockServer(options().dynamicPort()));
+        wireMockServer.get().start();
+        configureFor(wireMockServer.get().port());
 
         stubFor(post(KEY_CLOAK_SERVICE_TOKEN_PATH_VALUE)
                 .withHeader(CONTENT_TYPE, equalTo(APPLICATION_FORM_URLENCODED))
@@ -52,7 +52,7 @@ public Map<String, String> start() {
                         .withBody(getTokenResult())));
 
         Map<String, String> properties = new HashMap<>();
-        properties.put(KEY_CLOAK_SERVICE_URL, wireMockServer.baseUrl());
+        properties.put(KEY_CLOAK_SERVICE_URL, wireMockServer.get().baseUrl());
         properties.put(KEY_CLOAK_SERVICE_TOKEN_PATH, KEY_CLOAK_SERVICE_TOKEN_PATH_VALUE);
         return properties;
     }
@@ -74,8 +74,9 @@ private static String getTokenResult() {
 
     @Override
     public void stop() {
-        if (wireMockServer != null) {
-            wireMockServer.stop();
+        if (wireMockServer.get() != null) {
+            wireMockServer.get().stop();
+            wireMockServer.remove();
         }
     }
 }
diff --git a/client/integration-tests/auth-provider/src/test/java/io/quarkiverse/openapi/generator/it/auth/TokenWithCustomCredentialProviderTest.java b/client/integration-tests/auth-provider/src/test/java/io/quarkiverse/openapi/generator/it/auth/TokenWithCustomCredentialProviderTest.java
@@ -27,9 +27,7 @@ class TokenWithCustomCredentialProviderTest {
     @ParameterizedTest
     @ValueSource(strings = { "service1", "service2", "service3", "service5" })
     void testService(String service) {
-        Map<String, String> headers = new HashMap<>();
-        // service token-external-service1 and token-external-service2 will receive the AUTHORIZATION_TOKEN
-        headers.put(HttpHeaders.AUTHORIZATION, AUTHORIZATION_TOKEN);
+        Map<String, String> headers = Map.of(HttpHeaders.AUTHORIZATION, AUTHORIZATION_TOKEN);
 
         given()
                 .headers(headers)
diff --git a/client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/KeycloakServiceMock.java b/client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/KeycloakServiceMock.java
@@ -35,13 +35,12 @@ public class KeycloakServiceMock implements QuarkusTestResourceLifecycleManager
 
     public static final String AUTH_REQUEST_BODY = "grant_type=client_credentials";
 
-    private WireMockServer wireMockServer;
-
+    private static final ThreadLocal<WireMockServer> wireMockServer = new ThreadLocal<>();
     @Override
     public Map<String, String> start() {
-        wireMockServer = new WireMockServer(options().dynamicPort());
-        wireMockServer.start();
-        configureFor(wireMockServer.port());
+        wireMockServer.set(new WireMockServer(options().dynamicPort()));
+        wireMockServer.get().start();
+        configureFor(wireMockServer.get().port());
 
         stubFor(post(KEY_CLOAK_SERVICE_TOKEN_PATH_VALUE)
                 .withHeader(CONTENT_TYPE, equalTo(APPLICATION_FORM_URLENCODED))
@@ -52,7 +51,7 @@ public Map<String, String> start() {
                         .withBody(getTokenResult())));
 
         Map<String, String> properties = new HashMap<>();
-        properties.put(KEY_CLOAK_SERVICE_URL, wireMockServer.baseUrl());
+        properties.put(KEY_CLOAK_SERVICE_URL, wireMockServer.get().baseUrl());
         properties.put(KEY_CLOAK_SERVICE_TOKEN_PATH, KEY_CLOAK_SERVICE_TOKEN_PATH_VALUE);
         return properties;
     }
@@ -74,8 +73,9 @@ private static String getTokenResult() {
 
     @Override
     public void stop() {
-        if (wireMockServer != null) {
-            wireMockServer.stop();
+        if (wireMockServer.get() != null) {
+            wireMockServer.get().stop();
+            wireMockServer.remove();
         }
     }
 }
diff --git a/client/oidc/src/test/java/io/quarkiverse/openapi/generator/oidc/ReactiveOAuth2AuthenticationProviderTest.java b/client/oidc/src/test/java/io/quarkiverse/openapi/generator/oidc/ReactiveOAuth2AuthenticationProviderTest.java
@@ -16,7 +16,8 @@
 import org.assertj.core.api.Assertions;
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
-import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext;
+import org.jboss.resteasy.reactive.client.impl.ClientRequestContextImpl;
+import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -44,7 +45,10 @@ public class ReactiveOAuth2AuthenticationProviderTest {
 
     private static final String HEADER_NAME = "HEADER_NAME";
     @Mock
-    private ResteasyReactiveClientRequestContext reactiveRequestContext;
+    private ClientRequestContextImpl reactiveRequestContext;
+
+    @Mock
+    private RestClientRequestContext restClientRequestContext;
     private MultivaluedMap<String, Object> headers;
 
     private ReactiveOidcClientRequestFilterDelegate reactiveDelegate;
@@ -57,7 +61,11 @@ public class ReactiveOAuth2AuthenticationProviderTest {
     void setUp() {
         headers = new MultivaluedHashMap<>();
         Mockito.lenient().doReturn(headers).when(reactiveRequestContext).getHeaders();
-
+        Mockito.lenient().doReturn(restClientRequestContext).when(reactiveRequestContext).getRestClientRequestContext();
+        Mockito.lenient().doAnswer(invocationOnMock -> restClientRequestContext.setSuspended(true))
+                .when(restClientRequestContext).suspend();
+        Mockito.lenient().doAnswer(invocationOnMock -> restClientRequestContext.setSuspended(false))
+                .when(restClientRequestContext).resume();
         reactiveDelegate = Mockito.mock(ReactiveOidcClientRequestFilterDelegate.class);
         try {
             Mockito.lenient().doCallRealMethod().when(reactiveDelegate).filter(Mockito.any(ClientRequestContext.class));
@@ -87,19 +95,23 @@ static Stream<Arguments> filterWithPropagationTestValues() {
     }
 
     @Test
-    void filterReactive() throws IOException {
+    void filterReactive() throws IOException, InterruptedException {
         filter(provider, "Bearer " + ACCESS_TOKEN);
     }
 
-    private void filter(OAuth2AuthenticationProvider provider, String expectedAuthorizationHeader) throws IOException {
+    private void filter(OAuth2AuthenticationProvider provider, String expectedAuthorizationHeader)
+            throws IOException, InterruptedException {
         provider.filter(reactiveRequestContext);
+        while (reactiveRequestContext.getRestClientRequestContext().isSuspended()) {
+            Thread.sleep(1000);
+        }
         assertHeader(headers, HttpHeaders.AUTHORIZATION, expectedAuthorizationHeader);
     }
 
     @ParameterizedTest
     @MethodSource("filterWithPropagationTestValues")
     void filterWithPropagation(String headerName,
-            String expectedAuthorizationHeader) throws IOException {
+            String expectedAuthorizationHeader) throws IOException, InterruptedException {
         String propagatedHeaderName;
         if (headerName == null) {
             propagatedHeaderName = propagationHeaderName(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME,

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ void verifyOneOfDiscriminatorGeneration() throws java.net.URISyntaxException, Fi`
`104`	`104`	`final CompilationUnit compilationUnit = StaticJavaParser.parse(classWithDiscriminator.orElseThrow());`
`105`	`105`	`assertThat(compilationUnit.findFirst(ClassOrInterfaceDeclaration.class)`
`106`	`106`	`.flatMap(first -> first.getAnnotationByClass(com.fasterxml.jackson.annotation.JsonSubTypes.class)))`
`107`		`- .isNotPresent();`
	`107`	`+ .isNotPresent();`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`/**`