Review comments 1

Author: wmedvede

client/oidc/src/main/java/io/quarkiverse/openapi/generator/oidc/providers/OAuth2AuthenticationProvider.java

@@ -3,11 +3,9 @@
 import static io.quarkiverse.openapi.generator.AuthConfig.TOKEN_PROPAGATION;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 
 import jakarta.ws.rs.client.ClientRequestContext;
-import jakarta.ws.rs.core.HttpHeaders;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,9 +33,7 @@ public void filter(ClientRequestContext requestContext) throws IOException {
         if (isTokenPropagation()) {
             String bearerToken = sanitizeBearerToken(getTokenForPropagation(requestContext.getHeaders()));
             if (!isEmptyOrBlank(bearerToken)) {
-                requestContext.getHeaders().remove(HttpHeaders.AUTHORIZATION);
-                requestContext.getHeaders().put(HttpHeaders.AUTHORIZATION,
-                        Collections.singletonList(OidcConstants.BEARER_SCHEME + " " + bearerToken));
+                addAuthorizationHeader(requestContext.getHeaders(), OidcConstants.BEARER_SCHEME + " " + bearerToken);
             }
         } else {
             delegate.filter(requestContext);

client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AbstractAuthProvider.java

@@ -4,6 +4,7 @@
 import static io.quarkiverse.openapi.generator.providers.AbstractAuthenticationPropagationHeadersFactory.propagationHeaderName;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -89,6 +90,10 @@ public static String getCanonicalAuthConfigPropertyName(String authPropertyName,
         return String.format(CANONICAL_AUTH_CONFIG_PROPERTY_NAME, openApiSpecId, authName, authPropertyName);
     }
 
+    protected void addAuthorizationHeader(MultivaluedMap<String, Object> headers, String value) {
+        headers.put(HttpHeaders.AUTHORIZATION, Collections.singletonList(value));
+    }
+
     protected static boolean isEmptyOrBlank(String value) {
         return value == null || value.isBlank();
     }

client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProvider.java

@@ -1,11 +1,9 @@
 package io.quarkiverse.openapi.generator.providers;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 
 import jakarta.ws.rs.client.ClientRequestContext;
-import jakarta.ws.rs.core.HttpHeaders;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,10 +44,7 @@ public void filter(ClientRequestContext requestContext) throws IOException {
         }
 
         if (!isEmptyOrBlank(basicToken)) {
-            requestContext.getHeaders().remove(HttpHeaders.AUTHORIZATION);
-            requestContext.getHeaders().put(HttpHeaders.AUTHORIZATION,
-                    Collections.singletonList(AuthUtils.basicAuthAccessToken(basicToken)));
+            addAuthorizationHeader(requestContext.getHeaders(), AuthUtils.basicAuthAccessToken(basicToken));
         }
-
     }
 }

client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProvider.java

@@ -1,11 +1,9 @@
 package io.quarkiverse.openapi.generator.providers;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 
 import jakarta.ws.rs.client.ClientRequestContext;
-import jakarta.ws.rs.core.HttpHeaders;
 
 /**
  * Provides bearer token authentication or any other valid scheme.
@@ -36,9 +34,7 @@ public void filter(ClientRequestContext requestContext) throws IOException {
         }
 
         if (!isEmptyOrBlank(bearerToken)) {
-            requestContext.getHeaders().remove(HttpHeaders.AUTHORIZATION);
-            requestContext.getHeaders().put(HttpHeaders.AUTHORIZATION,
-                    Collections.singletonList(AuthUtils.authTokenOrBearer(this.scheme, bearerToken)));
+            addAuthorizationHeader(requestContext.getHeaders(), AuthUtils.authTokenOrBearer(this.scheme, bearerToken));
         }
     }