Rename data structure for CredentialProvider

gabriel-farache · gabriel-farache · commit eb736060df8a · 2025-05-15T09:55:24.000+02:00
Signed-off-by: gabriel-farache &lt;gfarache@redhat.com&gt;
diff --git a/client/integration-tests/auth-provider/src/main/java/io/quarkiverse/openapi/generator/it/auth/provider/CustomCredentialsProvider.java b/client/integration-tests/auth-provider/src/main/java/io/quarkiverse/openapi/generator/it/auth/provider/CustomCredentialsProvider.java
@@ -16,12 +16,12 @@ public CustomCredentialsProvider() {
     }
 
     @Override
-    public String getBearerToken(DataInput input) {
+    public String getBearerToken(CredentialsContext input) {
         return super.getBearerToken(input) + "_TEST";
     }
 
     @Override
-    public String getOauth2BearerToken(DataInput input) {
+    public String getOauth2BearerToken(CredentialsContext input) {
         return super.getOauth2BearerToken(input) + "_TEST";
     }
 }
diff --git a/client/oidc/src/main/java/io/quarkiverse/openapi/generator/oidc/providers/OAuth2AuthenticationProvider.java b/client/oidc/src/main/java/io/quarkiverse/openapi/generator/oidc/providers/OAuth2AuthenticationProvider.java
@@ -44,7 +44,7 @@ public void filter(ClientRequestContext requestContext) throws IOException {
             bearerToken = this.getTokenForPropagation(requestContext.getHeaders());
         } else {
             delegate.filter(requestContext);
-            bearerToken = this.getCredentialsProvider().getOauth2BearerToken(CredentialsProvider.DataInput.builder()
+            bearerToken = this.getCredentialsProvider().getOauth2BearerToken(CredentialsProvider.CredentialsContext.builder()
                     .requestContext(requestContext)
                     .openApiSpecId(getOpenApiSpecId())
                     .authName(getName())
diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProvider.java
@@ -59,7 +59,7 @@ && isUseAuthorizationHeaderValue()) {
     }
 
     private String getApiKey(ClientRequestContext requestContext) {
-        return credentialsProvider.getApiKey(CredentialsProvider.DataInput.builder()
+        return credentialsProvider.getApiKey(CredentialsProvider.CredentialsContext.builder()
                 .requestContext(requestContext)
                 .openApiSpecId(getOpenApiSpecId())
                 .authName(getName())
diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProvider.java
@@ -27,15 +27,15 @@ public BasicAuthenticationProvider(final String openApiSpecId, String name, List
     }
 
     private String getUsername(ClientRequestContext requestContext) {
-        return credentialsProvider.getBasicUsername(CredentialsProvider.DataInput.builder()
+        return credentialsProvider.getBasicUsername(CredentialsProvider.CredentialsContext.builder()
                 .requestContext(requestContext)
                 .openApiSpecId(getOpenApiSpecId())
                 .authName(getName())
                 .build());
     }
 
     private String getPassword(ClientRequestContext requestContext) {
-        return credentialsProvider.getBasicPassword(CredentialsProvider.DataInput.builder()
+        return credentialsProvider.getBasicPassword(CredentialsProvider.CredentialsContext.builder()
                 .requestContext(requestContext)
                 .openApiSpecId(getOpenApiSpecId())
                 .authName(getName())
diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProvider.java
@@ -40,7 +40,7 @@ public void filter(ClientRequestContext requestContext) throws IOException {
     }
 
     private String getBearerToken(ClientRequestContext requestContext) {
-        return credentialsProvider.getBearerToken(CredentialsProvider.DataInput.builder()
+        return credentialsProvider.getBearerToken(CredentialsProvider.CredentialsContext.builder()
                 .requestContext(requestContext)
                 .openApiSpecId(getOpenApiSpecId())
                 .authName(getName())
diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ConfigCredentialsProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ConfigCredentialsProvider.java
@@ -26,7 +26,7 @@ public ConfigCredentialsProvider() {
     }
 
     @Override
-    public String getApiKey(DataInput input) {
+    public String getApiKey(CredentialsContext input) {
         final String key = ConfigProvider.getConfig()
                 .getOptionalValue(
                         AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, input.getOpenApiSpecId(),
@@ -42,7 +42,7 @@ public String getApiKey(DataInput input) {
     }
 
     @Override
-    public String getBasicUsername(DataInput input) {
+    public String getBasicUsername(CredentialsContext input) {
         return ConfigProvider.getConfig()
                 .getOptionalValue(
                         AbstractAuthProvider.getCanonicalAuthConfigPropertyName(USER_NAME, input.getOpenApiSpecId(),
@@ -52,7 +52,7 @@ public String getBasicUsername(DataInput input) {
     }
 
     @Override
-    public String getBasicPassword(DataInput input) {
+    public String getBasicPassword(CredentialsContext input) {
         return ConfigProvider.getConfig()
                 .getOptionalValue(
                         AbstractAuthProvider.getCanonicalAuthConfigPropertyName(PASSWORD, input.getOpenApiSpecId(),
@@ -62,7 +62,7 @@ public String getBasicPassword(DataInput input) {
     }
 
     @Override
-    public String getBearerToken(DataInput input) {
+    public String getBearerToken(CredentialsContext input) {
         return ConfigProvider.getConfig()
                 .getOptionalValue(
                         AbstractAuthProvider.getCanonicalAuthConfigPropertyName(BEARER_TOKEN, input.getOpenApiSpecId(),
@@ -72,7 +72,7 @@ public String getBearerToken(DataInput input) {
     }
 
     @Override
-    public String getOauth2BearerToken(DataInput input) {
+    public String getOauth2BearerToken(CredentialsContext input) {
         return input.getRequestContext().getHeaderString(HttpHeaders.AUTHORIZATION);
     }
 }
diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/CredentialsProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/CredentialsProvider.java
@@ -15,49 +15,49 @@ public interface CredentialsProvider {
      * @param input the input data available to the method
      * @return the API Key to use when filtering the request
      */
-    String getApiKey(DataInput input);
+    String getApiKey(CredentialsContext input);
 
     /**
      * Gets the username given the OpenAPI definition and security schema
      *
      * @param input the input data available to the method
      * @return the username to use when filtering the request
      */
-    String getBasicUsername(DataInput input);
+    String getBasicUsername(CredentialsContext input);
 
     /**
      * Gets the password given the OpenAPI definition and security schema
      *
      * @param input the input data available to the method
      * @return the password to use when filtering the request
      */
-    String getBasicPassword(DataInput input);
+    String getBasicPassword(CredentialsContext input);
 
     /**
      * Gets the Bearer Token given the OpenAPI definition and security schema
      *
      * @param input the input data available to the method
      * @return the Bearer Token to use when filtering the request
      */
-    String getBearerToken(DataInput input);
+    String getBearerToken(CredentialsContext input);
 
     /**
      * Gets the OAuth2 Bearer Token given the OpenAPI definition and security schema
      *
      * @param input the input data available to the method
      * @return the Bearer Token to use when filtering the request
      */
-    String getOauth2BearerToken(DataInput input);
+    String getOauth2BearerToken(CredentialsContext input);
 
-    class DataInput {
+    class CredentialsContext {
         // requestContext The current request context in which set the authorization header token
         private ClientRequestContext requestContext;
         // openApiSpecId the OpenAPI Spec identification as defined by the OpenAPI Extension
         private String openApiSpecId;
         // authName The security schema for this Bearer Token definition
         private String authName;
 
-        public DataInput(ClientRequestContext requestContext, String openApiSpecId, String authName) {
+        public CredentialsContext(ClientRequestContext requestContext, String openApiSpecId, String authName) {
             this.requestContext = requestContext;
             this.openApiSpecId = openApiSpecId;
             this.authName = authName;
@@ -75,32 +75,32 @@ public String getAuthName() {
             return authName;
         }
 
-        public static DataInputBuilder builder() {
-            return new DataInputBuilder();
+        public static CredentialsContextBuilder builder() {
+            return new CredentialsContextBuilder();
         }
 
-        public static class DataInputBuilder {
+        public static class CredentialsContextBuilder {
             private ClientRequestContext requestContext;
             private String openApiSpecId;
             private String authName;
 
-            public DataInputBuilder requestContext(ClientRequestContext requestContext) {
+            public CredentialsContextBuilder requestContext(ClientRequestContext requestContext) {
                 this.requestContext = requestContext;
                 return this;
             }
 
-            public DataInputBuilder openApiSpecId(String openApiSpecId) {
+            public CredentialsContextBuilder openApiSpecId(String openApiSpecId) {
                 this.openApiSpecId = openApiSpecId;
                 return this;
             }
 
-            public DataInputBuilder authName(String authName) {
+            public CredentialsContextBuilder authName(String authName) {
                 this.authName = authName;
                 return this;
             }
 
-            public CredentialsProvider.DataInput build() {
-                return new CredentialsProvider.DataInput(requestContext, openApiSpecId, authName);
+            public CredentialsContext build() {
+                return new CredentialsContext(requestContext, openApiSpecId, authName);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ public CustomCredentialsProvider() {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`@Override`
`19`		`- public String getBearerToken(DataInput input) {`
	`19`	`+ public String getBearerToken(CredentialsContext input) {`
`20`	`20`	`return super.getBearerToken(input) + "_TEST";`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`@Override`
`24`		`- public String getOauth2BearerToken(DataInput input) {`
	`24`	`+ public String getOauth2BearerToken(CredentialsContext input) {`
`25`	`25`	`return super.getOauth2BearerToken(input) + "_TEST";`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ && isUseAuthorizationHeaderValue()) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`private String getApiKey(ClientRequestContext requestContext) {`
`62`		`- return credentialsProvider.getApiKey(CredentialsProvider.DataInput.builder()`
	`62`	`+ return credentialsProvider.getApiKey(CredentialsProvider.CredentialsContext.builder()`
`63`	`63`	`.requestContext(requestContext)`
`64`	`64`	`.openApiSpecId(getOpenApiSpecId())`
`65`	`65`	`.authName(getName())`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void filter(ClientRequestContext requestContext) throws IOException {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`private String getBearerToken(ClientRequestContext requestContext) {`
`43`		`- return credentialsProvider.getBearerToken(CredentialsProvider.DataInput.builder()`
	`43`	`+ return credentialsProvider.getBearerToken(CredentialsProvider.CredentialsContext.builder()`
`44`	`44`	`.requestContext(requestContext)`
`45`	`45`	`.openApiSpecId(getOpenApiSpecId())`
`46`	`46`	`.authName(getName())`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public ConfigCredentialsProvider() {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@Override`
`29`		`- public String getApiKey(DataInput input) {`
	`29`	`+ public String getApiKey(CredentialsContext input) {`
`30`	`30`	`final String key = ConfigProvider.getConfig()`
`31`	`31`	`.getOptionalValue(`
`32`	`32`	`AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, input.getOpenApiSpecId(),`
`@@ -42,7 +42,7 @@ public String getApiKey(DataInput input) {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Override`
`45`		`- public String getBasicUsername(DataInput input) {`
	`45`	`+ public String getBasicUsername(CredentialsContext input) {`
`46`	`46`	`return ConfigProvider.getConfig()`
`47`	`47`	`.getOptionalValue(`
`48`	`48`	`AbstractAuthProvider.getCanonicalAuthConfigPropertyName(USER_NAME, input.getOpenApiSpecId(),`
`@@ -52,7 +52,7 @@ public String getBasicUsername(DataInput input) {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Override`
`55`		`- public String getBasicPassword(DataInput input) {`
	`55`	`+ public String getBasicPassword(CredentialsContext input) {`
`56`	`56`	`return ConfigProvider.getConfig()`
`57`	`57`	`.getOptionalValue(`
`58`	`58`	`AbstractAuthProvider.getCanonicalAuthConfigPropertyName(PASSWORD, input.getOpenApiSpecId(),`
`@@ -62,7 +62,7 @@ public String getBasicPassword(DataInput input) {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Override`
`65`		`- public String getBearerToken(DataInput input) {`
	`65`	`+ public String getBearerToken(CredentialsContext input) {`
`66`	`66`	`return ConfigProvider.getConfig()`
`67`	`67`	`.getOptionalValue(`
`68`	`68`	`AbstractAuthProvider.getCanonicalAuthConfigPropertyName(BEARER_TOKEN, input.getOpenApiSpecId(),`
`@@ -72,7 +72,7 @@ public String getBearerToken(DataInput input) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`@Override`
`75`		`- public String getOauth2BearerToken(DataInput input) {`
	`75`	`+ public String getOauth2BearerToken(CredentialsContext input) {`
`76`	`76`	`return input.getRequestContext().getHeaderString(HttpHeaders.AUTHORIZATION);`
`77`	`77`	`}`
`78`	`78`	`}`